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

Commit bcf3b863 authored by Rakesh Pallerla's avatar Rakesh Pallerla Committed by Steve Kondik
Browse files

Telephony: Add DETECTED state and PIN/PUK retry count. 

1. Add App state DETECTED in the IccCardConstants.State enum.
   Modified logic for allowing PIN cancel based on number of
   cards configured/activated instead of number of cards present.

2. Add method in ITelephonyMSim.aidl to retrieve PIN1RetryCount.
   Display Attempts remaining in PIN/PUK lockscreen UI.

3. Clean up KeyguardUpdateMonitorCallback and MSimCarrierText by
   removing Initialize method from Callback.

Change-Id: I89c9825b35257c1cca5946bf0cbffedb07d0015b
CRs-Fixed: 501887, 504086, 508283, 510400, 513293
parent d6da6fa0

policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java

+5 −9
Original line number Diff line number Diff line
@@ -753,19 +753,15 @@ public class KeyguardUpdateMonitor { 
        final IccCardConstants.State state = simArgs.simState;

        final int subscription = simArgs.subscription;



        if (DEBUG) {

        Log.d(TAG, "handleSimStateChange: intentValue = " + simArgs + " "

                + "state resolved to " + state.toString() + " "

                + "subscription =" + subscription);

        }



        //Incase of MultiSim,unconfigured app state APPSTATE_DETECTED is reported as UNKNOWN.

        //UNKNOWN state is captured to get correct number of cards configured based on state.

        mSimState[subscription] = state;

        if (state != IccCardConstants.State.UNKNOWN && state != mSimState[subscription]) {

            if (DEBUG_SIM_STATES) Log.v(TAG, "dispatching state: " + state

                    + "subscription: " + subscription);



            mSimState[subscription] = state;

            for (int i = 0; i < mCallbacks.size(); i++) {

                KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

                if (cb != null) {
@@ -1000,7 +996,7 @@ public class KeyguardUpdateMonitor { 
    }



    public void reportSimUnlocked(int subscription) {

        if (DEBUG) Log.d(TAG, "--msim--: reportSimUnlocked(" + subscription + ")");

        if (DEBUG) Log.d(TAG, "reportSimUnlocked(" + subscription + ")");

        mSimState[subscription] = IccCardConstants.State.READY;

        handleSimStateChange(new SimArgs(mSimState[subscription], subscription));

    }

policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitorCallback.java

+0 −2
Original line number Diff line number Diff line
@@ -150,6 +150,4 @@ class KeyguardUpdateMonitorCallback { 
     * @param subscription The subscription for which onRefreshCarrierInfo is meant

     */

    void onRefreshCarrierInfo(CharSequence plmn, CharSequence spn, int subscription) { }



    void initialize() { }

}

policy/src/com/android/internal/policy/impl/keyguard/msim/MSimCarrierText.java

+11 −12
Original line number Diff line number Diff line
@@ -34,19 +34,11 @@ import android.telephony.MSimTelephonyManager; 


public class MSimCarrierText extends CarrierText {

    private static final String TAG = "MSimCarrierText";



    private KeyguardUpdateMonitorCallback mMSimCallback = new KeyguardUpdateMonitorCallback() {

    private CharSequence []mPlmn;

    private CharSequence []mSpn;

    private State []mSimState;



        @Override

        public void initialize() {

            int numPhones = MSimTelephonyManager.getDefault().getPhoneCount();

            mPlmn = new CharSequence[numPhones];

            mSpn = new CharSequence[numPhones];

            mSimState = new State[numPhones];

        }

    private KeyguardUpdateMonitorCallback mMSimCallback = new KeyguardUpdateMonitorCallback() {



        @Override

        public void onRefreshCarrierInfo(CharSequence plmn, CharSequence spn, int sub) {
@@ -62,13 +54,20 @@ public class MSimCarrierText extends CarrierText { 
        }

    };



    private void initialize() {

        int numPhones = MSimTelephonyManager.getDefault().getPhoneCount();

        mPlmn = new CharSequence[numPhones];

        mSpn = new CharSequence[numPhones];

        mSimState = new State[numPhones];

    }



    public MSimCarrierText(Context context) {

        this(context, null);

    }



    public MSimCarrierText(Context context, AttributeSet attrs) {

        super(context, attrs);

        mMSimCallback.initialize();

        initialize();

    }



    protected void updateCarrierText(State []simState, CharSequence []plmn, CharSequence []spn) {

policy/src/com/android/internal/policy/impl/keyguard/msim/MSimKeyguardSimPinView.java

+64 −13
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ public class MSimKeyguardSimPinView extends KeyguardSimPinView { 
    private final static boolean DEBUG = KeyguardViewMediator.DEBUG;

    private static String TAG = "MSimKeyguardSimPinView";

    private static int sCancelledCount = 0;

    private int mSubscription = -1;



    public MSimKeyguardSimPinView(Context context) {

        this(context, null);
@@ -55,34 +56,63 @@ public class MSimKeyguardSimPinView extends KeyguardSimPinView { 
                @Override

                public void onClick(View v) {

                    doHapticKeyClick();

                    MSimKeyguardSimPinView.sCancelledCount++;

                    closeKeyGuard(false);

                }

            });

        }

    }



    /*

    * CloseKeyGuard: Method used to Close the keyguard.

    * @param bAuthenticated:

    *               true:  user entered correct PIN and pressed OK.

    *               false: user pressed cancel.

    *

    * Description: used to close keyguard when user presses cancel or

    * user enters correct PIN and presses OK

    *

    * Logic:

    * 1. Calculate number of SIMs configured i.e. selected from MultiSIM settings

    * 2. Calculate number of SIMs which are PIN Locked

    * 3. sCancelledCount will tell us number of keyguards got cancelled. If user tries to cancel

    *    all Keyguard screens, do not allow him to close Keyguard as atleast one SIM has to

    *    be authenticated before allowing user to access HomeScreen.

    * 4. If present keyguard screen is last one we are about to show HomeScreen after closing this

    *    keyguard so reset the sCancelledCount.

    * 5. Report SIM unlocked to KGUpdateMonitor so that keyguard is closed right away without

    *    waiting for indication from framework.

    */

    private void closeKeyGuard(boolean bAuthenticated) {

        KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(getContext());

        int numCardsPresent = 0;

        int numCardsConfigured = 0;

        int numPinLocked = 0;

        IccCardConstants.State simState = IccCardConstants.State.UNKNOWN;



        int numPhones = MSimTelephonyManager.getDefault().getPhoneCount();

        for (int i = 0; i < numPhones; i++) {

            simState = updateMonitor.getSimState(i);

            if (simState.isPinLocked()) {

            if (simState == IccCardConstants.State.PIN_REQUIRED) {

                numPinLocked++;

            }



            if (simState.iccCardExist()) {

                numCardsPresent++;

            //Get number of cards that are present and configured.

            //Exclude cards with DETECTED state as they are not configured and are not used.

            if (simState == IccCardConstants.State.READY ||

                simState == IccCardConstants.State.PIN_REQUIRED ||

                simState == IccCardConstants.State.PUK_REQUIRED ||

                simState == IccCardConstants.State.PERSO_LOCKED) {

                numCardsConfigured++;

            }

        }

        //If Cancel is pressed for last sub, don't allow cancel and decrement Count.

        if (!bAuthenticated && MSimKeyguardSimPinView.sCancelledCount >= numCardsPresent) {

            MSimKeyguardSimPinView.sCancelledCount--;



        //If Cancel is pressed for last configured sub return without incrementing sCancelledCount

        // else increment sCancelledCount.

        if (!bAuthenticated) {

            if (MSimKeyguardSimPinView.sCancelledCount >= (numCardsConfigured - 1)) {

                return;

            } else {

                MSimKeyguardSimPinView.sCancelledCount++;

            }

        }



        //If this is last PIN lock screen, we will show HomeScreen now.
@@ -91,13 +121,35 @@ public class MSimKeyguardSimPinView extends KeyguardSimPinView { 
            MSimKeyguardSimPinView.sCancelledCount = 0;

        }



        updateMonitor.reportSimUnlocked(updateMonitor.getPinLockedSubscription());

        //If Cancel is pressed get current locked sub,

        //In case user presses OK we anyways have locked sub, no need to get again.

        if (!bAuthenticated) mSubscription = updateMonitor.getPinLockedSubscription();



        //Before closing the keyguard, report back that the sim is unlocked

        //so it knows right away.

        if (mSubscription >= 0) updateMonitor.reportSimUnlocked(mSubscription);

        mCallback.dismiss(true);

    }



    public void resetState() {

        mSecurityMessageDisplay.setMessage(

                getSecurityMessageDisplay(R.string.kg_sim_pin_instructions), true);

        String  displayMessage = "";

        try {

            mSubscription = KeyguardUpdateMonitor.getInstance(mContext)

                    .getPinLockedSubscription();

            int attemptsRemaining = ITelephonyMSim.Stub.asInterface(ServiceManager

                    .checkService("phone_msim")).getIccPin1RetryCount(mSubscription);



            if (attemptsRemaining >= 0) {

                displayMessage = getContext().getString(R.string.keyguard_password_wrong_pin_code)

                        + getContext().getString(R.string.pinpuk_attempts)

                        + attemptsRemaining + ". ";

            }

        } catch (RemoteException ex) {

            displayMessage = getContext().getString(R.string.keyguard_password_pin_failed);

        }

        displayMessage = getSecurityMessageDisplay(R.string.kg_sim_pin_instructions)

                + displayMessage;

        mSecurityMessageDisplay.setMessage(displayMessage, true);

        mPasswordEntry.setEnabled(true);

    }
@@ -107,7 +159,6 @@ public class MSimKeyguardSimPinView extends KeyguardSimPinView { 
     */

    private abstract class MSimCheckSimPin extends Thread {

        private final String mPin;

        protected final int mSubscription;



        protected MSimCheckSimPin(String pin, int sub) {

            mPin = pin;

policy/src/com/android/internal/policy/impl/keyguard/msim/MSimKeyguardSimPukView.java

100755 → 100644
+18 −2
Original line number Diff line number Diff line
@@ -69,11 +69,27 @@ public class MSimKeyguardSimPukView extends KeyguardSimPukView { 
        }



        void reset() {

            String  displayMessage = "";

            try {

                int attemptsRemaining = ITelephonyMSim.Stub.asInterface(ServiceManager

                        .checkService("phone_msim")).getIccPin1RetryCount(KeyguardUpdateMonitor

                        .getInstance(mContext).getPukLockedSubscription());

                if (attemptsRemaining >= 0) {

                    displayMessage = getContext().getString(

                            R.string.keyguard_password_wrong_puk_code)

                            + getContext().getString(R.string.pinpuk_attempts)

                            + attemptsRemaining + ". ";

                }

            } catch (RemoteException ex) {

                displayMessage = getContext().getString(

                        R.string.keyguard_password_puk_failed);

            }

            displayMessage = getSecurityMessageDisplay(R.string.kg_puk_enter_puk_hint)

                    + displayMessage;

            mPinText="";

            mPukText="";

            state = ENTER_PUK;

            mSecurityMessageDisplay.setMessage(

                    getSecurityMessageDisplay(R.string.kg_puk_enter_puk_hint), true);

            mSecurityMessageDisplay.setMessage(displayMessage, true);

            mPasswordEntry.requestFocus();

        }

    }