summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Haamel <haamel@google.com>2010-03-15 12:54:45 +0100
committerTobias Haamel <haamel@google.com>2010-03-15 13:07:18 +0100
commit780b2603041a56800ff6e49fb14535c1b1ca8907 (patch)
tree4029c518d204d04b79f2cb0227983de1b6f22ee0
parent24217d8e4dad2a99d7db6f51e89945421a6e7da8 (diff)
downloadframeworks_base-780b2603041a56800ff6e49fb14535c1b1ca8907.zip
frameworks_base-780b2603041a56800ff6e49fb14535c1b1ca8907.tar.gz
frameworks_base-780b2603041a56800ff6e49fb14535c1b1ca8907.tar.bz2
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
-rw-r--r--services/java/com/android/server/UiModeManagerService.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/services/java/com/android/server/UiModeManagerService.java b/services/java/com/android/server/UiModeManagerService.java
index 84790ca..37a3cdf 100644
--- a/services/java/com/android/server/UiModeManagerService.java
+++ b/services/java/com/android/server/UiModeManagerService.java
@@ -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;
}