From cd4ff2e72d42d66ea2d6a27f1c87cfffd16b1791 Mon Sep 17 00:00:00 2001
From: Christopher Tate <ctate@google.com>
Date: Fri, 5 Jun 2009 13:57:54 -0700
Subject: [PATCH] Fix tracking of backup participants across package
 remove/update

---
 .../java/com/android/server/BackupManagerService.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java
index 5770a771836a6..5b70c2c47292c 100644
--- a/services/java/com/android/server/BackupManagerService.java
+++ b/services/java/com/android/server/BackupManagerService.java
@@ -337,7 +337,14 @@ class BackupManagerService extends IBackupManager.Stub {
                 int uid = app.uid;
                 HashSet<ApplicationInfo> set = mBackupParticipants.get(uid);
                 if (set != null) {
-                    set.remove(app);
+                    // Find the existing entry with the same package name, and remove it.
+                    // We can't just remove(app) because the instances are different.
+                    for (ApplicationInfo entry: set) {
+                        if (entry.packageName.equals(app.packageName)) {
+                            set.remove(entry);
+                            break;
+                        }
+                    }
                     if (set.size() == 0) {
                         mBackupParticipants.delete(uid);                    }
                 }