Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba101c12 authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merge "Fix AppPrediction/Smartspace leak" into tm-qpr-dev am: 4f934d78 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19123424



Change-Id: Ic17281a0a556682fdeb06a245cc2c6b7bb1120f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9feb71e 4f934d78

services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java

+1 −12
Original line number Diff line number Diff line
@@ -398,18 +398,7 @@ public class AppPredictionPerUserService extends 
        final IBinder.DeathRecipient mDeathRecipient;



        private final RemoteCallbackList<IPredictionCallback> mCallbacks =

                new RemoteCallbackList<IPredictionCallback>() {

                    @Override

                    public void onCallbackDied(IPredictionCallback callback) {

                        if (DEBUG) {

                            Slog.d(TAG, "Binder died for session Id=" + mSessionId

                                    + " and callback=" + callback.asBinder());

                        }

                        if (mCallbacks.getRegisteredCallbackCount() == 0) {

                            destroy();

                        }

                    }

                };

                new RemoteCallbackList<>();



        AppPredictionSessionInfo(

                @NonNull final AppPredictionSessionId id,

services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java

+1 −12
Original line number Diff line number Diff line
@@ -334,18 +334,7 @@ public class SmartspacePerUserService extends 
        @NonNull

        private final SmartspaceConfig mSmartspaceConfig;

        private final RemoteCallbackList<ISmartspaceCallback> mCallbacks =

                new RemoteCallbackList<ISmartspaceCallback>() {

                    @Override

                    public void onCallbackDied(ISmartspaceCallback callback) {

                        if (DEBUG) {

                            Slog.d(TAG, "Binder died for session Id=" + mSessionId

                                    + " and callback=" + callback.asBinder());

                        }

                        if (mCallbacks.getRegisteredCallbackCount() == 0) {

                            destroy();

                        }

                    }

                };

                new RemoteCallbackList<>();



        SmartspaceSessionInfo(

                @NonNull final SmartspaceSessionId id,