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

Commit fca39621 authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "Merge "Fix error message: getAllowedCarriers" am: 112d039d am:... 

Merge "Merge "Fix error message: getAllowedCarriers" am: 112d039d am: 03f4a0f0 am: 96b14048" into oc-dev-plus-aosp
am: 1b92e2d8

Change-Id: I6df83c2fed6f9f91451c37a49244baff78c03347
parents b3e17c13 1b92e2d8

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -6410,7 +6410,7 @@ public class TelephonyManager { 
        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#getAllowedCarriers", e);

        } catch (NullPointerException e) {

            Log.e(TAG, "Error calling ITelephony#setAllowedCarriers", e);

            Log.e(TAG, "Error calling ITelephony#getAllowedCarriers", e);

        }

        return new ArrayList<CarrierIdentifier>(0);

    }