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

Commit 64dce8e2 authored by Patrick Baumann's avatar Patrick Baumann Committed by android-build-merger
Browse files

Merge "Allows disk reads when adding native paths to classloader" into pi-dev am: 147ef6b1 

am: e4f5215f

Change-Id: I7f63c402d307f6be2cde282ff94488f2e49dee3e
parents 48b4f4fe e4f5215f

core/java/android/app/LoadedApk.java

+7 −1
Original line number Diff line number Diff line
@@ -736,7 +736,13 @@ public final class LoadedApk { 
        }



        if (!libPaths.isEmpty() && SystemProperties.getBoolean(PROPERTY_NAME_APPEND_NATIVE, true)) {

            // Temporarily disable logging of disk reads on the Looper thread as this is necessary

            StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();

            try {

                ApplicationLoaders.getDefault().addNative(mClassLoader, libPaths);

            } finally {

                StrictMode.setThreadPolicy(oldPolicy);

            }

        }



        if (addedPaths != null && addedPaths.size() > 0) {