Merge "Fix spinning TaskPersister" into oc-dev

2017-05-16 15:13:28 +00:00
parent ba21a120c1 2f9c7a2f14
commit 88c6ec9f17
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
@@ -209,11 +209,12 @@ class TaskSnapshotPersister {
                    SystemClock.sleep(DELAY_MS);
                }
                synchronized (mLock) {
-                    if (!mWriteQueue.isEmpty()) {
+                    final boolean writeQueueEmpty = mWriteQueue.isEmpty();
+                    if (!writeQueueEmpty && !mPaused) {
                        continue;
                    }
                    try {
-                        mQueueIdling = true;
+                        mQueueIdling = writeQueueEmpty;
                        mLock.wait();
                        mQueueIdling = false;
                    } catch (InterruptedException e) {