summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcashman <dcashman@google.com>2014-10-07 22:37:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-07 22:37:21 +0000
commit90f46eca86df268d8df276fb68dac2e731f35479 (patch)
tree444dca8a7f9be240b19a127d241defa0fcfd1f80
parent6ec5a256d78579057e82691e4cc21ca6222e2b1f (diff)
parentd876a1d368c668c17aca2b9c96ff012befb49dcf (diff)
downloadframeworks_base-90f46eca86df268d8df276fb68dac2e731f35479.zip
frameworks_base-90f46eca86df268d8df276fb68dac2e731f35479.tar.gz
frameworks_base-90f46eca86df268d8df276fb68dac2e731f35479.tar.bz2
Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
-rw-r--r--services/core/java/com/android/server/pm/PackageKeySetData.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageKeySetData.java b/services/core/java/com/android/server/pm/PackageKeySetData.java
index 11ed5d2..9f9bafd 100644
--- a/services/core/java/com/android/server/pm/PackageKeySetData.java
+++ b/services/core/java/com/android/server/pm/PackageKeySetData.java
@@ -41,6 +41,7 @@ public class PackageKeySetData {
}
PackageKeySetData(PackageKeySetData original) {
+ mProperSigningKeySet = original.mProperSigningKeySet;
mSigningKeySets = ArrayUtils.cloneOrNull(original.mSigningKeySets);
mUpgradeKeySets = ArrayUtils.cloneOrNull(original.mUpgradeKeySets);
mDefinedKeySets = ArrayUtils.cloneOrNull(original.mDefinedKeySets);