Merge "Fix taskbar restarting after turning on workapps from taskbar." into tm-qpr-dev (64fd05ae) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static android.view.MotionEvent.ACTION_CANCEL;
		import static android.view.MotionEvent.ACTION_DOWN;
		import static android.view.MotionEvent.ACTION_UP;
		import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;

		import static com.android.internal.accessibility.common.ShortcutConstants.CHOOSER_PACKAGE_NAME;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SUPPORTS_WINDOW_CORNERS;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
		@@ -713,6 +712,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		}

		public void startConnectionToCurrentUser() {
		Log.v(TAG_OPS, "startConnectionToCurrentUser: connection is restarted");
		if (mHandler.getLooper() != Looper.myLooper()) {
		mHandler.post(mConnectionRunnable);
		} else {

+4 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		package com.android.systemui.statusbar;

		import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED;

		import static com.android.systemui.DejankUtils.whitelistIpcs;

		import android.app.KeyguardManager;
		@@ -145,7 +144,10 @@ public class NotificationLockscreenUserManagerImpl implements
		break;
		case Intent.ACTION_USER_UNLOCKED:
		// Start the overview connection to the launcher service
		// Connect if user hasn't connected yet
		if (mOverviewProxyServiceLazy.get().getProxy() == null) {
		mOverviewProxyServiceLazy.get().startConnectionToCurrentUser();
		}
		break;
		case NOTIFICATION_UNLOCKED_BY_WORK_CHALLENGE_ACTION:
		final IntentSender intentSender = intent.getParcelableExtra(