summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2009-07-16 15:15:25 -0700
committerChristopher Tate <ctate@google.com>2009-07-16 15:31:39 -0700
commit10c59a365a095d322f29aa969a3d0f6bb3314972 (patch)
tree0bfcdf002b47c23c501054d6a2590fa60eecbb23 /services
parent58d19d1f6321161fdcd10140fe7b9d9053f80bd2 (diff)
downloadframeworks_base-10c59a365a095d322f29aa969a3d0f6bb3314972.zip
frameworks_base-10c59a365a095d322f29aa969a3d0f6bb3314972.tar.gz
frameworks_base-10c59a365a095d322f29aa969a3d0f6bb3314972.tar.bz2
DO NOT MERGE - Disable settings backup in Donut
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/SystemServer.java7
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);
}