diff options
| author | 2017-09-28 22:22:56 +0000 | |
|---|---|---|
| committer | 2017-09-28 22:22:56 +0000 | |
| commit | 4de7ab5cb14846d9b416a274b4371a8f5c09d160 (patch) | |
| tree | 86e6d157c8cd2988bcbbdd7aa869ecc77bc0319c | |
| parent | 1b8e47aebf16d1dd64f66103b0cb44ca9059da22 (diff) | |
| parent | 6ce92394ad9de271994680f940f4e7f4ab8e7c8e (diff) | |
Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 2e4ce1886fd6..f01feea14e73 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -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) { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index bffccafc677b..30ecbcf80ea7 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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); } |