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

2019-04-16 18:01:33 +00:00
parent facddb4508 9ac588b0dd
commit cc33160f6a
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();
        }