summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-07-08 12:22:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-08 12:22:59 -0700
commit619682dfaefcc1b8a308924a283dfad160963684 (patch)
treea9853f962e2c6b071ed52c8b5066f1e680f4f217 /services
parent5bee57567b31305c8d43ec22b720f971331d734e (diff)
parent58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5 (diff)
downloadframeworks_base-619682dfaefcc1b8a308924a283dfad160963684.zip
frameworks_base-619682dfaefcc1b8a308924a283dfad160963684.tar.gz
frameworks_base-619682dfaefcc1b8a308924a283dfad160963684.tar.bz2
am 58d52298: am 57512008: am 8f793103: Merge "Set foreground priority for shutdown receivers."
* commit '58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5': Set foreground priority for shutdown receivers.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/power/ShutdownThread.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/power/ShutdownThread.java b/services/java/com/android/server/power/ShutdownThread.java
index ba321bc..88a27f5 100644
--- a/services/java/com/android/server/power/ShutdownThread.java
+++ b/services/java/com/android/server/power/ShutdownThread.java
@@ -297,7 +297,9 @@ public final class ShutdownThread extends Thread {
// First send the high-level shut down broadcast.
mActionDone = false;
- mContext.sendOrderedBroadcastAsUser(new Intent(Intent.ACTION_SHUTDOWN),
+ Intent intent = new Intent(Intent.ACTION_SHUTDOWN);
+ intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ mContext.sendOrderedBroadcastAsUser(intent,
UserHandle.ALL, null, br, mHandler, 0, null, null);
final long endTime = SystemClock.elapsedRealtime() + MAX_BROADCAST_TIME;