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

Commit d9e9dbf6 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "There's no CDMA-only devices anymore" into main

parents 2651dace 5bb272a3
Loading
Loading
Loading
Loading
+1 −11
Original line number Diff line number Diff line
@@ -54,17 +54,7 @@ class EnterpriseSpecificIdCalculator {
        TelephonyManager telephonyService = context.getSystemService(TelephonyManager.class);
        Preconditions.checkState(telephonyService != null, "Unable to access telephony service");

        String imei;
        try {
            imei = telephonyService.getImei(0);
        } catch (UnsupportedOperationException doesNotSupportGms) {
            // Instead of catching the exception, we could check for FEATURE_TELEPHONY_GSM.
            // However that runs the risk of changing a device's existing ESID if on these devices
            // telephonyService.getImei() actually returns non-null even when the device does not
            // declare FEATURE_TELEPHONY_GSM.
            imei = null;
        }
        mImei = imei;
        mImei = telephonyService.getImei(0);
        String meid;
        try {
            meid = telephonyService.getMeid(0);