Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7598 into donut

Browse Source 
* changes:
  DO NOT MERGE - Disable settings backup in Donut
This commit is contained in:
Android (Google) Code Review
2009-07-16 15:38:41 -07:00
parent 43463bfb69 10c59a365a
commit 0a6a05cdb5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/SystemServer.java
View File

@@ -52,6 +52,7 @@ import java.lang.reflect.InvocationTargetException;
class ServerThread extends Thread { class ServerThread extends Thread {
private static final String TAG = "SystemServer"; private static final String TAG = "SystemServer";
private final static boolean INCLUDE_DEMO = false; private final static boolean INCLUDE_DEMO = false;
private final static boolean INCLUDE_BACKUP = false;
private static final int LOG_BOOT_PROGRESS_SYSTEM_RUN = 3010; private static final int LOG_BOOT_PROGRESS_SYSTEM_RUN = 3010;
@@ -318,8 +319,10 @@ class ServerThread extends Thread {
} }
try { try {
Log.i(TAG, "Starting Backup Service"); if (INCLUDE_BACKUP) {
ServiceManager.addService(Context.BACKUP_SERVICE, new BackupManagerService(context)); Log.i(TAG, "Starting Backup Service");
ServiceManager.addService(Context.BACKUP_SERVICE, new BackupManagerService(context));
}
} catch (Throwable e) { } catch (Throwable e) {
Log.e(TAG, "Failure starting Backup Service", e); Log.e(TAG, "Failure starting Backup Service", e);
} }