resolved conflicts for merge of cf098294 to master (575d1af9) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -2247,6 +2247,19 @@ public final class Settings {
		*/
		public static final String USE_LOCATION_FOR_SERVICES = "use_location";

		/**
		* Controls whether data backup is enabled.
		* Type: int ( 0 = disabled, 1 = enabled )
		* @hide
		*/
		public static final String BACKUP_ENABLED = "backup_enabled";

		/**
		* Component of the transport to use for backup/restore.
		* @hide
		*/
		public static final String BACKUP_TRANSPORT = "backup_transport";

		/**
		* Helper method for determining if a location provider is enabled.
		* @param cr the content resolver to use

packages/SettingsProvider/res/values/defaults.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -42,4 +42,7 @@
		<bool name="def_usb_mass_storage_enabled">true</bool>
		<bool name="def_wifi_on">false</bool>
		<bool name="def_networks_available_notification_on">true</bool>

		<bool name="def_backup_enabled">false</bool>
		<string name="def_backup_transport"></string>
		</resources>

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

+25 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		private static final String TAG = "SettingsProvider";
		private static final String DATABASE_NAME = "settings.db";
		private static final int DATABASE_VERSION = 35;
		private static final int DATABASE_VERSION = 36;

		private Context mContext;

		@@ -401,6 +401,20 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		upgradeVersion = 35;
		}

		if (upgradeVersion == 35) {
		db.beginTransaction();
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
		+ " VALUES(?,?);");
		loadSecure35Settings(stmt);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}
		upgradeVersion = 36;
		}

		if (upgradeVersion != currentVersion) {
		Log.w(TAG, "Got stuck trying to upgrade from version " + upgradeVersion
		+ ", must wipe the settings provider");
		@@ -708,9 +722,19 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		loadSetting(stmt, Settings.Secure.ALLOW_MOCK_LOCATION,
		"1".equals(SystemProperties.get("ro.allow.mock.location")) ? 1 : 0);

		loadSecure35Settings(stmt);

		stmt.close();
		}

		private void loadSecure35Settings(SQLiteStatement stmt) {
		loadBooleanSetting(stmt, Settings.Secure.BACKUP_ENABLED,
		R.bool.def_backup_enabled);

		loadStringSetting(stmt, Settings.Secure.BACKUP_TRANSPORT,
		R.string.def_backup_transport);
		}

		private void loadSetting(SQLiteStatement stmt, String key, Object value) {
		stmt.bindString(1, key);
		stmt.bindString(2, value.toString());

services/java/com/android/server/BackupManagerService.java

+20 −29

Original line number	Diff line number	Diff line
		@@ -74,10 +74,6 @@ class BackupManagerService extends IBackupManager.Stub {
		private static final String TAG = "BackupManagerService";
		private static final boolean DEBUG = true;

		// Secure settings
		private static final String BACKUP_TRANSPORT_SETTING = "backup_transport";
		private static final String BACKUP_ENABLED_SETTING = "backup_enabled";

		// How often we perform a backup pass. Privileged external callers can
		// trigger an immediate pass.
		private static final long BACKUP_INTERVAL = 60 * 60 * 1000;
		@@ -165,10 +161,8 @@ class BackupManagerService extends IBackupManager.Stub {
		mActivityManager = ActivityManagerNative.getDefault();

		// Set up our bookkeeping
		// !!! STOPSHIP: make this disabled by default so that we then gate on
		// setupwizard or other opt-out UI
		mEnabled = (Settings.Secure.getInt(mContext.getContentResolver(),
		BACKUP_ENABLED_SETTING, 1) != 0);
		mEnabled = Settings.Secure.getInt(context.getContentResolver(),
		Settings.Secure.BACKUP_ENABLED, 0) != 0;
		mBaseStateDir = new File(Environment.getDataDirectory(), "backup");
		mDataDir = Environment.getDownloadCacheDirectory();

		@@ -192,13 +186,10 @@ class BackupManagerService extends IBackupManager.Stub {
		registerTransport(localName.flattenToShortString(), mLocalTransport);

		mGoogleTransport = null;
		// !!! TODO: set up the default transport name "the right way"
		mCurrentTransport = Settings.Secure.getString(mContext.getContentResolver(),
		BACKUP_TRANSPORT_SETTING);
		if (mCurrentTransport == null) {
		mCurrentTransport = "com.google.android.backup/.BackupTransportService";
		Settings.Secure.putString(mContext.getContentResolver(),
		BACKUP_TRANSPORT_SETTING, mCurrentTransport);
		mCurrentTransport = Settings.Secure.getString(context.getContentResolver(),
		Settings.Secure.BACKUP_TRANSPORT);
		if ("".equals(mCurrentTransport)) {
		mCurrentTransport = null;
		}
		if (DEBUG) Log.v(TAG, "Starting with transport " + mCurrentTransport);

		@@ -1093,7 +1084,7 @@ class BackupManagerService extends IBackupManager.Stub {
		// If the caller does not hold the BACKUP permission, it can only request a
		// backup of its own data.
		HashSet<ApplicationInfo> targets;
		if ((mContext.checkPermission("android.permission.BACKUP", Binder.getCallingPid(),
		if ((mContext.checkPermission(android.Manifest.permission.BACKUP, Binder.getCallingPid(),
		Binder.getCallingUid())) == PackageManager.PERMISSION_DENIED) {
		targets = mBackupParticipants.get(Binder.getCallingUid());
		} else {
		@@ -1154,7 +1145,7 @@ class BackupManagerService extends IBackupManager.Stub {
		// Run a backup pass immediately for any applications that have declared
		// that they have pending updates.
		public void backupNow() throws RemoteException {
		mContext.enforceCallingPermission("android.permission.BACKUP", "backupNow");
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "backupNow");

		if (DEBUG) Log.v(TAG, "Scheduling immediate backup pass");
		synchronized (mQueueLock) {
		@@ -1164,12 +1155,12 @@ class BackupManagerService extends IBackupManager.Stub {

		// Enable/disable the backup transport
		public void setBackupEnabled(boolean enable) {
		mContext.enforceCallingPermission("android.permission.BACKUP", "setBackupEnabled");
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "setBackupEnabled");

		boolean wasEnabled = mEnabled;
		synchronized (this) {
		Settings.Secure.putInt(mContext.getContentResolver(), BACKUP_ENABLED_SETTING,
		enable ? 1 : 0);
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.BACKUP_ENABLED, enable ? 1 : 0);
		mEnabled = enable;
		}

		@@ -1186,7 +1177,7 @@ class BackupManagerService extends IBackupManager.Stub {

		// Report whether the backup mechanism is currently enabled
		public boolean isBackupEnabled() {
		mContext.enforceCallingPermission("android.permission.BACKUP", "isBackupEnabled");
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "isBackupEnabled");
		return mEnabled; // no need to synchronize just to read it
		}

		@@ -1199,7 +1190,7 @@ class BackupManagerService extends IBackupManager.Stub {

		// Report all known, available backup transports
		public String[] listAllTransports() {
		mContext.enforceCallingPermission("android.permission.BACKUP", "listAllTransports");
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "listAllTransports");

		String[] list = null;
		ArrayList<String> known = new ArrayList<String>();
		@@ -1220,15 +1211,15 @@ class BackupManagerService extends IBackupManager.Stub {
		// name is not one of the available transports, no action is taken and the method
		// returns null.
		public String selectBackupTransport(String transport) {
		mContext.enforceCallingPermission("android.permission.BACKUP", "selectBackupTransport");
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "selectBackupTransport");

		synchronized (mTransports) {
		String prevTransport = null;
		if (mTransports.get(transport) != null) {
		prevTransport = mCurrentTransport;
		mCurrentTransport = transport;
		Settings.Secure.putString(mContext.getContentResolver(), BACKUP_TRANSPORT_SETTING,
		transport);
		Settings.Secure.putString(mContext.getContentResolver(),
		Settings.Secure.BACKUP_TRANSPORT, transport);
		Log.v(TAG, "selectBackupTransport() set " + mCurrentTransport
		+ " returning " + prevTransport);
		} else {
		@@ -1274,7 +1265,7 @@ class BackupManagerService extends IBackupManager.Stub {

		// Hand off a restore session
		public IRestoreSession beginRestoreSession(String transport) {
		mContext.enforceCallingPermission("android.permission.BACKUP", "beginRestoreSession");
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "beginRestoreSession");

		synchronized(this) {
		if (mActiveRestoreSession != null) {
		@@ -1300,7 +1291,7 @@ class BackupManagerService extends IBackupManager.Stub {

		// --- Binder interface ---
		public RestoreSet[] getAvailableRestoreSets() throws android.os.RemoteException {
		mContext.enforceCallingPermission("android.permission.BACKUP",
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP,
		"getAvailableRestoreSets");

		try {
		@@ -1319,7 +1310,7 @@ class BackupManagerService extends IBackupManager.Stub {

		public int performRestore(long token, IRestoreObserver observer)
		throws android.os.RemoteException {
		mContext.enforceCallingPermission("android.permission.BACKUP", "performRestore");
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "performRestore");

		Log.d(TAG, "performRestore token=" + token + " observer=" + observer);

		@@ -1339,7 +1330,7 @@ class BackupManagerService extends IBackupManager.Stub {
		}

		public void endRestoreSession() throws android.os.RemoteException {
		mContext.enforceCallingPermission("android.permission.BACKUP",
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP,
		"endRestoreSession");

		Log.d(TAG, "endRestoreSession");