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

Commit 931fe7cc authored by Karuna Wadhera's avatar Karuna Wadhera Committed by Automerger Merge Worker
Browse files

Merge "Catch UnsupportedOperationException for getMeid" into main am: 7e336d6d am: 29fa6d1e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3441170



Change-Id: I3723c6b11488a6ad9cf2173d15fdc97c08cc442b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85173285 29fa6d1e

keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java

+10 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.security.keystore2.AndroidKeyStoreCipherSpiBase.DEFAULT_MG 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.content.Context;

import android.hardware.security.keymint.EcCurve;

import android.hardware.security.keymint.KeyParameter;
@@ -732,6 +733,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato 
        }

    }



    @RequiresPermission(value = android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

            conditional = true)

    private void addAttestationParameters(@NonNull List<KeyParameter> params)

            throws ProviderException, IllegalArgumentException, DeviceIdAttestationException {

        byte[] challenge = mSpec.getAttestationChallenge();
@@ -824,7 +827,13 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato 
                        break;

                    }

                    case AttestationUtils.ID_TYPE_MEID: {

                        final String meid = telephonyService.getMeid(0);

                        String meid;

                        try {

                            meid = telephonyService.getMeid(0);

                        } catch (UnsupportedOperationException e) {

                            Log.e(TAG, "Unable to retrieve MEID", e);

                            meid = null;

                        }

                        if (meid == null) {

                            throw new DeviceIdAttestationException("Unable to retrieve MEID");

                        }