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

Merge "ProviderMap: remove hashmap when entire user specific entries are removed"

Browse Source
This commit is contained in:
Amith Yamasani
2012-08-20 10:16:36 -07:00
committed by android code review
parent 6626398a72 8809004bc5
commit a3db5297cd
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/am/ProviderMap.java
View File

@@ -127,7 +127,12 @@ public class ProviderMap {
Slog.i(TAG,
"Removing from providersByName name=" + name + " user="
+ (optionalUserId == -1 ? Binder.getOrigCallingUser() : optionalUserId));
getProvidersByName(optionalUserId).remove(name);
HashMap<String, ContentProviderRecord> map = getProvidersByName(optionalUserId);
// map returned by getProvidersByName wouldn't be null
map.remove(name);
if (map.size() == 0) {
mProvidersByNamePerUser.remove(optionalUserId);
}
}
}
@@ -141,7 +146,12 @@ public class ProviderMap {
Slog.i(TAG,
"Removing from providersByClass name=" + name + " user="
+ (optionalUserId == -1 ? Binder.getOrigCallingUser() : optionalUserId));
getProvidersByClass(optionalUserId).remove(name);
HashMap<ComponentName, ContentProviderRecord> map = getProvidersByClass(optionalUserId);
// map returned by getProvidersByClass wouldn't be null
map.remove(name);
if (map.size() == 0) {
mProvidersByClassPerUser.remove(optionalUserId);
}
}
}