summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/ContextWrapper.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-25 09:36:28 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-09-25 09:36:32 -0700
commit7951c459aefeb012638477b762e19b792ecbe009 (patch)
tree7a9625e8186f9e040a2daa3121f4189feb1685ac /core/java/android/content/ContextWrapper.java
parenta5e1d21f566c8df750d766c76f6a99432a703c5e (diff)
parentea7e91514ee1968d15713e82a5cca745e2c46a05 (diff)
downloadframeworks_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/content/ContextWrapper.java')
-rw-r--r--core/java/android/content/ContextWrapper.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index d824f1e..84ad667 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -311,6 +311,12 @@ public class ContextWrapper extends Context {
mBase.startActivities(intents, options);
}
+ /** @hide */
+ @Override
+ public void startActivitiesAsUser(Intent[] intents, Bundle options, UserHandle userHandle) {
+ mBase.startActivitiesAsUser(intents, options, userHandle);
+ }
+
@Override
public void startIntentSender(IntentSender intent,
Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags)