Merge "Revert "TelephonyManager: cache service handles"" (50b12192) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SmsManager.java

+16 −4

Original line number	Diff line number	Diff line
		@@ -780,7 +780,11 @@ public final class SmsManager {
		"Invalid pdu format. format must be either 3gpp or 3gpp2");
		}
		try {
		ISms iSms = TelephonyManager.getSmsService();
		ISms iSms = ISms.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSmsServiceRegisterer()
		.get());
		if (iSms != null) {
		iSms.injectSmsPduForSubscriber(
		getSubscriptionId(), pdu, format, receivedIntent);
		@@ -1603,7 +1607,7 @@ public final class SmsManager {
		* the service does not exist.
		*/
		private static ISms getISmsServiceOrThrow() {
		ISms iSms = TelephonyManager.getSmsService();
		ISms iSms = getISmsService();
		if (iSms == null) {
		throw new UnsupportedOperationException("Sms is not supported");
		}
		@@ -1611,7 +1615,11 @@ public final class SmsManager {
		}

		private static ISms getISmsService() {
		return TelephonyManager.getSmsService();
		return ISms.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSmsServiceRegisterer()
		.get());
		}

		/**
		@@ -2045,7 +2053,11 @@ public final class SmsManager {
		public boolean isSMSPromptEnabled() {
		ISms iSms = null;
		try {
		iSms = TelephonyManager.getSmsService();
		iSms = ISms.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSmsServiceRegisterer()
		.get());
		return iSms.isSMSPromptEnabled();
		} catch (RemoteException ex) {
		return false;

telephony/java/android/telephony/SubscriptionManager.java

+210 −42

Original line number	Diff line number	Diff line
		@@ -1146,7 +1146,11 @@ public class SubscriptionManager {
		SubscriptionInfo subInfo = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		subInfo = iSub.getActiveSubscriptionInfo(subId, mContext.getOpPackageName(),
		mContext.getFeatureId());
		@@ -1180,7 +1184,11 @@ public class SubscriptionManager {
		SubscriptionInfo result = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getActiveSubscriptionInfoForIccId(iccId, mContext.getOpPackageName(),
		mContext.getFeatureId());
		@@ -1214,7 +1222,11 @@ public class SubscriptionManager {
		SubscriptionInfo result = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getActiveSubscriptionInfoForSimSlotIndex(slotIndex,
		mContext.getOpPackageName(), mContext.getFeatureId());
		@@ -1238,7 +1250,11 @@ public class SubscriptionManager {
		List<SubscriptionInfo> result = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getAllSubInfoList(mContext.getOpPackageName(),
		mContext.getFeatureId());
		@@ -1319,7 +1335,11 @@ public class SubscriptionManager {
		List<SubscriptionInfo> activeList = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		activeList = iSub.getActiveSubscriptionInfoList(mContext.getOpPackageName(),
		mContext.getFeatureId());
		@@ -1370,7 +1390,11 @@ public class SubscriptionManager {
		List<SubscriptionInfo> result = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getAvailableSubscriptionInfoList(mContext.getOpPackageName(),
		mContext.getFeatureId());
		@@ -1409,7 +1433,11 @@ public class SubscriptionManager {
		List<SubscriptionInfo> result = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getAccessibleSubscriptionInfoList(mContext.getOpPackageName());
		}
		@@ -1438,7 +1466,11 @@ public class SubscriptionManager {
		public void requestEmbeddedSubscriptionInfoListRefresh() {
		int cardId = TelephonyManager.from(mContext).getCardIdForDefaultEuicc();
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.requestEmbeddedSubscriptionInfoListRefresh(cardId);
		}
		@@ -1467,7 +1499,11 @@ public class SubscriptionManager {
		@SystemApi
		public void requestEmbeddedSubscriptionInfoListRefresh(int cardId) {
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.requestEmbeddedSubscriptionInfoListRefresh(cardId);
		}
		@@ -1488,7 +1524,11 @@ public class SubscriptionManager {
		int result = 0;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getAllSubInfoCount(mContext.getOpPackageName(),
		mContext.getFeatureId());
		@@ -1517,7 +1557,11 @@ public class SubscriptionManager {
		int result = 0;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getActiveSubInfoCount(mContext.getOpPackageName(),
		mContext.getFeatureId());
		@@ -1538,7 +1582,11 @@ public class SubscriptionManager {
		int result = 0;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getActiveSubInfoCountMax();
		}
		@@ -1595,7 +1643,11 @@ public class SubscriptionManager {
		}

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub == null) {
		Log.e(LOG_TAG, "[addSubscriptionInfoRecord]- ISub service is null");
		return;
		@@ -1629,7 +1681,11 @@ public class SubscriptionManager {
		}

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub == null) {
		Log.e(LOG_TAG, "[removeSubscriptionInfoRecord]- ISub service is null");
		return;
		@@ -1732,7 +1788,11 @@ public class SubscriptionManager {
		int result = INVALID_SIM_SLOT_INDEX;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getSlotIndex(subscriptionId);
		}
		@@ -1766,7 +1826,11 @@ public class SubscriptionManager {
		int[] subId = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		subId = iSub.getSubId(slotIndex);
		}
		@@ -1790,7 +1854,11 @@ public class SubscriptionManager {
		int result = INVALID_PHONE_INDEX;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getPhoneId(subId);
		}
		@@ -1824,7 +1892,11 @@ public class SubscriptionManager {
		int subId = INVALID_SUBSCRIPTION_ID;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		subId = iSub.getDefaultSubId();
		}
		@@ -1847,7 +1919,11 @@ public class SubscriptionManager {
		int subId = INVALID_SUBSCRIPTION_ID;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		subId = iSub.getDefaultVoiceSubId();
		}
		@@ -1877,7 +1953,11 @@ public class SubscriptionManager {
		public void setDefaultVoiceSubscriptionId(int subscriptionId) {
		if (VDBG) logd("setDefaultVoiceSubId sub id = " + subscriptionId);
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.setDefaultVoiceSubId(subscriptionId);
		}
		@@ -1925,7 +2005,11 @@ public class SubscriptionManager {
		int subId = INVALID_SUBSCRIPTION_ID;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		subId = iSub.getDefaultSmsSubId();
		}
		@@ -1951,7 +2035,11 @@ public class SubscriptionManager {
		public void setDefaultSmsSubId(int subscriptionId) {
		if (VDBG) logd("setDefaultSmsSubId sub id = " + subscriptionId);
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.setDefaultSmsSubId(subscriptionId);
		}
		@@ -1989,7 +2077,11 @@ public class SubscriptionManager {
		int subId = INVALID_SUBSCRIPTION_ID;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		subId = iSub.getDefaultDataSubId();
		}
		@@ -2015,7 +2107,11 @@ public class SubscriptionManager {
		public void setDefaultDataSubId(int subscriptionId) {
		if (VDBG) logd("setDataSubscription sub id = " + subscriptionId);
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.setDefaultDataSubId(subscriptionId);
		}
		@@ -2046,7 +2142,11 @@ public class SubscriptionManager {
		/** @hide */
		public void clearSubscriptionInfo() {
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.clearSubInfo();
		}
		@@ -2182,7 +2282,11 @@ public class SubscriptionManager {
		*/
		public @NonNull int[] getActiveSubscriptionIdList(boolean visibleOnly) {
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		int[] subId = iSub.getActiveSubIdList(visibleOnly);
		if (subId != null) return subId;
		@@ -2233,7 +2337,11 @@ public class SubscriptionManager {
		int simState = TelephonyManager.SIM_STATE_UNKNOWN;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		simState = iSub.getSimStateForSlotIndex(slotIndex);
		}
		@@ -2252,7 +2360,11 @@ public class SubscriptionManager {
		*/
		public static void setSubscriptionProperty(int subId, String propKey, String propValue) {
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.setSubscriptionProperty(subId, propKey, propValue);
		}
		@@ -2272,7 +2384,11 @@ public class SubscriptionManager {
		Context context) {
		String resultValue = null;
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		resultValue = iSub.getSubscriptionProperty(subId, propKey,
		context.getOpPackageName(), context.getFeatureId());
		@@ -2414,7 +2530,11 @@ public class SubscriptionManager {
		@UnsupportedAppUsage
		public boolean isActiveSubId(int subId) {
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		return iSub.isActiveSubId(subId, mContext.getOpPackageName(),
		mContext.getFeatureId());
		@@ -2717,7 +2837,11 @@ public class SubscriptionManager {
		@TelephonyManager.SetOpportunisticSubscriptionResult Consumer<Integer> callback) {
		if (VDBG) logd("[setPreferredDataSubscriptionId]+ subId:" + subId);
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub == null) return;

		ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() {
		@@ -2760,7 +2884,11 @@ public class SubscriptionManager {
		public int getPreferredDataSubscriptionId() {
		int preferredSubId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		preferredSubId = iSub.getPreferredDataSubscriptionId();
		}
		@@ -2791,7 +2919,11 @@ public class SubscriptionManager {
		List<SubscriptionInfo> subInfoList = null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		subInfoList = iSub.getOpportunisticSubscriptions(contextPkg, contextFeature);
		}
		@@ -2892,7 +3024,11 @@ public class SubscriptionManager {
		ParcelUuid groupUuid = null;
		int[] subIdArray = subIdList.stream().mapToInt(i->i).toArray();
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		groupUuid = iSub.createSubscriptionGroup(subIdArray, pkgForDebug);
		} else {
		@@ -2942,7 +3078,11 @@ public class SubscriptionManager {
		int[] subIdArray = subIdList.stream().mapToInt(i->i).toArray();

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.addSubscriptionsIntoGroup(subIdArray, groupUuid, pkgForDebug);
		} else {
		@@ -2994,7 +3134,11 @@ public class SubscriptionManager {
		int[] subIdArray = subIdList.stream().mapToInt(i->i).toArray();

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		iSub.removeSubscriptionsFromGroup(subIdArray, groupUuid, pkgForDebug);
		} else {
		@@ -3039,7 +3183,11 @@ public class SubscriptionManager {

		List<SubscriptionInfo> result = null;
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = iSub.getSubscriptionsInGroup(groupUuid, contextPkg, contextFeature);
		} else {
		@@ -3152,7 +3300,11 @@ public class SubscriptionManager {
		logd("setSubscriptionActivated subId= " + subscriptionId + " enable " + enable);
		}
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		return iSub.setSubscriptionEnabled(enable, subscriptionId);
		}
		@@ -3241,7 +3393,11 @@ public class SubscriptionManager {
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public boolean isSubscriptionEnabled(int subscriptionId) {
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		return iSub.isSubscriptionEnabled(subscriptionId);
		}
		@@ -3264,7 +3420,11 @@ public class SubscriptionManager {
		int subId = INVALID_SUBSCRIPTION_ID;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		subId = iSub.getEnabledSubscriptionId(slotIndex);
		}
		@@ -3290,7 +3450,11 @@ public class SubscriptionManager {
		int result = 0;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		result = helper.callMethod(iSub);
		}
		@@ -3313,7 +3477,11 @@ public class SubscriptionManager {
		*/
		public static int getActiveDataSubscriptionId() {
		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		ISub iSub = ISub.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getSubscriptionServiceRegisterer()
		.get());
		if (iSub != null) {
		return iSub.getActiveDataSubscriptionId();
		}