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

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

Merge "Fix error message: getAllowedCarriers" am: 112d039d am: 03f4a0f0 

am: 96b14048

Change-Id: Icec36f8895e4ffb081989973abf563fddbf2f2fd
parents 9488302c 96b14048

telephony/java/android/telephony/TelephonyManager.java

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

        } catch (RemoteException e) {

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

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

        } catch (NullPointerException 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);

        return new ArrayList<CarrierIdentifier>(0);

    }

    }