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

Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev am: bdd1f279c5

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

Change-Id: I76e1b5613b5c12682f173e240fc43e1a2fd468cf
This commit is contained in:
Ruslan Tkhakokhov
2021-05-01 13:42:17 +00:00
committed by Automerger Merge Worker
parent cc7d9f4004 bdd1f279c5
commit 69bfe6e18e
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/backup/FullBackup.java
View File

@@ -23,6 +23,7 @@ import android.annotation.StringDef;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledSince;
import android.compat.annotation.Overridable;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -107,6 +108,7 @@ public class FullBackup {
* {@code android:fullBackupContent} are ignored during D2D transfers.
*/
@ChangeId
@Overridable
@EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)
private static final long IGNORE_FULL_BACKUP_CONTENT_IN_D2D = 180523564L;

2
services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java
View File

@@ -28,6 +28,7 @@ import android.app.backup.BackupTransport;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledSince;
import android.app.compat.CompatChanges;
import android.compat.annotation.Overridable;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -76,6 +77,7 @@ public class BackupEligibilityRules {
* (device-to-device) migrations.
*/
@ChangeId
@Overridable
@EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)
static final long IGNORE_ALLOW_BACKUP_IN_D2D = 183147249L;