summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-08-09 09:03:48 -0400
committerJohn Spurlock <jspurlock@google.com>2012-08-09 09:03:48 -0400
commit7a99b21a4b4d18d65110e1835eb8529ceeaa91cf (patch)
tree3210ab80795bd647163b819ad3feda65afc63c7b /src/com/android
parenta1f463cb1930e806420844d4915def2dcfe7ae72 (diff)
downloadpackages_apps_settings-7a99b21a4b4d18d65110e1835eb8529ceeaa91cf.zip
packages_apps_settings-7a99b21a4b4d18d65110e1835eb8529ceeaa91cf.tar.gz
packages_apps_settings-7a99b21a4b4d18d65110e1835eb8529ceeaa91cf.tar.bz2
Fix NPE in Dreams settings.
Handle the null case to avoid crashing Settings. Change-Id: I257b766370bd604e0af5b332241619258fb732c9
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/DreamComponentPreference.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/DreamComponentPreference.java b/src/com/android/settings/DreamComponentPreference.java
index 2114dd1..1b70db1 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;
}