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

Commit a40ec3b7 authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov
Browse files

Make changes guarding the new opt-out scheme overridable 

Mark app compat changes guarding the new opt-out rules for D2D transfers
as @Overridable. This allows enabdling / disabling the behaviour without
code changes.

Bug: 186833084
Test: m -j
Change-Id: I97396bd2a27c86ffccffec364cf57d9647bb760d
parent 2f8d1baa

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;