commit b588b30274fcdd3fe5953838cfa86f38b52f4944
author Antonio Cortes Perez <antoniocortes@google.com> Tue Mar 14 20:30:00 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 14 20:30:00 2017 +0000
tree bfc518a5bb31dea296adb349f78ba0c9472df191
parent 43b72d3cd877791e3d6bdc402998d5fe847bd830
parent 9db963a2178a46510c479500c46d00104996369d

Merge "Return all the layers when reporting subscription data"

service/src/com/android/car/CarAudioService.java

diff --git a/service/src/com/android/car/CarAudioService.java b/service/src/com/android/car/CarAudioService.java
index 2a70eef..29012da 100644
--- a/service/src/com/android/car/CarAudioService.java
+++ b/service/src/com/android/car/CarAudioService.java
@@ -1491,6 +1491,11 @@
     }
 
     private void checkCanStatus() {
+        if (mCanBusErrorNotifier == null) {
+            // TODO(b/36189057): create CanBusErrorNotifier from unit-tests and remove this code
+            return;
+        }
+
         // If CAN bus recovers, message will be removed.
         if (mNumConsecutiveHalFailures >= mNumConsecutiveHalFailuresForCanError) {
             mCanBusErrorNotifier.reportFailure(this);