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

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

Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev

parents 1b8e47ae 6ce92394

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
@@ -24567,7 +24567,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);

                        }