diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-09 03:34:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 03:34:47 +0000 |
| commit | 031b9477663e0974fbc765795ccd7694a0430b5a (patch) | |
| tree | 5a470e777f6569097eb23ab0a5d662b5212a55cf /telephony/java/android | |
| parent | af468addb672ef002dee64376bc06f2bf8c6c0f9 (diff) | |
| parent | 348988c5704a5a6eb6aec093e295c2d9f00ee33c (diff) | |
| download | frameworks_base-031b9477663e0974fbc765795ccd7694a0430b5a.zip frameworks_base-031b9477663e0974fbc765795ccd7694a0430b5a.tar.gz frameworks_base-031b9477663e0974fbc765795ccd7694a0430b5a.tar.bz2 | |
am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
* commit '348988c5704a5a6eb6aec093e295c2d9f00ee33c':
Fix permissions on TelephonyManager
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 7211570..8526b86 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1371,7 +1371,7 @@ public class TelephonyManager { try { ITelephony telephony = getITelephony(); if (telephony != null) { - return telephony.getNetworkTypeForSubscriber(subId); + return telephony.getNetworkTypeForSubscriber(subId, getOpPackageName()); } else { // This can happen when the ITelephony interface is not up yet. return NETWORK_TYPE_UNKNOWN; @@ -1425,7 +1425,7 @@ public class TelephonyManager { try{ ITelephony telephony = getITelephony(); if (telephony != null) { - return telephony.getDataNetworkTypeForSubscriber(subId); + return telephony.getDataNetworkTypeForSubscriber(subId, getOpPackageName()); } else { // This can happen when the ITelephony interface is not up yet. return NETWORK_TYPE_UNKNOWN; @@ -1919,7 +1919,7 @@ public class TelephonyManager { ITelephony telephony = getITelephony(); if (telephony == null) return PhoneConstants.LTE_ON_CDMA_UNKNOWN; - return telephony.getLteOnCdmaModeForSubscriber(subId); + return telephony.getLteOnCdmaModeForSubscriber(subId, getOpPackageName()); } catch (RemoteException ex) { // Assume no ICC card if remote exception which shouldn't happen return PhoneConstants.LTE_ON_CDMA_UNKNOWN; @@ -2657,7 +2657,7 @@ public class TelephonyManager { ITelephony telephony = getITelephony(); if (telephony == null) return -1; - return telephony.getCdmaEriIconIndexForSubscriber(subId); + return telephony.getCdmaEriIconIndexForSubscriber(subId, getOpPackageName()); } catch (RemoteException ex) { // the phone process is restarting. return -1; @@ -2688,7 +2688,7 @@ public class TelephonyManager { ITelephony telephony = getITelephony(); if (telephony == null) return -1; - return telephony.getCdmaEriIconModeForSubscriber(subId); + return telephony.getCdmaEriIconModeForSubscriber(subId, getOpPackageName()); } catch (RemoteException ex) { // the phone process is restarting. return -1; @@ -2716,7 +2716,7 @@ public class TelephonyManager { ITelephony telephony = getITelephony(); if (telephony == null) return null; - return telephony.getCdmaEriTextForSubscriber(subId); + return telephony.getCdmaEriTextForSubscriber(subId, getOpPackageName()); } catch (RemoteException ex) { // the phone process is restarting. return null; @@ -3833,7 +3833,7 @@ public class TelephonyManager { try { ITelephony telephony = getITelephony(); if (telephony != null) - return telephony.isOffhook(); + return telephony.isOffhook(getOpPackageName()); } catch (RemoteException e) { Log.e(TAG, "Error calling ITelephony#isOffhook", e); } @@ -3846,7 +3846,7 @@ public class TelephonyManager { try { ITelephony telephony = getITelephony(); if (telephony != null) - return telephony.isRinging(); + return telephony.isRinging(getOpPackageName()); } catch (RemoteException e) { Log.e(TAG, "Error calling ITelephony#isRinging", e); } @@ -3859,7 +3859,7 @@ public class TelephonyManager { try { ITelephony telephony = getITelephony(); if (telephony != null) - return telephony.isIdle(); + return telephony.isIdle(getOpPackageName()); } catch (RemoteException e) { Log.e(TAG, "Error calling ITelephony#isIdle", e); } @@ -3872,7 +3872,7 @@ public class TelephonyManager { try { ITelephony telephony = getITelephony(); if (telephony != null) - return telephony.isRadioOn(); + return telephony.isRadioOn(getOpPackageName()); } catch (RemoteException e) { Log.e(TAG, "Error calling ITelephony#isRadioOn", e); } |