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

Commit 9cbedc74 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AssetManager: Add runtime overlay support for '/system/priv-app'."

parents 2f180521 5de1a991

libs/androidfw/AssetManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ bool AssetManager::addAssetPath(const String8& path, void** cookie) 
    }



    // add overlay packages for /system/framework and /system/app

    // as well as /system/priv-app, which is newly added from kitkat

    if (strncmp(path.string(), "/system/framework/", 18) == 0) {

        // When there is an environment variable for /vendor, this

        // should be changed to something similar to how ANDROID_ROOT
@@ -216,7 +217,8 @@ bool AssetManager::addAssetPath(const String8& path, void** cookie) 
        String8 overlayPath("/vendor/overlay/framework/");

        overlayPath.append(path.getPathLeaf());

        addAssetPathForOverlayRes(ap, overlayPath);

    } else if (strncmp(path.string(), "/system/app/", 12) == 0) {

    } else if (strncmp(path.string(), "/system/app/", 12) == 0

        || strncmp(path.string(), "/system/priv-app/", 17) == 0) {

        // When there is an environment variable for /vendor, this

        // should be changed to something similar to how ANDROID_ROOT

        // and ANDROID_DATA are used in this file.