commit dad7ea4614ce38f4c34fffdf164891b4d9438a15
author Martijn Coenen <maco@google.com> Tue Mar 23 18:30:55 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 23 18:30:55 2021 +0000
tree 07abe684c9f1930ed6e71f17bce4316cc4476f8b
parent 0cfc1d185257b825b99472949ee9f8ab1803b2f5
parent e9e9b709d97b9d6696b85c6a7e8f1d5976cb9b74

Merge "Bail early on devices without updatable APEX."

ondevice-signing/odsign_main.cpp

diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index f6d663b..6cab8b6 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -297,6 +297,11 @@
     };
     auto scope_guard = android::base::make_scope_guard(errorScopeGuard);
 
+    if (!android::base::GetBoolProperty("ro.apex.updatable", false)) {
+        LOG(INFO) << "Device doesn't support updatable APEX, exiting.";
+        return 0;
+    }
+
     SigningKey* key;
     if (kUseKeystore) {
         auto keystoreResult = KeystoreKey::getInstance();