diff options
| author | Shishir Agrawal <shishir@google.com> | 2015-02-10 19:02:38 -0800 |
|---|---|---|
| committer | Shishir Agrawal <shishir@google.com> | 2015-02-10 19:20:16 -0800 |
| commit | 64ce5f8fab077e4792737f86502d0e77ad6cbb0b (patch) | |
| tree | 3ac8aa67bc95fcf440c8223af13b2642e4b7ccb6 /telephony | |
| parent | 3bb5fdc7e607febaad3bd41ed7a36b596b7286af (diff) | |
| download | frameworks_base-64ce5f8fab077e4792737f86502d0e77ad6cbb0b.zip frameworks_base-64ce5f8fab077e4792737f86502d0e77ad6cbb0b.tar.gz frameworks_base-64ce5f8fab077e4792737f86502d0e77ad6cbb0b.tar.bz2 | |
GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug: 18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 513359b..db0da61 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3669,12 +3669,12 @@ public class TelephonyManager { /** @hide */ @SystemApi public boolean getDataEnabled(int subId) { - boolean retVal; + boolean retVal = false; try { retVal = getITelephony().getDataEnabled(subId); } catch (RemoteException e) { Log.e(TAG, "Error calling ITelephony#getDataEnabled", e); - retVal = false; + } catch (NullPointerException e) { } Log.d(TAG, "getDataEnabled: retVal=" + retVal); return retVal; |