Merge "Stop silently dropping a NullPointerException" am: d99ca07884

am: 66c4dc0757 Change-Id: I6fb1b41660b61c83a1f6883df823d2840f974de3
2019-05-24 12:36:42 -07:00
parent e64fd38ce2 66c4dc0757
commit 55bc95f8d0
1 changed files with 1 additions and 2 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -8393,9 +8393,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;
    }