diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-16 15:38:41 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-16 15:38:41 -0700 |
commit | 0a6a05cdb57561e2d932a62a018c83ca5667f4da (patch) | |
tree | 5b117be19f983ac46114798b2fcee10fe2af5cf6 /services | |
parent | 43463bfb69fc8fab33afbd5b5f7fe4b7b823a7a2 (diff) | |
parent | 10c59a365a095d322f29aa969a3d0f6bb3314972 (diff) | |
download | frameworks_base-0a6a05cdb57561e2d932a62a018c83ca5667f4da.zip frameworks_base-0a6a05cdb57561e2d932a62a018c83ca5667f4da.tar.gz frameworks_base-0a6a05cdb57561e2d932a62a018c83ca5667f4da.tar.bz2 |
Merge change 7598 into donut
* changes:
DO NOT MERGE - Disable settings backup in Donut
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/SystemServer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index b038a64..aa1a5cf 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -52,6 +52,7 @@ import java.lang.reflect.InvocationTargetException; class ServerThread extends Thread { private static final String TAG = "SystemServer"; private final static boolean INCLUDE_DEMO = false; + private final static boolean INCLUDE_BACKUP = false; private static final int LOG_BOOT_PROGRESS_SYSTEM_RUN = 3010; @@ -318,8 +319,10 @@ class ServerThread extends Thread { } try { - Log.i(TAG, "Starting Backup Service"); - ServiceManager.addService(Context.BACKUP_SERVICE, new BackupManagerService(context)); + if (INCLUDE_BACKUP) { + Log.i(TAG, "Starting Backup Service"); + ServiceManager.addService(Context.BACKUP_SERVICE, new BackupManagerService(context)); + } } catch (Throwable e) { Log.e(TAG, "Failure starting Backup Service", e); } |