Add Multi Audio focus (4e984e55) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

100644 → 100755

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4729,6 +4729,14 @@ public final class Settings {
	*/		*/
	public static final String SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";		public static final String SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";

			/**
			* Whether or not to enable multiple audio focus.
			* When enabled, requires more management by user over application playback activity,
			* for instance pausing media apps when another starts.
			* @hide
			*/
			public static final String MULTI_AUDIO_FOCUS_ENABLED = "multi_audio_focus_enabled";

	/**		/**
	* IMPORTANT: If you add a new public settings you also have to add it to		* IMPORTANT: If you add a new public settings you also have to add it to
	* PUBLIC_SETTINGS below. If the new setting is hidden you have to add		* PUBLIC_SETTINGS below. If the new setting is hidden you have to add

100644 → 100755

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6001,6 +6001,17 @@ public class AudioManager {
	}		}
	}		}

			/** @hide
			* TODO: make this a @SystemApi */
			@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
			public void setMultiAudioFocusEnabled(boolean enabled) {
			try {
			getService().setMultiAudioFocusEnabled(enabled);
			} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
			}
			}

	//---------------------------------------------------------		//---------------------------------------------------------
	// Inner classes		// Inner classes
	//--------------------		//--------------------

100644 → 100755

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -296,4 +296,6 @@ interface IAudioService {

	// WARNING: read warning at top of file, new methods that need to be used by native		// WARNING: read warning at top of file, new methods that need to be used by native
	// code via IAudioManager.h need to be added to the top section.		// code via IAudioManager.h need to be added to the top section.

			oneway void setMultiAudioFocusEnabled(in boolean enabled);
	}		}

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,8 @@ public class SettingsBackupTest {
	Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities		Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities
	Settings.System.PEAK_REFRESH_RATE, // depends on hardware capabilities		Settings.System.PEAK_REFRESH_RATE, // depends on hardware capabilities
	Settings.System.SCREEN_BRIGHTNESS_FLOAT,		Settings.System.SCREEN_BRIGHTNESS_FLOAT,
	Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT		Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT,
			Settings.System.MULTI_AUDIO_FOCUS_ENABLED // form-factor/OEM specific
	);		);

	private static final Set<String> BACKUP_BLACKLISTED_GLOBAL_SETTINGS =		private static final Set<String> BACKUP_BLACKLISTED_GLOBAL_SETTINGS =

100644 → 100755

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8285,6 +8285,23 @@ public class AudioService extends IAudioService.Stub
	AudioSystem.setAudioHalPids(pidsArray);		AudioSystem.setAudioHalPids(pidsArray);
	}		}

			//======================
			// Multi Audio Focus
			//======================
			public void setMultiAudioFocusEnabled(boolean enabled) {
			enforceModifyAudioRoutingPermission();
			if (mMediaFocusControl != null) {
			boolean mafEnabled = mMediaFocusControl.getMultiAudioFocusEnabled();
			if (mafEnabled != enabled) {
			mMediaFocusControl.updateMultiAudioFocus(enabled);
			if (!enabled) {
			mDeviceBroker.postBroadcastBecomingNoisy();
			}
			}
			}
			}


	//======================		//======================
	// misc		// misc
	//======================		//======================