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

Commit 779812c6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix the bug that queries UsageStatsService for locked users" into rvc-dev am: 24a1ea3f 

Change-Id: I91382d8765778498570ead3241237daccbb26816
parents 259609c5 24a1ea3f

services/people/java/com/android/server/people/PeopleService.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -72,13 +72,13 @@ public class PeopleService extends SystemService { 
    }

    }





    @Override

    @Override

    public void onUserUnlocking(@NonNull TargetUser targetUser) {

    public void onUserUnlocked(@NonNull TargetUser user) {

        mDataManager.onUserUnlocked(targetUser.getUserIdentifier());

        mDataManager.onUserUnlocked(user.getUserIdentifier());

    }

    }





    @Override

    @Override

    public void onUserStopping(@NonNull TargetUser targetUser) {

    public void onUserStopping(@NonNull TargetUser user) {

        mDataManager.onUserStopped(targetUser.getUserIdentifier());

        mDataManager.onUserStopping(user.getUserIdentifier());

    }

    }





    @VisibleForTesting

    @VisibleForTesting

services/people/java/com/android/server/people/data/DataManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -198,13 +198,13 @@ public class DataManager { 
        DataMaintenanceService.scheduleJob(mContext, userId);

        DataMaintenanceService.scheduleJob(mContext, userId);

    }

    }





    /** This method is called when a user is stopped. */

    /** This method is called when a user is stopping. */

    public void onUserStopped(int userId) {

    public void onUserStopping(int userId) {

        if (mUserDataArray.indexOfKey(userId) >= 0) {

        if (mUserDataArray.indexOfKey(userId) >= 0) {

            mUserDataArray.get(userId).setUserStopped();

            mUserDataArray.get(userId).setUserStopped();

        }

        }

        if (mUsageStatsQueryFutures.indexOfKey(userId) >= 0) {

        if (mUsageStatsQueryFutures.indexOfKey(userId) >= 0) {

            mUsageStatsQueryFutures.valueAt(userId).cancel(true);

            mUsageStatsQueryFutures.get(userId).cancel(true);

        }

        }

        if (mBroadcastReceivers.indexOfKey(userId) >= 0) {

        if (mBroadcastReceivers.indexOfKey(userId) >= 0) {

            mContext.unregisterReceiver(mBroadcastReceivers.get(userId));

            mContext.unregisterReceiver(mBroadcastReceivers.get(userId));

services/tests/servicestests/src/com/android/server/people/data/DataManagerTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -269,7 +269,7 @@ public final class DataManagerTest { 
        assertEquals(1, conversations.size());

        assertEquals(1, conversations.size());

        assertEquals("sc_1", conversations.get(0).getShortcutId());

        assertEquals("sc_1", conversations.get(0).getShortcutId());





        mDataManager.onUserStopped(USER_ID_PRIMARY);

        mDataManager.onUserStopping(USER_ID_PRIMARY);

        conversations = getConversationsInPrimary();

        conversations = getConversationsInPrimary();

        assertTrue(conversations.isEmpty());

        assertTrue(conversations.isEmpty());

    }

    }