diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 18:29:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 18:29:25 +0000 |
| commit | 2287879039556ad3c8fce58974e2396b4a2dab45 (patch) | |
| tree | fcf951e96ead62f6808fcddc3c05508ea1fdb6e3 /core/java | |
| parent | b43a7eefb75b2a6397d738055389567e1faa21d9 (diff) | |
| parent | 93f94c2ca5bf23533fc5a9bd70a4795584d20618 (diff) | |
| download | frameworks_base-2287879039556ad3c8fce58974e2396b4a2dab45.zip frameworks_base-2287879039556ad3c8fce58974e2396b4a2dab45.tar.gz frameworks_base-2287879039556ad3c8fce58974e2396b4a2dab45.tar.bz2 | |
am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index fdb992a..dc83802 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4751,6 +4751,10 @@ public class Activity extends ContextThemeWrapper * <p>You will receive this call immediately before onResume() when your * activity is re-starting. * + * <p>This method is never invoked if your activity sets + * {@link android.R.styleable#AndroidManifestActivity_noHistory noHistory} to + * <code>true</code>. + * * @param requestCode The integer request code originally supplied to * startActivityForResult(), allowing you to identify who this * result came from. diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index af6f181..7ce4d8d 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3535,6 +3535,10 @@ public class Intent implements Parcelable, Cloneable { * the user navigates away from it, the activity is finished. This may also * be set with the {@link android.R.styleable#AndroidManifestActivity_noHistory * noHistory} attribute. + * + * <p>If set, {@link android.app.Activity#onActivityResult onActivityResult()} + * is never invoked when the current activity starts a new activity which + * sets a result and finishes. */ public static final int FLAG_ACTIVITY_NO_HISTORY = 0x40000000; /** |