commit 39ac91a47fa8000afecb84c07939e2b602ddac29
author Evan Tyra <evantyra@google.com> Fri May 31 19:29:12 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 31 19:29:12 2019 -0700
tree 6436415f95d812f4d554d7869df84bc9ee69ff52
parent bfb79fe57b77ca7433c6381e585456fb1a6a4ec7
parent cc36a441dd7ebc242729ab8246b805d6d7bb47a7

Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev
am: cc36a441dd

Change-Id: I177744e8e569c6c96c5ad8b8d27b9630d1e7b64e

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index ed1c00f..3f27752 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -105,6 +105,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
@@ -9285,6 +9286,10 @@
             }
         } catch (RemoteException e) {
             Log.e(TAG, "Error calling ITelephony#getServiceStateForSubscriber", e);
+        } catch (NullPointerException e) {
+            AnomalyReporter.reportAnomaly(
+                    UUID.fromString("a3ab0b9d-f2aa-4baf-911d-7096c0d4645a"),
+                    "getServiceStateForSubscriber " + subId + " NPE");
         }
         return null;
     }