summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2017-12-12 00:37:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-12-12 00:37:35 +0000
commit57e6b4fb4d9be6ac8d01bf0ea2debddb10216039 (patch)
tree23c55ca001018fcca2dd79274fda6036b5750717 /core/java
parent0d13717248cf34b4dfee9cd757c33ed7c57338d6 (diff)
parent5b1df2fb5aa2b9ea8fe3fe21104eaaf5298d997f (diff)
Merge "Fix package manager tests"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/pm/PackageParser.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index fb1b885f0106..97c2b7d11354 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -6462,6 +6462,7 @@ public class PackageParser {
mAdoptPermissions = dest.createStringArrayList();
mAppMetaData = dest.readBundle();
mVersionCode = dest.readInt();
+ mVersionCodeMajor = dest.readInt();
mVersionName = dest.readString();
if (mVersionName != null) {
mVersionName = mVersionName.intern();
@@ -6608,6 +6609,7 @@ public class PackageParser {
dest.writeStringList(mAdoptPermissions);
dest.writeBundle(mAppMetaData);
dest.writeInt(mVersionCode);
+ dest.writeInt(mVersionCodeMajor);
dest.writeString(mVersionName);
dest.writeString(mSharedUserId);
dest.writeInt(mSharedUserLabel);