Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d26c21a authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge changes from topic "lifecycle_transaction_base" 

* changes:
  Add transaction unit tests
  Add basic lifecycle transaction containers
parents 7c524781 6b9d3a14

core/java/android/app/ActivityThread.java

+114 −323

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/ClientTransactionHandler.java

0 → 100644
+114 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.app;



import android.app.servertransaction.ClientTransaction;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.os.Bundle;

import android.os.IBinder;

import android.os.PersistableBundle;



import com.android.internal.app.IVoiceInteractor;

import com.android.internal.content.ReferrerIntent;



import java.util.List;



/**

 * Defines operations that a {@link android.app.servertransaction.ClientTransaction} or its items

 * can perform on client.

 * @hide

 */

public abstract class ClientTransactionHandler {



    // Schedule phase related logic and handlers.



    /** Prepare and schedule transaction for execution. */

    void scheduleTransaction(ClientTransaction transaction) {

        transaction.prepare(this);

        sendMessage(ActivityThread.H.EXECUTE_TRANSACTION, transaction);

    }



    abstract void sendMessage(int what, Object obj);





    // Prepare phase related logic and handlers. Methods that inform about about pending changes or

    // do other internal bookkeeping.



    /** Get current lifecycle request number to maintain correct ordering. */

    public abstract int getLifecycleSeq();



    /** Set pending config in case it will be updated by other transaction item. */

    public abstract void updatePendingConfiguration(Configuration config);



    /** Set current process state. */

    public abstract void updateProcessState(int processState, boolean fromIpc);





    // Execute phase related logic and handlers. Methods here execute actual lifecycle transactions

    // and deliver callbacks.



    /** Destroy the activity. */

    public abstract void handleDestroyActivity(IBinder token, boolean finishing, int configChanges,

            boolean getNonConfigInstance);



    /** Pause the activity. */

    public abstract void handlePauseActivity(IBinder token, boolean finished, boolean userLeaving,

            int configChanges, boolean dontReport, int seq);



    /** Resume the activity. */

    public abstract void handleResumeActivity(IBinder token, boolean clearHide, boolean isForward,

            boolean reallyResume, int seq, String reason);



    /** Stop the activity. */

    public abstract void handleStopActivity(IBinder token, boolean show, int configChanges,

            int seq);



    /** Deliver activity (override) configuration change. */

    public abstract void handleActivityConfigurationChanged(IBinder activityToken,

            Configuration overrideConfig, int displayId);



    /** Deliver result from another activity. */

    public abstract void handleSendResult(IBinder token, List<ResultInfo> results);



    /** Deliver multi-window mode change notification. */

    public abstract void handleMultiWindowModeChanged(IBinder token, boolean isInMultiWindowMode,

            Configuration overrideConfig);



    /** Deliver new intent. */

    public abstract void handleNewIntent(IBinder token, List<ReferrerIntent> intents,

            boolean andPause);



    /** Deliver picture-in-picture mode change notification. */

    public abstract void handlePictureInPictureModeChanged(IBinder token, boolean isInPipMode,

            Configuration overrideConfig);



    /** Update window visibility. */

    public abstract void handleWindowVisibility(IBinder token, boolean show);



    /** Perform activity launch. */

    public abstract void handleLaunchActivity(IBinder token, Intent intent, int ident,

            ActivityInfo info, Configuration overrideConfig, CompatibilityInfo compatInfo,

            String referrer, IVoiceInteractor voiceInteractor, Bundle state,

            PersistableBundle persistentState, List<ResultInfo> pendingResults,

            List<ReferrerIntent> pendingNewIntents, boolean notResumed, boolean isForward,

            ProfilerInfo profilerInfo);



    /** Deliver app configuration change notification. */

    public abstract void handleConfigurationChanged(Configuration config);

}

core/java/android/app/IApplicationThread.aidl

+2 −26
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.IInstrumentationWatcher; 
import android.app.IUiAutomationConnection;

import android.app.ProfilerInfo;

import android.app.ResultInfo;

import android.app.servertransaction.ClientTransaction;

import android.content.ComponentName;

import android.content.IIntentReceiver;

import android.content.Intent;
@@ -52,24 +53,6 @@ import java.util.Map; 
 * {@hide}

 */

