From 2e6bca690197978bb23cdcf31d948383bdb14c91 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 7 Aug 2009 20:26:13 -0700 Subject: [PATCH] Temporarily rollback a change that's causing SetupWizard failures during restore. #2042337 Don't kill the process of the package that's being restored. This is causing a chain reaction of killing a provider needed by the setup process. --- services/java/com/android/server/BackupManagerService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index ed16a37a15de1..32ee61b19417b 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -792,11 +792,15 @@ class BackupManagerService extends IBackupManager.Stub { synchronized(mClearDataLock) { mClearingData = true; + /* This is causing some critical processes to be killed during setup. + Temporarily revert this change until we find a better solution. try { mActivityManager.clearApplicationUserData(packageName, observer); } catch (RemoteException e) { // can't happen because the activity manager is in this process } + */ + mPackageManager.clearApplicationUserData(packageName, observer); // only wait 10 seconds for the clear data to happen long timeoutMark = System.currentTimeMillis() + TIMEOUT_INTERVAL;