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

Update BlobStoreMS to use LongSparseArray.removeIf(Predicate).

Browse Source 
Test: atest cts/tests/BlobStore/src/com/android/cts/blob/BlobStoreManagerTest.java
Test: atest services/tests/mockingservicestests/src/com/android/server/blob/BlobStoreManagerServiceTest.java
Change-Id: I5c8bf7f86cbdb9b3a11608cacee280b323a0027f
This commit is contained in:
Sudheer Shanka
2020-02-16 13:04:18 -08:00
parent e6836f5c6f
commit 4acba54d92
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
View File

@@ -858,12 +858,9 @@ public class BlobStoreManagerService extends SystemService {
writeBlobsInfoAsync();
// Cleanup any stale sessions.
final ArrayList<Integer> indicesToRemove = new ArrayList<>();
for (int i = 0, userCount = mSessions.size(); i < userCount; ++i) {
final LongSparseArray<BlobStoreSession> userSessions = mSessions.valueAt(i);
indicesToRemove.clear();
for (int j = 0, sessionsCount = userSessions.size(); j < sessionsCount; ++j) {
final BlobStoreSession blobStoreSession = userSessions.valueAt(j);
userSessions.removeIf((sessionId, blobStoreSession) -> {
boolean shouldRemove = false;
// Cleanup sessions which haven't been modified in a while.
@@ -880,13 +877,10 @@ public class BlobStoreManagerService extends SystemService {
if (shouldRemove) {
blobStoreSession.getSessionFile().delete();
mActiveBlobIds.remove(blobStoreSession.getSessionId());
indicesToRemove.add(j);
deletedBlobIds.add(blobStoreSession.getSessionId());
}
}
for (int j = 0; j < indicesToRemove.size(); ++j) {
userSessions.removeAt(indicesToRemove.get(j));
}
return shouldRemove;
});
}
if (LOGV) {
Slog.v(TAG, "Completed idle maintenance; deleted "