Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d429ee4 authored by JianYang Liu's avatar JianYang Liu Committed by Jian-Yang Liu
Browse files

Changed NotificationViewController to be enabled when car service is 

ready.

Also moved the listener to be added at the end of connectNotificationsUI
when all other variables have been initialized.

Bug: 144583077
Test: Manual
Change-Id: I281fbdd833c23d8dc9d2430d8a6eaad7e4577c53
parent 07405663

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

+14 −14
Original line number Diff line number Diff line
@@ -560,13 +560,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
        });

        CarNotificationListener carNotificationListener = new CarNotificationListener();

        mCarUxRestrictionManagerWrapper = new CarUxRestrictionManagerWrapper();

        mCarServiceProvider.addListener(car -> {

            CarUxRestrictionsManager carUxRestrictionsManager =

                    (CarUxRestrictionsManager)

                            car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);

            mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(

                    carUxRestrictionsManager);

        });



        mNotificationDataManager = new NotificationDataManager();

        mNotificationDataManager.setOnUnseenCountUpdateListener(
@@ -681,6 +674,12 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                return handled || isTracking;

            }

        });

        mCarServiceProvider.addListener(car -> {

            CarUxRestrictionsManager carUxRestrictionsManager =

                    (CarUxRestrictionsManager)

                            car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);

            mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(

                    carUxRestrictionsManager);



                    mNotificationViewController = new NotificationViewController(

                            mNotificationView,
@@ -689,6 +688,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                            mCarUxRestrictionManagerWrapper,

                            mNotificationDataManager);

                    mNotificationViewController.enable();

        });

    }



    /**