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

Merge "Stop silently dropping a NullPointerException"

Browse Source
This commit is contained in:
Hall Liu
2019-05-24 18:27:44 +00:00
committed by Gerrit Code Review
parent 8863583ffa d69d2599d1
commit d99ca07884
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

@@ -8245,9 +8245,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;
} }