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

Commit f0f7eb06 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue 2512221: Car Dock Notification doesn't go away"

parents f3c755a0 780b2603

services/java/com/android/server/UiModeManagerService.java

+1 −4
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ class UiModeManagerService extends IUiModeManager.Stub { 
            String action = null;

            String oldAction = null;

            if (mLastBroadcastState == Intent.EXTRA_DOCK_STATE_CAR) {

                adjustStatusBarCarModeLocked();

                oldAction = UiModeManager.ACTION_EXIT_CAR_MODE;

            } else if (mLastBroadcastState == Intent.EXTRA_DOCK_STATE_DESK) {

                oldAction = UiModeManager.ACTION_EXIT_DESK_MODE;
@@ -447,10 +448,6 @@ class UiModeManagerService extends IUiModeManager.Stub { 
                    action = UiModeManager.ACTION_ENTER_DESK_MODE;

                }

            } else {

                if (mLastBroadcastState == Intent.EXTRA_DOCK_STATE_CAR) {

                    adjustStatusBarCarModeLocked();

                }



                mLastBroadcastState = Intent.EXTRA_DOCK_STATE_UNDOCKED;

                action = oldAction;

            }