From: John Spurlock <jspurlock@google.com>
Date: Thu, 9 Aug 2012 13:03:48 +0000 (-0400)
Subject: Fix NPE in Dreams settings.
X-Git-Tag: android-x86-4.4-r1~634^2~3^2~295^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7a99b21a4b4d18d65110e1835eb8529ceeaa91cf;p=android-x86%2Fpackages-apps-Settings.git

Fix NPE in Dreams settings.

Handle the null case to avoid crashing Settings.

Change-Id: I257b766370bd604e0af5b332241619258fb732c9
---

diff --git a/src/com/android/settings/DreamComponentPreference.java b/src/com/android/settings/DreamComponentPreference.java
index 2114dd153e..1b70db1ff9 100644
--- a/src/com/android/settings/DreamComponentPreference.java
+++ b/src/com/android/settings/DreamComponentPreference.java
@@ -80,7 +80,9 @@ public class DreamComponentPreference extends Preference {
                 ServiceManager.getService("dreams"));
         try {
             cn = dm.getDreamComponent();
-        } catch (RemoteException ex) {
+        } catch (RemoteException ex) { }
+
+        if (cn == null) {
             setSummary("(unknown)");
             return;
         }