From 4cc92f87cb7d277df6274b273750461b1287193b Mon Sep 17 00:00:00 2001 From: Jin Seok Park Date: Tue, 4 Aug 2020 00:19:07 +0900 Subject: [PATCH] [Media ML] Remove hidden API usage in SystemServer Replace calling MediaSessionService and MediaResourceMonitorService directly with calling string equivalents. Bug: 162734094 Test: build, boot and check service is running with adb command: "adb shell service list" Change-Id: I243b1dbeabcfeadd8927de51cd595fceb48d461b --- services/java/com/android/server/SystemServer.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index ae6ccda71558a..30725e98b6838 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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; @@ -311,6 +309,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"; @@ -1886,7 +1888,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)) { @@ -1910,7 +1912,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(); }