commit 6fe4b878e56b1d5f7cb7b6110d3ce37c79e182b4
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 26 13:13:24 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 26 13:13:24 2021 +0000
tree c957f1774def870365515531fd056bae8d14e7b8
parent 160aac3fa03a1c6387c31d62a1a6b32c7caa7e42
parent c44d11ccec5b2bdf82bf6e7d350b49eba5361f2a

Merge changes I713bc2ec,Ib9ab07c9

* changes:
  [FUI05] Remove wimax data usage unit test
  [FUI14] Get SSID from NetworkCapabilities

core/java/android/net/NetworkIdentity.java

diff --git a/core/java/android/net/NetworkIdentity.java b/core/java/android/net/NetworkIdentity.java
index a0dc72d..b644ed5 100644
--- a/core/java/android/net/NetworkIdentity.java
+++ b/core/java/android/net/NetworkIdentity.java
@@ -194,13 +194,15 @@
         subscriberId = state.subscriberId;
 
         if (type == TYPE_WIFI) {
-            if (state.networkId != null) {
-                networkId = state.networkId;
-            } else {
-                final WifiManager wifi = (WifiManager) context.getSystemService(
-                        Context.WIFI_SERVICE);
-                final WifiInfo info = wifi.getConnectionInfo();
-                networkId = info != null ? info.getSSID() : null;
+            if (state.networkCapabilities.getSsid() != null) {
+                networkId = state.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;
+                }
             }
         }