Merge "[TelephonyMainline] @hide system api since we'll revisit in S. -... (aab877c8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −2

telephony/java/android/telephony/TelephonyManager.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -12618,7 +12618,6 @@ public class TelephonyManager {
	}		}

	/**		/**
	<<<<<<< HEAD
	* Gets the voice call forwarding info {@link CallForwardingInfo}, given the call forward		* Gets the voice call forwarding info {@link CallForwardingInfo}, given the call forward
	* reason.		* reason.
	*		*
	@@ -12818,7 +12817,6 @@ public class TelephonyManager {
	*		*
	* @hide		* @hide
	*/		*/
	@SystemApi
	@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
	public boolean setDataAllowedDuringVoiceCall(boolean allow) {		public boolean setDataAllowedDuringVoiceCall(boolean allow) {
	try {		try {
	@@ -12847,7 +12845,6 @@ public class TelephonyManager {
	*		*
	* @hide		* @hide
	*/		*/
	@SystemApi
	@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
	public boolean isDataAllowedInVoiceCall() {		public boolean isDataAllowedInVoiceCall() {
	try {		try {

Original line number	Original line	Diff line number	Diff line
	@@ -9362,7 +9362,6 @@ package android.telephony {
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAnyRadioPoweredOn();		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAnyRadioPoweredOn();
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);
	method public boolean isCurrentSimOperator(@NonNull String, int, @Nullable String);		method public boolean isCurrentSimOperator(@NonNull String, int, @Nullable String);
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataAllowedInVoiceCall();
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataConnectionAllowed();		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataConnectionAllowed();
	method public boolean isDataConnectivityPossible();		method public boolean isDataConnectivityPossible();
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);
	@@ -9404,7 +9403,6 @@ package android.telephony {
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setDataAllowedDuringVoiceCall(boolean);
	method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIccLockEnabled(boolean, @NonNull String);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIccLockEnabled(boolean, @NonNull String);