am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit '2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5': Fix for MidiManager bug
2015-07-20 18:47:21 +00:00
parent dd0602e89d 2dcfc7a997
commit 238f03c9b3
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -691,6 +691,9 @@ final class SystemServiceRegistry {
            @Override
            public MidiManager createService(ContextImpl ctx) {
                IBinder b = ServiceManager.getService(Context.MIDI_SERVICE);
+                if (b == null) {
+                    return null;
+                }
                return new MidiManager(IMidiManager.Stub.asInterface(b));
            }});