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

Commit a4f2522c authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Use proper Telephony API to supply sim pin and puk. 

Bug: 146593004
Test: manual - pin and puk

Change-Id: Ic64cc8a48c6e28f3ac8a013cbb4c15e7e58f7f4d
Merged-In: Ic64cc8a48c6e28f3ac8a013cbb4c15e7e58f7f4d
parent 893f3931

packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java

+15 −16
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.content.res.Configuration; 
import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Color;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -37,7 +35,6 @@ import android.view.View; 
import android.view.WindowManager;

import android.widget.ImageView;



import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.PhoneConstants;
@@ -254,27 +251,29 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 


        @Override

        public void run() {

            try {

            if (DEBUG) {

                Log.v(TAG, "call supplyPinReportResultForSubscriber(subid=" + mSubId + ")");

            }

                final int[] result = ITelephony.Stub.asInterface(ServiceManager

                        .checkService("phone")).supplyPinReportResultForSubscriber(mSubId, mPin);

                if (DEBUG) {

                    Log.v(TAG, "supplyPinReportResult returned: " + result[0] + " " + result[1]);

                }

            TelephonyManager telephonyManager =

                    ((TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE))

                            .createForSubscriptionId(mSubId);

            final int[] result = telephonyManager.supplyPinReportResult(mPin);

            if (result == null || result.length == 0) {

                Log.e(TAG, "Error result for supplyPinReportResult.");

                post(new Runnable() {

                    @Override

                    public void run() {

                        onSimCheckResponse(result[0], result[1]);

                        onSimCheckResponse(PhoneConstants.PIN_GENERAL_FAILURE, -1);

                    }

                });

            } catch (RemoteException e) {

                Log.e(TAG, "RemoteException for supplyPinReportResult:", e);

            } else {

                if (DEBUG) {

                    Log.v(TAG, "supplyPinReportResult returned: " + result[0] + " " + result[1]);

                }

                post(new Runnable() {

                    @Override

                    public void run() {

                        onSimCheckResponse(PhoneConstants.PIN_GENERAL_FAILURE, -1);

                        onSimCheckResponse(result[0], result[1]);

                    }

                });

            }

packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java

+13 −14
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import android.content.res.ColorStateList; 
import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Color;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -36,7 +34,6 @@ import android.view.View; 
import android.view.WindowManager;

import android.widget.ImageView;



import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.PhoneConstants;
@@ -314,25 +311,27 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { 


        @Override

        public void run() {

            try {

            if (DEBUG) Log.v(TAG, "call supplyPukReportResult()");

                final int[] result = ITelephony.Stub.asInterface(ServiceManager

                    .checkService("phone")).supplyPukReportResultForSubscriber(mSubId, mPuk, mPin);

                if (DEBUG) {

                    Log.v(TAG, "supplyPukReportResult returned: " + result[0] + " " + result[1]);

                }

            TelephonyManager telephonyManager =

                    ((TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE))

                            .createForSubscriptionId(mSubId);

            final int[] result = telephonyManager.supplyPukReportResult(mPuk, mPin);

            if (result == null || result.length == 0) {

                Log.e(TAG, "Error result for supplyPukReportResult.");

                post(new Runnable() {

                    @Override

                    public void run() {

                        onSimLockChangedResponse(result[0], result[1]);

                        onSimLockChangedResponse(PhoneConstants.PIN_GENERAL_FAILURE, -1);

                    }

                });

            } catch (RemoteException e) {

                Log.e(TAG, "RemoteException for supplyPukReportResult:", e);

            } else {

                if (DEBUG) {

                    Log.v(TAG, "supplyPukReportResult returned: " + result[0] + " " + result[1]);

                }

                post(new Runnable() {

                    @Override

                    public void run() {

                        onSimLockChangedResponse(PhoneConstants.PIN_GENERAL_FAILURE, -1);

                        onSimLockChangedResponse(result[0], result[1]);

                    }

                });

            }