commit 74309884188d8a43a86669c42df62abe3e5b7c54
author Taeun Kim <taeun99.kim@samsung.com> Tue Mar 15 20:11:38 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 15 20:11:38 2022 +0000
tree 6039466adc1ab63c371807a10109287304a0bd5d
parent 95d5d110067cc5603d8464a53f2b71fe11a3542f
parent a62ca14425dbd40a95dab958404f66bc4b09791b

Fix NullPointerException by 'adb shell service call uimode 1' am: a62ca14425

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2026103

Change-Id: Ibd3faa9181261014d718bcd7c4c23d95f6e431fa

src/com/android/server/telecom/InCallController.java

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index d315127..06d8fdc 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -2175,6 +2175,10 @@
     public void handleCarModeChange(int priority, String packageName, boolean isCarMode) {
         Log.i(this, "handleCarModeChange: packageName=%s, priority=%d, isCarMode=%b",
                 packageName, priority, isCarMode);
+        if (packageName == null) {
+            Log.i(this, "handleCarModeChange: Got null packageName, ignoring");
+            return;
+        }
         // Don't ignore the signal if we are disabling car mode; package may be uninstalled.
         if (isCarMode && !isCarModeInCallService(packageName)) {
             Log.i(this, "handleCarModeChange: not a valid InCallService; packageName=%s",