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

Commit 6fe2a0e2 authored by Julian Thomassie's avatar Julian Thomassie Committed by Android (Google) Code Review
Browse files

Merge "PinStorage: Record missing encryption key metric."

parents 502abb86 d9d42a05

src/java/com/android/internal/telephony/uicc/PinStorage.java

+6 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT 
import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_COUNT_NOT_MATCHING_AFTER_REBOOT;

import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_DECRYPTION_ERROR;

import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_ENCRYPTION_ERROR;

import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_ENCRYPTION_KEY_MISSING;

import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_REQUIRED_AFTER_REBOOT;

import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_STORED_FOR_VERIFICATION;

import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_VERIFICATION_FAILURE;
@@ -721,7 +722,11 @@ public class PinStorage extends Handler { 
     */

    @Nullable

    private StoredPin decryptStoredPin(byte[] blob, @Nullable SecretKey secretKey) {

        if (secretKey != null) {

        if (secretKey == null) {

            TelephonyStatsLog.write(PIN_STORAGE_EVENT,

                    PIN_STORAGE_EVENT__EVENT__PIN_ENCRYPTION_KEY_MISSING,

                    /* number_of_pins= */ 1, /* package_name= */ "");

        } else {

            try {

                byte[] decryptedPin = decrypt(secretKey, blob);

                if (decryptedPin.length > 0) {