commit 6f784e35d68260848796b8e77bb00afba2846aca
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 18 04:30:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 18 04:30:34 2018 +0000
tree 3c9180baba3293e7b548a295f302e6abb75a1860
parent 2ea0a750b6d522c669110e43ff91bfee7f5081dc
parent ef8f3945a38a58cb9d54a9f4cc27c5236635d904

Merge "Check that mDrivingStateManager is not null."

packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java

diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java
index 730c3e3..a442426 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java
@@ -52,6 +52,9 @@
      * is idling or moving, {@code false} otherwise.
      */
     public boolean isCurrentlyDriving() {
+        if (mDrivingStateManager == null) {
+            return false;
+        }
         try {
             CarDrivingStateEvent currentState = mDrivingStateManager.getCurrentCarDrivingState();
             if (currentState != null) {