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

Commit 7a44c145 authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Automerger Merge Worker
Browse files

Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev... 

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

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

Change-Id: I1222aa774abcc95c465a0859e4dd7a913f885c39
parents 30217605 26aa9028

core/java/android/app/backup/FullBackup.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java

+2 −0
Original line number Diff line number Diff line
@@ -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;