From 86f01c4cd9177f285563db421c2cb052c51f7b9c Mon Sep 17 00:00:00 2001 From: Andrey Epin Date: Thu, 12 Jan 2023 19:56:56 -0800 Subject: [PATCH] Fix SmartspaceService callback comparison. We should use binder references when comparing two IPC callbacks. Test: Inject a test code into LocscreenSmartspaceController#reloadSmartspace() that register and unregister a test smartspace listener. Verify that the listeners is get invoked without the fix and is not get invoked with the fix. Change-Id: I3229c6496cde43ba1df65412857eb36b47b525c4 --- core/java/android/service/smartspace/SmartspaceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/service/smartspace/SmartspaceService.java b/core/java/android/service/smartspace/SmartspaceService.java index 3a148dffe6d69..b13a069116af0 100644 --- a/core/java/android/service/smartspace/SmartspaceService.java +++ b/core/java/android/service/smartspace/SmartspaceService.java @@ -302,7 +302,7 @@ public abstract class SmartspaceService extends Service { Slog.e(TAG, "Callback is null, likely the binder has died."); return false; } - return mCallback.equals(callback); + return mCallback.asBinder().equals(callback.asBinder()); } @Override