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

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

Merge "webview: remove MATCH_DEBUG_TRIAGED_MISSING." into main

parents c523772a 4a7f61e4

core/java/android/webkit/WebViewFactory.java

+1 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ public final class WebViewFactory { 
        String libraryFileName;

        try {

            PackageInfo packageInfo = packageManager.getPackageInfo(packageName,

                    PackageManager.GET_META_DATA | PackageManager.MATCH_DEBUG_TRIAGED_MISSING);

                    PackageManager.GET_META_DATA);

            libraryFileName = getWebViewLibrary(packageInfo.applicationInfo);

        } catch (PackageManager.NameNotFoundException e) {

            Log.e(LOGTAG, "Couldn't find package " + packageName);
@@ -479,7 +479,6 @@ public final class WebViewFactory { 
                newPackageInfo = pm.getPackageInfo(

                    response.packageInfo.packageName,

                    PackageManager.GET_SHARED_LIBRARY_FILES

                    | PackageManager.MATCH_DEBUG_TRIAGED_MISSING

                    // Make sure that we fetch the current provider even if its not

                    // installed for the current user

                    | PackageManager.MATCH_UNINSTALLED_PACKAGES

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

+1 −1
Original line number Diff line number Diff line
@@ -326,5 +326,5 @@ public class SystemImpl implements SystemInterface { 
    // flags declaring we want extra info from the package manager for webview providers

    private final static int PACKAGE_FLAGS = PackageManager.GET_META_DATA

            | PackageManager.GET_SIGNATURES | PackageManager.GET_SHARED_LIBRARY_FILES

            | PackageManager.MATCH_DEBUG_TRIAGED_MISSING | PackageManager.MATCH_ANY_USER;

            | PackageManager.MATCH_ANY_USER;

}