Merge "Remove usage of Telephonymanager getDefault() hidden API"

This commit is contained in:
Jayachandran Chinnakkannu
2019-11-18 06:19:58 +00:00
committed by Gerrit Code Review

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;