Merge "Delete Filipendo workaround code for R" into main (1f8b3c36) · Commits · e / os / android_frameworks_base

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

+0 −36

Original line number	Diff line number	Diff line
		@@ -314,8 +314,6 @@ public class UserBackupManagerService {

		private static final String SERIAL_ID_FILE = "serial_id";

		private static final String SKIP_USER_FACING_PACKAGES = "backup_skip_user_facing_packages";

		private final @UserIdInt int mUserId;
		private final BackupAgentTimeoutParameters mAgentTimeoutParameters;
		private final TransportManager mTransportManager;
		@@ -3503,40 +3501,6 @@ public class UserBackupManagerService {
		}
		}

		/**
		* We want to skip backup/restore of certain packages if 'backup_skip_user_facing_packages' is
		* set to true in secure settings. See b/153940088 for details.
		*
		* TODO(b/154822946): Remove this logic in the next release.
		*/
		public List<PackageInfo> filterUserFacingPackages(List<PackageInfo> packages) {
		if (!shouldSkipUserFacingData()) {
		return packages;
		}

		List<PackageInfo> filteredPackages = new ArrayList<>(packages.size());
		for (PackageInfo packageInfo : packages) {
		if (!shouldSkipPackage(packageInfo.packageName)) {
		filteredPackages.add(packageInfo);
		} else {
		Slog.i(TAG, "Will skip backup/restore for " + packageInfo.packageName);
		}
		}

		return filteredPackages;
		}

		@VisibleForTesting
		public boolean shouldSkipUserFacingData() {
		return Settings.Secure.getInt(mContext.getContentResolver(), SKIP_USER_FACING_PACKAGES,
		/* def */ 0) != 0;
		}

		@VisibleForTesting
		public boolean shouldSkipPackage(String packageName) {
		return WALLPAPER_PACKAGE.equals(packageName);
		}

		private void updateStateForTransport(String newTransportName) {
		// Publish the name change
		Settings.Secure.putStringForUser(mContext.getContentResolver(),

services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -272,8 +272,6 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba
		}
		}

		mPackages = backupManagerService.filterUserFacingPackages(mPackages);

		Set<String> packageNames = Sets.newHashSet();
		for (PackageInfo pkgInfo : mPackages) {
		packageNames.add(pkgInfo.packageName);

services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -315,8 +315,6 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask {
		}
		}

		mAcceptSet = backupManagerService.filterUserFacingPackages(mAcceptSet);

		if (MORE_DEBUG) {
		Slog.v(TAG, "Restore; accept set size is " + mAcceptSet.size());
		for (PackageInfo info : mAcceptSet) {

services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java

+0 −46

Original line number	Diff line number	Diff line
		@@ -30,13 +30,10 @@ import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;
		import static org.robolectric.Shadows.shadowOf;
		import static org.testng.Assert.assertFalse;
		import static org.testng.Assert.assertTrue;
		import static org.testng.Assert.expectThrows;

		import android.app.backup.BackupManager;
		@@ -90,7 +87,6 @@ import java.io.IOException;
		import java.io.PrintWriter;
		import java.io.StringWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;

		/**
		@@ -110,7 +106,6 @@ public class UserBackupManagerServiceTest {
		private static final String TAG = "BMSTest";
		private static final String PACKAGE_1 = "some.package.1";
		private static final String PACKAGE_2 = "some.package.2";
		private static final String USER_FACING_PACKAGE = "user.facing.package";
		private static final int USER_ID = 10;

		@Mock private TransportManager mTransportManager;
		@@ -1213,47 +1208,6 @@ public class UserBackupManagerServiceTest {
		eq(packageTrackingReceiver), eq(UserHandle.of(USER_ID)), any(), any(), any());
		}

		@Test
		public void testFilterUserFacingPackages_shouldSkipUserFacing_filtersUserFacing() {
		List<PackageInfo> packages = Arrays.asList(getPackageInfo(USER_FACING_PACKAGE),
		getPackageInfo(PACKAGE_1));
		UserBackupManagerService backupManagerService = spy(
		createUserBackupManagerServiceAndRunTasks());
		when(backupManagerService.shouldSkipUserFacingData()).thenReturn(true);
		when(backupManagerService.shouldSkipPackage(eq(USER_FACING_PACKAGE))).thenReturn(true);

		List<PackageInfo> filteredPackages = backupManagerService.filterUserFacingPackages(
		packages);

		assertFalse(containsPackage(filteredPackages, USER_FACING_PACKAGE));
		assertTrue(containsPackage(filteredPackages, PACKAGE_1));
		}

		@Test
		public void testFilterUserFacingPackages_shouldNotSkipUserFacing_doesNotFilterUserFacing() {
		List<PackageInfo> packages = Arrays.asList(getPackageInfo(USER_FACING_PACKAGE),
		getPackageInfo(PACKAGE_1));
		UserBackupManagerService backupManagerService = spy(
		createUserBackupManagerServiceAndRunTasks());
		when(backupManagerService.shouldSkipUserFacingData()).thenReturn(false);
		when(backupManagerService.shouldSkipPackage(eq(USER_FACING_PACKAGE))).thenReturn(true);

		List<PackageInfo> filteredPackages = backupManagerService.filterUserFacingPackages(
		packages);

		assertTrue(containsPackage(filteredPackages, USER_FACING_PACKAGE));
		assertTrue(containsPackage(filteredPackages, PACKAGE_1));
		}

		private static boolean containsPackage(List<PackageInfo> packages, String targetPackage) {
		for (PackageInfo packageInfo : packages) {
		if (targetPackage.equals(packageInfo.packageName)) {
		return true;
		}
		}
		return false;
		}

		private UserBackupManagerService createUserBackupManagerServiceAndRunTasks() {
		return BackupManagerServiceTestUtils.createUserBackupManagerServiceAndRunTasks(
		USER_ID, mContext, mBackupThread, mBaseStateDir, mDataDir, mTransportManager);