Merge "[Multi-user] Extract BackupManagerService to UserBackupManagerService" (178828f2) · Commits · e / os / android_frameworks_base

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

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -16,12 +16,15 @@

	package com.android.server.backup;		package com.android.server.backup;

			import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;

	import android.content.ContentResolver;		import android.content.ContentResolver;
	import android.os.Handler;		import android.os.Handler;
	import android.provider.Settings;		import android.provider.Settings;
	import android.util.KeyValueListParser;		import android.util.KeyValueListParser;
	import android.util.KeyValueSettingObserver;		import android.util.KeyValueSettingObserver;
	import android.util.Slog;		import android.util.Slog;

	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;

	@@ -137,7 +140,7 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {

	public long getKvBackupAgentTimeoutMillis() {		public long getKvBackupAgentTimeoutMillis() {
	synchronized (mLock) {		synchronized (mLock) {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(TAG, "getKvBackupAgentTimeoutMillis(): " + mKvBackupAgentTimeoutMillis);		Slog.v(TAG, "getKvBackupAgentTimeoutMillis(): " + mKvBackupAgentTimeoutMillis);
	}		}
	return mKvBackupAgentTimeoutMillis;		return mKvBackupAgentTimeoutMillis;
	@@ -146,7 +149,7 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {

	public long getFullBackupAgentTimeoutMillis() {		public long getFullBackupAgentTimeoutMillis() {
	synchronized (mLock) {		synchronized (mLock) {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(TAG, "getFullBackupAgentTimeoutMillis(): " + mFullBackupAgentTimeoutMillis);		Slog.v(TAG, "getFullBackupAgentTimeoutMillis(): " + mFullBackupAgentTimeoutMillis);
	}		}
	return mFullBackupAgentTimeoutMillis;		return mFullBackupAgentTimeoutMillis;
	@@ -155,7 +158,7 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {

	public long getSharedBackupAgentTimeoutMillis() {		public long getSharedBackupAgentTimeoutMillis() {
	synchronized (mLock) {		synchronized (mLock) {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getSharedBackupAgentTimeoutMillis(): " + mSharedBackupAgentTimeoutMillis);		"getSharedBackupAgentTimeoutMillis(): " + mSharedBackupAgentTimeoutMillis);
	@@ -166,7 +169,7 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {

	public long getRestoreAgentTimeoutMillis() {		public long getRestoreAgentTimeoutMillis() {
	synchronized (mLock) {		synchronized (mLock) {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(TAG, "getRestoreAgentTimeoutMillis(): " + mRestoreAgentTimeoutMillis);		Slog.v(TAG, "getRestoreAgentTimeoutMillis(): " + mRestoreAgentTimeoutMillis);
	}		}
	return mRestoreAgentTimeoutMillis;		return mRestoreAgentTimeoutMillis;
	@@ -175,7 +178,7 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {

	public long getRestoreAgentFinishedTimeoutMillis() {		public long getRestoreAgentFinishedTimeoutMillis() {
	synchronized (mLock) {		synchronized (mLock) {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getRestoreAgentFinishedTimeoutMillis(): "		"getRestoreAgentFinishedTimeoutMillis(): "
	@@ -187,7 +190,7 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {

	public long getQuotaExceededTimeoutMillis() {		public long getQuotaExceededTimeoutMillis() {
	synchronized (mLock) {		synchronized (mLock) {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getQuotaExceededTimeoutMillis(): "		"getQuotaExceededTimeoutMillis(): "

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

+11 −8

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package com.android.server.backup;		package com.android.server.backup;

			import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;

	import android.app.AlarmManager;		import android.app.AlarmManager;
	import android.content.ContentResolver;		import android.content.ContentResolver;
	import android.os.Handler;		import android.os.Handler;
	@@ -24,6 +26,7 @@ import android.text.TextUtils;
	import android.util.KeyValueListParser;		import android.util.KeyValueListParser;
	import android.util.KeyValueSettingObserver;		import android.util.KeyValueSettingObserver;
	import android.util.Slog;		import android.util.Slog;

	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;

	/**		/**
	@@ -151,7 +154,7 @@ public class BackupManagerConstants extends KeyValueSettingObserver {
	// group the calls of these methods in a block syncrhonized on		// group the calls of these methods in a block syncrhonized on
	// a reference of this object.		// a reference of this object.
	public synchronized long getKeyValueBackupIntervalMilliseconds() {		public synchronized long getKeyValueBackupIntervalMilliseconds() {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getKeyValueBackupIntervalMilliseconds(...) returns "		"getKeyValueBackupIntervalMilliseconds(...) returns "
	@@ -161,7 +164,7 @@ public class BackupManagerConstants extends KeyValueSettingObserver {
	}		}

	public synchronized long getKeyValueBackupFuzzMilliseconds() {		public synchronized long getKeyValueBackupFuzzMilliseconds() {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getKeyValueBackupFuzzMilliseconds(...) returns "		"getKeyValueBackupFuzzMilliseconds(...) returns "
	@@ -171,7 +174,7 @@ public class BackupManagerConstants extends KeyValueSettingObserver {
	}		}

	public synchronized boolean getKeyValueBackupRequireCharging() {		public synchronized boolean getKeyValueBackupRequireCharging() {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getKeyValueBackupRequireCharging(...) returns "		"getKeyValueBackupRequireCharging(...) returns "
	@@ -181,7 +184,7 @@ public class BackupManagerConstants extends KeyValueSettingObserver {
	}		}

	public synchronized int getKeyValueBackupRequiredNetworkType() {		public synchronized int getKeyValueBackupRequiredNetworkType() {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getKeyValueBackupRequiredNetworkType(...) returns "		"getKeyValueBackupRequiredNetworkType(...) returns "
	@@ -191,7 +194,7 @@ public class BackupManagerConstants extends KeyValueSettingObserver {
	}		}

	public synchronized long getFullBackupIntervalMilliseconds() {		public synchronized long getFullBackupIntervalMilliseconds() {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getFullBackupIntervalMilliseconds(...) returns "		"getFullBackupIntervalMilliseconds(...) returns "
	@@ -201,14 +204,14 @@ public class BackupManagerConstants extends KeyValueSettingObserver {
	}		}

	public synchronized boolean getFullBackupRequireCharging() {		public synchronized boolean getFullBackupRequireCharging() {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(TAG, "getFullBackupRequireCharging(...) returns " + mFullBackupRequireCharging);		Slog.v(TAG, "getFullBackupRequireCharging(...) returns " + mFullBackupRequireCharging);
	}		}
	return mFullBackupRequireCharging;		return mFullBackupRequireCharging;
	}		}

	public synchronized int getFullBackupRequiredNetworkType() {		public synchronized int getFullBackupRequiredNetworkType() {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getFullBackupRequiredNetworkType(...) returns "		"getFullBackupRequiredNetworkType(...) returns "
	@@ -219,7 +222,7 @@ public class BackupManagerConstants extends KeyValueSettingObserver {

	/** Returns an array of package names that should be notified whenever a backup finishes. */		/** Returns an array of package names that should be notified whenever a backup finishes. */
	public synchronized String[] getBackupFinishedNotificationReceivers() {		public synchronized String[] getBackupFinishedNotificationReceivers() {
	if (BackupManagerService.DEBUG_SCHEDULING) {		if (DEBUG_SCHEDULING) {
	Slog.v(		Slog.v(
	TAG,		TAG,
	"getBackupFinishedNotificationReceivers(...) returns "		"getBackupFinishedNotificationReceivers(...) returns "

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package com.android.server.backup;		package com.android.server.backup;

	import static com.android.server.backup.BackupManagerService.TAG;		import static com.android.server.backup.GlobalBackupManagerService.TAG;

	import android.app.backup.BackupAgent;		import android.app.backup.BackupAgent;
	import android.util.Slog;		import android.util.Slog;

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,7 @@ public class FullBackupJob extends JobService {
	@Override		@Override
	public boolean onStartJob(JobParameters params) {		public boolean onStartJob(JobParameters params) {
	mParams = params;		mParams = params;
	Trampoline service = BackupManagerService.getInstance();		Trampoline service = GlobalBackupManagerService.getInstance();
	return service.beginFullBackup(this);		return service.beginFullBackup(this);
	}		}

	@@ -69,7 +69,7 @@ public class FullBackupJob extends JobService {
	public boolean onStopJob(JobParameters params) {		public boolean onStopJob(JobParameters params) {
	if (mParams != null) {		if (mParams != null) {
	mParams = null;		mParams = null;
	Trampoline service = BackupManagerService.getInstance();		Trampoline service = GlobalBackupManagerService.getInstance();
	service.endFullBackup();		service.endFullBackup();
	}		}
	return false;		return false;

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

0 → 100644

+633 −0

File added.

Preview size limit exceeded, changes collapsed.