Merge "Fix a subtle timing issue in AppsFilter" (06e6bcd1) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/AppsFilterImpl.java

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -834,12 +834,6 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
	}		}

	updateEntireShouldFilterCacheInner(snapshot, settings, usersRef[0], USER_ALL);		updateEntireShouldFilterCacheInner(snapshot, settings, usersRef[0], USER_ALL);
	synchronized (mImplicitlyQueryableLock) {
	if (mNeedToUpdateCacheForImplicitAccess) {
	updateShouldFilterCacheForImplicitAccess();
	mNeedToUpdateCacheForImplicitAccess = false;
	}
	}
	logCacheRebuilt(reason, SystemClock.currentTimeMicro() - currentTimeUs,		logCacheRebuilt(reason, SystemClock.currentTimeMicro() - currentTimeUs,
	users.length, settings.size());		users.length, settings.size());

	@@ -850,7 +844,14 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
	return;		return;
	}		}

			synchronized (mImplicitlyQueryableLock) {
			if (mNeedToUpdateCacheForImplicitAccess) {
			updateShouldFilterCacheForImplicitAccess();
			mNeedToUpdateCacheForImplicitAccess = false;
			}
	mCacheReady = true;		mCacheReady = true;
			}

	onChanged();		onChanged();
	}, delayMs);		}, delayMs);
	}		}