[automerger] Do not run StateHandler code while holding the lock am: f46779fe01 (bda98141) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/states/InternalStateHandler.java

+15 −11

Original line number	Diff line number	Diff line
		@@ -96,11 +96,13 @@ public abstract class InternalStateHandler extends Binder {
		private WeakReference<InternalStateHandler> mPendingHandler = new WeakReference<>(null);
		private MainThreadExecutor mMainThreadExecutor;

		public synchronized void schedule(InternalStateHandler handler) {
		public void schedule(InternalStateHandler handler) {
		synchronized (this) {
		mPendingHandler = new WeakReference<>(handler);
		if (mMainThreadExecutor == null) {
		mMainThreadExecutor = new MainThreadExecutor();
		}
		}
		mMainThreadExecutor.execute(this);
		}

		@@ -118,24 +120,26 @@ public abstract class InternalStateHandler extends Binder {
		initIfPending(launcher, launcher.isStarted());
		}

		public synchronized boolean initIfPending(Launcher launcher, boolean alreadyOnHome) {
		public boolean initIfPending(Launcher launcher, boolean alreadyOnHome) {
		InternalStateHandler pendingHandler = mPendingHandler.get();
		if (pendingHandler != null) {
		if (!pendingHandler.init(launcher, alreadyOnHome)) {
		mPendingHandler.clear();
		clearReference(pendingHandler);
		}
		return true;
		}
		return false;
		}

		public synchronized boolean clearReference(InternalStateHandler handler) {
		public boolean clearReference(InternalStateHandler handler) {
		synchronized (this) {
		if (mPendingHandler.get() == handler) {
		mPendingHandler.clear();
		return true;
		}
		return false;
		}
		}

		public boolean hasPending() {
		return mPendingHandler.get() != null;