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

Commit 4a119dba authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge changes from topic "camera-compat-force-rotation" into tm-qpr-dev am:... 

Merge changes from topic "camera-compat-force-rotation" into tm-qpr-dev am: 13459ada am: 84c4ab69

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19694267



Change-Id: I07caa12358bef154c2d5de1ed657a2531644350d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcc24fd8 84c4ab69

core/java/android/app/ActivityClient.java

+9 −0
Original line number Diff line number Diff line
@@ -59,6 +59,15 @@ public class ActivityClient { 
        }

    }



    /** Reports {@link android.app.servertransaction.RefreshCallbackItem} is executed. */

    public void activityRefreshed(IBinder token) {

        try {

            getActivityClientController().activityRefreshed(token);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

    }



    /**

     * Reports after {@link Activity#onTopResumedActivityChanged(boolean)} is called for losing the

     * top most position.

core/java/android/app/ActivityThread.java

+5 −0
Original line number Diff line number Diff line
@@ -5342,6 +5342,11 @@ public final class ActivityThread extends ClientTransactionHandler 
        }

    }



    @Override

    public void reportRefresh(ActivityClientRecord r) {

        ActivityClient.getInstance().activityRefreshed(r.token);

    }



    private void handleSetCoreSettings(Bundle coreSettings) {

        synchronized (mCoreSettingsLock) {

            mCoreSettings = coreSettings;

core/java/android/app/ClientTransactionHandler.java

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ public abstract class ClientTransactionHandler { 
    /** Restart the activity after it was stopped. */

    public abstract void performRestartActivity(@NonNull ActivityClientRecord r, boolean start);



     /** Report that activity was refreshed to server. */

    public abstract void reportRefresh(@NonNull ActivityClientRecord r);



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

    public abstract void updatePendingActivityConfiguration(@NonNull IBinder token,

            Configuration overrideConfig);

core/java/android/app/IActivityClientController.aidl

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.internal.policy.IKeyguardDismissCallback; 
interface IActivityClientController {

    oneway void activityIdle(in IBinder token, in Configuration config, in boolean stopProfiling);

    oneway void activityResumed(in IBinder token, in boolean handleSplashScreenExit);

    oneway void activityRefreshed(in IBinder token);

    /**

     * This call is not one-way because {@link #activityPaused()) is not one-way, or

     * the top-resumed-lost could be reported after activity paused.

core/java/android/app/servertransaction/ClientTransactionItem.java

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ public abstract class ClientTransactionItem implements BaseClientRequest, Parcel 
        return UNDEFINED;

    }



    boolean shouldHaveDefinedPreExecutionState() {

        return true;

    }



    // Parcelable