diff options
Diffstat (limited to 'telephony/java/android/telephony/SubscriptionManager.java')
-rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 88ca8a4..33e52bf 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -32,8 +32,6 @@ import com.android.internal.telephony.ISub; import com.android.internal.telephony.IOnSubscriptionsChangedListener; import com.android.internal.telephony.ITelephonyRegistry; import com.android.internal.telephony.PhoneConstants; -import com.android.internal.telephony.TelephonyProperties; - import java.util.ArrayList; import java.util.List; @@ -274,10 +272,6 @@ public class SubscriptionManager { * for #onSubscriptionsChanged to be invoked. */ public static class OnSubscriptionsChangedListener { - /** @hide */ - public static final String PERMISSION_ON_SUBSCRIPTIONS_CHANGED = - android.Manifest.permission.READ_PHONE_STATE; - private final Handler mHandler = new Handler() { @Override public void handleMessage(Message msg) { @@ -402,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 @@ -430,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 @@ -456,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 @@ -478,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 @@ -516,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 @@ -537,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 @@ -557,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 @@ -606,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 @@ -636,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 @@ -681,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 @@ -709,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 @@ -738,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 @@ -973,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 @@ -1007,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 |