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

Commit ad95d22b authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Send client relaunch event to WMCore." into tm-dev am: a688a749 

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



Change-Id: I12d47b799a5d5b89f4145830bb02a229a9497706
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7593599c a688a749

core/java/android/app/ActivityClient.java

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

        }

    }

    }





    /** Reports the activity starts local relaunch. */

    public void activityLocalRelaunch(IBinder token) {

        try {

            getActivityClientController().activityLocalRelaunch(token);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

    }



    /** Reports the activity has completed relaunched. */

    /** Reports the activity has completed relaunched. */

    public void activityRelaunched(IBinder token) {

    public void activityRelaunched(IBinder token) {

        try {

        try {

core/java/android/app/ActivityThread.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -5728,6 +5728,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            return;

            return;

        }

        }





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

        // Initialize a relaunch request.

        // Initialize a relaunch request.

        final MergedConfiguration mergedConfiguration = new MergedConfiguration(

        final MergedConfiguration mergedConfiguration = new MergedConfiguration(

                r.createdConfig != null

                r.createdConfig != null

core/java/android/app/IActivityClientController.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ interface IActivityClientController { 
    oneway void activityStopped(in IBinder token, in Bundle state,

    oneway void activityStopped(in IBinder token, in Bundle state,

            in PersistableBundle persistentState, in CharSequence description);

            in PersistableBundle persistentState, in CharSequence description);

    oneway void activityDestroyed(in IBinder token);

    oneway void activityDestroyed(in IBinder token);

    oneway void activityLocalRelaunch(in IBinder token);

    oneway void activityRelaunched(in IBinder token);

    oneway void activityRelaunched(in IBinder token);





    oneway void reportSizeConfigurations(in IBinder token,

    oneway void reportSizeConfigurations(in IBinder token,

services/core/java/com/android/server/wm/ActivityClientController.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -245,6 +245,18 @@ class ActivityClientController extends IActivityClientController.Stub { 
        }

        }

    }

    }





    @Override

    public void activityLocalRelaunch(IBinder token) {

        final long origId = Binder.clearCallingIdentity();

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.forTokenLocked(token);

            if (r != null) {

                r.startRelaunching();

            }

        }

        Binder.restoreCallingIdentity(origId);

    }



    @Override

    @Override

    public void activityRelaunched(IBinder token) {

    public void activityRelaunched(IBinder token) {

        final long origId = Binder.clearCallingIdentity();

        final long origId = Binder.clearCallingIdentity();