Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-28 22:22:56 +00:00
committed by Android (Google) Code Review
parent 1b8e47aebf 6ce92394ad
commit 4de7ab5cb1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
View File

@@ -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) {

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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);
}