Merge "Add a @hide API to indicate 5G and DSDS conflict." (88fed59c) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12977,4 +12977,21 @@ public class TelephonyManager {
	}		}
	return 0;		return 0;
	}		}

			/**
			* 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	Original line	Diff line number	Diff line
	@@ -2248,4 +2248,9 @@ interface ITelephony {
	int setIccLockEnabled(int subId, boolean enabled, String password);		int setIccLockEnabled(int subId, boolean enabled, String password);

	int changeIccLockPassword(int subId, String oldPassword, String newPassword);		int changeIccLockPassword(int subId, String oldPassword, String newPassword);

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