diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-08-30 14:56:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-30 14:56:11 -0700 |
| commit | 73365695e4d169126c6932df8e8e932aefe6aaca (patch) | |
| tree | 28bf999c15a738287a7d8aac3e3cb7951848107c /services/java/com/android/server/power/ShutdownThread.java | |
| parent | d02239d1c05054e4a1e06009410a933a45c24d3e (diff) | |
| parent | 5ac72a29593ab9a20337a2225df52bdf4754be02 (diff) | |
| download | frameworks_base-73365695e4d169126c6932df8e8e932aefe6aaca.zip frameworks_base-73365695e4d169126c6932df8e8e932aefe6aaca.tar.gz frameworks_base-73365695e4d169126c6932df8e8e932aefe6aaca.tar.bz2 | |
Merge "Improve multi-user broadcasts." into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server/power/ShutdownThread.java')
| -rw-r--r-- | services/java/com/android/server/power/ShutdownThread.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/power/ShutdownThread.java b/services/java/com/android/server/power/ShutdownThread.java index a3770d7..c7f7390 100644 --- a/services/java/com/android/server/power/ShutdownThread.java +++ b/services/java/com/android/server/power/ShutdownThread.java @@ -37,6 +37,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; import android.os.SystemProperties; +import android.os.UserHandle; import android.os.Vibrator; import android.os.SystemVibrator; import android.os.storage.IMountService; @@ -296,8 +297,8 @@ public final class ShutdownThread extends Thread { // First send the high-level shut down broadcast. mActionDone = false; - mContext.sendOrderedBroadcast(new Intent(Intent.ACTION_SHUTDOWN), null, - br, mHandler, 0, null, null); + mContext.sendOrderedBroadcastAsUser(new Intent(Intent.ACTION_SHUTDOWN), + UserHandle.ALL, null, br, mHandler, 0, null, null); final long endTime = SystemClock.elapsedRealtime() + MAX_BROADCAST_TIME; synchronized (mActionDoneSync) { |