Merge "Fixed tethering failed when device is on CBRS" am: fa9c857b21 (2bbd84ce) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -3175,4 +3175,24 @@ public class SubscriptionManager {

		return result;
		}

		/**
		* Get active data subscription id.
		* See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details.
		*
		* @return Active data subscription id
		*
		* //TODO: Refactor this API in b/134702460
		* @hide
		*/
		public static int getActiveDataSubscriptionId() {
		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		return iSub.getActiveDataSubscriptionId();
		}
		} catch (RemoteException ex) {
		}
		return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		}
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -2563,7 +2563,7 @@ public class TelephonyManager {
		@Deprecated
		@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
		public @NetworkType int getNetworkType() {
		return getNetworkType(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));
		return getNetworkType(getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
		}

		/**
		@@ -2646,7 +2646,7 @@ public class TelephonyManager {
		@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
		@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
		public @NetworkType int getDataNetworkType() {
		return getDataNetworkType(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));
		return getDataNetworkType(getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
		}

		/**
		@@ -7432,7 +7432,7 @@ public class TelephonyManager {
		* @hide
		*/
		public boolean getTetherApnRequired() {
		return getTetherApnRequired(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));
		return getTetherApnRequired(getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
		}

		/**
		@@ -8215,7 +8215,7 @@ public class TelephonyManager {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		return telephony.isDataConnectivityPossible(getSubId(SubscriptionManager
		.getDefaultDataSubscriptionId()));
		.getActiveDataSubscriptionId()));
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#isDataAllowed", e);
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -281,4 +281,6 @@ interface ISub {
		boolean isActiveSubId(int subId, String callingPackage);

		boolean setAlwaysAllowMmsData(int subId, boolean alwaysAllow);

		int getActiveDataSubscriptionId();
		}