diff options
| author | Amy Zhang <amyjojo@google.com> | 2020-05-07 17:50:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 17:50:52 +0000 |
| commit | 0309df17802c7040ee3d392870ade876a15ffae9 (patch) | |
| tree | 9f173b0c1439c064b1729deae8f5e9e9461253fc /services/java/com/android/server/SystemServer.java | |
| parent | 2b461fb1fe8238956552f8f544200dbea12c62c8 (diff) | |
| parent | 71f11a7ec5f087cf29f5a289be8266bd79820a07 (diff) | |
Merge "Start TunerResourceManager when FEATURE_TUNER is supported" into rvc-dev am: 71f11a7ec5
Change-Id: I70a1ddac77f1be879809c4a7b79be4c6e8b13b9f
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 96635b902fee..9daa018df284 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1885,6 +1885,10 @@ public final class SystemServer { || mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) { t.traceBegin("StartTvInputManager"); mSystemServiceManager.startService(TvInputManagerService.class); + t.traceEnd(); + } + + if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TUNER)) { t.traceBegin("StartTunerResourceManager"); mSystemServiceManager.startService(TunerResourceManagerService.class); t.traceEnd(); |