diff options
| author | Andrii Kulian <akulian@google.com> | 2018-05-02 18:40:59 -0700 |
|---|---|---|
| committer | Andrii Kulian <akulian@google.com> | 2018-05-02 18:40:59 -0700 |
| commit | 770c4030691f11ca36ef0028a336a27eda2049ef (patch) | |
| tree | 62c26efc40ebf4c3caee6768c8e2df8d9f7efb2e /core/java/android/app/ClientTransactionHandler.java | |
| parent | 12f404e3e33c21a4f0d634698bef94c219ec48ab (diff) | |
Preserve custom activity intent on relaunch
An activity can have a custom intent set via Activity#setIntent().
This was lost in ag/3305584
Change-Id: I88f3e164d2cf7f6c62989bba05cd84b9b83befc3
Fixes: 73181785
Test: ActivityThreadTest#testCustomIntentPreservedOnRelaunch
Diffstat (limited to 'core/java/android/app/ClientTransactionHandler.java')
| -rw-r--r-- | core/java/android/app/ClientTransactionHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ClientTransactionHandler.java b/core/java/android/app/ClientTransactionHandler.java index ea0d703a30e3..d9c7cf3ccc74 100644 --- a/core/java/android/app/ClientTransactionHandler.java +++ b/core/java/android/app/ClientTransactionHandler.java @@ -18,6 +18,7 @@ package android.app; import android.app.servertransaction.ClientTransaction; import android.app.servertransaction.PendingTransactionActions; import android.app.servertransaction.TransactionExecutor; +import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; @@ -140,7 +141,7 @@ public abstract class ClientTransactionHandler { /** Perform activity launch. */ public abstract Activity handleLaunchActivity(ActivityThread.ActivityClientRecord r, - PendingTransactionActions pendingActions); + PendingTransactionActions pendingActions, Intent customIntent); /** Perform activity start. */ public abstract void handleStartActivity(ActivityThread.ActivityClientRecord r, |