Merge "The transport system API needs to manage binder identity" into lmp-dev (835b313f) · Commits · e / os / android_frameworks_base

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

+18 −8

Original line number	Diff line number	Diff line
		@@ -8395,11 +8395,16 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF

		Slog.i(TAG, "Auto restore => " + doAutoRestore);

		final long oldId = Binder.clearCallingIdentity();
		try {
		synchronized (this) {
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.BACKUP_AUTO_RESTORE, doAutoRestore ? 1 : 0);
		mAutoRestore = doAutoRestore;
		}
		} finally {
		Binder.restoreCallingIdentity(oldId);
		}
		}

		// Mark the backup service as having been provisioned
		@@ -8467,10 +8472,15 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
		synchronized (mTransports) {
		String prevTransport = null;
		if (mTransports.get(transport) != null) {
		final long oldId = Binder.clearCallingIdentity();
		try {
		prevTransport = mCurrentTransport;
		mCurrentTransport = transport;
		Settings.Secure.putString(mContext.getContentResolver(),
		Settings.Secure.BACKUP_TRANSPORT, transport);
		} finally {
		Binder.restoreCallingIdentity(oldId);
		}
		Slog.v(TAG, "selectBackupTransport() set " + mCurrentTransport
		+ " returning " + prevTransport);
		} else {