summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-01-05 21:09:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-05 21:09:05 +0000
commitb142b7552a6245606d93c43ce56ce81c700b3c09 (patch)
tree9002c093ddf3cf8702ffdff0c2c1f29dc6e98f73 /packages/SystemUI/src
parent22a3163f1da8387e42c68c459f5667ac10744a3c (diff)
parent85eec267dd0c67774e2482a615a36313b4389fb8 (diff)
downloadframeworks_base-b142b7552a6245606d93c43ce56ce81c700b3c09.zip
frameworks_base-b142b7552a6245606d93c43ce56ce81c700b3c09.tar.gz
frameworks_base-b142b7552a6245606d93c43ce56ce81c700b3c09.tar.bz2
Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
index 479c982..dc6af6a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
@@ -125,7 +125,7 @@ public class AccessPointControllerImpl implements NetworkController.AccessPointC
Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
intent.putExtra(EXTRA_START_CONNECT_SSID, ap.ssid);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mContext.startActivity(intent);
+ mContext.startActivityAsUser(intent, new UserHandle(mCurrentUser));
return true;
} else {
WifiConfiguration config = new WifiConfiguration();