Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of Telephonymanager getDefault() hidden API" am: 29146f991b

Browse Source 
am: 400c51fa68

Change-Id: I7bf39235ed2a8b947479c791e04365254ad58b8d
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-18 01:05:59 -08:00
committed by android-build-merger
parent 6d2b8e0d6a 400c51fa68
commit 8b8cb98096
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/location/GnssNetworkConnectivityHandler.java
View File

@@ -321,7 +321,11 @@ class GnssNetworkConnectivityHandler {
private void handleUpdateNetworkState(Network network, boolean isConnected,
NetworkCapabilities capabilities) {
boolean networkAvailable = isConnected && TelephonyManager.getDefault().getDataEnabled();
boolean networkAvailable = false;
TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
if (telephonyManager != null) {
networkAvailable = isConnected && telephonyManager.getDataEnabled();
}
NetworkAttributes networkAttributes = updateTrackedNetworksState(isConnected, network,
capabilities);
String apn = networkAttributes.mApn;