commit 78ccbf55969e651d817bb398bfe056571d42e81b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 01 00:21:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 01 00:21:46 2017 +0000
tree 6aa069bfeaf9654db1c74c198b8061f5d77b57ee
parent 42a57522c5c3ee645bf82d3090d308b9428e3e21
parent 3f94b5e2d830c1c9000b8c391041a07776de3696

Merge changes Ie5b66d6c,Ia1004ca6

* changes:
  Revert "Otapreopt: Work around bug 38186355"
  Clean up possible null dereference warning.

cmds/installd/CacheTracker.cpp

diff --git a/cmds/installd/CacheTracker.cpp b/cmds/installd/CacheTracker.cpp
index e293948..3eb39b9 100644
--- a/cmds/installd/CacheTracker.cpp
+++ b/cmds/installd/CacheTracker.cpp
@@ -148,6 +148,7 @@
         }
 
         // Bubble up modified time to parent
+        CHECK(p != nullptr);
         switch (p->fts_info) {
         case FTS_DP:
         case FTS_DEFAULT:

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;
     }