Merge "Fix error message: getAllowedCarriers" am: 112d039dfb

am: 03f4a0f034

Change-Id: If62a8b9d7b4a2c36d20cdb00877563a5586a5f72
This commit is contained in:
Meng Wang
2017-04-21 16:38:13 +00:00
committed by android-build-merger

View File

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