summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-10-01 17:46:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-01 17:46:27 -0700
commit3750db176adbaf3f9779df5eadf335f673b2ac4f (patch)
treec3dc41f075caedc0f858fb5dfa0c743ef8b37327 /packages/SystemUI
parent6f354ed9994b4ea7612cc4499413de108dcac7d4 (diff)
parent38389b6cf7bd2ef49d2bd20ff1bca8677596590e (diff)
downloadframeworks_base-3750db176adbaf3f9779df5eadf335f673b2ac4f.zip
frameworks_base-3750db176adbaf3f9779df5eadf335f673b2ac4f.tar.gz
frameworks_base-3750db176adbaf3f9779df5eadf335f673b2ac4f.tar.bz2
Merge "Route GPS notifications to all users." into jb-mr1-dev
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java
index f864d04..776cf36 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java
@@ -97,7 +97,6 @@ public class LocationController extends BroadcastReceiver {
}
try {
- // XXX WHAT TO DO ABOUT MULTI-USER?
if (visible) {
Intent gpsIntent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
gpsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -126,7 +125,7 @@ public class LocationController extends BroadcastReceiver {
GPS_NOTIFICATION_ID,
n,
idOut,
- UserHandle.USER_CURRENT);
+ UserHandle.USER_ALL);
for (LocationGpsStateChangeCallback cb : mChangeCallbacks) {
cb.onLocationGpsStateChanged(true, text);
@@ -134,7 +133,7 @@ public class LocationController extends BroadcastReceiver {
} else {
mNotificationService.cancelNotificationWithTag(
mContext.getPackageName(), null,
- GPS_NOTIFICATION_ID, UserHandle.USER_CURRENT);
+ GPS_NOTIFICATION_ID, UserHandle.USER_ALL);
for (LocationGpsStateChangeCallback cb : mChangeCallbacks) {
cb.onLocationGpsStateChanged(false, null);