Merge changes from topic "revert-29548976-TRGCOEXKHG" into main (4bf8a0ae) · Commits · e / os / android_frameworks_base

core/java/android/app/BroadcastStickyCache.java

deleted100644 → 0

+0 −229

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.app;

		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.hardware.usb.UsbManager;
		import android.media.AudioManager;
		import android.net.ConnectivityManager;
		import android.net.TetheringManager;
		import android.net.nsd.NsdManager;
		import android.net.wifi.WifiManager;
		import android.net.wifi.p2p.WifiP2pManager;
		import android.os.SystemProperties;
		import android.os.UpdateLock;
		import android.telephony.TelephonyManager;
		import android.util.ArrayMap;
		import android.view.WindowManagerPolicyConstants;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;

		import java.util.ArrayList;

		/** @hide */
		public class BroadcastStickyCache {

		private static final String[] CACHED_BROADCAST_ACTIONS = {
		AudioManager.ACTION_HDMI_AUDIO_PLUG,
		AudioManager.ACTION_HEADSET_PLUG,
		AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED,
		AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED,
		AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION,
		AudioManager.RINGER_MODE_CHANGED_ACTION,
		ConnectivityManager.CONNECTIVITY_ACTION,
		Intent.ACTION_BATTERY_CHANGED,
		Intent.ACTION_DEVICE_STORAGE_FULL,
		Intent.ACTION_DEVICE_STORAGE_LOW,
		Intent.ACTION_SIM_STATE_CHANGED,
		NsdManager.ACTION_NSD_STATE_CHANGED,
		TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED,
		TetheringManager.ACTION_TETHER_STATE_CHANGED,
		UpdateLock.UPDATE_LOCK_CHANGED,
		UsbManager.ACTION_USB_STATE,
		WifiManager.ACTION_WIFI_SCAN_AVAILABILITY_CHANGED,
		WifiManager.NETWORK_STATE_CHANGED_ACTION,
		WifiManager.SUPPLICANT_STATE_CHANGED_ACTION,
		WifiManager.WIFI_STATE_CHANGED_ACTION,
		WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION,
		WindowManagerPolicyConstants.ACTION_HDMI_PLUGGED,
		"android.net.conn.INET_CONDITION_ACTION" // ConnectivityManager.INET_CONDITION_ACTION
		};

		@GuardedBy("sCachedStickyBroadcasts")
		private static final ArrayList<CachedStickyBroadcast> sCachedStickyBroadcasts =
		new ArrayList<>();

		@GuardedBy("sCachedPropertyHandles")
		private static final ArrayMap<String, SystemProperties.Handle> sCachedPropertyHandles =
		new ArrayMap<>();

		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		public static boolean useCache(@Nullable IntentFilter filter) {
		if (!shouldCache(filter)) {
		return false;
		}
		synchronized (sCachedStickyBroadcasts) {
		final CachedStickyBroadcast cachedStickyBroadcast = getValueUncheckedLocked(filter);
		if (cachedStickyBroadcast == null) {
		return false;
		}
		final long version = cachedStickyBroadcast.propertyHandle.getLong(-1 /* def */);
		return version > 0 && cachedStickyBroadcast.version == version;
		}
		}

		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		public static void add(@Nullable IntentFilter filter, @Nullable Intent intent) {
		if (!shouldCache(filter)) {
		return;
		}
		synchronized (sCachedStickyBroadcasts) {
		CachedStickyBroadcast cachedStickyBroadcast = getValueUncheckedLocked(filter);
		if (cachedStickyBroadcast == null) {
		final String key = getKey(filter.getAction(0));
		final SystemProperties.Handle handle = SystemProperties.find(key);
		final long version = handle == null ? -1 : handle.getLong(-1 /* def */);
		if (version == -1) {
		return;
		}
		cachedStickyBroadcast = new CachedStickyBroadcast(filter, handle);
		sCachedStickyBroadcasts.add(cachedStickyBroadcast);
		cachedStickyBroadcast.intent = intent;
		cachedStickyBroadcast.version = version;
		} else {
		cachedStickyBroadcast.intent = intent;
		cachedStickyBroadcast.version = cachedStickyBroadcast.propertyHandle
		.getLong(-1 /* def */);
		}
		}
		}

		private static boolean shouldCache(@Nullable IntentFilter filter) {
		if (!Flags.useStickyBcastCache()) {
		return false;
		}
		if (filter == null \|\| filter.safeCountActions() != 1) {
		return false;
		}
		if (!ArrayUtils.contains(CACHED_BROADCAST_ACTIONS, filter.getAction(0))) {
		return false;
		}
		return true;
		}

		@VisibleForTesting
		@NonNull
		public static String getKey(@NonNull String action) {
		return "cache_key.system_server.sticky_bcast." + action;
		}

		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		@Nullable
		public static Intent getIntentUnchecked(@NonNull IntentFilter filter) {
		synchronized (sCachedStickyBroadcasts) {
		final CachedStickyBroadcast cachedStickyBroadcast = getValueUncheckedLocked(filter);
		return cachedStickyBroadcast.intent;
		}
		}

		@GuardedBy("sCachedStickyBroadcasts")
		@Nullable
		private static CachedStickyBroadcast getValueUncheckedLocked(@NonNull IntentFilter filter) {
		for (int i = sCachedStickyBroadcasts.size() - 1; i >= 0; --i) {
		final CachedStickyBroadcast cachedStickyBroadcast = sCachedStickyBroadcasts.get(i);
		if (IntentFilter.filterEquals(filter, cachedStickyBroadcast.filter)) {
		return cachedStickyBroadcast;
		}
		}
		return null;
		}

		public static void incrementVersion(@NonNull String action) {
		if (!shouldIncrementVersion(action)) {
		return;
		}
		final String key = getKey(action);
		synchronized (sCachedPropertyHandles) {
		SystemProperties.Handle handle = sCachedPropertyHandles.get(key);
		final long version;
		if (handle == null) {
		handle = SystemProperties.find(key);
		if (handle != null) {
		sCachedPropertyHandles.put(key, handle);
		}
		}
		version = handle == null ? 0 : handle.getLong(0 /* def */);
		SystemProperties.set(key, String.valueOf(version + 1));
		if (handle == null) {
		sCachedPropertyHandles.put(key, SystemProperties.find(key));
		}
		}
		}

		public static void incrementVersionIfExists(@NonNull String action) {
		if (!shouldIncrementVersion(action)) {
		return;
		}
		final String key = getKey(action);
		synchronized (sCachedPropertyHandles) {
		final SystemProperties.Handle handle = sCachedPropertyHandles.get(key);
		if (handle == null) {
		return;
		}
		final long version = handle.getLong(0 /* def */);
		SystemProperties.set(key, String.valueOf(version + 1));
		}
		}

		private static boolean shouldIncrementVersion(@NonNull String action) {
		if (!Flags.useStickyBcastCache()) {
		return false;
		}
		if (!ArrayUtils.contains(CACHED_BROADCAST_ACTIONS, action)) {
		return false;
		}
		return true;
		}

		@VisibleForTesting
		public static void clearForTest() {
		synchronized (sCachedStickyBroadcasts) {
		sCachedStickyBroadcasts.clear();
		}
		synchronized (sCachedPropertyHandles) {
		sCachedPropertyHandles.clear();
		}
		}

		private static final class CachedStickyBroadcast {
		@NonNull public final IntentFilter filter;
		@Nullable public Intent intent;
		@IntRange(from = 0) public long version;
		@NonNull public final SystemProperties.Handle propertyHandle;

		CachedStickyBroadcast(@NonNull IntentFilter filter,
		@NonNull SystemProperties.Handle propertyHandle) {
		this.filter = filter;
		this.propertyHandle = propertyHandle;
		}
		}
		}

