ソースを参照

EuiccChannelManager: Better logging about the APDU channel used

Peter Cai 2 年 前
コミット
e493a8e885

+ 2 - 0
app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt

@@ -81,10 +81,12 @@ open class EuiccChannelManager(protected val context: Context) {
             var euiccChannel: EuiccChannel? = tryOpenEuiccChannelPrivileged(uiccInfo, channelInfo)
             var euiccChannel: EuiccChannel? = tryOpenEuiccChannelPrivileged(uiccInfo, channelInfo)
 
 
             if (euiccChannel == null) {
             if (euiccChannel == null) {
+                Log.i(TAG, "Trying OMAPI for slot ${uiccInfo.slotIndex}")
                 try {
                 try {
                     euiccChannel = OmapiChannel(seService!!, channelInfo)
                     euiccChannel = OmapiChannel(seService!!, channelInfo)
                 } catch (e: IllegalArgumentException) {
                 } catch (e: IllegalArgumentException) {
                     // Failed
                     // Failed
+                    Log.w(TAG, "OMAPI APDU interface unavailable for slot ${uiccInfo.slotIndex}.")
                 }
                 }
             }
             }
 
 

+ 2 - 1
app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelManager.kt

@@ -13,12 +13,13 @@ class PrivilegedEuiccChannelManager(context: Context): EuiccChannelManager(conte
 
 
     override fun tryOpenEuiccChannelPrivileged(uiccInfo: UiccCardInfo, channelInfo: EuiccChannelInfo): EuiccChannel? {
     override fun tryOpenEuiccChannelPrivileged(uiccInfo: UiccCardInfo, channelInfo: EuiccChannelInfo): EuiccChannel? {
         if (uiccInfo.isEuicc && !uiccInfo.isRemovable) {
         if (uiccInfo.isEuicc && !uiccInfo.isRemovable) {
-            Log.d(TAG, "Using TelephonyManager for slot ${uiccInfo.slotIndex}")
+            Log.i(TAG, "Trying TelephonyManager for slot ${uiccInfo.slotIndex}")
             // TODO: On Tiramisu, we should also connect all available "ports" for MEP support
             // TODO: On Tiramisu, we should also connect all available "ports" for MEP support
             try {
             try {
                 return TelephonyManagerChannel(channelInfo, tm)
                 return TelephonyManagerChannel(channelInfo, tm)
             } catch (e: IllegalArgumentException) {
             } catch (e: IllegalArgumentException) {
                 // Failed
                 // Failed
+                Log.w(TAG, "TelephonyManager APDU interface unavailable for slot ${uiccInfo.slotIndex}, falling back")
             }
             }
         }
         }
         return null
         return null