commit d99ca078844dd9f5b82418f4a2c5c05d63cfe5f8
author Hall Liu <hallliu@google.com> Fri May 24 18:27:44 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 24 18:27:44 2019 +0000
tree 72fc5ab0f531480661e6492de8b8bbc23df661d6
parent 8863583ffa6df43e929d108732817c6cda6b189d
parent d69d2599d1a406ecb34ad2d9af1905f02cf3cb72

Merge "Stop silently dropping a NullPointerException"

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 5731646..76497f4 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -8245,9 +8245,8 @@
             ITelephony telephony = getITelephony();
             if (telephony != null)
                 retVal = telephony.isUserDataEnabled(subId);
-        } catch (RemoteException e) {
+        } catch (RemoteException | NullPointerException e) {
             Log.e(TAG, "Error calling ITelephony#isUserDataEnabled", e);
-        } catch (NullPointerException e) {
         }
         return retVal;
     }