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

Commit 4d07b4d7 authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge changes I4ee2affc,I81577500 

* changes:
  Fix uninstall/disable with multi-user compressed stubs
  Refactor PackageSetting codePath and remove resourcePath
parents 24da92af 328aa43b

services/core/java/com/android/server/pm/PackageInstallerSession.java

+1 −1
Original line number Diff line number Diff line
@@ -2091,7 +2091,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        if (ps == null) {

            return 0;

        }

        final File apkDirOrPath = ps.codePath;

        final File apkDirOrPath = ps.getCodePath();

        if (apkDirOrPath == null) {

            return 0;

        }

services/core/java/com/android/server/pm/PackageManagerService.java

+85 −99

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+6 −4
Original line number Diff line number Diff line
@@ -423,13 +423,15 @@ class PackageManagerShellCommand extends ShellCommand { 
            final List<ApplicationInfo> list;

            if (packageName == null) {

                final ParceledListSlice<ApplicationInfo> packages =

                        mInterface.getInstalledApplications(

                                PackageManager.MATCH_SYSTEM_ONLY, UserHandle.USER_SYSTEM);

                        mInterface.getInstalledApplications(PackageManager.MATCH_SYSTEM_ONLY

                                        | PackageManager.MATCH_UNINSTALLED_PACKAGES,

                                UserHandle.USER_SYSTEM);

                list = packages.getList();

            } else {

                list = new ArrayList<>(1);

                list.add(mInterface.getApplicationInfo(packageName,

                        PackageManager.MATCH_SYSTEM_ONLY, UserHandle.USER_SYSTEM));

                list.add(mInterface.getApplicationInfo(packageName, PackageManager.MATCH_SYSTEM_ONLY

                                | PackageManager.MATCH_UNINSTALLED_PACKAGES,

                        UserHandle.USER_SYSTEM));

            }

            for (ApplicationInfo info : list) {

                if (info.isUpdatedSystemApp()) {

services/core/java/com/android/server/pm/PackageSetting.java

+2 −2
Original line number Diff line number Diff line
@@ -71,13 +71,13 @@ public class PackageSetting extends PackageSettingBase { 
    private PackageStateUnserialized pkgState = new PackageStateUnserialized();



    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public PackageSetting(String name, String realName, File codePath, File resourcePath,

    public PackageSetting(String name, String realName, @NonNull File codePath,

            String legacyNativeLibraryPathString, String primaryCpuAbiString,

            String secondaryCpuAbiString, String cpuAbiOverrideString,

            long pVersionCode, int pkgFlags, int privateFlags,

            int sharedUserId, String[] usesStaticLibraries,

            long[] usesStaticLibrariesVersions, Map<String, ArraySet<String>> mimeGroups) {

        super(name, realName, codePath, resourcePath, legacyNativeLibraryPathString,

        super(name, realName, codePath, legacyNativeLibraryPathString,

                primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString,

                pVersionCode, pkgFlags, privateFlags,

                usesStaticLibraries, usesStaticLibrariesVersions);

services/core/java/com/android/server/pm/PackageSettingBase.java

+20 −17

File changed.

Preview size limit exceeded, changes collapsed.