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

Commit db49e459 authored by Rubin Xu's avatar Rubin Xu
Browse files

Guard against exception from TelephonyManager.getImei() 

Bug: 325625753
Test: EnrollmentSpecificIdTest
Change-Id: Ib209b878cde56b0059ac87f3b1a733bc5181c43e
parent 23951e63

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

+12 −1
Original line number Diff line number Diff line
@@ -52,7 +52,18 @@ class EnterpriseSpecificIdCalculator { 
    EnterpriseSpecificIdCalculator(Context context) {

        TelephonyManager telephonyService = context.getSystemService(TelephonyManager.class);

        Preconditions.checkState(telephonyService != null, "Unable to access telephony service");

        mImei = telephonyService.getImei(0);



        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;

        String meid;

        try {

            meid = telephonyService.getMeid(0);