Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bae6f00 authored by Amy Zhang's avatar Amy Zhang Committed by Automerger Merge Worker
Browse files

Merge "Start TunerResourceManager when FEATURE_TUNER is supported" into... 

Merge "Start TunerResourceManager when FEATURE_TUNER is supported" into rvc-dev am: 71f11a7e am: c1d37660

Change-Id: I3fbb294dccc4e2e25d01d78757665ce00b816263
parents ad02f277 c1d37660

services/java/com/android/server/SystemServer.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -1891,6 +1891,10 @@ public final class SystemServer { 
                    || mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {

                    || mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {

                t.traceBegin("StartTvInputManager");

                t.traceBegin("StartTvInputManager");

                mSystemServiceManager.startService(TvInputManagerService.class);

                mSystemServiceManager.startService(TvInputManagerService.class);

                t.traceEnd();

            }



            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TUNER)) {

                t.traceBegin("StartTunerResourceManager");

                t.traceBegin("StartTunerResourceManager");

                mSystemServiceManager.startService(TunerResourceManagerService.class);

                mSystemServiceManager.startService(TunerResourceManagerService.class);

                t.traceEnd();

                t.traceEnd();