commit d5ca61de3fc83ca512c7eac7e7a8cfd21999eff6
author Les Lee <lesl@google.com> Tue Apr 06 05:24:54 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 06 05:24:54 2021 +0000
tree f36f1cd0ad2fd0c623bd1f527b222049ac704d07
parent ecf81a98bdaa06686601b7882ca57f96c788f41a
parent e7ac82b9a343f56bf6016d8d8ba291a8d51ba7da

Merge "Fix Wi-Fi SSID null handling" am: cadd76044e am: e7ac82b9a3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624059

Change-Id: I9dacf92104c544f9ed12dc6fa60e4895ab228cbd

core/java/android/net/NetworkIdentity.java

diff --git a/core/java/android/net/NetworkIdentity.java b/core/java/android/net/NetworkIdentity.java
index b037261..1eef7d9 100644
--- a/core/java/android/net/NetworkIdentity.java
+++ b/core/java/android/net/NetworkIdentity.java
@@ -198,15 +198,11 @@
         final int oemManaged = getOemBitfield(snapshot.networkCapabilities);
 
         if (legacyType == TYPE_WIFI) {
-            if (snapshot.networkCapabilities.getSsid() != null) {
-                networkId = snapshot.networkCapabilities.getSsid();
-                if (networkId == null) {
-                    // TODO: Figure out if this code path never runs. If so, remove them.
-                    final WifiManager wifi = (WifiManager) context.getSystemService(
-                            Context.WIFI_SERVICE);
-                    final WifiInfo info = wifi.getConnectionInfo();
-                    networkId = info != null ? info.getSSID() : null;
-                }
+            networkId = snapshot.networkCapabilities.getSsid();
+            if (networkId == null) {
+                final WifiManager wifi = context.getSystemService(WifiManager.class);
+                final WifiInfo info = wifi.getConnectionInfo();
+                networkId = info != null ? info.getSSID() : null;
             }
         }