Fix issue #6426645: API REVIEW: android.app.ActivityOptions

Change-Id: If2f7b987e1825a8b0ebaf2c499924dfc1527274b

1 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index 423b02a8ddaf..b73058140bd9 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;
         }