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

Commit cafa63af authored by Sarah Chin's avatar Sarah Chin
Browse files

Expose PinResult and ICC PIN/PUK APIs as SystemApi 

Test: atest TelephonyManagerTest
Fix: 171884262
Change-Id: I9cdc11c49e4ca602cfa1464e5f424c4a96798cfe
Merged-In: I9cdc11c49e4ca602cfa1464e5f424c4a96798cfe
parent 0b2d583b

core/api/system-current.txt

+18 −2
Original line number Original line Diff line number Diff line
@@ -9745,6 +9745,18 @@ package android.telephony { 
    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000

    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000

  }

  }




















  public final class PinResult implements android.os.Parcelable {














    method public int describeContents();














    method public int getAttemptsRemaining();














    method public int getResult();














    method public void writeToParcel(@NonNull android.os.Parcel, int);














    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PinResult> CREATOR;














    field public static final int PIN_RESULT_TYPE_ABORTED = 3; // 0x3














    field public static final int PIN_RESULT_TYPE_FAILURE = 2; // 0x2














    field public static final int PIN_RESULT_TYPE_INCORRECT = 1; // 0x1














    field public static final int PIN_RESULT_TYPE_SUCCESS = 0; // 0x0














  }
























  public final class PreciseCallState implements android.os.Parcelable {







  public final class PreciseCallState implements android.os.Parcelable {











    ctor public PreciseCallState(int, int, int, int, int);







    ctor public PreciseCallState(int, int, int, int, int);











    method public int describeContents();







    method public int describeContents();










@@ -10088,6 +10100,7 @@ package android.telephony {

























  public class TelephonyManager {







  public class TelephonyManager {











    method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);







    method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);














    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult changeIccLockPin(@NonNull String, @NonNull String);











    method public int checkCarrierPrivilegesForPackage(String);







    method public int checkCarrierPrivilegesForPackage(String);











    method public int checkCarrierPrivilegesForPackageAnyPhone(String);







    method public int checkCarrierPrivilegesForPackageAnyPhone(String);











    method public void dial(String);







    method public void dial(String);










@@ -10188,6 +10201,7 @@ package android.telephony {









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







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











    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);







    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);











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







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














    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult setIccLockEnabled(boolean, @NonNull String);











    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean);







    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean);











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







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











    method public int setNrDualConnectivityState(int);







    method public int setNrDualConnectivityState(int);









@@ -10203,10 +10217,12 @@ package android.telephony {









    method @Deprecated public void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);







    method @Deprecated public void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);











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







    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 void shutdownAllRadios();














    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult supplyIccLockPin(@NonNull String);














    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult supplyIccLockPuk(@NonNull String, @NonNull String);











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







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











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







    method @Deprecated @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 @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPuk(String, String);











    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(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 boolean switchSlots(int[]);







    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.MODIFY_PHONE_STATE) public void toggleRadioOnOff();











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







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

























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



+8
−23




























Original line number
Original line
Diff line number
Diff line








@@ -257,31 +257,16 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {









        @Override







        @Override











        public void run() {







        public void run() {











            if (DEBUG) {







            if (DEBUG) {











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







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











            }







            }











            TelephonyManager telephonyManager =







            TelephonyManager telephonyManager =











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







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











                            .createForSubscriptionId(mSubId);







                            .createForSubscriptionId(mSubId);











            final PinResult result = telephonyManager.supplyPinReportPinResult(mPin);







            final PinResult result = telephonyManager.supplyIccLockPin(mPin);











            if (result == null) {














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














                post(new Runnable() {














                    @Override














                    public void run() {














                        onSimCheckResponse(PinResult.getDefaultFailedResult());














                    }














                });














            } else {














            if (DEBUG) {







            if (DEBUG) {











                    Log.v(TAG, "supplyPinReportResult returned: " + result.toString());







                Log.v(TAG, "supplyIccLockPin returned: " + result.toString());











                }














                post(new Runnable() {














                    @Override














                    public void run() {














                        onSimCheckResponse(result);














                    }














                });














            }







            }














            post(() -> onSimCheckResponse(result));











        }







        }











    }







    }






























