summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-12-01 13:54:59 -0800
committerMike Lockwood <lockwood@google.com>2014-12-08 10:45:37 -0800
commit67f8e8bd8927f24147d7a1edd6ec3db1a54233b2 (patch)
tree9f559cd794ceeb33e8b1a92bbdfcfe0937602c2c /services/java
parent0927c43c38c2ef12e8b15490adf0d5d3796c39b7 (diff)
downloadframeworks_base-67f8e8bd8927f24147d7a1edd6ec3db1a54233b2.zip
frameworks_base-67f8e8bd8927f24147d7a1edd6ec3db1a54233b2.tar.gz
frameworks_base-67f8e8bd8927f24147d7a1edd6ec3db1a54233b2.tar.bz2
MIDI Manager work in progress
Still to do: Add MidiInputPort and MidiOutputPort classes Schedule sending MIDI events in the future Security/permissions Reconsider interface for virtual devices Look into performance optimizations Change-Id: I9b7d63b196996a04be0a830efa913043da1328a8
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 0ccb25c..db60866 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -74,6 +74,7 @@ import com.android.server.lights.LightsService;
import com.android.server.media.MediaRouterService;
import com.android.server.media.MediaSessionService;
import com.android.server.media.projection.MediaProjectionManagerService;
+import com.android.server.midi.MidiService;
import com.android.server.net.NetworkPolicyManagerService;
import com.android.server.net.NetworkStatsService;
import com.android.server.notification.NotificationManagerService;
@@ -410,6 +411,7 @@ public final class SystemServer {
AudioService audioService = null;
MmsServiceBroker mmsService = null;
EntropyMixer entropyMixer = null;
+ MidiService midiService = null;
boolean disableStorage = SystemProperties.getBoolean("config.disable_storage", false);
boolean disableMedia = SystemProperties.getBoolean("config.disable_media", false);
@@ -521,6 +523,7 @@ public final class SystemServer {
LockSettingsService lockSettings = null;
AssetAtlasService atlas = null;
MediaRouterService mediaRouter = null;
+ MidiService midi = null;
// Bring up services needed for UI.
if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) {
@@ -827,6 +830,16 @@ public final class SystemServer {
}
}
+ if (!disableNonCoreServices) {
+ try {
+ Slog.i(TAG, "MIDI Service");
+ ServiceManager.addService(Context.MIDI_SERVICE,
+ new MidiService(context));
+ } catch (Throwable e) {
+ reportWtf("starting MIDI Service", e);
+ }
+ }
+
mSystemServiceManager.startService(TwilightService.class);
mSystemServiceManager.startService(UiModeManagerService.class);