From 9dfdac5b088d91b905f4f24822b76f4a0883f9d6 Mon Sep 17 00:00:00 2001
From: Christopher Tate <ctate@android.com>
Date: Thu, 6 Aug 2009 14:57:53 -0700
Subject: [PATCH] Clear app data via the Activity Manager, not Package Manager

This is because doing it through the Activity Manager also makes sure that the
app has been shut down first, which is quite a desirable invariant for restore
handling.
---
 services/java/com/android/server/BackupManagerService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java
index d0e714f624e60..ed16a37a15de1 100644
--- a/services/java/com/android/server/BackupManagerService.java
+++ b/services/java/com/android/server/BackupManagerService.java
@@ -792,7 +792,11 @@ class BackupManagerService extends IBackupManager.Stub {
 
         synchronized(mClearDataLock) {
             mClearingData = true;
-            mPackageManager.clearApplicationUserData(packageName, observer);
+            try {
+                mActivityManager.clearApplicationUserData(packageName, observer);
+            } catch (RemoteException e) {
+                // can't happen because the activity manager is in this process
+            }
 
             // only wait 10 seconds for the clear data to happen
             long timeoutMark = System.currentTimeMillis() + TIMEOUT_INTERVAL;