Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b69b4938 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change secure setting that controls skipping of user-facing packages"... 

Merge "Change secure setting that controls skipping of user-facing packages" into rvc-dev am: 1d1bc0f5 am: ad79def9 am: 6525f619

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11956183

Change-Id: I3e0b388ec7acca6f9d7311b36fe4991b47b75c19
parents 88c1279a 6525f619

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -318,7 +318,7 @@ public class UserBackupManagerService { 




    private static final String SERIAL_ID_FILE = "serial_id";

    private static final String SERIAL_ID_FILE = "serial_id";





    private static final String SKIP_USER_FACING_DATA = "backup_skip_user_facing_data";

    private static final String SKIP_USER_FACING_PACKAGES = "backup_skip_user_facing_packages";

    private static final String WALLPAPER_PACKAGE = "com.android.wallpaperbackup";

    private static final String WALLPAPER_PACKAGE = "com.android.wallpaperbackup";





    private final @UserIdInt int mUserId;

    private final @UserIdInt int mUserId;
@@ -3557,7 +3557,7 @@ public class UserBackupManagerService { 
    }

    }





    /**

    /**

     * We want to skip backup/restore of certain packages if 'backup_skip_user_facing_data' is

     * 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.

     * set to true in secure settings. See b/153940088 for details.

     *

     *

     * TODO(b/154822946): Remove this logic in the next release.

     * TODO(b/154822946): Remove this logic in the next release.
@@ -3581,7 +3581,7 @@ public class UserBackupManagerService { 




    @VisibleForTesting

    @VisibleForTesting

    public boolean shouldSkipUserFacingData() {

    public boolean shouldSkipUserFacingData() {

        return Settings.Secure.getInt(mContext.getContentResolver(), SKIP_USER_FACING_DATA,

        return Settings.Secure.getInt(mContext.getContentResolver(), SKIP_USER_FACING_PACKAGES,

                /* def */ 0) != 0;

                /* def */ 0) != 0;

    }

    }