Merge "Deprecate some system apis in TelephonyManager"

This commit is contained in:
TreeHugger Robot
2018-08-27 21:54:17 +00:00
committed by Android (Google) Code Review
2 changed files with 24 additions and 8 deletions

View File

@@ -5389,10 +5389,10 @@ package android.telephony {
method public boolean handlePinMmi(java.lang.String);
method public boolean handlePinMmiForSubscriber(int, java.lang.String);
method public boolean isDataConnectivityPossible();
method public boolean isIdle();
method public boolean isOffhook();
method public boolean isRadioOn();
method public boolean isRinging();
method public deprecated boolean isIdle();
method public deprecated boolean isOffhook();
method public deprecated boolean isRadioOn();
method public deprecated boolean isRinging();
method public boolean isVideoCallingEnabled();
method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
method public boolean needsOtaServiceProvisioning();

View File

@@ -6180,7 +6180,11 @@ public class TelephonyManager {
}
}
/** @hide */
/**
* @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead
* @hide
*/
@Deprecated
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6197,7 +6201,11 @@ public class TelephonyManager {
return false;
}
/** @hide */
/**
* @deprecated Use {@link android.telecom.TelecomManager#isRinging} instead
* @hide
*/
@Deprecated
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6214,7 +6222,11 @@ public class TelephonyManager {
return false;
}
/** @hide */
/**
* @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead
* @hide
*/
@Deprecated
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6231,7 +6243,11 @@ public class TelephonyManager {
return true;
}
/** @hide */
/**
* @deprecated Use {@link android.telephony.TelephonyManager#getServiceState} instead
* @hide
*/
@Deprecated
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,