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

Merge changes I713bc2ec,Ib9ab07c9 am: 6fe4b878e5 am: db887739f9 am: 1ec09a7e48

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b291a4e82b89d3808e9bcd980d5b2aa4d2b1b71
This commit is contained in:
Treehugger Robot
2021-01-27 07:53:30 +00:00
committed by Automerger Merge Worker
parent 9d5f64d15f 1ec09a7e48
commit 93f61ef742
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

@@ -195,15 +195,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);