commit 16e65883f0beb5dd0aa081467d474e6ff2dc7677
author Brad Ebinger <breadley@google.com> Mon Sep 11 23:46:21 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 11 23:46:21 2023 +0000
tree 632b04f13779da99f697aaba7ed7f3db19ecabe4
parent 0d10f467bc44c8d83b0208b033f3b975197ad183
parent 021a0ee8ff8077a27e0bf4efa8d3e3f7bf942d63

Fix ConnectionServiceFocusManager NPE am: 021a0ee8ff

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

Change-Id: I01eb9ca04c0b8134470c73a3c94f9a918c1674c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
old mode 100755
new mode 100644
index c550ede..728e121
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -2391,6 +2391,7 @@
         BindCallback callback = new BindCallback() {
             @Override
             public void onSuccess() {
+                if (!isServiceValid("connectionServiceFocusLost")) return;
                 try {
                     mServiceInterface.connectionServiceFocusLost(
                             Log.getExternalSession(TELECOM_ABBREVIATION));
@@ -2410,6 +2411,7 @@
         BindCallback callback = new BindCallback() {
             @Override
             public void onSuccess() {
+                if (!isServiceValid("connectionServiceFocusGained")) return;
                 try {
                     mServiceInterface.connectionServiceFocusGained(
                             Log.getExternalSession(TELECOM_ABBREVIATION));