commit | 4c8cc1c86a5ca613173b22e135cedb1c2b2e77c3 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 10 17:31:52 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 10 17:31:53 2017 +0000 |
tree | 885256f0724e5a4801f1306cdf1668c55d7bbfdd | |
parent | 5aab4176932de5e899c03876f64cb6f09a999337 [diff] | |
parent | 12375069e753adea6c123fca7706b1018d358c92 [diff] |
Merge "Otapreopt: Work around bug 38186355" into oc-dev
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; }