diff options
| author | Aaron Huang <huangaaron@google.com> | 2021-03-15 12:30:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-15 12:30:17 +0000 |
| commit | ce43593e5ee5d82148b184310c92af60d05007dc (patch) | |
| tree | e5e3baf0f36277724ba797d0292fe70253478725 /services/java/com/android/server/SystemServer.java | |
| parent | d5258c36f144db8b6b8d2b99b61992e747c5f27d (diff) | |
| parent | 688ae36dcbef23d43ccc58f16b201a6fa94d390e (diff) | |
Merge changes from topic "pacproxy-service" am: 16f50075b1 am: 688ae36dcb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife210de3adbdaff6c88caf744d805571b365b294
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index a6a99f232ef4..7bde760191b5 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -108,6 +108,7 @@ import com.android.server.camera.CameraServiceProxy; import com.android.server.clipboard.ClipboardService; import com.android.server.compat.PlatformCompat; import com.android.server.compat.PlatformCompatNative; +import com.android.server.connectivity.PacProxyService; import com.android.server.contentcapture.ContentCaptureManagerInternal; import com.android.server.coverage.CoverageService; import com.android.server.devicepolicy.DevicePolicyManagerService; @@ -1115,6 +1116,7 @@ public final class SystemServer { ConsumerIrService consumerIr = null; MmsServiceBroker mmsService = null; HardwarePropertiesManagerService hardwarePropertiesService = null; + PacProxyService pacProxyService = null; boolean disableSystemTextClassifier = SystemProperties.getBoolean( "config.disable_systemtextclassifier", false); @@ -1623,6 +1625,15 @@ public final class SystemServer { t.traceEnd(); } + 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.traceBegin("StartConnectivityService"); // This has to be called after NetworkManagementService, NetworkStatsService // and NetworkPolicyManager because ConnectivityService needs to take these |