Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a2104d7 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge changes Ie5b66d6c,Ia1004ca6 

am: 78ccbf55

Change-Id: I7aa61c32a2d49e6fe917c7be3b784543d33e48ff
parents dbebdcd6 78ccbf55

cmds/installd/CacheTracker.cpp

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ void CacheTracker::loadItemsFrom(const std::string& path) { 
        }



        // Bubble up modified time to parent

        CHECK(p != nullptr);

        switch (p->fts_info) {

        case FTS_DP:

        case FTS_DEFAULT:

cmds/installd/otapreopt.cpp

+0 −4
Original line number Diff line number Diff line
@@ -753,10 +753,6 @@ 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;

    }