Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable PacProxyService on devices that doesn't support WebView/JavaScript."

Browse Source
This commit is contained in:
Abdelrahman Ibrahim
2023-06-20 16:35:56 +00:00
committed by Gerrit Code Review
parent 037783ba46 f9bff8720b
commit c25c1ca1a6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/java/com/android/server/SystemServer.java
View File

@@ -2004,14 +2004,17 @@ public final class SystemServer implements Dumpable {
t.traceEnd(); t.traceEnd();
} }
t.traceBegin("StartPacProxyService"); // Devices without WebView/JavaScript cannot support PAC proxies.
try { if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WEBVIEW)) {
pacProxyService = new PacProxyService(context); t.traceBegin("StartPacProxyService");
ServiceManager.addService(Context.PAC_PROXY_SERVICE, pacProxyService); try {
} catch (Throwable e) { pacProxyService = new PacProxyService(context);
reportWtf("starting PacProxyService", e); ServiceManager.addService(Context.PAC_PROXY_SERVICE, pacProxyService);
} catch (Throwable e) {
reportWtf("starting PacProxyService", e);
}
t.traceEnd();
} }
t.traceEnd();
t.traceBegin("StartConnectivityService"); t.traceBegin("StartConnectivityService");
// This has to be called after NetworkManagementService, NetworkStatsService // This has to be called after NetworkManagementService, NetworkStatsService