Merge "Check before closing the CloseGuard if not closed yet" into qt-dev

am: cc33160f6a Change-Id: I2ce46bec53da48d6817690a9595098f70917323f
2019-04-16 11:32:44 -07:00
parent bc3244400e cc33160f6a
commit cfef9f4bb0
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/app/prediction/AppPredictor.java
+++ b/core/java/android/app/prediction/AppPredictor.java
@@ -271,7 +271,9 @@ public final class AppPredictor {
            if (mCloseGuard != null) {
                mCloseGuard.warnIfOpen();
            }
-            destroy();
+            if (!mIsClosed.get()) {
+                destroy();
+            }
        } finally {
            super.finalize();
        }