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

Commit 6ce92394 authored by Svet Ganov's avatar Svet Ganov
Browse files

Don't clobber shared libs when updating app info 

If we update a package without restart or if an installed
package is a target of a resource overlay we update the app
info on the applicaiton side which is then used to update
the class loader and the resources the app is loading from.
To do that we send over an app info instance for the package
which was partially populated and missing the shared lib
entries resulting in apps not finding resources and classes
from the lib.

Test: manual

bug:62685545

Change-Id: Ib40b430c85a1e5d74f270a4326497ea3bd832215
parent a120e6b6

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -5267,7 +5267,7 @@ public final class ActivityThread { 
                                final ApplicationInfo aInfo =

                                        sPackageManager.getApplicationInfo(

                                                packageName,

                                                0 /*flags*/,

                                                PackageManager.GET_SHARED_LIBRARY_FILES,

                                                UserHandle.myUserId());



                                if (mActivities.size() > 0) {

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -24537,7 +24537,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                if (updateFrameworkRes || packagesToUpdate.contains(packageName)) {

                    try {

                        final ApplicationInfo ai = AppGlobals.getPackageManager()

                                .getApplicationInfo(packageName, 0 /*flags*/, app.userId);

                                .getApplicationInfo(packageName, STOCK_PM_FLAGS, app.userId);

                        if (ai != null) {

                            app.thread.scheduleApplicationInfoChanged(ai);

                        }