Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9731aafc authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

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

am: 701d213e

Change-Id: Ia5a31148450d160109ca67f9ce1b1eed5979d8bd
parents 1b4f1de0 701d213e

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -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();

telephony/java/android/telephony/TelephonyManager.java

+20 −4
Original line number Diff line number Diff line
@@ -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,