diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 09:54:30 -0800 |
|---|---|---|
| committer | Ricardo Cervera <rcervera@google.com> | 2015-01-16 09:54:30 -0800 |
| commit | 93f94c2ca5bf23533fc5a9bd70a4795584d20618 (patch) | |
| tree | 764f2c6ad28b9199ead3d09efa230b30701fd3eb /core | |
| parent | 3212c3aa226f8cc7cf54e72772a001906fd4d7c3 (diff) | |
| parent | e8f6bd484627e16fa2fd9509b0f06056ee44be94 (diff) | |
| download | frameworks_base-93f94c2ca5bf23533fc5a9bd70a4795584d20618.zip frameworks_base-93f94c2ca5bf23533fc5a9bd70a4795584d20618.tar.gz frameworks_base-93f94c2ca5bf23533fc5a9bd70a4795584d20618.tar.bz2 | |
resolved conflicts for merge of e8f6bd48 to lmp-dev
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
Diffstat (limited to 'core')
| -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 4b705dd..48dd584 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; /** |