Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate some system apis in TelephonyManager" am: cec2e41d43

Browse Source 
am: 701d213e0a

Change-Id: Ia5a31148450d160109ca67f9ce1b1eed5979d8bd
This commit is contained in:
Shuo Qian
2018-08-31 18:16:55 -07:00
committed by android-build-merger
parent 1b4f1de0a7 701d213e0a
commit 9731aafce1
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/system-current.txt
View File

@@ -5262,10 +5262,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();

24
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -6232,7 +6232,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,
@@ -6249,7 +6253,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,
@@ -6266,7 +6274,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,
@@ -6283,7 +6295,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,