diff options
3 files changed, 20 insertions, 20 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt index a817b31070a1..7bf9efa78142 100644 --- a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt @@ -195,7 +195,7 @@ constructor( val callback = object : UserTracker.Callback { - override fun onUserChanging(newUser: Int, userContext: Context) { + override fun onBeforeUserSwitching(newUser: Int) { send(SelectionStatus.SELECTION_IN_PROGRESS) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt index c235954dffa4..1af0f79f2dde 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt @@ -248,10 +248,17 @@ class UserRepositoryImplTest : SysuiTestCase() { setUpUsers(count = 2, selectedIndex = 1) + // WHEN the user switch is starting + tracker.onBeforeUserSwitching(userId = 1) + + // THEN the selection status is IN_PROGRESS + assertThat(selectedUser!!.selectionStatus) + .isEqualTo(SelectionStatus.SELECTION_IN_PROGRESS) + // WHEN the user is changing tracker.onUserChanging(userId = 1) - // THEN the selection status is IN_PROGRESS + // THEN the selection status is still IN_PROGRESS assertThat(selectedUser!!.selectionStatus) .isEqualTo(SelectionStatus.SELECTION_IN_PROGRESS) @@ -266,6 +273,7 @@ class UserRepositoryImplTest : SysuiTestCase() { setUpUsers(count = 2, selectedIndex = 0) + tracker.onBeforeUserSwitching(userId = 0) tracker.onUserChanging(userId = 0) assertThat(selectedUser!!.selectionStatus) .isEqualTo(SelectionStatus.SELECTION_IN_PROGRESS) diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java index fc4a909e761f..f68ae2c7e249 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java @@ -173,10 +173,6 @@ public class SharedConnectivityManager { } } } - - Executor getExecutor() { - return mExecutor; - } } private ISharedConnectivityService mService; @@ -192,7 +188,7 @@ public class SharedConnectivityManager { private final String mServicePackageName; private final String mIntentAction; private ServiceConnection mServiceConnection; - private final UserManager mUserManager; + private UserManager mUserManager; /** * Creates a new instance of {@link SharedConnectivityManager}. @@ -320,19 +316,15 @@ public class SharedConnectivityManager { private void registerCallbackInternal(SharedConnectivityClientCallback callback, SharedConnectivityCallbackProxy proxy) { - proxy.getExecutor().execute( - () -> { - try { - mService.registerCallback(proxy); - synchronized (mProxyDataLock) { - mProxyMap.put(callback, proxy); - } - } catch (RemoteException e) { - Log.e(TAG, "Exception in registerCallback", e); - callback.onRegisterCallbackFailed(e); - } - } - ); + try { + mService.registerCallback(proxy); + synchronized (mProxyDataLock) { + mProxyMap.put(callback, proxy); + } + } catch (RemoteException e) { + Log.e(TAG, "Exception in registerCallback", e); + callback.onRegisterCallbackFailed(e); + } } /** |