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

Commit 893f3931 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Hook supplyPin and supplyPuk to proper impl with subId specified 

All TelephonyManager APIs are subId specified, where the public  API call
should map to a subId specific implementation via ITelephony and
PhoneInterfaceManager. But that's not the case for supplyPin and
supplyPuk. So fixing it and clean up unused aidl calls.

Bug: 146593004
Test: manual - pin and puk
Change-Id: If496674ef2ddc608264cf7b12905614698dc7e2d
Merged-In: If496674ef2ddc608264cf7b12905614698dc7e2d
parent 538fd0d4

telephony/java/android/telephony/TelephonyManager.java

+7 −7
Original line number Diff line number Diff line
@@ -8051,9 +8051,9 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.supplyPin(pin);

                return telephony.supplyPinForSubscriber(getSubId(), pin);

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#supplyPin", e);

            Log.e(TAG, "Error calling ITelephony#supplyPinForSubscriber", e);

        }

        return false;

    }
@@ -8065,9 +8065,9 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.supplyPuk(puk, pin);

                return telephony.supplyPukForSubscriber(getSubId(), puk, pin);

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#supplyPuk", e);

            Log.e(TAG, "Error calling ITelephony#supplyPukForSubscriber", e);

        }

        return false;

    }
@@ -8079,9 +8079,9 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.supplyPinReportResult(pin);

                return telephony.supplyPinReportResultForSubscriber(getSubId(), pin);

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#supplyPinReportResult", e);

            Log.e(TAG, "Error calling ITelephony#supplyPinReportResultForSubscriber", e);

        }

        return new int[0];

    }
@@ -8093,7 +8093,7 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.supplyPukReportResult(puk, pin);

                return telephony.supplyPukReportResultForSubscriber(getSubId(), puk, pin);

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#]", e);

        }

telephony/java/com/android/internal/telephony/ITelephony.aidl

+0 −36
Original line number Diff line number Diff line
@@ -105,13 +105,6 @@ interface ITelephony { 
    @UnsupportedAppUsage

    boolean isRadioOnForSubscriber(int subId, String callingPackage);



    /**

     * Supply a pin to unlock the SIM.  Blocks until a result is determined.

     * @param pin The pin to check.

     * @return whether the operation was a success.

     */

    @UnsupportedAppUsage

    boolean supplyPin(String pin);



    /**

     * Supply a pin to unlock the SIM for particular subId.
@@ -122,15 +115,6 @@ interface ITelephony { 
     */

    boolean supplyPinForSubscriber(int subId, String pin);



    /**

     * Supply puk to unlock the SIM and set SIM pin to new pin.

     *  Blocks until a result is determined.

     * @param puk The puk to check.

     *        pin The new pin to be set in SIM

     * @return whether the operation was a success.

     */

    boolean supplyPuk(String puk, String pin);



    /**

     * Supply puk to unlock the SIM and set SIM pin to new pin.

     *  Blocks until a result is determined.
@@ -141,15 +125,6 @@ interface ITelephony { 
     */

    boolean supplyPukForSubscriber(int subId, String puk, String pin);



    /**

     * Supply a pin to unlock the SIM.  Blocks until a result is determined.

     * Returns a specific success/error code.

     * @param pin The pin to check.

     * @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code

     *         retValue[1] = number of attempts remaining if known otherwise -1

     */

    int[] supplyPinReportResult(String pin);



    /**

     * Supply a pin to unlock the SIM.  Blocks until a result is determined.

     * Returns a specific success/error code.
@@ -159,17 +134,6 @@ interface ITelephony { 
     */

    int[] supplyPinReportResultForSubscriber(int subId, String pin);



    /**

     * Supply puk to unlock the SIM and set SIM pin to new pin.

     * Blocks until a result is determined.

     * Returns a specific success/error code

     * @param puk The puk to check

     *        pin The pin to check.

     * @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code

     *         retValue[1] = number of attempts remaining if known otherwise -1

     */

    int[] supplyPukReportResult(String puk, String pin);



    /**

     * Supply puk to unlock the SIM and set SIM pin to new pin.

     * Blocks until a result is determined.