Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the bug that queries UsageStatsService for locked users" into rvc-dev

Browse Source
This commit is contained in:
Danning Chen
2020-03-06 17:16:44 +00:00
committed by Android (Google) Code Review
parent eaebc6540c 18fecf78d3
commit 24a1ea3f03
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/people/java/com/android/server/people/PeopleService.java
View File

@@ -72,13 +72,13 @@ public class PeopleService extends SystemService {
}
@Override
public void onUserUnlocking(@NonNull TargetUser targetUser) {
mDataManager.onUserUnlocked(targetUser.getUserIdentifier());
public void onUserUnlocked(@NonNull TargetUser user) {
mDataManager.onUserUnlocked(user.getUserIdentifier());
}
@Override
public void onUserStopping(@NonNull TargetUser targetUser) {
mDataManager.onUserStopped(targetUser.getUserIdentifier());
public void onUserStopping(@NonNull TargetUser user) {
mDataManager.onUserStopping(user.getUserIdentifier());
}
@VisibleForTesting

6
services/people/java/com/android/server/people/data/DataManager.java
View File

@@ -198,13 +198,13 @@ public class DataManager {
DataMaintenanceService.scheduleJob(mContext, userId);
}
/** This method is called when a user is stopped. */
public void onUserStopped(int userId) {
/** This method is called when a user is stopping. */
public void onUserStopping(int userId) {
if (mUserDataArray.indexOfKey(userId) >= 0) {
mUserDataArray.get(userId).setUserStopped();
}
if (mUsageStatsQueryFutures.indexOfKey(userId) >= 0) {
mUsageStatsQueryFutures.valueAt(userId).cancel(true);
mUsageStatsQueryFutures.get(userId).cancel(true);
}
if (mBroadcastReceivers.indexOfKey(userId) >= 0) {
mContext.unregisterReceiver(mBroadcastReceivers.get(userId));

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

@@ -269,7 +269,7 @@ public final class DataManagerTest {
assertEquals(1, conversations.size());
assertEquals("sc_1", conversations.get(0).getShortcutId());
mDataManager.onUserStopped(USER_ID_PRIMARY);
mDataManager.onUserStopping(USER_ID_PRIMARY);
conversations = getConversationsInPrimary();
assertTrue(conversations.isEmpty());
}