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

Commit 51591f1d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove "@Deprecated" from supplyPinReportResult +... 

Merge "Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" into rvc-dev am: ddcf560b" into rvc-dev-plus-aosp
parents fcf2a6b6 3f1e7189

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -11319,9 +11319,9 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoiceActivationState(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void shutdownAllRadios();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPin(String);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPinReportResult(String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPinReportResult(String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPuk(String, String);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(String, String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(String, String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean switchSlots(int[]);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void toggleRadioOnOff();

    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor);

telephony/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -815,9 +815,9 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoiceActivationState(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void shutdownAllRadios();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPin(String);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPinReportResult(String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPinReportResult(String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPuk(String, String);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(String, String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(String, String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean switchSlots(int[]);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void toggleRadioOnOff();

    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor);

telephony/java/android/telephony/TelephonyManager.java

+2 −10
Original line number Diff line number Diff line
@@ -8679,13 +8679,9 @@ public class TelephonyManager { 
        return false;

    }



    /**

     * @deprecated use {@link #supplyPinReportPinResult(String pin)} instead.

     *

     * @hide */

    /** @hide */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    @Deprecated

    public int[] supplyPinReportResult(String pin) {

        try {

            ITelephony telephony = getITelephony();
@@ -8697,13 +8693,9 @@ public class TelephonyManager { 
        return new int[0];

    }



    /**

     * @deprecated use {@link #supplyPukReportPinResult(String puk, String pin)} instead.

     *

     * @hide */

    /** @hide */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    @Deprecated

    public int[] supplyPukReportResult(String puk, String pin) {

        try {

            ITelephony telephony = getITelephony();