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

Commit a6176e3c authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Fix extra pause report from client 

Activity pause is now reported from PauseActivityItem.

Fixes: 73020245
Test: Pause activity, check logs.
Change-Id: Iabfb1b1b51dec259f1928607ef7c321b54a93286
parent ddd4ca1e

core/java/android/app/ActivityThread.java

+1 −11
Original line number Diff line number Diff line
@@ -3900,8 +3900,7 @@ public final class ActivityThread extends ClientTransactionHandler { 


    @Override

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

            int configChanges, boolean dontReport, PendingTransactionActions pendingActions,

            String reason) {

            int configChanges, PendingTransactionActions pendingActions, String reason) {

        ActivityClientRecord r = mActivities.get(token);

        if (r != null) {

            if (userLeaving) {
@@ -3915,15 +3914,6 @@ public final class ActivityThread extends ClientTransactionHandler { 
            if (r.isPreHoneycomb()) {

                QueuedWork.waitToFinish();

            }



            // Tell the activity manager we have paused.

            if (!dontReport) {

                try {

                    ActivityManager.getService().activityPaused(token);

                } catch (RemoteException ex) {

                    throw ex.rethrowFromSystemServer();

                }

            }

            mSomeActivitiesChanged = true;

        }

    }

core/java/android/app/ClientTransactionHandler.java

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ public abstract class ClientTransactionHandler { 


    /** Pause the activity. */

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

            int configChanges, boolean dontReport, PendingTransactionActions pendingActions,

            String reason);

            int configChanges, PendingTransactionActions pendingActions, String reason);



    /** Resume the activity. */

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

core/java/android/app/servertransaction/PauseActivityItem.java

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ public class PauseActivityItem extends ActivityLifecycleItem { 
    public void execute(ClientTransactionHandler client, IBinder token,

            PendingTransactionActions pendingActions) {

        Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityPause");

        client.handlePauseActivity(token, mFinished, mUserLeaving, mConfigChanges, mDontReport,

                pendingActions, "PAUSE_ACTIVITY_ITEM");

        client.handlePauseActivity(token, mFinished, mUserLeaving, mConfigChanges, pendingActions,

                "PAUSE_ACTIVITY_ITEM");

        Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);

    }

core/java/android/app/servertransaction/TransactionExecutor.java

+2 −2
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ public class TransactionExecutor { 
                    break;

                case ON_PAUSE:

                    mTransactionHandler.handlePauseActivity(r.token, false /* finished */,

                            false /* userLeaving */, 0 /* configChanges */,

                            true /* dontReport */, mPendingActions, "LIFECYCLER_PAUSE_ACTIVITY");

                            false /* userLeaving */, 0 /* configChanges */, mPendingActions,

                            "LIFECYCLER_PAUSE_ACTIVITY");

                    break;

                case ON_STOP:

                    mTransactionHandler.handleStopActivity(r.token, false /* show */,