diff options
| author | Ricardo Garcia <rago@google.com> | 2015-07-20 18:03:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-20 18:03:45 +0000 |
| commit | 2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5 (patch) | |
| tree | 8f04699d72559a2565a875aebf8c40a4d7800d8d /core/java | |
| parent | 072e04a7f1a167dc653b5bcca4876fecfdb4f6be (diff) | |
| parent | 47abda576e06612b8af7b80504fafdfc076aff2d (diff) | |
Merge "Fix for MidiManager bug" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 10e8a535014b..01a1c18b99a2 100644 --- 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)); }}); |