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

Commit 4679918c authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Merge sleeping activities with visibility updates 

Previously we were using a separate SLEEP message to communicate
with the client. The sleeping implementation on the client though
simply transitioned it between STARTED and STOPPED states.

This CL relies on visibility updates to communicate the sleeping
state. The "sleeping" status field is still used in the server-side
to record when device started going to sleep, and prevents any
activity that was launched before to influence the power state of
the device.

Bug: 137329632
Test: AM/WM CTS and unit tests
Change-Id: Idd7f5bf6730d3372168d862ef713a44f700430f1
parent c8e17b66

config/boot-image-profile.txt

+0 −1
Original line number Diff line number Diff line
@@ -1515,7 +1515,6 @@ HSPLandroid/app/IActivityTaskManager$Stub$Proxy;->activityDestroyed(Landroid/os/ 
HSPLandroid/app/IActivityTaskManager$Stub$Proxy;->activityIdle(Landroid/os/IBinder;Landroid/content/res/Configuration;Z)V

HSPLandroid/app/IActivityTaskManager$Stub$Proxy;->activityPaused(Landroid/os/IBinder;)V

HSPLandroid/app/IActivityTaskManager$Stub$Proxy;->activityResumed(Landroid/os/IBinder;)V

HSPLandroid/app/IActivityTaskManager$Stub$Proxy;->activitySlept(Landroid/os/IBinder;)V

HSPLandroid/app/IActivityTaskManager$Stub$Proxy;->activityStopped(Landroid/os/IBinder;Landroid/os/Bundle;Landroid/os/PersistableBundle;Ljava/lang/CharSequence;)V

HSPLandroid/app/IActivityTaskManager$Stub$Proxy;->activityTopResumedStateLost()V

HSPLandroid/app/IActivityTaskManager$Stub$Proxy;->finishActivity(Landroid/os/IBinder;ILandroid/content/Intent;I)Z

core/java/android/app/ActivityThread.java

+0 −45
Original line number Diff line number Diff line
@@ -924,10 +924,6 @@ public final class ActivityThread extends ClientTransactionHandler { 
    private class ApplicationThread extends IApplicationThread.Stub {

        private static final String DB_INFO_FORMAT = "  %8s %8s %14s %14s  %s";



        public final void scheduleSleeping(IBinder token, boolean sleeping) {

            sendMessage(H.SLEEPING, token, sleeping ? 1 : 0);

        }



        public final void scheduleReceiver(Intent intent, ActivityInfo info,

                CompatibilityInfo compatInfo, int resultCode, String data, Bundle extras,

                boolean sync, int sendingUser, int processState) {
@@ -1855,7 +1851,6 @@ public final class ActivityThread extends ClientTransactionHandler { 
                    case SCHEDULE_CRASH: return "SCHEDULE_CRASH";

                    case DUMP_HEAP: return "DUMP_HEAP";

                    case DUMP_ACTIVITY: return "DUMP_ACTIVITY";

                    case SLEEPING: return "SLEEPING";

                    case SET_CORE_SETTINGS: return "SET_CORE_SETTINGS";

                    case UPDATE_PACKAGE_COMPATIBILITY_INFO: return "UPDATE_PACKAGE_COMPATIBILITY_INFO";

                    case DUMP_PROVIDER: return "DUMP_PROVIDER";
@@ -1985,11 +1980,6 @@ public final class ActivityThread extends ClientTransactionHandler { 
                case DUMP_PROVIDER:

                    handleDumpProvider((DumpComponentInfo)msg.obj);

                    break;

                case SLEEPING:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "sleeping");

                    handleSleeping((IBinder)msg.obj, msg.arg1 != 0);

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case SET_CORE_SETTINGS:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "setCoreSettings");

                    handleSetCoreSettings((Bundle) msg.obj);
@@ -4855,41 +4845,6 @@ public final class ActivityThread extends ClientTransactionHandler { 
        }

    }



    // TODO: This method should be changed to use {@link #performStopActivityInner} to perform to

    // stop operation on the activity to reduce code duplication and the chance of fixing a bug in

    // one place and missing the other.

    private void handleSleeping(IBinder token, boolean sleeping) {

        ActivityClientRecord r = mActivities.get(token);



        if (r == null) {

            Log.w(TAG, "handleSleeping: no activity for token " + token);

            return;

        }



        if (sleeping) {

            if (!r.stopped && !r.isPreHoneycomb()) {

                callActivityOnStop(r, true /* saveState */, "sleeping");

            }



            // Make sure any pending writes are now committed.

            if (!r.isPreHoneycomb()) {

                QueuedWork.waitToFinish();

            }



            // Tell activity manager we slept.

            try {

                ActivityTaskManager.getService().activitySlept(r.token);

            } catch (RemoteException ex) {

                throw ex.rethrowFromSystemServer();

            }

        } else {

            if (r.stopped && r.activity.mVisibleFromServer) {

                r.activity.performRestart(true /* start */, "handleSleeping");

                r.setState(ON_START);

            }

        }

    }



    private void handleSetCoreSettings(Bundle coreSettings) {

        synchronized (mResourcesManager) {

            mCoreSettings = coreSettings;

core/java/android/app/IActivityTaskManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ interface IActivityTaskManager { 
            in PersistableBundle persistentState, in CharSequence description);

    oneway void activityDestroyed(in IBinder token);

    void activityRelaunched(in IBinder token);

    oneway void activitySlept(in IBinder token);

    int getFrontActivityScreenCompatMode();

    void setFrontActivityScreenCompatMode(int mode);

    String getCallingPackage(in IBinder token);

core/java/android/app/IApplicationThread.aidl

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ oneway interface IApplicationThread { 
            int resultCode, in String data, in Bundle extras, boolean ordered,

            boolean sticky, int sendingUser, int processState);

    void scheduleLowMemory();

    void scheduleSleeping(IBinder token, boolean sleeping);

    void profilerControl(boolean start, in ProfilerInfo profilerInfo, int profileType);

    void setSchedulingGroup(int group);

    void scheduleCreateBackupAgent(in ApplicationInfo app, in CompatibilityInfo compatInfo,

core/tests/coretests/src/android/app/activity/ActivityThreadTest.java

+0 −10
Original line number Diff line number Diff line
@@ -96,16 +96,6 @@ public class ActivityThreadTest { 
        InstrumentationRegistry.getInstrumentation().waitForIdleSync();

    }



    @Test

    public void testSleepAndStop() throws Exception {

        final Activity activity = mActivityTestRule.launchActivity(new Intent());

        final IApplicationThread appThread = activity.getActivityThread().getApplicationThread();



        appThread.scheduleSleeping(activity.getActivityToken(), true /* sleeping */);

        appThread.scheduleTransaction(newStopTransaction(activity));

        InstrumentationRegistry.getInstrumentation().waitForIdleSync();

    }



    /** Verify that repeated resume requests to activity will be ignored. */

    @Test

    public void testRepeatedResume() throws Exception {