commit 3f94b5e2d830c1c9000b8c391041a07776de3696
author Andreas Gampe <agampe@google.com> Thu Jul 06 16:05:41 2017 -0700
committer Andreas Gampe <agampe@google.com> Tue Oct 31 14:51:58 2017 -0700
tree 6aa069bfeaf9654db1c74c198b8061f5d77b57ee
parent 682e57b845a46c02bebd194a2689831f1b2b5948

Revert "Otapreopt: Work around bug 38186355"

This reverts commit 12375069e753adea6c123fca7706b1018d358c92.

(cherry picked from commit efd53f88635840fe2a77fc836db57c4ecd94ed45)

Bug: 38186355
Bug: 38199123
Test: m
Test: manual OTA
Merged-In: Ie5b66d6ca5c3bc6af590bc7685234e75cc4d1ce4
Change-Id: Ie5b66d6ca5c3bc6af590bc7685234e75cc4d1ce4

cmds/installd/otapreopt.cpp

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