Merge "Skip writing item during shutdown process if the user is locked." into main (e6bde5aa) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/SnapshotPersistQueue.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -231,8 +231,13 @@ class SnapshotPersistQueue {
	if (next.isReady(mUserManagerInternal)) {		if (next.isReady(mUserManagerInternal)) {
	isReadyToWrite = true;		isReadyToWrite = true;
	next.onDequeuedLocked();		next.onDequeuedLocked();
	} else {		} else if (!mShutdown) {
	mWriteQueue.addLast(next);		mWriteQueue.addLast(next);
			} else {
			// User manager is locked and device is shutting down, skip writing
			// this item.
			next.onDequeuedLocked();
			next = null;
	}		}
	}		}
	}		}