From d69d2599d1a406ecb34ad2d9af1905f02cf3cb72 Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Thu, 18 Apr 2019 17:59:48 -0700
Subject: [PATCH] Stop silently dropping a NullPointerException

In TelephonyManager, if we get a NullPointerException, don't just
silently drop it.

Bug: 130287372
Test: manual
Change-Id: Ic85512577f67edd25b0fa808ff3280201c851383
---
 telephony/java/android/telephony/TelephonyManager.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 12acf9d098309..29e8b8c6d628d 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -8236,9 +8236,8 @@ public class TelephonyManager {
             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;
     }