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

Commit 5bb272a3 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

There's no CDMA-only devices anymore 

So there should be no need to check for GSM feature.

Bug: 367363970
Test: TH
Flag: EXEMPT should be a no-op
Change-Id: I8eec048af39dd9b4bf4fc96609b732dec4ddc088
parent 9a93e195

services/devicepolicy/java/com/android/server/devicepolicy/EnterpriseSpecificIdCalculator.java

+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);