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

Commit 679825e9 authored by Jin Seok Park's avatar Jin Seok Park Committed by Android (Google) Code Review
Browse files

Merge "[Media ML] Remove hidden API usage in SystemServer"

parents 10f5c227 4cc92f87

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

+6 −4
Original line number Diff line number Diff line
@@ -121,9 +121,7 @@ import com.android.server.inputmethod.MultiClientInputMethodManagerService; 
import com.android.server.integrity.AppIntegrityManagerService;

import com.android.server.lights.LightsService;

import com.android.server.location.LocationManagerService;

import com.android.server.media.MediaResourceMonitorService;

import com.android.server.media.MediaRouterService;

import com.android.server.media.MediaSessionService;

import com.android.server.media.projection.MediaProjectionManagerService;

import com.android.server.net.NetworkPolicyManagerService;

import com.android.server.net.NetworkStatsService;
@@ -312,6 +310,10 @@ public final class SystemServer { 
            "com.android.server.rollback.RollbackManagerService";

    private static final String ALARM_MANAGER_SERVICE_CLASS =

            "com.android.server.alarm.AlarmManagerService";

    private static final String MEDIA_SESSION_SERVICE_CLASS =

            "com.android.server.media.MediaSessionService";

    private static final String MEDIA_RESOURCE_MONITOR_SERVICE_CLASS =

            "com.android.server.media.MediaResourceMonitorService";



    private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";
@@ -1893,7 +1895,7 @@ public final class SystemServer { 
            t.traceEnd();



            t.traceBegin("StartMediaSessionService");

            mSystemServiceManager.startService(MediaSessionService.class);

            mSystemServiceManager.startService(MEDIA_SESSION_SERVICE_CLASS);

            t.traceEnd();



            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_HDMI_CEC)) {
@@ -1917,7 +1919,7 @@ public final class SystemServer { 


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

                t.traceBegin("StartMediaResourceMonitor");

                mSystemServiceManager.startService(MediaResourceMonitorService.class);

                mSystemServiceManager.startService(MEDIA_RESOURCE_MONITOR_SERVICE_CLASS);

                t.traceEnd();

            }