commit 4a7f61e46acbed942789b4bbfebedcdb1eb60b56
author Torne (Richard Coles) <torne@google.com> Fri Aug 30 15:14:15 2024 -0400
committer Torne (Richard Coles) <torne@google.com> Fri Aug 30 16:44:32 2024 -0400
tree 17a84fc5cff198434c623a14b6bcabe180ae3c14
parent 925d1a6ffc25f268771831f78a2c50f8c6e51ac2

webview: remove MATCH_DEBUG_TRIAGED_MISSING.

MATCH_DEBUG_TRIAGED_MISSING is a deprecated alias for
MATCH_DIRECT_BOOT_AUTO, which has no effect here as we aren't fetching
component information, so just remove it.

Bug: 310653407
Test: atest CtsWebkitTestCases; atest WebViewUpdateServiceTest
Flag: NONE removing obsolete hidden API dependency
Change-Id: I6a6d49a9f14bb7163c80a6d092080bf564bc0ced

core/java/android/webkit/WebViewFactory.java

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index c53a0e1..f532934 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -318,7 +318,7 @@
         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 @@
                 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

diff --git a/services/core/java/com/android/server/webkit/SystemImpl.java b/services/core/java/com/android/server/webkit/SystemImpl.java
index c4d601d..c9f778e 100644
--- a/services/core/java/com/android/server/webkit/SystemImpl.java
+++ b/services/core/java/com/android/server/webkit/SystemImpl.java
@@ -327,5 +327,5 @@
     // 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;
 }