diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-03 19:40:12 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-05-04 12:04:40 -0700 |
| commit | ddc52a80b5280d4a67180a6caae8c7dead00157f (patch) | |
| tree | 7a1ccad81e4d47eabb4ab9ce0c35b149a0e1b7a1 /core/java/android/app | |
| parent | a2c213080d26c08235f11829fb2bbcf07cdfdd46 (diff) | |
| download | frameworks_base-ddc52a80b5280d4a67180a6caae8c7dead00157f.zip frameworks_base-ddc52a80b5280d4a67180a6caae8c7dead00157f.tar.gz frameworks_base-ddc52a80b5280d4a67180a6caae8c7dead00157f.tar.bz2 | |
Fix issue #6426645: API REVIEW: android.app.ActivityOptions
Change-Id: If2f7b987e1825a8b0ebaf2c499924dfc1527274b
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 423b02a..b730581 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -325,10 +325,11 @@ public class ActivityOptions { } /** - * Join the values in <var>otherOptions</var> in to this one. Any values + * Update the current values in this ActivityOptions from those supplied + * in <var>otherOptions</var>. Any values * defined in <var>otherOptions</var> replace those in the base options. */ - public void join(ActivityOptions otherOptions) { + public void update(ActivityOptions otherOptions) { if (otherOptions.mPackageName != null) { mPackageName = otherOptions.mPackageName; } |