Merge "Fix deadlock by keeping local copy of currentUserId" into klp-dev (fc1d8f0a) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+6 −13

Original line number	Diff line number	Diff line
		@@ -460,6 +460,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		PowerManager.WakeLock mBroadcastWakeLock;
		boolean mHavePendingMediaKeyRepeatWithWakeLock;

		private int mCurrentUserId;

		// Maps global key codes to the components that will handle them.
		private GlobalKeyManager mGlobalKeyManager;

		@@ -4813,7 +4815,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		ResolveInfo info = mContext.getPackageManager().resolveActivityAsUser(
		intent,
		PackageManager.MATCH_DEFAULT_ONLY \| PackageManager.GET_META_DATA,
		getCurrentUserId());
		mCurrentUserId);
		if (info != null) {
		ai = info.activityInfo;
		}
		@@ -4828,16 +4830,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return null;
		}

		private int getCurrentUserId() {
		try {
		UserInfo user = ActivityManagerNative.getDefault().getCurrentUser();
		return user != null ? user.id : UserHandle.USER_NULL;
		} catch (RemoteException e) {
		// noop
		}
		return UserHandle.USER_NULL;
		}

		void startDockOrHome() {
		awakenDreams();

		@@ -5093,9 +5085,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		boolean oldTransientNav = isTransientNavigationAllowed(oldVis);
		boolean isTransientNav = isTransientNavigationAllowed(vis);
		if (mFocusedWindow != null && oldTransientNav != isTransientNav) {
		final int uid = getCurrentUserId();
		final String pkg = mFocusedWindow.getOwningPackage();
		mTransientNavigationConfirmation.transientNavigationChanged(uid, pkg, isTransientNav);
		mTransientNavigationConfirmation.transientNavigationChanged(mCurrentUserId, pkg,
		isTransientNav);
		}
		vis = mNavigationBarController.updateVisibilityLw(isTransientNav, oldVis, vis);

		@@ -5174,6 +5166,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		@Override
		public void setCurrentUserLw(int newUserId) {
		mCurrentUserId = newUserId;
		if (mKeyguardDelegate != null) {
		mKeyguardDelegate.setCurrentUser(newUserId);
		}