Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop silently dropping a NullPointerException" am: d99ca07884 am: 66c4dc0757

Browse Source 
am: 55bc95f8d0

Change-Id: Id4b7b3ee8329f1e6ed6e60be75c47fcec52f72c4
This commit is contained in:
Hall Liu
2019-05-24 17:45:50 -07:00
committed by android-build-merger
parent 29048b390c 55bc95f8d0
commit a6eed633f1
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -8393,9 +8393,8 @@ public class TelephonyManager {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) if (telephony != null)
retVal = telephony.isUserDataEnabled(subId); retVal = telephony.isUserDataEnabled(subId);
} catch (RemoteException e) { } catch (RemoteException | NullPointerException e) {
Log.e(TAG, "Error calling ITelephony#isUserDataEnabled", e); Log.e(TAG, "Error calling ITelephony#isUserDataEnabled", e);
} catch (NullPointerException e) {
} }
return retVal; return retVal;
} }