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

Commit 780b2603 authored by Tobias Haamel's avatar Tobias Haamel
Browse files

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

Bug description:
1) Start Car Dock app.
2) Drop phone into Desk Dock
3) Press back to quit Desk Dock app.

Car Dock Notification doesn't go away if I select it from the shade.

Change-Id: I9d3ad4dbbe8f886fc8d523d104676194c3943473
parent 24217d8e

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;

            }