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

Merge changes I6512d3f7,I99bca71c am: eccbfe4b72 am: 26d42f094a am: 50a13c982f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57c4dffd22338d850beaff7b2575204ee2a42cd9
This commit is contained in:
Junyu Lai
2021-03-06 06:25:54 +00:00
committed by Automerger Merge Worker
parent 1ac9e246c4 50a13c982f
commit 6a61660729
3 changed files with 57 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,6 @@ import android.graphics.Typeface;
import android.hardware.display.DisplayManagerInternal;
import android.net.ConnectivityManager;
import android.net.ConnectivityModuleConnector;
import android.net.IConnectivityManager;
import android.net.NetworkStackClient;
import android.os.BaseBundle;
import android.os.Binder;
@@ -1307,7 +1306,6 @@ public final class SystemServer implements Dumpable {
VcnManagementService vcnManagement = null;
NetworkStatsService networkStats = null;
NetworkPolicyManagerService networkPolicy = null;
IConnectivityManager connectivity = null;
NsdService serviceDiscovery = null;
WindowManagerService wm = null;
SerialService serial = null;
@@ -1882,10 +1880,7 @@ public final class SystemServer implements Dumpable {
// services to initialize.
mSystemServiceManager.startServiceFromJar(CONNECTIVITY_SERVICE_INITIALIZER_CLASS,
CONNECTIVITY_SERVICE_APEX_PATH);
connectivity = IConnectivityManager.Stub.asInterface(
ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
// TODO: Use ConnectivityManager instead of ConnectivityService.
networkPolicy.bindConnectivityManager(connectivity);
networkPolicy.bindConnectivityManager();
t.traceEnd();
t.traceBegin("StartVpnManagerService");