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

Commit 721a3488 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Query for static shared libs as well when needed" into oc-dev

parents b76845aa a5c867c8

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1093,7 +1093,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub { 
        PackageInfo packageInfo = null;

        PackageInfo packageInfo = null;

        try {

        try {

            packageInfo = AppGlobals.getPackageManager().getPackageInfo(

            packageInfo = AppGlobals.getPackageManager().getPackageInfo(

                    basePackageName, 0, userId);

                    basePackageName, PackageManager.MATCH_STATIC_SHARED_LIBRARIES, userId);

        } catch (RemoteException ignored) {

        } catch (RemoteException ignored) {

        }

        }

        if (packageInfo == null || packageInfo.applicationInfo == null) {

        if (packageInfo == null || packageInfo.applicationInfo == null) {

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        public boolean handleMessage(Message msg) {

        public boolean handleMessage(Message msg) {

            // Cache package manager data without the lock held

            // Cache package manager data without the lock held

            final PackageInfo pkgInfo = mPm.getPackageInfo(

            final PackageInfo pkgInfo = mPm.getPackageInfo(

                    params.appPackageName, PackageManager.GET_SIGNATURES /*flags*/, userId);

                    params.appPackageName, PackageManager.GET_SIGNATURES

                            | PackageManager.MATCH_STATIC_SHARED_LIBRARIES /*flags*/, userId);

            final ApplicationInfo appInfo = mPm.getApplicationInfo(

            final ApplicationInfo appInfo = mPm.getApplicationInfo(

                    params.appPackageName, 0, userId);

                    params.appPackageName, 0, userId);

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -892,7 +892,8 @@ class PackageManagerShellCommand extends ShellCommand { 
            userId = UserHandle.USER_SYSTEM;

            userId = UserHandle.USER_SYSTEM;

            flags |= PackageManager.DELETE_ALL_USERS;

            flags |= PackageManager.DELETE_ALL_USERS;

        } else {

        } else {

            final PackageInfo info = mInterface.getPackageInfo(packageName, 0, userId);

            final PackageInfo info = mInterface.getPackageInfo(packageName,

                    PackageManager.MATCH_STATIC_SHARED_LIBRARIES, userId);

            if (info == null) {

            if (info == null) {

                pw.println("Failure [not installed for " + userId + "]");

                pw.println("Failure [not installed for " + userId + "]");

                return 1;

                return 1;