commit 12375069e753adea6c123fca7706b1018d358c92
author Andreas Gampe <agampe@google.com> Wed May 10 08:18:06 2017 -0700
committer Andreas Gampe <agampe@google.com> Wed May 10 08:18:06 2017 -0700
tree 4c2e27e48f42bd0250f1f571013e2bc5e6626809
parent 903726f55bf57210bf6523dc909074f46c8c4e5a

Otapreopt: Work around bug 38186355

Temporarily also accept a malformed string for null.

Bug: 38186355
Test: m
Test: manual OTA
Change-Id: I19d527d04b86596551f7bed54221c67be06c34c7

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index ff838ce..9a3fb70 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -734,6 +734,10 @@
     }
 
     static const char* ParseNull(const char* arg) {
+        // b/38186355. Revert soon.
+        if (strcmp(arg, "!null") == 0) {
+            return nullptr;
+        }
         return (strcmp(arg, "!") == 0) ? nullptr : arg;
     }