diff options
| author | Christopher Tate <ctate@google.com> | 2012-06-14 17:37:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-14 17:37:05 -0700 |
| commit | 5eed873f1076b685d3a8538894a49f29f85d1189 (patch) | |
| tree | 2babeec489a03fc1bc55257bfacf75bd0f777368 /services/java/com/android/server/PowerManagerService.java | |
| parent | 42fb511f1b5dd399bda3cd9fb3896bfe428a7837 (diff) | |
| parent | 7661bc6c5afef4cca8ccee2f859906f8fb64087b (diff) | |
am 7661bc6c: Merge "Run the screen on/off broadcasts at foreground priority" into jb-dev
* commit '7661bc6c5afef4cca8ccee2f859906f8fb64087b':
Run the screen on/off broadcasts at foreground priority
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 3bf08a782a8a..e9fbd3a480bc 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -618,9 +618,11 @@ public class PowerManagerService extends IPowerManager.Stub PowerManager.PARTIAL_WAKE_LOCK, "Proximity Partial", false); mScreenOnIntent = new Intent(Intent.ACTION_SCREEN_ON); - mScreenOnIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); + mScreenOnIntent.addFlags( + Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND); mScreenOffIntent = new Intent(Intent.ACTION_SCREEN_OFF); - mScreenOffIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); + mScreenOffIntent.addFlags( + Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND); Resources resources = mContext.getResources(); |