commit a3db5297cda370ce41db99b6839cd9528c31ef7c
author Amith Yamasani <yamasani@google.com> Mon Aug 20 10:16:36 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Aug 20 10:16:36 2012 -0700
tree 0d2f1d5736851dd3baf5d7a054989eac3100b36c
parent 6626398a72ae592e3a9184c9b0868df0fc1f1724
parent 8809004bc5125d48a1bbfc292509514374cc4fce

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

services/java/com/android/server/am/ProviderMap.java

diff --git a/services/java/com/android/server/am/ProviderMap.java b/services/java/com/android/server/am/ProviderMap.java
index d148ec3..e4608a2 100644
--- a/services/java/com/android/server/am/ProviderMap.java
+++ b/services/java/com/android/server/am/ProviderMap.java
@@ -127,7 +127,12 @@
                 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 @@
                 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);
+            }
         }
     }