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

Merge "Use post-execution state for ActivityResultItem" into sc-v2-dev

Browse Source
This commit is contained in:
Chilun Huang
2021-10-05 07:31:59 +00:00
committed by Android (Google) Code Review
parent 2674889177 3e0f315f8c
commit 69c8b1aef6
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/app/servertransaction/ActivityResultItem.java
View File

@@ -16,6 +16,8 @@
package android.app.servertransaction; package android.app.servertransaction;
import static android.app.servertransaction.ActivityLifecycleItem.ON_RESUME;
import static android.app.servertransaction.ActivityLifecycleItem.UNDEFINED;
import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -23,6 +25,9 @@ import android.annotation.Nullable;
import android.app.ActivityThread.ActivityClientRecord; import android.app.ActivityThread.ActivityClientRecord;
import android.app.ClientTransactionHandler; import android.app.ClientTransactionHandler;
import android.app.ResultInfo; import android.app.ResultInfo;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.os.Build; import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
@@ -41,11 +46,19 @@ public class ActivityResultItem extends ActivityTransactionItem {
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
private List<ResultInfo> mResultInfoList; private List<ResultInfo> mResultInfoList;
/* TODO(b/78294732) /**
* Correct the lifecycle of activity result after {@link android.os.Build.VERSION_CODES#S} to
* guarantee that an activity gets activity result just before resume.
*/
@ChangeId
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.S)
public static final long CALL_ACTIVITY_RESULT_BEFORE_RESUME = 78294732L;
@Override @Override
public int getPostExecutionState() { public int getPostExecutionState() {
return ON_RESUME; return CompatChanges.isChangeEnabled(CALL_ACTIVITY_RESULT_BEFORE_RESUME)
}*/ ? ON_RESUME : UNDEFINED;
}
@Override @Override
public void execute(ClientTransactionHandler client, ActivityClientRecord r, public void execute(ClientTransactionHandler client, ActivityClientRecord r,