diff options
| author | Nate Jiang <qiangjiang@google.com> | 2020-04-17 10:11:44 -0700 |
|---|---|---|
| committer | Nate Jiang <qiangjiang@google.com> | 2020-04-17 10:16:03 -0700 |
| commit | e09a2fd27995f08cc032cd9ebfcefea76d8cbd68 (patch) | |
| tree | 6bf153f1d20d4f343208ca99f78f7e7bafa9f955 | |
| parent | bfe73b182d85930ea04d0c2cdce2c73674fc3b6f (diff) | |
Log Sim identity info after null check.
Bug: 154290461
Test: atest com.android.server.wifi
Change-Id: I3ba8cf0f2e4ca5a3f28c3d9a384266cd446ace88
| -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 99fa7f585..c8c46cf04 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -3942,13 +3942,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; |