Merge change Id93f4c9e into eclair (5f3c928f) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -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";

+3 −3

Original line number	Diff line number	Diff line
		@@ -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