commit 6b694ea5babead2510d3688b7c3f5239c7e89add
author LuK1337 <priv.luk@gmail.com> Thu Oct 10 19:52:11 2024 +0200
committer micky387 <mickaelsaibi@free.fr> Fri Nov 29 16:09:30 2024 -0500
tree 00c51fb34de5e06d217c9e2c7ab8f7aef2e9f96f
parent c7142efceafc6577c35f8d777816220df3927d07

webkit: SystemImpl: Filter out unavailable providers

Change-Id: Ibb70503caeeeabd35dbb0e9c54223e306b3dbdca

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 a821f545..948845f 100644
--- a/services/core/java/com/android/server/webkit/SystemImpl.java
+++ b/services/core/java/com/android/server/webkit/SystemImpl.java
@@ -49,6 +49,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -150,7 +151,9 @@
      * */
     @Override
     public WebViewProviderInfo[] getWebViewPackages() {
-        return mWebViewProviderPackages;
+        return Arrays.stream(mWebViewProviderPackages)
+                .filter(x -> isProviderAvailable(x.packageName))
+                .toArray(WebViewProviderInfo[]::new);
     }
 
     public long getFactoryPackageVersion(String packageName) throws NameNotFoundException {
@@ -159,6 +162,15 @@
                 .getLongVersionCode();
     }
 
+    private boolean isProviderAvailable(String packageName) {
+        try {
+            getFactoryPackageVersion(packageName);
+            return true;
+        } catch (NameNotFoundException e) {
+            return false;
+        }
+    }
+
     /**
      * Reads all signatures at the current depth (within the current provider) from the XML parser.
      */