Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Using LaunchActivity when possible" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-23 11:13:09 +00:00
committed by Android (Google) Code Review
parent eec6c21ef8 1be9657cc4
commit a6a85a9be2
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/app/servertransaction/ActivityTransactionItem.java
View File

@@ -59,36 +59,37 @@ public abstract class ActivityTransactionItem extends ClientTransactionItem {
}
/**
* Get the {@link ActivityClientRecord} instance that corresponds to the provided token.
* Gets the {@link ActivityClientRecord} instance that corresponds to the provided token.
* @param client Target client handler.
* @param token Target activity token.
* @param includeLaunching Indicate to also find the {@link ActivityClientRecord} in launching
* activity list. It should be noted that there is no activity in
* @param includeLaunching Indicate to find the {@link ActivityClientRecord} in launching
* activity list.
* <p>Note that there is no {@link android.app.Activity} instance in
* {@link ActivityClientRecord} from the launching activity list.
* @return The {@link ActivityClientRecord} instance that corresponds to the provided token.
*/
@NonNull ActivityClientRecord getActivityClientRecord(
@NonNull ClientTransactionHandler client, IBinder token, boolean includeLaunching) {
ActivityClientRecord r = client.getActivityClient(token);
if (r != null) {
if (client.getActivity(token) == null) {
ActivityClientRecord r = null;
// Check launching Activity first to prevent race condition that activity instance has not
// yet set to ActivityClientRecord.
if (includeLaunching) {
r = client.getLaunchingActivity(token);
}
// Then if we don't want to find launching Activity or the ActivityClientRecord doesn't
// exist in launching Activity list. The ActivityClientRecord should have been initialized
// and put in the Activity list.
if (r == null) {
r = client.getActivityClient(token);
if (r != null && client.getActivity(token) == null) {
throw new IllegalArgumentException("Activity must not be null to execute "
+ "transaction item");
}
return r;
}
// The activity may not be launched yet. Fallback to check launching activity.
if (includeLaunching) {
r = client.getLaunchingActivity(token);
}
if (r == null) {
throw new IllegalArgumentException("Activity client record must not be null to execute "
+ "transaction item");
}
// We don't need to check the activity of launching activity client records because they
// have not been launched yet.
return r;
}
}