Merge "Cleanup USER_OWNER in backup service" (6b56ae59) · Commits · e / os / android_frameworks_base

core/java/com/android/server/backup/NotificationBackupHelper.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,8 @@ public class NotificationBackupHelper extends BlobBackupHelper {
		try {
		INotificationManager nm = INotificationManager.Stub.asInterface(
		ServiceManager.getService("notification"));
		newPayload = nm.getBackupPayload(UserHandle.USER_OWNER);
		// TODO: http://b/22388012
		newPayload = nm.getBackupPayload(UserHandle.USER_SYSTEM);
		} catch (Exception e) {
		// Treat as no data
		Slog.e(TAG, "Couldn't communicate with notification manager");
		@@ -66,7 +67,8 @@ public class NotificationBackupHelper extends BlobBackupHelper {
		try {
		INotificationManager nm = INotificationManager.Stub.asInterface(
		ServiceManager.getService("notification"));
		nm.applyRestore(payload, UserHandle.USER_OWNER);
		// TODO: http://b/22388012
		nm.applyRestore(payload, UserHandle.USER_SYSTEM);
		} catch (Exception e) {
		Slog.e(TAG, "Couldn't communicate with notification manager");
		}

core/java/com/android/server/backup/PreferredActivityBackupHelper.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -52,13 +52,14 @@ public class PreferredActivityBackupHelper extends BlobBackupHelper {
		Slog.d(TAG, "Handling backup of " + key);
		}
		try {
		// TODO: http://b/22388012
		switch (key) {
		case KEY_PREFERRED:
		return pm.getPreferredActivityBackup(UserHandle.USER_OWNER);
		return pm.getPreferredActivityBackup(UserHandle.USER_SYSTEM);
		case KEY_DEFAULT_APPS:
		return pm.getDefaultAppsBackup(UserHandle.USER_OWNER);
		return pm.getDefaultAppsBackup(UserHandle.USER_SYSTEM);
		case KEY_INTENT_VERIFICATION:
		return pm.getIntentFilterVerificationBackup(UserHandle.USER_OWNER);
		return pm.getIntentFilterVerificationBackup(UserHandle.USER_SYSTEM);
		default:
		Slog.w(TAG, "Unexpected backup key " + key);
		}
		@@ -75,15 +76,16 @@ public class PreferredActivityBackupHelper extends BlobBackupHelper {
		Slog.d(TAG, "Handling restore of " + key);
		}
		try {
		// TODO: http://b/22388012
		switch (key) {
		case KEY_PREFERRED:
		pm.restorePreferredActivities(payload, UserHandle.USER_OWNER);
		pm.restorePreferredActivities(payload, UserHandle.USER_SYSTEM);
		break;
		case KEY_DEFAULT_APPS:
		pm.restoreDefaultApps(payload, UserHandle.USER_OWNER);
		pm.restoreDefaultApps(payload, UserHandle.USER_SYSTEM);
		break;
		case KEY_INTENT_VERIFICATION:
		pm.restoreIntentFilterVerification(payload, UserHandle.USER_OWNER);
		pm.restoreIntentFilterVerification(payload, UserHandle.USER_SYSTEM);
		break;
		default:
		Slog.w(TAG, "Unexpected restore key " + key);

core/java/com/android/server/backup/SystemBackupAgent.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -54,13 +54,15 @@ public class SystemBackupAgent extends BackupAgentHelper {
		private static final String WALLPAPER_INFO_FILENAME = "wallpaper_info.xml";

		// TODO: Will need to change if backing up non-primary user's wallpaper
		// TODO: http://b/22388012
		private static final String WALLPAPER_IMAGE_DIR =
		Environment.getUserSystemDirectory(UserHandle.USER_OWNER).getAbsolutePath();
		Environment.getUserSystemDirectory(UserHandle.USER_SYSTEM).getAbsolutePath();
		private static final String WALLPAPER_IMAGE = WallpaperBackupHelper.WALLPAPER_IMAGE;

		// TODO: Will need to change if backing up non-primary user's wallpaper
		// TODO: http://b/22388012
		private static final String WALLPAPER_INFO_DIR =
		Environment.getUserSystemDirectory(UserHandle.USER_OWNER).getAbsolutePath();
		Environment.getUserSystemDirectory(UserHandle.USER_SYSTEM).getAbsolutePath();
		private static final String WALLPAPER_INFO = WallpaperBackupHelper.WALLPAPER_INFO;
		// Use old keys to keep legacy data compatibility and avoid writing two wallpapers
		private static final String WALLPAPER_IMAGE_KEY = WallpaperBackupHelper.WALLPAPER_IMAGE_KEY;

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

+30 −16

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ public class BackupManagerService {
		@Override
		public void onBootPhase(int phase) {
		if (phase == PHASE_SYSTEM_SERVICES_READY) {
		sInstance.initialize(UserHandle.USER_OWNER);
		sInstance.initialize(UserHandle.USER_SYSTEM);
		} else if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) {
		ContentResolver r = sInstance.mContext.getContentResolver();
		boolean areEnabled = Settings.Secure.getInt(r,
		@@ -934,7 +934,7 @@ public class BackupManagerService {
		case MSG_WIDGET_BROADCAST:
		{
		final Intent intent = (Intent) msg.obj;
		mContext.sendBroadcastAsUser(intent, UserHandle.OWNER);
		mContext.sendBroadcastAsUser(intent, UserHandle.SYSTEM);
		break;
		}
		}
		@@ -1092,8 +1092,9 @@ public class BackupManagerService {
		if (DEBUG) Slog.v(TAG, "Starting with transport " + mCurrentTransport);

		// Find all transport hosts and bind to their services
		// TODO: http://b/22388012
		List<ResolveInfo> hosts = mPackageManager.queryIntentServicesAsUser(
		mTransportServiceIntent, 0, UserHandle.USER_OWNER);
		mTransportServiceIntent, 0, UserHandle.USER_SYSTEM);
		if (DEBUG) {
		Slog.v(TAG, "Found transports: " + ((hosts == null) ? "null" : hosts.size()));
		}
		@@ -1953,8 +1954,9 @@ public class BackupManagerService {
		void checkForTransportAndBind(PackageInfo pkgInfo) {
		Intent intent = new Intent(mTransportServiceIntent)
		.setPackage(pkgInfo.packageName);
		// TODO: http://b/22388012
		List<ResolveInfo> hosts = mPackageManager.queryIntentServicesAsUser(
		intent, 0, UserHandle.USER_OWNER);
		intent, 0, UserHandle.USER_SYSTEM);
		if (hosts != null) {
		final int N = hosts.size();
		for (int i = 0; i < N; i++) {
		@@ -2002,9 +2004,10 @@ public class BackupManagerService {
		mContext.unbindService(connection);
		}
		}
		// TODO: http://b/22388012
		return mContext.bindServiceAsUser(intent,
		connection, Context.BIND_AUTO_CREATE,
		UserHandle.OWNER);
		UserHandle.SYSTEM);
		}

		// Add the backup agents in the given packages to our set of known backup participants.
		@@ -2853,8 +2856,9 @@ public class BackupManagerService {

		private void writeWidgetPayloadIfAppropriate(FileDescriptor fd, String pkgName)
		throws IOException {
		// TODO: http://b/22388012
		byte[] widgetState = AppWidgetBackupBridge.getWidgetState(pkgName,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);
		// has the widget state changed since last time?
		final File widgetFile = new File(mStateDir, pkgName + "_widget");
		final boolean priorStateExists = widgetFile.exists();
		@@ -3398,8 +3402,9 @@ public class BackupManagerService {
		&& ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0 \|\|
		(app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0);

		// TODO: http://b/22388012
		byte[] widgetBlob = AppWidgetBackupBridge.getWidgetState(pkg.packageName,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);

		final int token = generateToken();
		FullBackupRunner runner = new FullBackupRunner(pkg, agent, pipes[1],
		@@ -3463,7 +3468,8 @@ public class BackupManagerService {

		// Save associated .obb content if it exists and we did save the apk
		// check for .obb and save those too
		final UserEnvironment userEnv = new UserEnvironment(UserHandle.USER_OWNER);
		// TODO: http://b/22388012
		final UserEnvironment userEnv = new UserEnvironment(UserHandle.USER_SYSTEM);
		final File obbDir = userEnv.buildExternalStorageAppObbDirs(pkg.packageName)[0];
		if (obbDir != null) {
		if (MORE_DEBUG) Log.i(TAG, "obb dir: " + obbDir.getAbsolutePath());
		@@ -3803,8 +3809,9 @@ public class BackupManagerService {
		// If we're doing widget state as well, ensure that we have all the involved
		// host & provider packages in the set
		if (mDoWidgets) {
		// TODO: http://b/22388012
		List<String> pkgs =
		AppWidgetBackupBridge.getWidgetParticipants(UserHandle.USER_OWNER);
		AppWidgetBackupBridge.getWidgetParticipants(UserHandle.USER_SYSTEM);
		if (pkgs != null) {
		if (MORE_DEBUG) {
		Slog.i(TAG, "Adding widget participants to backup set:");
		@@ -7232,7 +7239,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
		// Used by both incremental and full restore
		void restoreWidgetData(String packageName, byte[] widgetData) {
		// Apply the restored widget state and generate the ID update for the app
		AppWidgetBackupBridge.restoreWidgetState(packageName, widgetData, UserHandle.USER_OWNER);
		// TODO: http://b/22388012
		AppWidgetBackupBridge.restoreWidgetState(packageName, widgetData, UserHandle.USER_SYSTEM);
		}

		// *****************************
		@@ -7489,7 +7497,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF

		// If we're starting a full-system restore, set up to begin widget ID remapping
		if (mIsSystemRestore) {
		AppWidgetBackupBridge.restoreStarting(UserHandle.USER_OWNER);
		// TODO: http://b/22388012
		AppWidgetBackupBridge.restoreStarting(UserHandle.USER_SYSTEM);
		}

		try {
		@@ -8095,7 +8104,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
		}

		// Kick off any work that may be needed regarding app widget restores
		AppWidgetBackupBridge.restoreFinished(UserHandle.USER_OWNER);
		// TODO: http://b/22388012
		AppWidgetBackupBridge.restoreFinished(UserHandle.USER_SYSTEM);

		// If this was a full-system restore, record the ancestral
		// dataset information
		@@ -8482,7 +8492,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF

		public void dataChanged(final String packageName) {
		final int callingUserHandle = UserHandle.getCallingUserId();
		if (callingUserHandle != UserHandle.USER_OWNER) {
		if (callingUserHandle != UserHandle.USER_SYSTEM) {
		// TODO: http://b/22388012
		// App is running under a non-owner user profile. For now, we do not back
		// up data from secondary user profiles.
		// TODO: backups for all user profiles although don't add backup for profiles
		@@ -8605,7 +8616,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "fullBackup");

		final int callingUserHandle = UserHandle.getCallingUserId();
		if (callingUserHandle != UserHandle.USER_OWNER) {
		// TODO: http://b/22388012
		if (callingUserHandle != UserHandle.USER_SYSTEM) {
		throw new IllegalStateException("Backup supported only for the device owner");
		}

		@@ -8677,7 +8689,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
		"fullTransportBackup");

		final int callingUserHandle = UserHandle.getCallingUserId();
		if (callingUserHandle != UserHandle.USER_OWNER) {
		// TODO: http://b/22388012
		if (callingUserHandle != UserHandle.USER_SYSTEM) {
		throw new IllegalStateException("Restore supported only for the device owner");
		}

		@@ -8717,7 +8730,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "fullRestore");

		final int callingUserHandle = UserHandle.getCallingUserId();
		if (callingUserHandle != UserHandle.USER_OWNER) {
		// TODO: http://b/22388012
		if (callingUserHandle != UserHandle.USER_SYSTEM) {
		throw new IllegalStateException("Restore supported only for the device owner");
		}

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -62,7 +62,8 @@ public class Trampoline extends IBackupManager.Stub {
		// internal control API
		public void initialize(final int whichUser) {
		// Note that only the owner user is currently involved in backup/restore
		if (whichUser == UserHandle.USER_OWNER) {
		// TODO: http://b/22388012
		if (whichUser == UserHandle.USER_SYSTEM) {
		// Does this product support backup/restore at all?
		if (mGlobalDisable) {
		Slog.i(TAG, "Backup/restore not supported");
		@@ -91,8 +92,8 @@ public class Trampoline extends IBackupManager.Stub {
		Slog.i(TAG, "Backup/restore not supported");
		return;
		}

		if (userHandle == UserHandle.USER_OWNER) {
		// TODO: http://b/22388012
		if (userHandle == UserHandle.USER_SYSTEM) {
		synchronized (this) {
		if (makeActive != isBackupServiceActive(userHandle)) {
		Slog.i(TAG, "Making backup "
		@@ -120,7 +121,8 @@ public class Trampoline extends IBackupManager.Stub {
		* @return true if the service is active.
		*/
		public boolean isBackupServiceActive(final int userHandle) {
		if (userHandle == UserHandle.USER_OWNER) {
		// TODO: http://b/22388012
		if (userHandle == UserHandle.USER_SYSTEM) {
		synchronized (this) {
		return mService != null;
		}