From 47abda576e06612b8af7b80504fafdfc076aff2d Mon Sep 17 00:00:00 2001
From: Ricardo Garcia <rago@google.com>
Date: Thu, 16 Jul 2015 18:20:46 -0700
Subject: Fix for MidiManager bug

Returning null if MidiManager service can't be created instead
of crashing with NPE.

bug: 22087661
Change-Id: Ia27835ea1197af2db04c3e7f1d2e7c9f32fddbd0
---
 core/java/android/app/SystemServiceRegistry.java | 3 +++
 1 file changed, 3 insertions(+)

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));
             }});
 
-- 
cgit v1.2.3-59-g8ed1b