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

Commit f8f3e97c authored by sqian's avatar sqian
Browse files

Deprecate some system apis in TelephonyManager 

Discussed and proposed in https://docs.google.com/spreadsheets/d/1OJ6EXJ-Zys21mZ1BHgJeWkcfLq0pPxBR765r46ck80U/edit#gid=0

Bug: 62346128
Test: compile
Change-Id: Ied111e4fe39cadaab738beca0a1c0a74eb27b01e
parent 4b12916e

api/system-current.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -5355,10 +5355,10 @@ package android.telephony { 
    method public boolean handlePinMmi(java.lang.String);

    method public boolean handlePinMmi(java.lang.String);

    method public boolean handlePinMmiForSubscriber(int, java.lang.String);

    method public boolean handlePinMmiForSubscriber(int, java.lang.String);

    method public boolean isDataConnectivityPossible();

    method public boolean isDataConnectivityPossible();

    method public boolean isIdle();

    method public deprecated boolean isIdle();

    method public boolean isOffhook();

    method public deprecated boolean isOffhook();

    method public boolean isRadioOn();

    method public deprecated boolean isRadioOn();

    method public boolean isRinging();

    method public deprecated boolean isRinging();

    method public boolean isVideoCallingEnabled();

    method public boolean isVideoCallingEnabled();

    method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

    method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

    method public boolean needsOtaServiceProvisioning();

    method public boolean needsOtaServiceProvisioning();

telephony/java/android/telephony/TelephonyManager.java

+20 −4
Original line number Original line Diff line number Diff line
@@ -6038,7 +6038,11 @@ public class TelephonyManager { 
        }

        }

    }

    }





    /** @hide */

    /**

     * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead

     * @hide

     */

    @Deprecated

    @SystemApi

    @SystemApi

    @RequiresPermission(anyOf = {

    @RequiresPermission(anyOf = {

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6055,7 +6059,11 @@ public class TelephonyManager { 
        return false;

        return false;

    }

    }





    /** @hide */

    /**

     * @deprecated Use {@link android.telecom.TelecomManager#isRinging} instead

     * @hide

     */

    @Deprecated

    @SystemApi

    @SystemApi

    @RequiresPermission(anyOf = {

    @RequiresPermission(anyOf = {

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6072,7 +6080,11 @@ public class TelephonyManager { 
        return false;

        return false;

    }

    }





    /** @hide */

    /**

     * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead

     * @hide

     */

    @Deprecated

    @SystemApi

    @SystemApi

    @RequiresPermission(anyOf = {

    @RequiresPermission(anyOf = {

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6089,7 +6101,11 @@ public class TelephonyManager { 
        return true;

        return true;

    }

    }





    /** @hide */

    /**

     * @deprecated Use {@link android.telephony.TelephonyManager#getServiceState} instead

     * @hide

     */

    @Deprecated

    @SystemApi

    @SystemApi

    @RequiresPermission(anyOf = {

    @RequiresPermission(anyOf = {

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,