commit 595224508d643bc0464bdf6ae36e4b4a0c31ea4f
author Julien Desprez <jdesprez@google.com> Tue Mar 24 09:55:06 2020 -0700
committer Julien Desprez <jdesprez@google.com> Tue Mar 24 09:55:38 2020 -0700
tree baa56b4eec0e79d7f1be1d2e82ec69961779f579
parent 17b7a24ed8756fc6f3a57bd08e26b60aeb33f5d0

Improve logging for sim card matching

Test: unit tests
Bug: 150842800
Change-Id: I99ecc8ca6fb9e1323d88818527e82256fe5b0f35

src/com/android/tradefed/invoker/shard/token/TelephonyTokenProvider.java

diff --git a/src/com/android/tradefed/invoker/shard/token/TelephonyTokenProvider.java b/src/com/android/tradefed/invoker/shard/token/TelephonyTokenProvider.java
index 2b62177..0a50a70 100644
--- a/src/com/android/tradefed/invoker/shard/token/TelephonyTokenProvider.java
+++ b/src/com/android/tradefed/invoker/shard/token/TelephonyTokenProvider.java
@@ -62,12 +62,17 @@
                 case SECURE_ELEMENT_SIM_CARD:
                     if (info.mHasSecuredElement && info.mHasSeService) {
                         // TODO: Improve how we detect this use case.
-                        if (ORANGE_SIM_ID.equals(device.getProperty(GSM_OPERATOR_PROP))) {
+                        String simProp = device.getProperty(GSM_OPERATOR_PROP);
+                        if (ORANGE_SIM_ID.equals(simProp)) {
                             return true;
                         } else {
                             CLog.w(
-                                    "%s doesn't have a Orange Sim card for secured elements.",
-                                    device.getSerialNumber());
+                                    "%s doesn't have a Orange Sim card (%s) for secured elements."
+                                            + " %s returned: '%s'",
+                                    device.getSerialNumber(),
+                                    ORANGE_SIM_ID,
+                                    GSM_OPERATOR_PROP,
+                                    simProp);
                         }
                     }