From 191149a4d0e8b1cda8741b43bb2e55734bbab5c6 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 21 Feb 2020 19:03:35 -0800
Subject: [PATCH] Clear registered prediction callbacks on destroy

destroy() removes callbacks from AppPredictionManagerService but not
from mRegisteredCallbacks.

Bug: 149388856
Test: manual
Change-Id: Id08d6b20362486bd1640310c64da35e0382d9b5e
---
 core/java/android/app/prediction/AppPredictor.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/app/prediction/AppPredictor.java b/core/java/android/app/prediction/AppPredictor.java
index f0eedf3d18f22..7f436401dbf47 100644
--- a/core/java/android/app/prediction/AppPredictor.java
+++ b/core/java/android/app/prediction/AppPredictor.java
@@ -260,6 +260,7 @@ public final class AppPredictor {
                 Log.e(TAG, "Failed to notify app target event", e);
                 e.rethrowAsRuntimeException();
             }
+            mRegisteredCallbacks.clear();
         } else {
             throw new IllegalStateException("This client has already been destroyed.");
         }