diff options
author | Christopher Tate <ctate@google.com> | 2009-06-10 15:49:30 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2009-06-10 16:43:50 -0700 |
commit | c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5 (patch) | |
tree | adbd6cb9919f8bf7af80acda4e5cc1049f1ed425 /services/java/com/android/server/am | |
parent | 2795c2d6b73f6e72565569f7d4f2f4b34e526bba (diff) | |
download | frameworks_base-c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5.zip frameworks_base-c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5.tar.gz frameworks_base-c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5.tar.bz2 |
The rest of the basic flow for restore
Also moved the processOneBackup() implementation into the Thread class that runs
the backup sequence.
Diffstat (limited to 'services/java/com/android/server/am')
-rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 14dcfd5..6a81178 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -10422,11 +10422,14 @@ public final class ActivityManagerService extends ActivityManagerNative implemen // Not backing this app up any more; reset its OOM adjustment updateOomAdjLocked(proc); - try { - proc.thread.scheduleDestroyBackupAgent(appInfo); - } catch (Exception e) { - Log.e(TAG, "Exception when unbinding backup agent:"); - e.printStackTrace(); + // If the app crashed during backup, 'thread' will be null here + if (proc.thread != null) { + try { + proc.thread.scheduleDestroyBackupAgent(appInfo); + } catch (Exception e) { + Log.e(TAG, "Exception when unbinding backup agent:"); + e.printStackTrace(); + } } } } |