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

Commit ce59d0ef authored by Satoshi Niwa's avatar Satoshi Niwa Committed by Android (Google) Code Review
Browse files

Merge "Fix PerformAdbBackupTask to use getPackageInfoAsUser" into main

parents e740b616 0c17231d

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");