Merge changes I3eb82680,I9d6147d9 am: bbd9fb5c27 am: c27bf45cb6 am: 54e08a027c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f0d6bfead295ed6a98a15ef9bb3542b88d5652a
This commit is contained in:
Lorenzo Colitti
2021-01-13 00:50:46 +00:00
committed by Automerger Merge Worker
9 changed files with 157 additions and 51 deletions

View File

@@ -1360,8 +1360,7 @@ public final class SystemServer implements Dumpable {
}
t.traceBegin("IpConnectivityMetrics");
mSystemServiceManager.startServiceFromJar(IP_CONNECTIVITY_METRICS_CLASS,
CONNECTIVITY_SERVICE_APEX_PATH);
mSystemServiceManager.startService(IP_CONNECTIVITY_METRICS_CLASS);
t.traceEnd();
t.traceBegin("NetworkWatchlistService");