drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8

Browse Source 
automerge: 6b27472

* commit '6b274720c5a210c07256e5b9fc11a1e9aca59017':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
This commit is contained in:
Shishir Agrawal
2015-02-11 03:44:42 +00:00
committed by android-build-merger
parent 5ff571155f 6b274720c5
commit b7e04f3294
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/location/GpsLocationProvider.java
View File

@ -788,9 +788,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
} }
if (info != null) { if (info != null) {
boolean dataEnabled = TelephonyManager.getIntWithSubId(mContext.getContentResolver(), boolean dataEnabled = TelephonyManager.getDefault().getDataEnabled();
Settings.Global.MOBILE_DATA, SubscriptionManager.getDefaultSubId(),
1) == 1;
boolean networkAvailable = info.isAvailable() && dataEnabled; boolean networkAvailable = info.isAvailable() && dataEnabled;
String defaultApn = getSelectedApn(); String defaultApn = getSelectedApn();
if (defaultApn == null) { if (defaultApn == null) {

4
telephony/java/android/telephony/TelephonyManager.java
View File

@ -3665,12 +3665,12 @@ public class TelephonyManager {
/** @hide */ /** @hide */
@SystemApi @SystemApi
public boolean getDataEnabled(int subId) { public boolean getDataEnabled(int subId) {
boolean retVal; boolean retVal = false;
try { try {
retVal = getITelephony().getDataEnabled(subId); retVal = getITelephony().getDataEnabled(subId);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#getDataEnabled", e); Log.e(TAG, "Error calling ITelephony#getDataEnabled", e);
retVal = false; } catch (NullPointerException e) {
} }
Log.d(TAG, "getDataEnabled: retVal=" + retVal); Log.d(TAG, "getDataEnabled: retVal=" + retVal);
return retVal; return retVal;