Merge "Flag removal: reduce_broadcasts_for_component_state_changes" into main (e1dd0efb) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/flags.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -235,14 +235,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "reduce_broadcasts_for_component_state_changes"
		namespace: "package_manager_service"
		description: "Feature flag to limit sending of the PACKAGE_CHANGED broadcast to only the system and the application itself during component state changes."
		bug: "292261144"
		is_fixed_read_only: true
		}

		flag {
		name: "change_launcher_badging"
		namespace: "package_manager_service"

services/core/java/com/android/server/pm/BroadcastHelper.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -363,17 +363,6 @@ public final class BroadcastHelper {
		final boolean isForWholeApp = componentNames.contains(packageName);
		final String callingPackageNameForTrace = mContext.getPackageManager().getNameForUid(
		callingUidForTrace);
		if (!android.content.pm.Flags.reduceBroadcastsForComponentStateChanges()) {
		tracePackageChangedBroadcastEvent(false /* applyFlag */, reasonForTrace, packageName,
		"<implicit>" /* targetPackageName /, "whole" / targetComponent */,
		componentNames.size(), callingPackageNameForTrace);
		sendPackageChangedBroadcastWithPermissions(packageName, dontKillApp, componentNames,
		packageUid, reason, userIds, instantUserIds, broadcastAllowList,
		null /* targetPackageName /, null / requiredPermissions */,
		null /* bOptions */);
		return;
		}

		if (isForWholeApp) {
		tracePackageChangedBroadcastEvent(true /* applyFlag */, reasonForTrace, packageName,
		"<implicit>" /* targetPackageName /, "whole" / targetComponent */,

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/BroadcastHelperTest.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.server.pm;

		import static android.content.pm.Flags.FLAG_REDUCE_BROADCASTS_FOR_COMPONENT_STATE_CHANGES;

		import static com.google.common.truth.Truth.assertThat;

		import static org.junit.Assert.assertNotNull;
		@@ -42,9 +40,6 @@ import android.os.Message;
		import android.os.UserHandle;
		import android.platform.test.annotations.AppModeFull;
		import android.platform.test.annotations.AppModeNonSdkSandbox;
		import android.platform.test.annotations.RequiresFlagsEnabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.platform.app.InstrumentationRegistry;
		@@ -54,7 +49,6 @@ import com.android.internal.pm.pkg.component.ParsedActivity;
		import com.android.server.pm.pkg.PackageStateInternal;

		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		@@ -73,9 +67,6 @@ public class BroadcastHelperTest {
		private static final String PACKAGE_CHANGED_TEST_MAIN_ACTIVITY =
		PACKAGE_CHANGED_TEST_PACKAGE_NAME + ".MainActivity";

		@Rule
		public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

		@Mock
		ActivityManagerInternal mMockActivityManagerInternal;
		@Mock
		@@ -121,7 +112,6 @@ public class BroadcastHelperTest {
		mBroadcastHelper = new BroadcastHelper(mMockPackageManagerServiceInjector);
		}

		@RequiresFlagsEnabled(FLAG_REDUCE_BROADCASTS_FOR_COMPONENT_STATE_CHANGES)
		@Test
		public void changeNonExportedComponent_sendPackageChangedBroadcastToSystemAndApplicationItself()
		throws Exception {
		@@ -142,7 +132,6 @@ public class BroadcastHelperTest {
		assertThat(intent2.getPackage()).isEqualTo(PACKAGE_CHANGED_TEST_PACKAGE_NAME);
		}

		@RequiresFlagsEnabled(FLAG_REDUCE_BROADCASTS_FOR_COMPONENT_STATE_CHANGES)
		@Test
		public void changeNonExportedComponent_sendPackageChangedBroadcastToSharedUserIdApplications()
		throws Exception {