Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c25c1ca1 authored by Abdelrahman Ibrahim's avatar Abdelrahman Ibrahim Committed by Gerrit Code Review
Browse files

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

parents 037783ba f9bff872

services/java/com/android/server/SystemServer.java

+10 −7
Original line number Diff line number Diff line
@@ -2004,6 +2004,8 @@ public final class SystemServer implements Dumpable { 
                t.traceEnd();

            }



            // Devices without WebView/JavaScript cannot support PAC proxies.

            if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WEBVIEW)) {

                t.traceBegin("StartPacProxyService");

                try {

                    pacProxyService = new PacProxyService(context);
@@ -2012,6 +2014,7 @@ public final class SystemServer implements Dumpable { 
                    reportWtf("starting PacProxyService", e);

                }

                t.traceEnd();

            }



            t.traceBegin("StartConnectivityService");

            // This has to be called after NetworkManagementService, NetworkStatsService