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

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

Merge "Cleanup avoid_resolving_type flag." into main

parents 963ae7cd 6992b051

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

+4 −9
Original line number Diff line number Diff line
@@ -491,15 +491,10 @@ class BroadcastController { 
                // provider that needs to lock mProviderMap in ActivityThread

                // and also it may need to wait application response, so we

                // cannot lock ActivityManagerService here.

                final int match;

                if (Flags.avoidResolvingType()) {

                    match = filter.match(intent.getAction(), broadcast.resolvedDataType,

                final int match = filter.match(intent.getAction(), broadcast.resolvedDataType,

                        intent.getScheme(), intent.getData(), intent.getCategories(),

                        TAG, false /* supportsWildcards */, null /* ignoreActions */,

                        intent.getExtras());

                } else {

                    match = filter.match(resolver, intent, true, TAG);

                }

                if (match >= 0) {

                    if (allSticky == null) {

                        allSticky = new ArrayList<>();

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

+0 −11
Original line number Diff line number Diff line
@@ -69,17 +69,6 @@ flag { 
    bug: "298263955"

}



flag {

    namespace: "backstage_power"

    name: "avoid_resolving_type"

    description: "Avoid resolving data type for sticky broadcasts"

    bug: "323817802"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "backstage_power"

    name: "trace_receiver_registration"

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

+0 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; 
import static com.android.dx.mockito.inline.extended.ExtendedMockito.when;

import static com.android.server.am.ActivityManagerInternalTest.CustomThread;

import static com.android.server.am.ActivityManagerService.Injector;

import static com.android.server.am.Flags.FLAG_AVOID_RESOLVING_TYPE;

import static com.android.server.am.ProcessList.NETWORK_STATE_BLOCK;

import static com.android.server.am.ProcessList.NETWORK_STATE_NO_CHANGE;

import static com.android.server.am.ProcessList.NETWORK_STATE_UNBLOCK;
@@ -968,7 +967,6 @@ public class ActivityManagerServiceTest { 
                        null));

    }



    @RequiresFlagsEnabled(FLAG_AVOID_RESOLVING_TYPE)

    @Test

    @SuppressWarnings("GuardedBy")

    public void testBroadcastStickyIntent_verifyTypeNotResolved() throws Exception {