Merge "Fix AppPrediction/Smartspace leak" into tm-dev (8683e320) · Commits · e / os / android_frameworks_base

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,

+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,