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

Commit 4cb8e1fe authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag com.android.server.am.avoid_repeated_bcast_re_enqueues." into main

parents bccfbe37 995f62d8

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

+0 −4
Original line number Diff line number Diff line
@@ -729,10 +729,6 @@ class BroadcastProcessQueue { 
    }



    public boolean wasActiveBroadcastReEnqueued() {

        // If the flag is not enabled, treat as if the broadcast was never re-enqueued.

        if (!Flags.avoidRepeatedBcastReEnqueues()) {

            return false;

        }

        return mActiveReEnqueued;

    }

services/core/java/com/android/server/am/flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -37,17 +37,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    namespace: "backstage_power"

    name: "avoid_repeated_bcast_re_enqueues"

    description: "Avoid re-enqueueing a broadcast repeatedly"

    bug: "319225224"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "skip_unimportant_connections"

    namespace: "backstage_power"

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

+0 −3
Original line number Diff line number Diff line
@@ -930,7 +930,6 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { 
     * responds with {@link DeadObjectException} even after restarting.

     */

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_AVOID_REPEATED_BCAST_RE_ENQUEUES)

    public void testRepeatedDead_Manifest() throws Exception {

        final ProcessRecord callerApp = makeActiveProcessRecord(PACKAGE_RED);

        mNewProcessBehaviors.put(PACKAGE_GREEN, ProcessBehavior.DEAD);
@@ -1144,7 +1143,6 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { 
     * it doesn't get stuck.

     */

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_AVOID_REPEATED_BCAST_RE_ENQUEUES)

    public void testRepeatedKillWithoutNotify() throws Exception {

        final ProcessRecord callerApp = makeActiveProcessRecord(PACKAGE_RED);

        final ProcessRecord receiverBlueApp = makeActiveProcessRecord(PACKAGE_BLUE);
@@ -2289,7 +2287,6 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { 
     * Verify that we skip broadcasts at enqueue if {@link BroadcastSkipPolicy} decides it

     * should be skipped.

     */

    @EnableFlags(Flags.FLAG_AVOID_NOTE_OP_AT_ENQUEUE)

    @Test

    public void testSkipPolicy_atEnqueueTime() throws Exception {

        final ProcessRecord callerApp = makeActiveProcessRecord(PACKAGE_RED);