Merge "Merge "Fix error message: getAllowedCarriers" am: 112d039dfb am: 03f4a0f034 am: 96b140489c" into oc-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-04-21 16:45:45 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
}