Merge "Add UserSwitchObserver.onBeforeUserSwitching and make SysUI use it." into udc-dev (bd63b5d9) · Commits · e / os / android_frameworks_base

core/java/android/app/IUserSwitchObserver.aidl

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.os.IRemoteCallback;

	/** {@hide} */		/** {@hide} */
	oneway interface IUserSwitchObserver {		oneway interface IUserSwitchObserver {
			void onBeforeUserSwitching(int newUserId);
	void onUserSwitching(int newUserId, IRemoteCallback reply);		void onUserSwitching(int newUserId, IRemoteCallback reply);
	void onUserSwitchComplete(int newUserId);		void onUserSwitchComplete(int newUserId);
	void onForegroundProfileSwitch(int newProfileId);		void onForegroundProfileSwitch(int newProfileId);

core/java/android/app/UserSwitchObserver.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,9 @@ public class UserSwitchObserver extends IUserSwitchObserver.Stub {
	public UserSwitchObserver() {		public UserSwitchObserver() {
	}		}

			@Override
			public void onBeforeUserSwitching(int newUserId) throws RemoteException {}

	@Override		@Override
	public void onUserSwitching(int newUserId, IRemoteCallback reply) throws RemoteException {		public void onUserSwitching(int newUserId, IRemoteCallback reply) throws RemoteException {
	if (reply != null) {		if (reply != null) {

packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -161,6 +161,10 @@ open class UserTrackerImpl internal constructor(

	private fun registerUserSwitchObserver() {		private fun registerUserSwitchObserver() {
	iActivityManager.registerUserSwitchObserver(object : UserSwitchObserver() {		iActivityManager.registerUserSwitchObserver(object : UserSwitchObserver() {
			override fun onBeforeUserSwitching(newUserId: Int) {
			setUserIdInternal(newUserId)
			}

	override fun onUserSwitching(newUserId: Int, reply: IRemoteCallback?) {		override fun onUserSwitching(newUserId: Int, reply: IRemoteCallback?) {
	backgroundHandler.run {		backgroundHandler.run {
	handleUserSwitching(newUserId)		handleUserSwitching(newUserId)
	@@ -181,8 +185,6 @@ open class UserTrackerImpl internal constructor(
	Assert.isNotMainThread()		Assert.isNotMainThread()
	Log.i(TAG, "Switching to user $newUserId")		Log.i(TAG, "Switching to user $newUserId")

	setUserIdInternal(newUserId)

	val list = synchronized(callbacks) {		val list = synchronized(callbacks) {
	callbacks.toList()		callbacks.toList()
	}		}
	@@ -205,7 +207,6 @@ open class UserTrackerImpl internal constructor(
	Assert.isNotMainThread()		Assert.isNotMainThread()
	Log.i(TAG, "Switched to user $newUserId")		Log.i(TAG, "Switched to user $newUserId")

	setUserIdInternal(newUserId)
	notifySubscribers {		notifySubscribers {
	onUserChanged(newUserId, userContext)		onUserChanged(newUserId, userContext)
	onProfilesChanged(userProfiles)		onProfilesChanged(userProfiles)

packages/SystemUI/tests/src/com/android/systemui/settings/UserTrackerImplTest.kt

+3 −0

services/core/java/com/android/server/am/UserController.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2141,6 +2141,17 @@ class UserController implements Handler.Callback {

	final int observerCount = mUserSwitchObservers.beginBroadcast();		final int observerCount = mUserSwitchObservers.beginBroadcast();
	if (observerCount > 0) {		if (observerCount > 0) {
			for (int i = 0; i < observerCount; i++) {
			final String name = "#" + i + " " + mUserSwitchObservers.getBroadcastCookie(i);
			t.traceBegin("onBeforeUserSwitching-" + name);
			try {
			mUserSwitchObservers.getBroadcastItem(i).onBeforeUserSwitching(newUserId);
			} catch (RemoteException e) {
			// Ignore
			} finally {
			t.traceEnd();
			}
			}
	final ArraySet<String> curWaitingUserSwitchCallbacks = new ArraySet<>();		final ArraySet<String> curWaitingUserSwitchCallbacks = new ArraySet<>();
	synchronized (mLock) {		synchronized (mLock) {
	uss.switching = true;		uss.switching = true;

Original line number	Original line	Diff line number	Diff line
	@@ -167,6 +167,7 @@ class UserTrackerImplTest : SysuiTestCase() {

	val captor = ArgumentCaptor.forClass(IUserSwitchObserver::class.java)		val captor = ArgumentCaptor.forClass(IUserSwitchObserver::class.java)
	verify(iActivityManager).registerUserSwitchObserver(capture(captor), anyString())		verify(iActivityManager).registerUserSwitchObserver(capture(captor), anyString())
			captor.value.onBeforeUserSwitching(newID)
	captor.value.onUserSwitching(newID, userSwitchingReply)		captor.value.onUserSwitching(newID, userSwitchingReply)
	verify(userSwitchingReply).sendResult(any())		verify(userSwitchingReply).sendResult(any())

	@@ -290,6 +291,7 @@ class UserTrackerImplTest : SysuiTestCase() {

	val captor = ArgumentCaptor.forClass(IUserSwitchObserver::class.java)		val captor = ArgumentCaptor.forClass(IUserSwitchObserver::class.java)
	verify(iActivityManager).registerUserSwitchObserver(capture(captor), anyString())		verify(iActivityManager).registerUserSwitchObserver(capture(captor), anyString())
			captor.value.onBeforeUserSwitching(newID)
	captor.value.onUserSwitching(newID, userSwitchingReply)		captor.value.onUserSwitching(newID, userSwitchingReply)
	verify(userSwitchingReply).sendResult(any())		verify(userSwitchingReply).sendResult(any())

	@@ -308,6 +310,7 @@ class UserTrackerImplTest : SysuiTestCase() {

	val captor = ArgumentCaptor.forClass(IUserSwitchObserver::class.java)		val captor = ArgumentCaptor.forClass(IUserSwitchObserver::class.java)
	verify(iActivityManager).registerUserSwitchObserver(capture(captor), anyString())		verify(iActivityManager).registerUserSwitchObserver(capture(captor), anyString())
			captor.value.onBeforeUserSwitching(newID)
	captor.value.onUserSwitchComplete(newID)		captor.value.onUserSwitchComplete(newID)

	assertThat(callback.calledOnUserChanged).isEqualTo(1)		assertThat(callback.calledOnUserChanged).isEqualTo(1)