diff options
| -rw-r--r-- | core/jni/Android.bp | 1 | ||||
| -rw-r--r-- | core/jni/android_os_GraphicsEnvironment.cpp | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index abd6278b056a..c5279e10d93f 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -231,6 +231,7 @@ cc_library_shared { "libutils", "libbinder", "libui", + "libgraphicsenv", "libgui", "libsensor", "libinput", diff --git a/core/jni/android_os_GraphicsEnvironment.cpp b/core/jni/android_os_GraphicsEnvironment.cpp index 399dec8fc9cf..f749488f39b0 100644 --- a/core/jni/android_os_GraphicsEnvironment.cpp +++ b/core/jni/android_os_GraphicsEnvironment.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "GraphicsEnvironment" -#include <ui/GraphicsEnv.h> +#include <graphicsenv/GraphicsEnv.h> #include <nativehelper/ScopedUtfChars.h> #include "core_jni_helpers.h" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index f58fe8290a43..55498af7a54b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4486,7 +4486,7 @@ public class StatusBar extends SystemUI implements DemoMode, animateCollapsePanels(); return true; } - if (mKeyguardUserSwitcher.hideIfNotSimple(true)) { + if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) { return true; } return false; |