commit 186bb68d4eb9a5767245b764522b26b466aa0cb6
author Yifan Hong <elsk@google.com> Tue Jul 23 14:04:39 2019 -0700
committer Yifan Hong <elsk@google.com> Wed Jul 31 17:43:14 2019 +0000
tree 55eff6300fe72d0b2eaca5e08a8b93e4e1269996
parent 012508efa3bb00b5b458caa918f2960653f41df2

[REFACTOR] DynamicPartitionControl: combine DAP feature flag APIs

Combine IsDynamicPartitionsEnabled/Retrofit into one API that
returns a FeatureFlag struct instead.

This allows us to add new feature flags more easily.

Test: unittest
Change-Id: I32f0f0c4d5c636d2eac3bf99d6f92fcc6b71c7a9

boot_control_android_unittest.cc

diff --git a/boot_control_android_unittest.cc b/boot_control_android_unittest.cc
index dfcb6fb..3e0320d 100644
--- a/boot_control_android_unittest.cc
+++ b/boot_control_android_unittest.cc
@@ -274,10 +274,8 @@
           return Void();
         }));
 
-    ON_CALL(dynamicControl(), IsDynamicPartitionsEnabled())
-        .WillByDefault(Return(true));
-    ON_CALL(dynamicControl(), IsDynamicPartitionsRetrofit())
-        .WillByDefault(Return(false));
+    ON_CALL(dynamicControl(), GetDynamicPartitionsFeatureFlag())
+        .WillByDefault(Return(FeatureFlag(FeatureFlag::Value::LAUNCH)));
     ON_CALL(dynamicControl(), DeviceExists(_)).WillByDefault(Return(true));
     ON_CALL(dynamicControl(), GetDeviceDir(_))
         .WillByDefault(Invoke([](auto path) {