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

Commit 0815cde2 authored by Luca Stefani's avatar Luca Stefani
Browse files

Revert "lineage: Move sdk resources to system_ext" 

This reverts commit 7148db43.

Change-Id: I8b73470c162691701b5b33891da9fb548aa5f3e7
parent d884e673

core/java/android/content/res/AssetManager.java

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ public final class AssetManager implements AutoCloseable { 
    private static final boolean DEBUG_REFS = false;



    private static final String FRAMEWORK_APK_PATH = "/system/framework/framework-res.apk";

    private static final String LINEAGE_APK_PATH =

            "/system_ext/framework/org.lineageos.platform-res.apk";

    private static final String LINEAGE_APK_PATH = "/system/framework/org.lineageos.platform-res.apk";



    private static final Object sSync = new Object();

core/java/com/android/internal/content/om/OverlayConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ public class OverlayConfig { 


        for (Map.Entry<String, String> target : new HashMap<String, String>() {{

                put("/system/framework/framework-res.apk", "android");

                put("/system_ext/framework/org.lineageos.platform-res.apk", "lineageos.platform");

                put("/system/framework/org.lineageos.platform-res.apk", "lineageos.platform");

        }}.entrySet()) {

            final String targetPath = target.getKey();

            final String targetPackageName = target.getValue();

core/jni/fd_utils.cpp

+1 −2
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ static const char* kPathAllowlist[] = { 
        "/sys/kernel/debug/tracing/trace_marker",

        "/sys/kernel/tracing/trace_marker",

        "/system/framework/framework-res.apk",

        "/system/system_ext/framework/org.lineageos.platform-res.apk",

        "/system_ext/framework/org.lineageos.platform-res.apk",

        "/system/framework/org.lineageos.platform-res.apk",

        "/dev/urandom",

        "/dev/ion",

        "/dev/dri/renderD129", // Fixes b/31172436