diff options
Diffstat (limited to 'services/backup/java')
3 files changed, 0 insertions, 40 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<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(), 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<String> 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) { |