diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:36:28 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:36:32 -0700 |
| commit | 7951c459aefeb012638477b762e19b792ecbe009 (patch) | |
| tree | 7a9625e8186f9e040a2daa3121f4189feb1685ac /core/java/android/app/IActivityManager.java | |
| parent | a5e1d21f566c8df750d766c76f6a99432a703c5e (diff) | |
| parent | ea7e91514ee1968d15713e82a5cca745e2c46a05 (diff) | |
| download | frameworks_base-7951c459aefeb012638477b762e19b792ecbe009.zip frameworks_base-7951c459aefeb012638477b762e19b792ecbe009.tar.gz frameworks_base-7951c459aefeb012638477b762e19b792ecbe009.tar.bz2 | |
Merge into jb-mr1-dev
Change-Id: Ifc2328e30a52c2baebc1322c9b161104dcf21618
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
| -rw-r--r-- | core/java/android/app/IActivityManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index 2b2679e..9454636 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -311,7 +311,7 @@ public interface IActivityManager extends IInterface { public int startActivities(IApplicationThread caller, Intent[] intents, String[] resolvedTypes, IBinder resultTo, - Bundle options) throws RemoteException; + Bundle options, int userId) throws RemoteException; public int getFrontActivityScreenCompatMode() throws RemoteException; public void setFrontActivityScreenCompatMode(int mode) throws RemoteException; |