diff options
| author | Junyu Lai <junyulai@google.com> | 2021-03-06 06:25:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-06 06:25:54 +0000 |
| commit | 6a6166072986e3d006d755687f03aeb694ebd279 (patch) | |
| tree | 1aeb63a7c023e1d316d12343022046ae444c36da /services/java/com/android/server/SystemServer.java | |
| parent | 1ac9e246c4e79b6819bffa4b798fc871cb8688eb (diff) | |
| parent | 50a13c982ff03ba78a3bafc13de8fe3e1dd4e0ec (diff) | |
Merge changes I6512d3f7,I99bca71c am: eccbfe4b72 am: 26d42f094a am: 50a13c982f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614984
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I57c4dffd22338d850beaff7b2575204ee2a42cd9
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 a3d335340e9f..5fbf1c4e1f40 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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"); |