Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix com.android.server.wm.TaskFpsCallbackController#unregisterListener method NEVER works" am: 4b755813d9 am: d18d95e02d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191395

Change-Id: Ied45228bbaf060b29a96671c39412ac3a7e0586b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hai Zhang
2023-04-15 04:30:14 +00:00
committed by Automerger Merge Worker
parent 94673e7dd5 d18d95e02d
commit f492f15c9a
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
services/core/java/com/android/server/wm/TaskFpsCallbackController.java
View File

@@ -26,8 +26,8 @@ import java.util.HashMap;
final class TaskFpsCallbackController {
private final Context mContext;
private final HashMap<ITaskFpsCallback, Long> mTaskFpsCallbacks;
private final HashMap<ITaskFpsCallback, IBinder.DeathRecipient> mDeathRecipients;
private final HashMap<IBinder, Long> mTaskFpsCallbacks;
private final HashMap<IBinder, IBinder.DeathRecipient> mDeathRecipients;
TaskFpsCallbackController(Context context) {
mContext = context;
@@ -36,32 +36,42 @@ final class TaskFpsCallbackController {
}
void registerListener(int taskId, ITaskFpsCallback callback) {
if (mTaskFpsCallbacks.containsKey(callback)) {
if (callback == null) {
return;
}
IBinder binder = callback.asBinder();
if (mTaskFpsCallbacks.containsKey(binder)) {
return;
}
final long nativeListener = nativeRegister(callback, taskId);
mTaskFpsCallbacks.put(callback, nativeListener);
mTaskFpsCallbacks.put(binder, nativeListener);
final IBinder.DeathRecipient deathRecipient = () -> unregisterListener(callback);
try {
callback.asBinder().linkToDeath(deathRecipient, 0);
mDeathRecipients.put(callback, deathRecipient);
binder.linkToDeath(deathRecipient, 0);
mDeathRecipients.put(binder, deathRecipient);
} catch (RemoteException e) {
// ignore
}
}
void unregisterListener(ITaskFpsCallback callback) {
if (!mTaskFpsCallbacks.containsKey(callback)) {
if (callback == null) {
return;
}
callback.asBinder().unlinkToDeath(mDeathRecipients.get(callback), 0);
mDeathRecipients.remove(callback);
IBinder binder = callback.asBinder();
if (!mTaskFpsCallbacks.containsKey(binder)) {
return;
}
nativeUnregister(mTaskFpsCallbacks.get(callback));
mTaskFpsCallbacks.remove(callback);
binder.unlinkToDeath(mDeathRecipients.get(binder), 0);
mDeathRecipients.remove(binder);
nativeUnregister(mTaskFpsCallbacks.get(binder));
mTaskFpsCallbacks.remove(binder);
}
private static native long nativeRegister(ITaskFpsCallback callback, int taskId);