commit a22ef552c04ca23165b428e51c43ed109ad6e5db
author Kelvin Zhang <zhangkelvin@google.com> Mon Oct 12 19:03:52 2020 -0400
committer Kelvin Zhang <zhangkelvin@google.com> Mon Oct 12 19:03:52 2020 -0400
tree cd14bdbb92b09fd63fdfc8bc768b2c3095f855d2
parent 7d64e28e6ddd726cefb050727f94c64185573991

Disable read/write to ota.warm_reset in recovery mode

Bug: 155372775

Test: treehugger
Change-Id: Ifd34f185e5df98984794dc0cda584f00769eb084

dynamic_partition_control_android.cc

diff --git a/dynamic_partition_control_android.cc b/dynamic_partition_control_android.cc
index c9888ab..1fb2c25 100644
--- a/dynamic_partition_control_android.cc
+++ b/dynamic_partition_control_android.cc
@@ -86,12 +86,6 @@
 // needs to be mapped, this timeout is longer than |kMapTimeout|.
 constexpr std::chrono::milliseconds kMapSnapshotTimeout{5000};
 
-#ifdef __ANDROID_RECOVERY__
-constexpr bool kIsRecovery = true;
-#else
-constexpr bool kIsRecovery = false;
-#endif
-
 DynamicPartitionControlAndroid::~DynamicPartitionControlAndroid() {
   Cleanup();
 }
@@ -1085,7 +1079,7 @@
 }
 
 bool DynamicPartitionControlAndroid::IsRecovery() {
-  return kIsRecovery;
+  return constants::kIsRecovery;
 }
 
 static bool IsIncrementalUpdate(const DeltaArchiveManifest& manifest) {