commit b8d760d3f4a782a6707f7475b12498dcbcd8e314
author Jian-Yang Liu <jianyliu@google.com> Mon Nov 18 13:05:19 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 18 13:05:19 2019 -0800
tree 2a4b35b647ca7dcf3cb95b4f572ea131f1750e6a
parent f08074d6ece8ab1054c0df02915f8cdf91c3d104
parent 17eb45ab54de2d4c277299d3d84e3d93a58e3360

Merge "Changed NotificationViewController to be enabled when car service is ready." into qt-qpr1-dev
am: 17eb45ab54

Change-Id: I44b59d35c8afb2be59755f14d0a0a0fa09ab9431

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

diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
index 164eeb3..be675d3 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -544,17 +544,6 @@
 
         CarNotificationListener carNotificationListener = new CarNotificationListener();
         mCarUxRestrictionManagerWrapper = new CarUxRestrictionManagerWrapper();
-        ((CarSystemUIFactory) SystemUIFactory.getInstance()).getCarServiceProvider(mContext)
-                .addListener((car, ready) -> {
-                    if (!ready) {
-                        return;
-                    }
-                    CarUxRestrictionsManager carUxRestrictionsManager =
-                            (CarUxRestrictionsManager)
-                                    car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
-                    mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
-                            carUxRestrictionsManager);
-                });
 
         mNotificationDataManager = new NotificationDataManager();
         mNotificationDataManager.setOnUnseenCountUpdateListener(
@@ -678,14 +667,25 @@
                 return handled || isTracking;
             }
         });
+        ((CarSystemUIFactory) SystemUIFactory.getInstance()).getCarServiceProvider(mContext)
+                .addListener((car, ready) -> {
+                    if (!ready) {
+                        return;
+                    }
+                    CarUxRestrictionsManager carUxRestrictionsManager =
+                            (CarUxRestrictionsManager)
+                                    car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
+                    mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
+                            carUxRestrictionsManager);
 
-        mNotificationViewController = new NotificationViewController(
-                mNotificationView,
-                PreprocessingManager.getInstance(mContext),
-                carNotificationListener,
-                mCarUxRestrictionManagerWrapper,
-                mNotificationDataManager);
-        mNotificationViewController.enable();
+                    mNotificationViewController = new NotificationViewController(
+                            mNotificationView,
+                            PreprocessingManager.getInstance(mContext),
+                            carNotificationListener,
+                            mCarUxRestrictionManagerWrapper,
+                            mNotificationDataManager);
+                    mNotificationViewController.enable();
+                });
     }
 
     /**