@@ -341,8 +326,8 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {









                            }







                            }











                            resetPasswordText(true /* animate */,







                            resetPasswordText(true /* animate */,











                                    /* announce */







                                    /* announce */











                                    result.getType() != PinResult.PIN_RESULT_TYPE_SUCCESS);







                                    result.getResult() != PinResult.PIN_RESULT_TYPE_SUCCESS);











                            if (result.getType() == PinResult.PIN_RESULT_TYPE_SUCCESS) {







                            if (result.getResult() == PinResult.PIN_RESULT_TYPE_SUCCESS) {











                                Dependency.get(KeyguardUpdateMonitor.class)







                                Dependency.get(KeyguardUpdateMonitor.class)











                                        .reportSimUnlocked(mSubId);







                                        .reportSimUnlocked(mSubId);











                                mRemainingAttempts = -1;







                                mRemainingAttempts = -1;









@@ -352,7 +337,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {









                                }







                                }











                            } else {







                            } else {











                                mShowDefaultMessage = false;







                                mShowDefaultMessage = false;











                                if (result.getType() == PinResult.PIN_RESULT_TYPE_INCORRECT) {







                                if (result.getResult() == PinResult.PIN_RESULT_TYPE_INCORRECT) {











                                    if (result.getAttemptsRemaining() <= 2) {







                                    if (result.getAttemptsRemaining() <= 2) {











                                        // this is getting critical - show dialog







                                        // this is getting critical - show dialog











                                        getSimRemainingAttemptsDialog(







                                        getSimRemainingAttemptsDialog(

































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



+10
−23




























Original line number
Original line
Diff line number
Diff line








@@ -319,30 +319,17 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {





























        @Override







        @Override











        public void run() {







        public void run() {











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







            if (DEBUG) {














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














            }











            TelephonyManager telephonyManager =







            TelephonyManager telephonyManager =











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







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











                            .createForSubscriptionId(mSubId);







                            .createForSubscriptionId(mSubId);











            final PinResult result = telephonyManager.supplyPukReportPinResult(mPuk, mPin);







            final PinResult result = telephonyManager.supplyIccLockPuk(mPuk, mPin);











            if (result == null) {














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














                post(new Runnable() {














                    @Override














                    public void run() {














                        onSimLockChangedResponse(PinResult.getDefaultFailedResult());














                    }














                });














            } else {














            if (DEBUG) {







            if (DEBUG) {











                    Log.v(TAG, "supplyPukReportResult returned: " + result.toString());







                Log.v(TAG, "supplyIccLockPuk returned: " + result.toString());











                }














                post(new Runnable() {














                    @Override














                    public void run() {














                        onSimLockChangedResponse(result);














                    }














                });














            }







            }














            post(() -> onSimLockChangedResponse(result));











        }







        }











    }







    }






























@@ -415,8 +402,8 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {









                            }







                            }











                            resetPasswordText(true /* animate */,







                            resetPasswordText(true /* animate */,











                                    /* announce */







                                    /* announce */











                                    result.getType() != PinResult.PIN_RESULT_TYPE_SUCCESS);







                                    result.getResult() != PinResult.PIN_RESULT_TYPE_SUCCESS);











                            if (result.getType() == PinResult.PIN_RESULT_TYPE_SUCCESS) {







                            if (result.getResult() == PinResult.PIN_RESULT_TYPE_SUCCESS) {











                                Dependency.get(KeyguardUpdateMonitor.class)







                                Dependency.get(KeyguardUpdateMonitor.class)











                                        .reportSimUnlocked(mSubId);







                                        .reportSimUnlocked(mSubId);











                                mRemainingAttempts = -1;







                                mRemainingAttempts = -1;









@@ -427,7 +414,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {









                                }







                                }











                            } else {







                            } else {











                                mShowDefaultMessage = false;







                                mShowDefaultMessage = false;











                                if (result.getType() == PinResult.PIN_RESULT_TYPE_INCORRECT) {







                                if (result.getResult() == PinResult.PIN_RESULT_TYPE_INCORRECT) {











                                    // show message







                                    // show message











                                    mSecurityMessageDisplay.setMessage(getPukPasswordErrorMessage(







                                    mSecurityMessageDisplay.setMessage(getPukPasswordErrorMessage(











                                            result.getAttemptsRemaining(), false));







                                            result.getAttemptsRemaining(), false));

































telephony/java/android/telephony/PinResult.java



+41
−22




























Original line number
Original line
Diff line number
Diff line








@@ -19,6 +19,7 @@ package android.telephony;









import android.annotation.IntDef;







import android.annotation.IntDef;











import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.Nullable;







import android.annotation.Nullable;














import android.annotation.SystemApi;











import android.os.Parcel;







import android.os.Parcel;











import android.os.Parcelable;







import android.os.Parcelable;





























@@ -27,10 +28,16 @@ import com.android.internal.telephony.PhoneConstants;









import java.util.Objects;







import java.util.Objects;































/**







/**











 * Holds the result from a pin attempt.







 * Holds the result from a PIN attempt.














 *














 * @see TelephonyManager#supplyIccLockPin














 * @see TelephonyManager#supplyIccLockPuk














 * @see TelephonyManager#setIccLockEnabled














 * @see TelephonyManager#changeIccLockPin











 *







 *











 * @hide







 * @hide











 */







 */














@SystemApi











public final class PinResult implements Parcelable {







public final class PinResult implements Parcelable {











    /** @hide */







    /** @hide */











    @IntDef({







    @IntDef({










@@ -64,24 +71,24 @@ public final class PinResult implements Parcelable {









    private static final PinResult sFailedResult =







    private static final PinResult sFailedResult =











            new PinResult(PinResult.PIN_RESULT_TYPE_FAILURE, -1);







            new PinResult(PinResult.PIN_RESULT_TYPE_FAILURE, -1);































    private final @PinResultType int mType;







    private final @PinResultType int mResult;































    private final int mAttemptsRemaining;







    private final int mAttemptsRemaining;































    /**







    /**











     * Returns either success, incorrect or failure.







     * Returns the result of the PIN attempt.











     *







     *











     * @see #PIN_RESULT_TYPE_SUCCESS







     * @return The result of the PIN attempt.











     * @see #PIN_RESULT_TYPE_INCORRECT














     * @see #PIN_RESULT_TYPE_FAILURE














     * @return The result type of the pin attempt.














     */







     */











    public @PinResultType int getType() {







    public @PinResultType int getResult() {











        return mType;







        return mResult;











    }







    }































    /**







    /**











     * The number of pin attempts remaining.







     * Returns the number of PIN attempts remaining.














     * This will be set when {@link #getResult} is {@link #PIN_RESULT_TYPE_INCORRECT}.














     * Indicates the number of attempts at entering the PIN before the SIM will be locked and














     * require a PUK unlock to be performed.











     *







     *











     * @return Number of attempts remaining.







     * @return Number of attempts remaining.











     */







     */









@@ -89,22 +96,32 @@ public final class PinResult implements Parcelable {









        return mAttemptsRemaining;







        return mAttemptsRemaining;











    }







    }


































    /**














     * Used to indicate a failed PIN attempt result.














     *














     * @return default PinResult for failure.














     *














     * @hide














     */











    @NonNull







    @NonNull











    public static PinResult getDefaultFailedResult() {







    public static PinResult getDefaultFailedResult() {











        return sFailedResult;







        return sFailedResult;











    }







    }































    /**







    /**











     * PinResult constructor







     * PinResult constructor.











     *







     *











     * @param type The type of pin result.







     * @param result The pin result value.











     * @see #PIN_RESULT_TYPE_SUCCESS







     * @see #PIN_RESULT_TYPE_SUCCESS











     * @see #PIN_RESULT_TYPE_INCORRECT







     * @see #PIN_RESULT_TYPE_INCORRECT











     * @see #PIN_RESULT_TYPE_FAILURE







     * @see #PIN_RESULT_TYPE_FAILURE














     * @see #PIN_RESULT_TYPE_ABORTED











     * @param attemptsRemaining Number of pin attempts remaining.







     * @param attemptsRemaining Number of pin attempts remaining.














     *














     * @hide











     */







     */











    public PinResult(@PinResultType int type, int attemptsRemaining) {







    public PinResult(@PinResultType int result, int attemptsRemaining) {











        mType = type;







        mResult = result;











        mAttemptsRemaining = attemptsRemaining;







        mAttemptsRemaining = attemptsRemaining;











    }







    }





























@@ -114,7 +131,7 @@ public final class PinResult implements Parcelable {









     * @hide







     * @hide











     */







     */











    private PinResult(Parcel in) {







    private PinResult(Parcel in) {











        mType = in.readInt();







        mResult = in.readInt();











        mAttemptsRemaining = in.readInt();







        mAttemptsRemaining = in.readInt();











    }







    }





























@@ -124,11 +141,11 @@ public final class PinResult implements Parcelable {









    @NonNull







    @NonNull











    @Override







    @Override











    public String toString() {







    public String toString() {











        return "type: " + getType() + ", attempts remaining: " + getAttemptsRemaining();







        return "result: " + getResult() + ", attempts remaining: " + getAttemptsRemaining();











    }







    }































    /**







    /**











     * Required to be Parcelable







     * Describe the contents of this object.











     */







     */











    @Override







    @Override











    public int describeContents() {







    public int describeContents() {









@@ -136,15 +153,17 @@ public final class PinResult implements Parcelable {









    }







    }































    /**







    /**











     * Required to be Parcelable







     * Write this object to a Parcel.











     */







     */











    @Override







    @Override











    public void writeToParcel(@NonNull Parcel out, int flags) {







    public void writeToParcel(@NonNull Parcel out, int flags) {











        out.writeInt(mType);







        out.writeInt(mResult);











        out.writeInt(mAttemptsRemaining);







        out.writeInt(mAttemptsRemaining);











    }







    }































    /** Required to be Parcelable */







    /**














     * Parcel creator class.














     */











    public static final @NonNull Parcelable.Creator<PinResult> CREATOR = new Creator<PinResult>() {







    public static final @NonNull Parcelable.Creator<PinResult> CREATOR = new Creator<PinResult>() {











        public PinResult createFromParcel(Parcel in) {







        public PinResult createFromParcel(Parcel in) {











            return new PinResult(in);







            return new PinResult(in);









@@ -156,7 +175,7 @@ public final class PinResult implements Parcelable {





























    @Override







    @Override











    public int hashCode() {







    public int hashCode() {











        return Objects.hash(mAttemptsRemaining, mType);







        return Objects.hash(mAttemptsRemaining, mResult);











    }







    }































    @Override







    @Override









@@ -171,7 +190,7 @@ public final class PinResult implements Parcelable {









            return false;







            return false;











        }







        }











        PinResult other = (PinResult) obj;







        PinResult other = (PinResult) obj;











        return (mType == other.mType







        return (mResult == other.mResult











                && mAttemptsRemaining == other.mAttemptsRemaining);







                && mAttemptsRemaining == other.mAttemptsRemaining);











    }







    }











}






}
























telephony/java/android/telephony/TelephonyManager.java



+112
−62


























File changed.
Preview size limit exceeded, changes collapsed.