Merge "Add OP_READ_PHONE_STATE app op continued - framework" (24aadf18) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+16 −14

Original line number	Diff line number	Diff line
		@@ -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

telephony/java/com/android/internal/telephony/ISub.aidl

+29 −15

Original line number	Diff line number	Diff line
		@@ -22,42 +22,48 @@ import com.android.internal.telephony.ISubscriptionListener;

		interface ISub {
		/**
		* @param callingPackage The package maing the call.
		* @return a list of all subscriptions in the database, this includes
		* all subscriptions that have been seen.
		*/
		List<SubscriptionInfo> getAllSubInfoList();
		List<SubscriptionInfo> getAllSubInfoList(String callingPackage);

		/**
		* @param callingPackage The package maing the call.
		* @return the count of all subscriptions in the database, this includes
		* all subscriptions that have been seen.
		*/
		int getAllSubInfoCount();
		int getAllSubInfoCount(String callingPackage);

		/**
		* Get the active SubscriptionInfo with the subId key
		* @param subId The unique SubscriptionInfo key in database
		* @param callingPackage The package maing the call.
		* @return SubscriptionInfo, maybe null if its not active
		*/
		SubscriptionInfo getActiveSubscriptionInfo(int subId);
		SubscriptionInfo getActiveSubscriptionInfo(int subId, String callingPackage);

		/**
		* Get the active SubscriptionInfo associated with the iccId
		* @param iccId the IccId of SIM card
		* @param callingPackage The package maing the call.
		* @return SubscriptionInfo, maybe null if its not active
		*/
		SubscriptionInfo getActiveSubscriptionInfoForIccId(String iccId);
		SubscriptionInfo getActiveSubscriptionInfoForIccId(String iccId, String callingPackage);

		/**
		* Get the active SubscriptionInfo associated with the slotIdx
		* @param slotIdx the slot which the subscription is inserted
		* @param callingPackage The package maing the call.
		* @return SubscriptionInfo, maybe null if its not active
		*/
		SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int slotIdx);
		SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int slotIdx, String callingPackage);

		/**
		* Get the SubscriptionInfo(s) of the active subscriptions. The records will be sorted
		* by {@link SubscriptionInfo#getSimSlotIndex} then by {@link SubscriptionInfo#getSubscriptionId}.
		*
		* @param callingPackage The package maing the call.
		* @return Sorted list of the currently {@link SubscriptionInfo} records available on the device.
		* <ul>
		* <li>
		@@ -74,12 +80,13 @@ interface ISub {
		* </li>
		* </ul>
		*/
		List<SubscriptionInfo> getActiveSubscriptionInfoList();
		List<SubscriptionInfo> getActiveSubscriptionInfoList(String callingPackage);

		/**
		* @param callingPackage The package maing the call.
		* @return the number of active subscriptions
		*/
		int getActiveSubInfoCount();
		int getActiveSubInfoCount(String callingPackage);

		/**
		* @return the maximum number of subscriptions this device will support at any one time.
		@@ -90,50 +97,57 @@ interface ISub {
		* Add a new SubscriptionInfo to subinfo database if needed
		* @param iccId the IccId of the SIM card
		* @param slotId the slot which the SIM is inserted
		* @param callingPackage The package maing the call.
		* @return the URL of the newly created row or the updated row
		*/
		int addSubInfoRecord(String iccId, int slotId);
		int addSubInfoRecord(String iccId, int slotId, String callingPackage);

		/**
		* Set SIM icon tint color by simInfo index
		* @param tint the icon tint color of the SIM
		* @param subId the unique SubscriptionInfo index in database
		* @param callingPackage The package maing the call.
		* @return the number of records updated
		*/
		int setIconTint(int tint, int subId);
		int setIconTint(int tint, int subId, String callingPackage);

		/**
		* Set display name by simInfo index
		* @param displayName the display name of SIM card
		* @param subId the unique SubscriptionInfo index in database
		* @param callingPackage The package maing the call.
		* @return the number of records updated
		*/
		int setDisplayName(String displayName, int subId);
		int setDisplayName(String displayName, int subId, String callingPackage);

		/**
		* Set display name by simInfo index with name source
		* @param displayName the display name of SIM card
		* @param subId the unique SubscriptionInfo index in database
		* @param nameSource, 0: DEFAULT_SOURCE, 1: SIM_SOURCE, 2: USER_INPUT
		* @param callingPackage The package maing the call.
		* @return the number of records updated
		*/
		int setDisplayNameUsingSrc(String displayName, int subId, long nameSource);
		int setDisplayNameUsingSrc(String displayName, int subId, long nameSource,
		String callingPackage);

		/**
		* Set phone number by subId
		* @param number the phone number of the SIM
		* @param subId the unique SubscriptionInfo index in database
		* @param callingPackage The package maing the call.
		* @return the number of records updated
		*/
		int setDisplayNumber(String number, int subId);
		int setDisplayNumber(String number, int subId, String callingPackage);

		/**
		* Set data roaming by simInfo index
		* @param roaming 0:Don't allow data when roaming, 1:Allow data when roaming
		* @param callingPackage The package maing the call.
		* @param subId the unique SubscriptionInfo index in database
		* @return the number of records updated
		*/
		int setDataRoaming(int roaming, int subId);
		int setDataRoaming(int roaming, int subId, String callingPackage);

		int getSlotId(int subId);

		@@ -141,7 +155,7 @@ interface ISub {

		int getDefaultSubId();

		int clearSubInfo();
		int clearSubInfo(String callingPackage);

		int getPhoneId(int subId);

		@@ -161,7 +175,7 @@ interface ISub {

		void setDefaultSmsSubId(int subId);

		void clearDefaultsForInactiveSubIds();
		void clearDefaultsForInactiveSubIds(String callingPackage);

		int[] getActiveSubIdList();