diff options
author | Yao Chen <yaochen@google.com> | 2019-04-25 11:52:10 -0700 |
---|---|---|
committer | Yao Chen <yaochen@google.com> | 2019-04-25 11:52:10 -0700 |
commit | 35be60eb22089db605694ae54c4c7a7138b52488 (patch) | |
tree | ee48b05bbfc4fa33718c5c6f5c8ddf07c0cb5919 /cmds/incidentd | |
parent | 1369a3b5cd5c87a50afef4902732ed5e7a641fa6 (diff) |
Disable incidentd encryption.
Bug: 131332217
Test: manually tested
Change-Id: If98d73978eb06a616e89025fcd615750976406e1
Diffstat (limited to 'cmds/incidentd')
-rw-r--r-- | cmds/incidentd/src/Privacy.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmds/incidentd/src/Privacy.cpp b/cmds/incidentd/src/Privacy.cpp index 91f0dd3a5c35..4fe74c445921 100644 --- a/cmds/incidentd/src/Privacy.cpp +++ b/cmds/incidentd/src/Privacy.cpp @@ -25,6 +25,8 @@ namespace incidentd { using namespace android::os; +static const bool kEncryptionEnabled = false; + uint64_t encode_field_id(const Privacy* p) { return (uint64_t)p->type << 32 | p->field_id; } const Privacy* lookup(const Privacy* p, uint32_t fieldId) { @@ -37,7 +39,9 @@ const Privacy* lookup(const Privacy* p, uint32_t fieldId) { return NULL; } -bool sectionEncryption(int section_id) { return section_id == 3025 /*restricted image section*/; } +bool sectionEncryption(int section_id) { + return kEncryptionEnabled ? (section_id == 3025) /*restricted image section*/ : false; +} static bool isAllowed(const uint8_t policy, const uint8_t check) { switch (check) { |