summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-07-08 12:20:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-08 12:20:15 -0700
commit58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5 (patch)
tree1a461ea15f7ce231dd21238ce97e02fb617afef6 /services
parenta998fa2df957ad3f1c860d5ab8903041cf53a2f0 (diff)
parent57512008e2f9f1f04ff5a11b522533c753ed36fe (diff)
downloadframeworks_base-58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5.zip
frameworks_base-58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5.tar.gz
frameworks_base-58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5.tar.bz2
am 57512008: am 8f793103: Merge "Set foreground priority for shutdown receivers."
* commit '57512008e2f9f1f04ff5a11b522533c753ed36fe': 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 c7f7390..c084666 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;