Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev am: cc36a441dd am: 7ca3f0d671 (c167ab2c) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ import java.util.HashMap;
		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 @@ public class TelephonyManager {
		}
		} 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;
		}