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

Commit e94fbfe1 authored by Eran Messeri's avatar Eran Messeri Committed by android-build-merger
Browse files

Merge "AttestationUtils: Request MEID explicitly" into pi-dev am: ec6268c5 

am: 3ae9a11c

Change-Id: I0bd82a0d811c482debb4795a444ea2d0eefbdc88
parents b0e2b559 3ae9a11c

keystore/java/android/security/keystore/AttestationUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public abstract class AttestationUtils { 
                    break;

                }

                case ID_TYPE_MEID: {

                    final String meid = telephonyService.getDeviceId();

                    final String meid = telephonyService.getMeid(0);

                    if (meid == null) {

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

                    }