summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-01-15 17:42:10 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-01-15 17:42:10 +0000
commit3a13a85fd4494731270535e5061bf23db97a6983 (patch)
tree52de47e1351b4337da27947718fad4ededa728dc
parentae1f3f26bb2a7d5758dccaaa943c14d17d679ae5 (diff)
parent610d0967549a45b79ef6fdd01c004777c59c883b (diff)
Merge "Log the fact that we don't have a prod key."
-rw-r--r--cmds/statsd/src/atoms.proto1
-rw-r--r--services/core/java/com/android/server/signedconfig/SignatureVerifier.java2
2 files changed, 3 insertions, 0 deletions
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index f9828a2b5302..0fa7cffa07af 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -3884,6 +3884,7 @@ message SignedConfigReported {
OLD_CONFIG = 6;
SIGNATURE_CHECK_FAILED = 7;
NOT_APPLICABLE = 8;
+ SIGNATURE_CHECK_FAILED_PROD_KEY_ABSENT = 9;
}
optional Status status = 2;
diff --git a/services/core/java/com/android/server/signedconfig/SignatureVerifier.java b/services/core/java/com/android/server/signedconfig/SignatureVerifier.java
index fcf40cf3601b..56db32a3071d 100644
--- a/services/core/java/com/android/server/signedconfig/SignatureVerifier.java
+++ b/services/core/java/com/android/server/signedconfig/SignatureVerifier.java
@@ -119,6 +119,8 @@ public class SignatureVerifier {
}
if (mProdKey == null) {
Slog.e(TAG, "No prod key; construction failed?");
+ mEvent.status =
+ StatsLog.SIGNED_CONFIG_REPORTED__STATUS__SIGNATURE_CHECK_FAILED_PROD_KEY_ABSENT;
return false;
}
if (verifyWithPublicKey(mProdKey, data, signature)) {