commit | ef39ce87d3d0270348b0ada1d6dc0a2b91ad33d9 | [log] [tgz] |
---|---|---|
author | Steve Pfetsch <spfetsch@google.com> | Thu Jan 28 18:41:19 2016 -0800 |
committer | Steve Pfetsch <spfetsch@google.com> | Thu Jan 28 18:41:19 2016 -0800 |
tree | ee3aecaab4b8c48ad9632c6a81f2c455f86d6e3b | |
parent | f2580c5d057bb81f36628d9fcbdf576cecc69795 [diff] |
Fixed NullPointerException in SystemUI NullPointerException occurred on some devices during boot if no user listener is attached to MultiUserSwitch. Change-Id: Id6aabf81e0e982a4a6d88d78dcae639a7cbedee4
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java index 8717a15..03dd25e3c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
@@ -66,6 +66,9 @@ } public boolean hasMultipleUsers() { + if (mUserListener == null) { + return false; + } return mUserListener.getCount() != 0; }