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

Commit 0c17231d authored by Satoshi Niwa's avatar Satoshi Niwa
Browse files

Fix PerformAdbBackupTask to use getPackageInfoAsUser 

When performing an adb backup for a package on a secondary user, the PerformAdbBackupTask was incorrectly using getPackageInfo() without specifying the user.
This caused the PackageManager to look for the package under the wrong user.

This change corrects the behavior by using getPackageInfoAsUser() and providing the correct user ID.
This ensures the package is found and backed up successfully, which resolves the test failure.

Bug: 423803029
Bug: 420527847
Test: atest BackupEligibilityHostSideTest
Flag: EXEMPT bugfix
Change-Id: Ie6666bf7c71ab33103c8dc20ca8fd02232fd8acb
parent 69a12166

services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java

+4 −3
Original line number Diff line number Diff line
@@ -129,12 +129,13 @@ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestor 
    }



    private void addPackagesToSet(TreeMap<String, PackageInfo> set, List<String> pkgNames) {

        int userId = mUserBackupManagerService.getUserId();

        PackageManager pm = mUserBackupManagerService.getPackageManager();

        for (String pkgName : pkgNames) {

            if (!set.containsKey(pkgName)) {

                try {

                    PackageInfo info = mUserBackupManagerService.getPackageManager().getPackageInfo(

                            pkgName,

                            PackageManager.GET_SIGNING_CERTIFICATES);

                    PackageInfo info = pm.getPackageInfoAsUser(

                            pkgName, PackageManager.GET_SIGNING_CERTIFICATES, userId);

                    set.put(pkgName, info);

                } catch (NameNotFoundException e) {

                    Slog.w(TAG, "Unknown package " + pkgName + ", skipping");