diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-04-21 19:52:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-21 19:52:11 +0000 |
| commit | 24aadf18d5f69f33460cf266ab8952c644a12c55 (patch) | |
| tree | fd11dfea73178645344bb46308b392a77f12b77c /telephony/java/android | |
| parent | fb52c73fb5507ecb1e4e71d5e73a3fde65bce94d (diff) | |
| parent | 21301f6016ce50594f6cd9c66581ee9a08b57be9 (diff) | |
| download | frameworks_base-24aadf18d5f69f33460cf266ab8952c644a12c55.zip frameworks_base-24aadf18d5f69f33460cf266ab8952c644a12c55.tar.gz frameworks_base-24aadf18d5f69f33460cf266ab8952c644a12c55.tar.bz2 | |
Merge "Add OP_READ_PHONE_STATE app op continued - framework"
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 3ecf5ac..e4c003a 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -396,7 +396,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - subInfo = iSub.getActiveSubscriptionInfo(subId); + subInfo = iSub.getActiveSubscriptionInfo(subId, mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -424,7 +424,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.getActiveSubscriptionInfoForIccId(iccId); + result = iSub.getActiveSubscriptionInfoForIccId(iccId, mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -450,7 +450,8 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.getActiveSubscriptionInfoForSimSlotIndex(slotIdx); + result = iSub.getActiveSubscriptionInfoForSimSlotIndex(slotIdx, + mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -472,7 +473,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.getAllSubInfoList(); + result = iSub.getAllSubInfoList(mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -510,7 +511,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.getActiveSubscriptionInfoList(); + result = iSub.getActiveSubscriptionInfoList(mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -531,7 +532,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.getAllSubInfoCount(); + result = iSub.getAllSubInfoCount(mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -551,7 +552,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.getActiveSubInfoCount(); + result = iSub.getActiveSubInfoCount(mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -600,7 +601,7 @@ public class SubscriptionManager { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { // FIXME: This returns 1 on success, 0 on error should should we return it? - iSub.addSubInfoRecord(iccId, slotId); + iSub.addSubInfoRecord(iccId, slotId, mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -630,7 +631,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.setIconTint(tint, subId); + result = iSub.setIconTint(tint, subId, mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -675,7 +676,8 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.setDisplayNameUsingSrc(displayName, subId, nameSource); + result = iSub.setDisplayNameUsingSrc(displayName, subId, nameSource, + mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -703,7 +705,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.setDisplayNumber(number, subId); + result = iSub.setDisplayNumber(number, subId, mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -732,7 +734,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.setDataRoaming(roaming, subId); + result = iSub.setDataRoaming(roaming, subId, mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -967,7 +969,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - iSub.clearSubInfo(); + iSub.clearSubInfo(mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it @@ -1001,7 +1003,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - iSub.clearDefaultsForInactiveSubIds(); + iSub.clearDefaultsForInactiveSubIds(mContext.getOpPackageName()); } } catch (RemoteException ex) { // ignore it |