diff options
| author | Brad Ebinger <breadley@google.com> | 2023-09-12 02:06:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-12 02:06:33 +0000 |
| commit | c136a962e366743432482c79758e0f42a2db59c9 (patch) | |
| tree | 4768aba64e80fdab7b419f374fd706d7f11336c9 | |
| parent | 0bc66fe2d42b1f0a8de6ffbe9f541bd73949b621 (diff) | |
| parent | 75a005b186659f6867bf6574377d63880152a043 (diff) | |
| download | Telecomm-c136a962e366743432482c79758e0f42a2db59c9.tar.gz | |
Fix ConnectionServiceFocusManager NPE am: 021a0ee8ff am: 16e65883f0 am: df26b7f841 am: 75a005b186
Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2747814
Change-Id: I847b63204a4a25291000e426839668e5706c4fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r--[-rwxr-xr-x] | src/com/android/server/telecom/ConnectionServiceWrapper.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java index c550eded7..728e121f5 100755..100644 --- a/src/com/android/server/telecom/ConnectionServiceWrapper.java +++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java @@ -2391,6 +2391,7 @@ public class ConnectionServiceWrapper extends ServiceBinder implements BindCallback callback = new BindCallback() { @Override public void onSuccess() { + if (!isServiceValid("connectionServiceFocusLost")) return; try { mServiceInterface.connectionServiceFocusLost( Log.getExternalSession(TELECOM_ABBREVIATION)); @@ -2410,6 +2411,7 @@ public class ConnectionServiceWrapper extends ServiceBinder implements BindCallback callback = new BindCallback() { @Override public void onSuccess() { + if (!isServiceValid("connectionServiceFocusGained")) return; try { mServiceInterface.connectionServiceFocusGained( Log.getExternalSession(TELECOM_ABBREVIATION)); |