LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I713bc2ec,Ib9ab07c9

Browse Source 
* changes:
  [FUI05] Remove wimax data usage unit test
  [FUI14] Get SSID from NetworkCapabilities
This commit is contained in:
Treehugger Robot
2021-01-26 13:13:24 +00:00
committed by Gerrit Code Review
parent 160aac3fa0 c44d11ccec
commit 6fe4b878e5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/NetworkIdentity.java
View File

@@ -194,15 +194,17 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
subscriberId = state.subscriberId; subscriberId = state.subscriberId;
if (type == TYPE_WIFI) { if (type == TYPE_WIFI) {
if (state.networkId != null) { if (state.networkCapabilities.getSsid() != null) {
networkId = state.networkId; networkId = state.networkCapabilities.getSsid();
} else { if (networkId == null) {
// TODO: Figure out if this code path never runs. If so, remove them.
final WifiManager wifi = (WifiManager) context.getSystemService( final WifiManager wifi = (WifiManager) context.getSystemService(
Context.WIFI_SERVICE); Context.WIFI_SERVICE);
final WifiInfo info = wifi.getConnectionInfo(); final WifiInfo info = wifi.getConnectionInfo();
networkId = info != null ? info.getSSID() : null; networkId = info != null ? info.getSSID() : null;
} }
} }
}
return new NetworkIdentity(type, subType, subscriberId, networkId, roaming, metered, return new NetworkIdentity(type, subType, subscriberId, networkId, roaming, metered,
defaultNetwork); defaultNetwork);