core/java/android/app/ContextImpl.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -1922,19 +1922,10 @@ class ContextImpl extends Context {
		}
		}
		try {
		final Intent intent;
		if (receiver == null && BroadcastStickyCache.useCache(filter)) {
		intent = BroadcastStickyCache.getIntentUnchecked(filter);
		} else {
		intent = ActivityManager.getService().registerReceiverWithFeature(
		final Intent intent = ActivityManager.getService().registerReceiverWithFeature(
		mMainThread.getApplicationThread(), mBasePackageName, getAttributionTag(),
		AppOpsManager.toReceiverId(receiver), rd, filter, broadcastPermission,
		userId,
		AppOpsManager.toReceiverId(receiver), rd, filter, broadcastPermission, userId,
		flags);
		if (receiver == null) {
		BroadcastStickyCache.add(filter, intent);
		}
		}
		if (intent != null) {
		intent.setExtrasClassLoader(getClassLoader());
		// TODO: determine at registration time if caller is

core/java/android/app/TEST_MAPPING

+0 −4

Original line number	Diff line number	Diff line
		@@ -177,10 +177,6 @@
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "CtsAppOpsTestCases"
		},
		{
		"file_patterns": ["(/\|^)BroadcastStickyCache.java"],
		"name": "BroadcastUnitTests"
		}
		]
		}

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

