diff options
| author | Craig Mautner <cmautner@google.com> | 2014-05-09 17:05:11 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-05-13 09:51:50 -0700 |
| commit | 233ceeebab7efe6ad4783371003c4cf29b896436 (patch) | |
| tree | 0e342913f30ebd922a3b4313bad0ece303c78e68 /core/java/android/app/Instrumentation.java | |
| parent | e4f1960652a50b99100f7ff68ed461524ca2b9f1 (diff) | |
| download | frameworks_base-233ceeebab7efe6ad4783371003c4cf29b896436.zip frameworks_base-233ceeebab7efe6ad4783371003c4cf29b896436.tar.gz frameworks_base-233ceeebab7efe6ad4783371003c4cf29b896436.tar.bz2 | |
Pass ActivityOptions back from finishing activity.
Adding an ActivityOptions parameter to convertToTranslucent provides
a mechanism for delivering these options to the activity that
launched the one that is returning.
Fixes bug 13032208.
Fixes bug 14469460.
Fixes bug 14597427.
Change-Id: I4115dd3c69de9d175f6df0498a6e964fca5eca29
Diffstat (limited to 'core/java/android/app/Instrumentation.java')
| -rw-r--r-- | core/java/android/app/Instrumentation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index bb3e002..b78b9c9 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1036,10 +1036,10 @@ public class Instrumentation { IllegalAccessException { Activity activity = (Activity)clazz.newInstance(); ActivityThread aThread = null; - activity.attach(context, aThread, this, token, application, intent, + activity.attach(context, aThread, this, token, 0, application, intent, info, title, parent, id, (Activity.NonConfigurationInstances)lastNonConfigurationInstance, - new Configuration()); + new Configuration(), null); return activity; } |