diff options
| author | Nate Jiang <qiangjiang@google.com> | 2020-04-17 22:04:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-17 22:04:25 +0000 |
| commit | 9d4e665b8e4c121abd1a8d1e63e1932a7666a5b1 (patch) | |
| tree | be19241b8a5e0a84040071f6980936e3c3fffd2e | |
| parent | 11e48601e54881059f44535efe2fd4b3c017eff2 (diff) | |
| parent | e09a2fd27995f08cc032cd9ebfcefea76d8cbd68 (diff) | |
Merge "Log Sim identity info after null check." into rvc-dev
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index 603573224..00e02df4a 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -3935,13 +3935,14 @@ public class ClientModeImpl extends StateMachine { // Pair<identity, encrypted identity> Pair<String, String> identityPair = mWifiCarrierInfoManager .getSimIdentity(mTargetWifiConfiguration); - Log.i(TAG, "SUP_REQUEST_IDENTITY: identityPair=[" - + ((identityPair.first.length() >= 7) - ? identityPair.first.substring(0, 7 /* Prefix+PLMN ID */) + "****" - : identityPair.first) + ", " - + (!TextUtils.isEmpty(identityPair.second) ? identityPair.second - : "<NONE>") + "]"); if (identityPair != null && identityPair.first != null) { + Log.i(TAG, "SUP_REQUEST_IDENTITY: identityPair=[" + + ((identityPair.first.length() >= 7) + ? identityPair.first.substring(0, 7 /* Prefix+PLMN ID */) + + "****" + : identityPair.first) + ", " + + (!TextUtils.isEmpty(identityPair.second) ? identityPair.second + : "<NONE>") + "]"); mWifiNative.simIdentityResponse(mInterfaceName, identityPair.first, identityPair.second); identitySent = true; |