diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 23:08:25 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 23:08:25 -0400 |
| commit | 5f3c928f5ecdd2f41f238807c59241d34a02517e (patch) | |
| tree | 7c8b04c80092899f1986cc569a21fa6f82777873 | |
| parent | 5e5001bc1a065f6d578b953b908052d623272fcd (diff) | |
| parent | 13f4a64ddd0d81ffa04cb2ff4fd4c6500d6d21ed (diff) | |
| download | frameworks_base-5f3c928f5ecdd2f41f238807c59241d34a02517e.zip frameworks_base-5f3c928f5ecdd2f41f238807c59241d34a02517e.tar.gz frameworks_base-5f3c928f5ecdd2f41f238807c59241d34a02517e.tar.bz2 | |
Merge change Id93f4c9e into eclair
* changes:
Turn off the last of the STOPSHIP verbose debugging
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index bb9206c..2738efb 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -50,7 +50,6 @@ import android.util.Log; * List of settings that are backed up are stored in the Settings.java file */ public class SettingsBackupAgent extends BackupHelperAgent { - // STOPSHIP: set DEBUG to false private static final boolean DEBUG = false; private static final String KEY_SYSTEM = "system"; diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index e722eb1..82a7c1c 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -79,7 +79,7 @@ import java.util.Map; class BackupManagerService extends IBackupManager.Stub { private static final String TAG = "BackupManagerService"; - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; // How often we perform a backup pass. Privileged external callers can // trigger an immediate pass. @@ -1648,13 +1648,13 @@ class BackupManagerService extends IBackupManager.Stub { stateFile.delete(); // Tell the transport to remove all the persistent storage for the app - // STOPSHIP TODO - need to handle failures + // TODO - need to handle failures mTransport.clearBackupData(mPackage); } catch (RemoteException e) { // can't happen; the transport is local } finally { try { - // STOPSHIP TODO - need to handle failures + // TODO - need to handle failures mTransport.finishBackup(); } catch (RemoteException e) { // can't happen; the transport is local |