Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change secure setting that controls skipping of user-facing packages" into rvc-dev am: 1d1bc0f550

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

Change-Id: I38c70fd421ec812d258e3ab32f2960e5a694b6dc
This commit is contained in:
TreeHugger Robot
2020-06-23 01:58:45 +00:00
committed by Automerger Merge Worker
parent 95db0a0476 1d1bc0f550
commit 6d0ce221d9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/backup/java/com/android/server/backup/UserBackupManagerService.java
View File

@@ -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;
} }