Merge "Fix NPE in Dreams settings." into jb-mr1-dev

2012-08-09 06:18:45 -07:00
parent 702cdf4c9a 7a99b21a4b
commit eaffad37c1
1 changed files with 3 additions and 1 deletions
--- 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;
        }