diff options
| author | Siva Velusamy <vsiva@google.com> | 2012-03-12 18:10:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-12 18:10:36 -0700 |
| commit | 4faaed97ab331b322afeef8055d740dc7673e1b2 (patch) | |
| tree | 21ad27fdbb17b14f2489c2ad2543849ed05f79f5 /core/java/android/app/Activity.java | |
| parent | b48e0291078e3a7052513572cfb2b19318f6c08c (diff) | |
| parent | 92a8b22e7410e74e1cba1b856333116652af8a5c (diff) | |
Merge "ActivityManager: add option to allow OpenGL trace."
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 599487dc8781..0f2aa4608f6f 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -3388,17 +3388,16 @@ public class Activity extends ContextThemeWrapper intent.setAllowFds(false); result = ActivityManagerNative.getDefault() .startActivity(mMainThread.getApplicationThread(), - intent, intent.resolveTypeIfNeeded( - getContentResolver()), + intent, intent.resolveTypeIfNeeded(getContentResolver()), null, 0, - mToken, mEmbeddedID, requestCode, true, false, - null, null, false); + mToken, mEmbeddedID, requestCode, true /* onlyIfNeeded */, + false, false, null, null, false); } catch (RemoteException e) { // Empty } - + Instrumentation.checkStartActivityResult(result, intent); - + if (requestCode >= 0) { // If this start is requesting a result, we can avoid making // the activity visible until the result is received. Setting |