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." am: c25c1ca1a6 am: 21d5ffb82a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2624649

Change-Id: I8f46ff25ca8e5c8741de14dd59de4868b10c1f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Abdelrahman Ibrahim
2023-06-20 17:07:18 +00:00
committed by Automerger Merge Worker
parent fc40c1e8e3 21d5ffb82a
commit 07c9a6bcff
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.traceBegin("StartPacProxyService");
try {
pacProxyService = new PacProxyService(context);
ServiceManager.addService(Context.PAC_PROXY_SERVICE, pacProxyService);
} catch (Throwable e) {
reportWtf("starting PacProxyService", e);
// Devices without WebView/JavaScript cannot support PAC proxies.
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WEBVIEW)) {
t.traceBegin("StartPacProxyService");
try {
pacProxyService = new PacProxyService(context);
ServiceManager.addService(Context.PAC_PROXY_SERVICE, pacProxyService);
} catch (Throwable e) {
reportWtf("starting PacProxyService", e);
}
t.traceEnd();
}
t.traceEnd();
t.traceBegin("StartConnectivityService");
// This has to be called after NetworkManagementService, NetworkStatsService