summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2015-10-21 00:55:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-21 00:55:05 +0000
commit257d2ca7fd75926bd1cfd13d3a07809e2d51a097 (patch)
tree669be74105048866cf59479b85e535bc653e5a25 /core/java/android/content
parentd91b1f6bb84c22b9b20df2537500bf23f6b65ad2 (diff)
parent55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456 (diff)
downloadframeworks_base-257d2ca7fd75926bd1cfd13d3a07809e2d51a097.zip
frameworks_base-257d2ca7fd75926bd1cfd13d3a07809e2d51a097.tar.gz
frameworks_base-257d2ca7fd75926bd1cfd13d3a07809e2d51a097.tar.bz2
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev
am: 55d2b6e8e6 * commit '55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456': Correctly derive ABI for apps on adopted media.
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/pm/PackageParser.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 7032c9a..99bd390 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -894,6 +894,7 @@ public class PackageParser {
}
pkg.volumeUuid = volumeUuid;
+ pkg.applicationInfo.volumeUuid = volumeUuid;
pkg.baseCodePath = apkPath;
pkg.mSignatures = null;