From e312b3099e75171c4c9d85aa1b2606908552b42d Mon Sep 17 00:00:00 2001 From: Sarp Misoglu Date: Mon, 2 Dec 2024 18:46:01 +0000 Subject: Delete Filipendo workaround code for R It seems this was intended to be removed for S. I've also double checked this setting isn't used anywhere that I can find. Fixes: 154822946 Test: presubmit Change-Id: I974b30a54883280d16dacf9a2de876d87f1e2c13 --- .../server/backup/UserBackupManagerService.java | 36 ----------------- .../fullbackup/PerformFullTransportBackupTask.java | 2 - .../backup/restore/PerformUnifiedRestoreTask.java | 2 - .../backup/UserBackupManagerServiceTest.java | 46 ---------------------- 4 files changed, 86 deletions(-) diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index a90b693c5a1d..3025e2eaede0 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -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 filterUserFacingPackages(List packages) { - if (!shouldSkipUserFacingData()) { - return packages; - } - - List 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(), diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java index 799494831f19..990c9416e38d 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -272,8 +272,6 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba } } - mPackages = backupManagerService.filterUserFacingPackages(mPackages); - Set packageNames = Sets.newHashSet(); for (PackageInfo pkgInfo : mPackages) { packageNames.add(pkgInfo.packageName); diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index dad84c86deef..ec9d340abe45 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -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) { diff --git a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java index 02e0bbfd3519..eb61a40e0ba5 100644 --- a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -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 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 filteredPackages = backupManagerService.filterUserFacingPackages( - packages); - - assertFalse(containsPackage(filteredPackages, USER_FACING_PACKAGE)); - assertTrue(containsPackage(filteredPackages, PACKAGE_1)); - } - - @Test - public void testFilterUserFacingPackages_shouldNotSkipUserFacing_doesNotFilterUserFacing() { - List 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 filteredPackages = backupManagerService.filterUserFacingPackages( - packages); - - assertTrue(containsPackage(filteredPackages, USER_FACING_PACKAGE)); - assertTrue(containsPackage(filteredPackages, PACKAGE_1)); - } - - private static boolean containsPackage(List 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); -- cgit v1.2.3-59-g8ed1b