commit 2a201a74c221ed6bf4adf597d7437b3a724a3898
author Jason Chiu <jasoncschiu@google.com> Sat Nov 25 02:53:02 2023 +0800
committer Jason Chiu <jasoncschiu@google.com> Tue Dec 05 09:14:38 2023 +0800
tree 1a9554cf8fec83c5e12a0730288d89166662c30c
parent f4d8fb7ad87375f225eae30bfa5f63fba042e03c

gs-common: bootctrl: check both properties in setActiveBootSlot

properties: ro.boot.bootdevice, ro.boot.boot_devices

Bug: 313092597
Change-Id: Ib158c2b2aadf87b2155c4c268264f06bc659b544
Signed-off-by: Jason Chiu <jasoncschiu@google.com>

bootctrl/1.2/BootControl.cpp

diff --git a/bootctrl/1.2/BootControl.cpp b/bootctrl/1.2/BootControl.cpp
index 7782075..4e72805 100644
--- a/bootctrl/1.2/BootControl.cpp
+++ b/bootctrl/1.2/BootControl.cpp
@@ -345,8 +345,12 @@
     char boot_dev[PROPERTY_VALUE_MAX];
     property_get("ro.boot.bootdevice", boot_dev, "");
     if (boot_dev[0] == '\0') {
-        _hidl_cb({false, "invalid ro.boot.bootdevice prop"});
-        return Void();
+        ALOGI("failed to get ro.boot.bootdevice. try ro.boot.boot_devices\n");
+        property_get("ro.boot.boot_devices", boot_dev, "");
+        if (boot_dev[0] == '\0') {
+            _hidl_cb({false, "invalid ro.boot.bootdevice and ro.boot.boot_devices prop"});
+            return Void();
+        }
     }
 
     std::string boot_lun_path =