diff options
| author | markchien <markchien@google.com> | 2019-11-30 04:31:28 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-30 04:31:28 -0800 |
| commit | 146e4976bf2413fd0002358cb9cad65512e447be (patch) | |
| tree | 1543aeb31cc806ee8340f76d1bf8f13e1b3c7ad6 /services/java/com | |
| parent | 463265c0345edf1db7f7098c1f071dacd7a23b86 (diff) | |
| parent | 6b828d2915b63ecc83b8237b44feb50b25762009 (diff) | |
[Tether07] Migrate Tethering into module am: 0df2ebc43d
am: 6b828d2915
Change-Id: I6e71b418b7303d37144532ab056c21ccbefcb554
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 1c6496026e39..f575c8ae8623 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -42,6 +42,7 @@ import android.hardware.display.DisplayManagerInternal; import android.net.ConnectivityModuleConnector; import android.net.Network; import android.net.NetworkStackClient; +import android.net.TetheringManager; import android.os.BaseBundle; import android.os.Binder; import android.os.Build; @@ -2187,6 +2188,15 @@ public final class SystemServer { } traceEnd(); + traceBeginAndSlog("StartTethering"); + try { + // Tethering must start after ConnectivityService and NetworkStack. + TetheringManager.getInstance().start(); + } catch (Throwable e) { + reportWtf("starting Tethering", e); + } + traceEnd(); + traceBeginAndSlog("MakeLocationServiceReady"); try { if (locationF != null) { |