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

2018-04-13 10:07:36 +00:00
parent 637422b2bf 52dcedca37
commit ec6268c514
1 changed files with 1 additions and 1 deletions
--- a/keystore/java/android/security/keystore/AttestationUtils.java
+++ b/keystore/java/android/security/keystore/AttestationUtils.java
@ -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");
                    }