Telephony: Convert subscription ID to int from long (e41e6000) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -930,10 +930,10 @@ public class TelecomManager {
		* Returns current active subscription.
		* @hide
		*/
		public long getActiveSubscription() {
		public int getActiveSubscription() {
		try {
		if (isServiceConnected()) {
		return getTelecomService().getActiveSubscription();
		return (int)getTelecomService().getActiveSubscription();
		}
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException attempting to get the active subsription.", e);
		@@ -945,7 +945,7 @@ public class TelecomManager {
		* switches to other active subscription.
		* @hide
		*/
		public void switchToOtherActiveSub(long subId) {
		public void switchToOtherActiveSub(int subId) {
		try {
		if (isServiceConnected()) {
		getTelecomService().switchToOtherActiveSub(subId);

+2 −2

Original line number	Diff line number	Diff line
		@@ -212,10 +212,10 @@ interface ITelecomService {
		/**
		* @see TelecommManager#getActiveSubscription
		*/
		long getActiveSubscription();
		int getActiveSubscription();

		/**
		* @see TelecommManager#switchToOtherActiveSub
		*/
		void switchToOtherActiveSub(long subId);
		void switchToOtherActiveSub(int subId);
		}