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 /core/java/android/app/ActivityManagerNative.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 'core/java/android/app/ActivityManagerNative.java')
| -rw-r--r-- | core/java/android/app/ActivityManagerNative.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index 05c009f..16b7c2a 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -89,11 +89,11 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM * Convenience for sending a sticky broadcast. For internal use only. * If you don't care about permission, use null. */ - static public void broadcastStickyIntent(Intent intent, String permission) { + static public void broadcastStickyIntent(Intent intent, String permission, int userId) { try { getDefault().broadcastIntent( null, intent, null, null, Activity.RESULT_OK, null, null, - null /*permission*/, false, true, Binder.getOrigCallingUser()); + null /*permission*/, false, true, userId); } catch (RemoteException ex) { } } |