diff options
| author | 2017-05-10 17:31:52 +0000 | |
|---|---|---|
| committer | 2017-05-10 17:31:53 +0000 | |
| commit | 4c8cc1c86a5ca613173b22e135cedb1c2b2e77c3 (patch) | |
| tree | 885256f0724e5a4801f1306cdf1668c55d7bbfdd | |
| parent | 5aab4176932de5e899c03876f64cb6f09a999337 (diff) | |
| parent | 12375069e753adea6c123fca7706b1018d358c92 (diff) | |
Merge "Otapreopt: Work around bug 38186355" into oc-dev
| -rw-r--r-- | cmds/installd/otapreopt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp index ff838ce0b2..9a3fb70a8a 100644 --- a/cmds/installd/otapreopt.cpp +++ b/cmds/installd/otapreopt.cpp @@ -734,6 +734,10 @@ private: } static const char* ParseNull(const char* arg) { + // b/38186355. Revert soon. + if (strcmp(arg, "!null") == 0) { + return nullptr; + } return (strcmp(arg, "!") == 0) ? nullptr : arg; } |