diff options
| author | Ricardo Garcia <rago@google.com> | 2015-07-16 18:20:46 -0700 |
|---|---|---|
| committer | Ricardo Garcia <rago@google.com> | 2015-07-16 18:20:46 -0700 |
| commit | 47abda576e06612b8af7b80504fafdfc076aff2d (patch) | |
| tree | ed04853ce2003b7a16c3da291d07024aaf5f2d50 /core/java/android/app/SystemServiceRegistry.java | |
| parent | e40d7a632668a3813a443195ba8e2146407a0517 (diff) | |
| download | frameworks_base-47abda576e06612b8af7b80504fafdfc076aff2d.zip frameworks_base-47abda576e06612b8af7b80504fafdfc076aff2d.tar.gz frameworks_base-47abda576e06612b8af7b80504fafdfc076aff2d.tar.bz2 | |
Fix for MidiManager bug
Returning null if MidiManager service can't be created instead
of crashing with NPE.
bug: 22087661
Change-Id: Ia27835ea1197af2db04c3e7f1d2e7c9f32fddbd0
Diffstat (limited to 'core/java/android/app/SystemServiceRegistry.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 10e8a53..01a1c18 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)); }}); |