oneway interface IApplicationThread {

    void schedulePauseActivity(IBinder token, boolean finished, boolean userLeaving,

            int configChanges, boolean dontReport);

    void scheduleStopActivity(IBinder token, boolean showWindow,

            int configChanges);

    void scheduleWindowVisibility(IBinder token, boolean showWindow);

    void scheduleResumeActivity(IBinder token, int procState, boolean isForward,

            in Bundle resumeArgs);

    void scheduleSendResult(IBinder token, in List<ResultInfo> results);

    void scheduleLaunchActivity(in Intent intent, IBinder token, int ident,

            in ActivityInfo info, in Configuration curConfig, in Configuration overrideConfig,

            in CompatibilityInfo compatInfo, in String referrer, IVoiceInteractor voiceInteractor,

            int procState, in Bundle state, in PersistableBundle persistentState,

            in List<ResultInfo> pendingResults, in List<ReferrerIntent> pendingNewIntents,

            boolean notResumed, boolean isForward, in ProfilerInfo profilerInfo);

    void scheduleNewIntent(

            in List<ReferrerIntent> intent, IBinder token, boolean andPause);

    void scheduleDestroyActivity(IBinder token, boolean finished,

            int configChanges);

    void scheduleReceiver(in Intent intent, in ActivityInfo info,

            in CompatibilityInfo compatInfo,

            int resultCode, in String data, in Bundle extras, boolean sync,
@@ -87,7 +70,6 @@ oneway interface IApplicationThread { 
            in Bundle coreSettings, in String buildSerial);

    void runIsolatedEntryPoint(in String entryPoint, in String[] entryPointArgs);

    void scheduleExit();

    void scheduleConfigurationChanged(in Configuration config);

    void scheduleServiceArgs(IBinder token, in ParceledListSlice args);

    void updateTimeZone();

    void processInBackground();
@@ -101,9 +83,6 @@ oneway interface IApplicationThread { 
            int resultCode, in String data, in Bundle extras, boolean ordered,

            boolean sticky, int sendingUser, int processState);

    void scheduleLowMemory();

    void scheduleActivityConfigurationChanged(IBinder token, in Configuration overrideConfig);

    void scheduleActivityMovedToDisplay(IBinder token, int displayId,

            in Configuration overrideConfig);

    void scheduleRelaunchActivity(IBinder token, in List<ResultInfo> pendingResults,

            in List<ReferrerIntent> pendingNewIntents, int configChanges, boolean notResumed,

            in Configuration config, in Configuration overrideConfig, boolean preserveWindow);
@@ -146,14 +125,11 @@ oneway interface IApplicationThread { 
    void notifyCleartextNetwork(in byte[] firstPacket);

    void startBinderTracking();

    void stopBinderTrackingAndDump(in ParcelFileDescriptor fd);

    void scheduleMultiWindowModeChanged(IBinder token, boolean isInMultiWindowMode,

            in Configuration newConfig);

    void schedulePictureInPictureModeChanged(IBinder token, boolean isInPictureInPictureMode,

            in Configuration newConfig);

    void scheduleLocalVoiceInteractionStarted(IBinder token,

            IVoiceInteractor voiceInteractor);

    void handleTrustStorageUpdate();

    void attachAgent(String path);

    void scheduleApplicationInfoChanged(in ApplicationInfo ai);

    void setNetworkBlockSeq(long procStateSeq);

    void scheduleTransaction(in ClientTransaction transaction);

}

core/java/android/app/ProfilerInfo.java

+29 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Parcelable; 
import android.util.Slog;



import java.io.IOException;

import java.util.Objects;



/**

 * System private API for passing profiler settings.
@@ -132,4 +133,32 @@ public class ProfilerInfo implements Parcelable { 
        streamingOutput = in.readInt() != 0;

        agent = in.readString();

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) {

            return true;

        }

        if (o == null || getClass() != o.getClass()) {

            return false;

        }

        final ProfilerInfo other = (ProfilerInfo) o;

        // TODO: Also check #profileFd for equality.

        return Objects.equals(profileFile, other.profileFile)

                && autoStopProfiler == other.autoStopProfiler

                && samplingInterval == other.samplingInterval

                && streamingOutput == other.streamingOutput

                && Objects.equals(agent, other.agent);

    }



    @Override

    public int hashCode() {

        int result = 17;

        result = 31 * result + Objects.hashCode(profileFile);

        result = 31 * result + samplingInterval;

        result = 31 * result + (autoStopProfiler ? 1 : 0);

        result = 31 * result + (streamingOutput ? 1 : 0);

        result = 31 * result + Objects.hashCode(agent);

        return result;

    }

}

core/java/android/app/ResultInfo.java

+27 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.content.Intent; 
import android.os.Parcel;

import android.os.Parcelable;



import java.util.Objects;



/**

 * {@hide}

 */
@@ -79,4 +81,29 @@ public class ResultInfo implements Parcelable { 
            mData = null;

        }

    }



    @Override

    public boolean equals(Object obj) {

        if (obj == null || !(obj instanceof ResultInfo)) {

            return false;

        }

        final ResultInfo other = (ResultInfo) obj;

        final boolean intentsEqual = mData == null ? (other.mData == null)

                : mData.filterEquals(other.mData);

        return intentsEqual && Objects.equals(mResultWho, other.mResultWho)

                && mResultCode == other.mResultCode

                && mRequestCode == other.mRequestCode;

    }



    @Override

    public int hashCode() {

        int result = 17;

        result = 31 * result + mRequestCode;

        result = 31 * result + mResultCode;

        result = 31 * result + Objects.hashCode(mResultWho);

        if (mData != null) {

            result = 31 * result + mData.filterHashCode();

        }

        return result;

    }

}