Merge "Initial round of MediaSession APIs"

This commit is contained in:
RoboErik
2014-02-20 00:25:10 +00:00
committed by Android (Google) Code Review
20 changed files with 1503 additions and 108 deletions

View File

@ -62,6 +62,7 @@ import com.android.server.input.InputManagerService;
import com.android.server.lights.LightsManager;
import com.android.server.lights.LightsService;
import com.android.server.media.MediaRouterService;
import com.android.server.media.MediaSessionService;
import com.android.server.net.NetworkPolicyManagerService;
import com.android.server.net.NetworkStatsService;
import com.android.server.notification.NotificationManagerService;
@ -881,6 +882,13 @@ public final class SystemServer {
reportWtf("starting Print Service", e);
}
try {
Slog.i(TAG, "MediaSessionService");
mSystemServiceManager.startService(MediaSessionService.class);
} catch (Throwable e) {
reportWtf("starting MediaSessionService", e);
}
if (!disableNonCoreServices) {
try {
Slog.i(TAG, "Media Router Service");