Additional changes to SubscriptionManager API as per API council. (33c05d3d) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/PhoneAccountRegistrar.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ public final class PhoneAccountRegistrar {
		private final List<Listener> mListeners = new CopyOnWriteArrayList<>();
		private final AtomicFile mAtomicFile;
		private final Context mContext;
		private final SubscriptionManager mSubscriptionManager;
		private State mState;

		@VisibleForTesting
		@@ -113,6 +114,7 @@ public final class PhoneAccountRegistrar {

		mState = new State();
		mContext = context;
		mSubscriptionManager = SubscriptionManager.from(mContext);
		read();
		}

		@@ -130,7 +132,7 @@ public final class PhoneAccountRegistrar {
		!TextUtils.isDigitsOnly(accountHandle.getId())) {
		// Since no decimals or negative numbers can be valid subscription ids, only a string of
		// numbers can be subscription id
		return SubscriptionManager.INVALID_SUB_ID;
		return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		}
		return Integer.parseInt(accountHandle.getId());
		}
		@@ -212,7 +214,7 @@ public final class PhoneAccountRegistrar {
		// If the account selected is a SIM account, propagate down to the subscription
		// record.
		int subId = getSubscriptionIdForPhoneAccount(accountHandle);
		SubscriptionManager.setDefaultVoiceSubId(subId);
		mSubscriptionManager.setDefaultVoiceSubId(subId);
		}

		mState.defaultOutgoing = accountHandle;

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ public class RespondViaSmsManager extends CallsManagerListenerBase {
		final Uri uri = Uri.fromParts(Constants.SCHEME_SMSTO, phoneNumber, null);
		final Intent intent = new Intent(TelephonyManager.ACTION_RESPOND_VIA_MESSAGE, uri);
		intent.putExtra(Intent.EXTRA_TEXT, textMessage);
		if (subId != SubscriptionManager.INVALID_SUB_ID) {
		if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
		}