diff options
| author | 2024-09-03 14:28:12 +0000 | |
|---|---|---|
| committer | 2024-09-03 14:28:12 +0000 | |
| commit | a2e032650788f64be5147223d2bf8df0eba97c8d (patch) | |
| tree | 17494058c64f29aa7d3a17c0ae6938949db92354 | |
| parent | c523772a86c5d045145b560e0fa6f2ba86534a3c (diff) | |
| parent | 4a7f61e46acbed942789b4bbfebedcdb1eb60b56 (diff) | |
Merge "webview: remove MATCH_DEBUG_TRIAGED_MISSING." into main
| -rw-r--r-- | core/java/android/webkit/WebViewFactory.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/webkit/SystemImpl.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index c53a0e158dea..f53293467a8d 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -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 diff --git a/services/core/java/com/android/server/webkit/SystemImpl.java b/services/core/java/com/android/server/webkit/SystemImpl.java index 5e35925aa69e..67401530763b 100644 --- a/services/core/java/com/android/server/webkit/SystemImpl.java +++ b/services/core/java/com/android/server/webkit/SystemImpl.java @@ -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; } |