summaryrefslogtreecommitdiff
path: root/core/java/android/app/ClientTransactionHandler.java
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2018-03-29 16:07:11 -0700
committerAndrii Kulian <akulian@google.com>2018-03-29 17:00:05 -0700
commitd9e2acba96ed59c40de15b37e813e1369d9e5169 (patch)
tree7888efa37c76af8722677e7a73470ba9adbfebda /core/java/android/app/ClientTransactionHandler.java
parent08a75e0ee7c659c99b3c3bd19d7cf050a75eaa67 (diff)
Don't finish activity on duplicate resume request
With ActivityLifecycler infrastructure duplicate resume situations are limited to double-relaunch scenario and there shouldn't be any incorrect resume requests. This means that there shouldn't be any reasons to finish activity when trying to resume it. Bug: 77240441 Test: android.app.activity.ActivityThreadTest Change-Id: I70a3fcbff72954ff673b2020be3134be367cd823
Diffstat (limited to 'core/java/android/app/ClientTransactionHandler.java')
-rw-r--r--core/java/android/app/ClientTransactionHandler.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/ClientTransactionHandler.java b/core/java/android/app/ClientTransactionHandler.java
index 925080e44778..0639b00045c4 100644
--- a/core/java/android/app/ClientTransactionHandler.java
+++ b/core/java/android/app/ClientTransactionHandler.java
@@ -24,6 +24,7 @@ import android.content.res.Configuration;
import android.os.IBinder;
import android.util.MergedConfiguration;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.content.ReferrerIntent;
import java.io.PrintWriter;
@@ -48,7 +49,8 @@ public abstract class ClientTransactionHandler {
* Execute transaction immediately without scheduling it. This is used for local requests, so
* it will also recycle the transaction.
*/
- void executeTransaction(ClientTransaction transaction) {
+ @VisibleForTesting
+ public void executeTransaction(ClientTransaction transaction) {
transaction.preExecute(this);
getTransactionExecutor().execute(transaction);
transaction.recycle();