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

Commit fcf78913 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Allowlist TelephonyProvider HSUM backup&restore" into main

parents d7d9a2d3 5352c7b3

services/backup/java/com/android/server/backup/UserBackupManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -281,6 +281,9 @@ public class UserBackupManagerService { 
    private static final int SCHEDULE_FILE_VERSION = 1;



    public static final String SETTINGS_PACKAGE = "com.android.providers.settings";



    public static final String TELEPHONY_PROVIDER_PACKAGE = "com.android.providers.telephony";



    public static final String SHARED_BACKUP_AGENT_PACKAGE = "com.android.sharedstoragebackup";



    // Pseudoname that we use for the Package Manager metadata "package".

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

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.server.backup.BackupManagerService.TAG; 
import static com.android.server.backup.UserBackupManagerService.PACKAGE_MANAGER_SENTINEL;

import static com.android.server.backup.UserBackupManagerService.SETTINGS_PACKAGE;

import static com.android.server.backup.UserBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE;

import static com.android.server.backup.UserBackupManagerService.TELEPHONY_PROVIDER_PACKAGE;

import static com.android.server.backup.UserBackupManagerService.WALLPAPER_PACKAGE;

import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
@@ -75,6 +76,12 @@ public class BackupEligibilityRules { 
            systemPackagesAllowedForProfileUser,

            Sets.newArraySet(WALLPAPER_PACKAGE, SETTINGS_PACKAGE));



    static {

        if (UserManager.isHeadlessSystemUserMode()) {

            systemPackagesAllowedForNonSystemUsers.add(TELEPHONY_PROVIDER_PACKAGE);

        }

    }



    private final PackageManager mPackageManager;

    private final PackageManagerInternal mPackageManagerInternal;

    private final int mUserId;