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

Commit 09d19b99 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Disable view compiler for protected storage" am: e396fe4a 

am: 03cc6bcc

Change-Id: Ib74e690dd8f19736718b54b5f4436618d9a62ae2
parents 17abc1fd 03cc6bcc

services/core/java/com/android/server/pm/dex/ArtManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -480,8 +480,10 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { 
            final String apkPath = pkg.baseCodePath;

            final ApplicationInfo appInfo = pkg.applicationInfo;

            final String outDexFile = appInfo.dataDir + "/code_cache/compiled_view.dex";

            if (appInfo.isPrivilegedApp()) {

            if (appInfo.isPrivilegedApp() || appInfo.isDefaultToDeviceProtectedStorage()) {

                // Privileged apps prefer to load trusted code so they don't use compiled views.

                // Also disable the view compiler for protected storage apps since there are

                // selinux permissions required for writing to user_de.

                return false;

            }

            Log.i("PackageManager", "Compiling layouts in " + packageName + " (" + apkPath +