Snap for 12502765 from 4a4c332d4924df559ff9d44735622b668d7714d2 to 25Q1-release (3163d6dc) · Commits · e / os / android_frameworks_native

include/audiomanager/AudioManager.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ enum {
		PLAYER_MUTE_PLAYBACK_RESTRICTED = (1 << 3),
		PLAYER_MUTE_CLIENT_VOLUME = (1 << 4),
		PLAYER_MUTE_VOLUME_SHAPER = (1 << 5),
		PLAYER_MUTE_PORT_VOLUME = (1 << 6),
		};

		struct mute_state_t {
		@@ -74,6 +75,8 @@ struct mute_state_t {
		bool muteFromClientVolume = false;
		/** Flag used when volume is muted by volume shaper. */
		bool muteFromVolumeShaper = false;
		/** Flag used when volume is muted by port volume. */
		bool muteFromPortVolume = false;

		explicit operator int() const
		{
		@@ -83,6 +86,7 @@ struct mute_state_t {
		result \|= muteFromPlaybackRestricted * PLAYER_MUTE_PLAYBACK_RESTRICTED;
		result \|= muteFromClientVolume * PLAYER_MUTE_CLIENT_VOLUME;
		result \|= muteFromVolumeShaper * PLAYER_MUTE_VOLUME_SHAPER;
		result \|= muteFromPortVolume * PLAYER_MUTE_PORT_VOLUME;
		return result;
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,9 @@ sp<BpBinder> BpBinder::create(int32_t handle, std::function<void()>* postTask) {
		&& currentValue < sBinderProxyCountHighWatermark
		&& ((trackedValue & WARNING_REACHED_MASK) == 0)) [[unlikely]] {
		sTrackingMap[trackedUid] \|= WARNING_REACHED_MASK;
		if (sWarningCallback) sWarningCallback(trackedUid);
		if (sWarningCallback) {
		*postTask = [=]() { sWarningCallback(trackedUid); };
		}
		} else if (currentValue >= sBinderProxyCountHighWatermark) {
		ALOGE("Too many binder proxy objects sent to uid %d from uid %d (%d proxies held)",
		getuid(), trackedUid, trackedValue);

+3 −3

Original line number	Diff line number	Diff line
		@@ -94,6 +94,9 @@
		},
		{
		"name": "libbinder_rpc_unstable_bindgen_test"
		},
		{
		"name": "binderCacheUnitTest"
		}
		],
		"presubmit-large": [
		@@ -133,9 +136,6 @@
		{
		"name": "binder_sdk_test",
		"host": true
		},
		{
		"name": "binderCacheUnitTest"
		}
		],
		"imports": [

+3 −1

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

		package android.content.pm;

		import android.content.pm.StagedApexInfo;

		/**
		* This event is designed for notification to native code listener about
		* any changes to set of apex packages staged for installation on next boot.
		@@ -23,5 +25,5 @@ package android.content.pm;
		* @hide
		*/
		parcelable ApexStagedEvent {
		@utf8InCpp String[] stagedApexModuleNames;
		StagedApexInfo[] stagedApexInfos;
		}

+2 −8

Original line number	Diff line number	Diff line
		@@ -135,13 +135,7 @@ interface IPackageManagerNative {
		void unregisterStagedApexObserver(in IStagedApexObserver observer);

		/**
		* Get APEX module names of all APEX that are staged ready for installation
		* Get information of staged APEXes.
		*/
		@utf8InCpp String[] getStagedApexModuleNames();

		/**
		* Get information of APEX which is staged ready for installation.
		* Returns null if no such APEX is found.
		*/
		@nullable StagedApexInfo getStagedApexInfo(in @utf8InCpp String moduleName);
		StagedApexInfo[] getStagedApexInfos();
		}