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

Commit cab3e986 authored by Bagus Maulana's avatar Bagus Maulana
Browse files

Revert "Disable SliceBackupHelper on devices with FEATURE_SLICES_DISABLED" 

This reverts commit 38eb00d6.

Reason for revert: b/277914315 (my change from tm-wear-kr1-dev breaks master on merge, need to update a test in master which isn't in T before merging)

Change-Id: I3d57767e82ff8cd73255e0973fe8f03cb9413dc0
parent 38eb00d6

services/core/java/com/android/server/backup/SystemBackupAgent.java

+1 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.app.backup.FullBackup; 
import android.app.backup.FullBackupDataOutput;

import android.app.backup.WallpaperBackupHelper;

import android.content.Context;

import android.content.pm.PackageManager;

import android.os.Environment;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;
@@ -125,9 +124,7 @@ public class SystemBackupAgent extends BackupAgentHelper { 
        addHelperIfEligibleForUser(USAGE_STATS_HELPER, new UsageStatsBackupHelper(mUserId));

        addHelperIfEligibleForUser(SHORTCUT_MANAGER_HELPER, new ShortcutBackupHelper(mUserId));

        addHelperIfEligibleForUser(ACCOUNT_MANAGER_HELPER, new AccountManagerBackupHelper(mUserId));

        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_SLICES_DISABLED)) {

        addHelperIfEligibleForUser(SLICES_HELPER, new SliceBackupHelper(this));

        }

        addHelperIfEligibleForUser(PEOPLE_HELPER, new PeopleBackupHelper(mUserId));

        addHelperIfEligibleForUser(APP_LOCALES_HELPER, new AppSpecificLocalesBackupHelper(mUserId));

        addHelperIfEligibleForUser(APP_GENDER_HELPER,