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

Browse Source 
am: 66c4dc0757

Change-Id: I6fb1b41660b61c83a1f6883df823d2840f974de3
This commit is contained in:
Hall Liu
2019-05-24 12:36:42 -07:00
committed by android-build-merger
parent e64fd38ce2 66c4dc0757
commit 55bc95f8d0
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;
} }