Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev am:... (e2eb2064) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -13250,4 +13250,21 @@ public class TelephonyManager {
		public static void enableServiceHandleCaching() {
		sServiceHandleCacheEnabled = true;
		}

		/**
		* Whether device can connect to 5G network when two SIMs are active.
		* @hide
		* TODO b/153669716: remove or make system API.
		*/
		public boolean canConnectTo5GInDsdsMode() {
		ITelephony telephony = getITelephony();
		if (telephony == null) return true;
		try {
		return telephony.canConnectTo5GInDsdsMode();
		} catch (RemoteException ex) {
		return true;
		} catch (NullPointerException ex) {
		return true;
		}
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -2268,4 +2268,9 @@ interface ITelephony {
		* @return operatorinfo on success
		*/
		String getManualNetworkSelectionPlmn(int subId);

		/**
		* Whether device can connect to 5G network when two SIMs are active.
		*/
		boolean canConnectTo5GInDsdsMode();
		}