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

* commit 'eaffad37c19ac5859539c232a7dc8d2f47159f61': Fix NPE in Dreams settings.
2012-08-09 06:20:50 -07:00
parent 8aa634529c eaffad37c1
commit aeb7b57105
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;
        }