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 am: ad79def9b5 am: 6525f619c6 am: b69b4938c1

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

Change-Id: I9421ee41f5b4d9c47d4e7cc38617559a989b3f5b
This commit is contained in:
TreeHugger Robot
2020-06-23 02:30:53 +00:00
committed by Automerger Merge Worker
parent 8936d28f8f b69b4938c1
commit a4d242032c
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

@@ -317,7 +317,7 @@ public class UserBackupManagerService {
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 final @UserIdInt int mUserId;
@@ -3612,7 +3612,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.
*
* TODO(b/154822946): Remove this logic in the next release.
@@ -3636,7 +3636,7 @@ public class UserBackupManagerService {
@VisibleForTesting
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;
}