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

Commit 0619b1c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "webview: handle null in pinning impl." into main

parents 3f3ff6bd e9a864d1

services/core/java/com/android/server/webkit/SystemImpl.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -310,9 +310,11 @@ public class SystemImpl implements SystemInterface { 




        ArrayList<String> apksToPin = new ArrayList<>();

        ArrayList<String> apksToPin = new ArrayList<>();

        boolean pinSharedFirst = appInfo.metaData.getBoolean("PIN_SHARED_LIBS_FIRST", true);

        boolean pinSharedFirst = appInfo.metaData.getBoolean("PIN_SHARED_LIBS_FIRST", true);

        if (appInfo.sharedLibraryFiles != null) {

            for (String sharedLib : appInfo.sharedLibraryFiles) {

            for (String sharedLib : appInfo.sharedLibraryFiles) {

                apksToPin.add(sharedLib);

                apksToPin.add(sharedLib);

            }

            }

        }

        apksToPin.add(appInfo.sourceDir);

        apksToPin.add(appInfo.sourceDir);

        if (!pinSharedFirst) {

        if (!pinSharedFirst) {

            // We want to prioritize pinning of the native library that is most likely used by apps

            // We want to prioritize pinning of the native library that is most likely used by apps