summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-11-07 11:31:29 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-07 11:31:30 -0800
commit506fd3b02ef4b036aceb66db76ca93c55254bfcf (patch)
tree75733488a1ba55b7fc1b4de4d07954ef71c9f906 /packages
parent59d73ab6fcc80b9e08ff06cfc13617a2f65af60e (diff)
parentf55769fefaeda9b3892c44262ca328f36505b919 (diff)
downloadframeworks_base-506fd3b02ef4b036aceb66db76ca93c55254bfcf.zip
frameworks_base-506fd3b02ef4b036aceb66db76ca93c55254bfcf.tar.gz
frameworks_base-506fd3b02ef4b036aceb66db76ca93c55254bfcf.tar.bz2
Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/power/PowerUI.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
index 318448e..ccb711a 100644
--- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
+++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
@@ -30,6 +30,7 @@ import android.content.IntentFilter;
import android.net.Uri;
import android.os.BatteryManager;
import android.os.Handler;
+import android.os.UserHandle;
import android.media.AudioManager;
import android.media.Ringtone;
import android.media.RingtoneManager;
@@ -209,7 +210,7 @@ public class PowerUI extends SystemUI {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- mContext.startActivity(intent);
+ mContext.startActivityAsUser(intent, UserHandle.CURRENT);
dismissLowBatteryWarning();
}
});