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

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 android.annotation.NonNull;

import android.app.ActivityThread.ActivityClientRecord;

import android.app.ClientTransactionHandler;

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.os.Build;

import android.os.Parcel;

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    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

    public int getPostExecutionState() {

        return ON_RESUME;

    }*/

        return CompatChanges.isChangeEnabled(CALL_ACTIVITY_RESULT_BEFORE_RESUME)

                ? ON_RESUME : UNDEFINED;

    }

    @Override

    public void execute(ClientTransactionHandler client, ActivityClientRecord r,