Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60ea826a authored by Yi Jiang's avatar Yi Jiang Committed by android-build-merger
Browse files

Merge "Add unit tests for AttentionManagerService. Make sure it won't crash... 

Merge "Add unit tests for AttentionManagerService. Make sure it won't crash when OnSwitchUser() is invoked while the bound service is null." into qt-dev
am: a8853fe2

Change-Id: I6a5a756b107dab76fab2378ce8442dee7318b21b
parents 7b7bdb17 a8853fe2

services/core/java/com/android/server/attention/AttentionManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ public class AttentionManagerService extends SystemService { 
    }



    @GuardedBy("mLock")

    private UserState getOrCreateUserStateLocked(int userId) {

    @VisibleForTesting

    protected UserState getOrCreateUserStateLocked(int userId) {

        UserState result = mUserStates.get(userId);

        if (result == null) {

            result = new UserState(userId, mContext, mLock, mComponentName);

services/tests/servicestests/src/com/android/server/attention/AttentionManagerServiceTest.java

+7 −0
Original line number Diff line number Diff line
@@ -132,6 +132,13 @@ public class AttentionManagerServiceTest { 
        verify(callback).onSuccess(anyInt(), anyLong());

    }



    @Test

    public void testOnSwitchUser_noCrashCurrentServiceIsNull() {

        final int userId = 10;

        mSpyAttentionManager.getOrCreateUserStateLocked(userId);

        mSpyAttentionManager.onSwitchUser(userId);

    }



    private class MockIAttentionService implements IAttentionService {

        public void checkAttention(IAttentionCallback callback) throws RemoteException {

            callback.onSuccess(0, 0);