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

Commit 23b7ebae authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Reland "Enable CORE_DEFER_UNTIL_ACTIVE by default"." into udc-dev am: a4edd78c 

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



Change-Id: I181a738d14fd07e3dc43feeab885dbf8ddae0788
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4dbc02b a4edd78c

services/core/java/com/android/server/am/BroadcastConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ public class BroadcastConstants { 
     */

    public boolean CORE_DEFER_UNTIL_ACTIVE = DEFAULT_CORE_DEFER_UNTIL_ACTIVE;

    private static final String KEY_CORE_DEFER_UNTIL_ACTIVE = "bcast_core_defer_until_active";

    private static final boolean DEFAULT_CORE_DEFER_UNTIL_ACTIVE = false;

    private static final boolean DEFAULT_CORE_DEFER_UNTIL_ACTIVE = true;



    // Settings override tracking for this instance

    private String mSettingsKey;

services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java

+37 −4
Original line number Diff line number Diff line
@@ -355,6 +355,33 @@ public final class BroadcastQueueModernImplTest { 
        assertEquals(ProcessList.SCHED_GROUP_UNDEFINED, queue.getPreferredSchedulingGroupLocked());

    }



    /**

     * Queue with a "normal" and "deferrable" broadcast is runnable at different times depending

     * on process cached state; when cached it's delayed indefinitely.

     */

    @Test

    public void testRunnableAt_Normal_Deferrable() {

        final BroadcastProcessQueue queue = new BroadcastProcessQueue(mConstants,

                PACKAGE_GREEN, getUidForPackage(PACKAGE_GREEN));



        final Intent airplane = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);

        final BroadcastOptions options = BroadcastOptions.makeBasic()

                .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE);

        final BroadcastRecord airplaneRecord = makeBroadcastRecord(airplane, options,

                List.of(makeMockRegisteredReceiver()), false);

        queue.enqueueOrReplaceBroadcast(airplaneRecord, 0, false);



        queue.setProcessCached(false);

        final long notCachedRunnableAt = queue.getRunnableAt();

        queue.setProcessCached(true);

        final long cachedRunnableAt = queue.getRunnableAt();

        assertThat(cachedRunnableAt).isGreaterThan(notCachedRunnableAt);

        assertFalse(queue.isRunnable());

        assertEquals(BroadcastProcessQueue.REASON_CACHED_INFINITE_DEFER,

                queue.getRunnableAtReason());

        assertEquals(ProcessList.SCHED_GROUP_UNDEFINED, queue.getPreferredSchedulingGroupLocked());

    }



    /**

     * Queue with a "normal" broadcast is runnable at different times depending

     * on process cached state; when cached it's delayed by some amount.
@@ -365,8 +392,10 @@ public final class BroadcastQueueModernImplTest { 
                PACKAGE_GREEN, getUidForPackage(PACKAGE_GREEN));



        final Intent airplane = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);

        final BroadcastRecord airplaneRecord = makeBroadcastRecord(airplane,

                List.of(makeMockRegisteredReceiver()));

        final BroadcastOptions options = BroadcastOptions.makeBasic()

                .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_NONE);

        final BroadcastRecord airplaneRecord = makeBroadcastRecord(airplane, options,

                List.of(makeMockRegisteredReceiver()), false);

        queue.enqueueOrReplaceBroadcast(airplaneRecord, 0, false);



        queue.setProcessCached(false);
@@ -374,6 +403,8 @@ public final class BroadcastQueueModernImplTest { 
        queue.setProcessCached(true);

        final long cachedRunnableAt = queue.getRunnableAt();

        assertThat(cachedRunnableAt).isGreaterThan(notCachedRunnableAt);

        assertTrue(queue.isRunnable());

        assertEquals(BroadcastProcessQueue.REASON_CACHED, queue.getRunnableAtReason());

        assertEquals(ProcessList.SCHED_GROUP_BACKGROUND, queue.getPreferredSchedulingGroupLocked());

    }
@@ -520,11 +551,13 @@ public final class BroadcastQueueModernImplTest { 
    }



    @Test

    public void testRunnableAt_Cached_Prioritized() {

    public void testRunnableAt_Cached_Prioritized_NonDeferrable() {

        final List receivers = List.of(

                withPriority(makeManifestReceiver(PACKAGE_RED, PACKAGE_RED), 10),

                withPriority(makeManifestReceiver(PACKAGE_GREEN, PACKAGE_GREEN), -10));

        doRunnableAt_Cached(makeBroadcastRecord(makeMockIntent(), null,

        final BroadcastOptions options = BroadcastOptions.makeBasic()

                .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_NONE);

        doRunnableAt_Cached(makeBroadcastRecord(makeMockIntent(), options,

                receivers, null, false), REASON_CONTAINS_PRIORITIZED);

    }