diff options
| author | Junyu Lai <junyulai@google.com> | 2021-03-06 05:38:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-06 05:38:02 +0000 |
| commit | 50a13c982ff03ba78a3bafc13de8fe3e1dd4e0ec (patch) | |
| tree | d58a68c738ebd32439974b2710d78b744df4de04 /services/java/com/android/server/SystemServer.java | |
| parent | a57b0042feb8c3eda566540804f5cba96ff31b6f (diff) | |
| parent | 26d42f094a74b6e91eb5b382aaa12f78a3698bfb (diff) | |
Merge changes I6512d3f7,I99bca71c am: eccbfe4b72 am: 26d42f094a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614984
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c3af48a7dee4ff3261310d2a04c8c67f8d3dc22
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 18c7e128b04e..a6a99f232ef4 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -51,7 +51,6 @@ import android.graphics.GraphicsStatsService; 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; @@ -1107,7 +1106,6 @@ public final class SystemServer { VcnManagementService vcnManagement = null; NetworkStatsService networkStats = null; NetworkPolicyManagerService networkPolicy = null; - IConnectivityManager connectivity = null; NsdService serviceDiscovery = null; WindowManagerService wm = null; SerialService serial = null; @@ -1631,10 +1629,7 @@ public final class SystemServer { // 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"); |