+3 −31

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import android.app.ApplicationExitInfo;
		import android.app.ApplicationThreadConstants;
		import android.app.BackgroundStartPrivileges;
		import android.app.BroadcastOptions;
		import android.app.BroadcastStickyCache;
		import android.app.IApplicationThread;
		import android.app.compat.CompatChanges;
		import android.appwidget.AppWidgetManager;
		@@ -702,7 +701,6 @@ class BroadcastController {
		boolean serialized, boolean sticky, int userId) {
		mService.enforceNotIsolatedCaller("broadcastIntent");

		int result;
		synchronized (mService) {
		intent = verifyBroadcastLocked(intent);

		@@ -724,7 +722,7 @@ class BroadcastController {

		final long origId = Binder.clearCallingIdentity();
		try {
		result = broadcastIntentLocked(callerApp,
		return broadcastIntentLocked(callerApp,
		callerApp != null ? callerApp.info.packageName : null, callingFeatureId,
		intent, resolvedType, resultToApp, resultTo, resultCode, resultData,
		resultExtras, requiredPermissions, excludedPermissions, excludedPackages,
		@@ -735,10 +733,6 @@ class BroadcastController {
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		}
		}
		if (sticky && result == ActivityManager.BROADCAST_SUCCESS) {
		BroadcastStickyCache.incrementVersion(intent.getAction());
		}
		return result;
		}

		// Not the binder call surface
		@@ -749,7 +743,6 @@ class BroadcastController {
		boolean serialized, boolean sticky, int userId,
		BackgroundStartPrivileges backgroundStartPrivileges,
		@Nullable int[] broadcastAllowList) {
		int result;
		synchronized (mService) {
		intent = verifyBroadcastLocked(intent);

		@@ -757,7 +750,7 @@ class BroadcastController {
		String[] requiredPermissions = requiredPermission == null ? null
		: new String[] {requiredPermission};
		try {
		result = broadcastIntentLocked(null, packageName, featureId, intent, resolvedType,
		return broadcastIntentLocked(null, packageName, featureId, intent, resolvedType,
		resultToApp, resultTo, resultCode, resultData, resultExtras,
		requiredPermissions, null, null, OP_NONE, bOptions, serialized, sticky, -1,
		uid, realCallingUid, realCallingPid, userId,
		@@ -767,10 +760,6 @@ class BroadcastController {
		Binder.restoreCallingIdentity(origId);
		}
		}
		if (sticky && result == ActivityManager.BROADCAST_SUCCESS) {
		BroadcastStickyCache.incrementVersion(intent.getAction());
		}
		return result;
		}

		@GuardedBy("mService")
		@@ -1469,7 +1458,6 @@ class BroadcastController {
		list.add(StickyBroadcast.create(new Intent(intent), deferUntilActive,
		callingUid, callerAppProcessState, resolvedType));
		}
		BroadcastStickyCache.incrementVersion(intent.getAction());
		}
		}

		@@ -1736,7 +1724,6 @@ class BroadcastController {
		Slog.w(TAG, msg);
		throw new SecurityException(msg);
		}
		final ArrayList<String> changedStickyBroadcasts = new ArrayList<>();
		synchronized (mStickyBroadcasts) {
		ArrayMap<String, ArrayList<StickyBroadcast>> stickies = mStickyBroadcasts.get(userId);
		if (stickies != null) {
		@@ -1753,16 +1740,12 @@ class BroadcastController {
		if (list.size() <= 0) {
		stickies.remove(intent.getAction());
		}
		changedStickyBroadcasts.add(intent.getAction());
		}
		if (stickies.size() <= 0) {
		mStickyBroadcasts.remove(userId);
		}
		}
		}
		for (int i = changedStickyBroadcasts.size() - 1; i >= 0; --i) {
		BroadcastStickyCache.incrementVersionIfExists(changedStickyBroadcasts.get(i));
		}
		}

		void finishReceiver(IBinder caller, int resultCode, String resultData,
		@@ -1925,9 +1908,7 @@ class BroadcastController {

		private void sendPackageBroadcastLocked(int cmd, String[] packages, int userId) {
		mService.mProcessList.sendPackageBroadcastLocked(cmd, packages, userId);
		}

		private List<ResolveInfo> collectReceiverComponents(
		}private List<ResolveInfo> collectReceiverComponents(
		Intent intent, String resolvedType, int callingUid, int callingPid,
		int[] users, int[] broadcastAllowList) {
		// TODO: come back and remove this assumption to triage all broadcasts
		@@ -2143,18 +2124,9 @@ class BroadcastController {
		}

		void removeStickyBroadcasts(int userId) {
		final ArrayList<String> changedStickyBroadcasts = new ArrayList<>();
		synchronized (mStickyBroadcasts) {
		final ArrayMap<String, ArrayList<StickyBroadcast>> stickies =
		mStickyBroadcasts.get(userId);
		if (stickies != null) {
		changedStickyBroadcasts.addAll(stickies.keySet());
		}
		mStickyBroadcasts.remove(userId);
		}
		for (int i = changedStickyBroadcasts.size() - 1; i >= 0; --i) {
		BroadcastStickyCache.incrementVersionIfExists(changedStickyBroadcasts.get(i));
		}
		}

		@NeverCompile

tests/broadcasts/OWNERS

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		# Bug component: 316181
		include platform/frameworks/base:/BROADCASTS_OWNERS