am 5518ab06: am f3afe157: Merge "AudioManager: deprecate vibrate settings" into jb-dev (50c07796) · Commits · e / os / android_frameworks_base

api/current.txt

+11 −11

Original line number	Diff line number	Diff line
		@@ -10643,7 +10643,7 @@ package android.media {
		method public deprecated int getRouting(int);
		method public int getStreamMaxVolume(int);
		method public int getStreamVolume(int);
		method public int getVibrateSetting(int);
		method public deprecated int getVibrateSetting(int);
		method public boolean isBluetoothA2dpOn();
		method public boolean isBluetoothScoAvailableOffCall();
		method public boolean isBluetoothScoOn();
		@@ -10668,9 +10668,9 @@ package android.media {
		method public void setStreamMute(int, boolean);
		method public void setStreamSolo(int, boolean);
		method public void setStreamVolume(int, int, int);
		method public void setVibrateSetting(int, int);
		method public deprecated void setVibrateSetting(int, int);
		method public deprecated void setWiredHeadsetOn(boolean);
		method public boolean shouldVibrate(int);
		method public deprecated boolean shouldVibrate(int);
		method public void startBluetoothSco();
		method public void stopBluetoothSco();
		method public void unloadSoundEffects();
		@@ -10693,8 +10693,8 @@ package android.media {
		field public static final java.lang.String EXTRA_RINGER_MODE = "android.media.EXTRA_RINGER_MODE";
		field public static final java.lang.String EXTRA_SCO_AUDIO_PREVIOUS_STATE = "android.media.extra.SCO_AUDIO_PREVIOUS_STATE";
		field public static final java.lang.String EXTRA_SCO_AUDIO_STATE = "android.media.extra.SCO_AUDIO_STATE";
		field public static final java.lang.String EXTRA_VIBRATE_SETTING = "android.media.EXTRA_VIBRATE_SETTING";
		field public static final java.lang.String EXTRA_VIBRATE_TYPE = "android.media.EXTRA_VIBRATE_TYPE";
		field public static final deprecated java.lang.String EXTRA_VIBRATE_SETTING = "android.media.EXTRA_VIBRATE_SETTING";
		field public static final deprecated java.lang.String EXTRA_VIBRATE_TYPE = "android.media.EXTRA_VIBRATE_TYPE";
		field public static final int FLAG_ALLOW_RINGER_MODES = 2; // 0x2
		field public static final int FLAG_PLAY_SOUND = 4; // 0x4
		field public static final int FLAG_REMOVE_SOUND_AND_VIBRATE = 8; // 0x8
		@@ -10739,12 +10739,12 @@ package android.media {
		field public static final int STREAM_SYSTEM = 1; // 0x1
		field public static final int STREAM_VOICE_CALL = 0; // 0x0
		field public static final int USE_DEFAULT_STREAM_TYPE = -2147483648; // 0x80000000
		field public static final java.lang.String VIBRATE_SETTING_CHANGED_ACTION = "android.media.VIBRATE_SETTING_CHANGED";
		field public static final int VIBRATE_SETTING_OFF = 0; // 0x0
		field public static final int VIBRATE_SETTING_ON = 1; // 0x1
		field public static final int VIBRATE_SETTING_ONLY_SILENT = 2; // 0x2
		field public static final int VIBRATE_TYPE_NOTIFICATION = 1; // 0x1
		field public static final int VIBRATE_TYPE_RINGER = 0; // 0x0
		field public static final deprecated java.lang.String VIBRATE_SETTING_CHANGED_ACTION = "android.media.VIBRATE_SETTING_CHANGED";
		field public static final deprecated int VIBRATE_SETTING_OFF = 0; // 0x0
		field public static final deprecated int VIBRATE_SETTING_ON = 1; // 0x1
		field public static final deprecated int VIBRATE_SETTING_ONLY_SILENT = 2; // 0x2
		field public static final deprecated int VIBRATE_TYPE_NOTIFICATION = 1; // 0x1
		field public static final deprecated int VIBRATE_TYPE_RINGER = 0; // 0x0
		}

		public static abstract interface AudioManager.OnAudioFocusChangeListener {

media/java/android/media/AudioManager.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,8 @@ public class AudioManager {
		*
		* @see #EXTRA_VIBRATE_TYPE
		* @see #EXTRA_VIBRATE_SETTING
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode and listen to {@link #RINGER_MODE_CHANGED_ACTION} instead.
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String VIBRATE_SETTING_CHANGED_ACTION =
		@@ -133,6 +135,8 @@ public class AudioManager {
		* @see #VIBRATE_SETTING_ON
		* @see #VIBRATE_SETTING_OFF
		* @see #VIBRATE_SETTING_ONLY_SILENT
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode and listen to {@link #RINGER_MODE_CHANGED_ACTION} instead.
		*/
		public static final String EXTRA_VIBRATE_SETTING = "android.media.EXTRA_VIBRATE_SETTING";

		@@ -142,6 +146,8 @@ public class AudioManager {
		* @see #VIBRATE_SETTING_CHANGED_ACTION
		* @see #VIBRATE_TYPE_NOTIFICATION
		* @see #VIBRATE_TYPE_RINGER
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode and listen to {@link #RINGER_MODE_CHANGED_ACTION} instead.
		*/
		public static final String EXTRA_VIBRATE_TYPE = "android.media.EXTRA_VIBRATE_TYPE";

		@@ -340,6 +346,8 @@ public class AudioManager {
		* @see #setVibrateSetting(int, int)
		* @see #getVibrateSetting(int)
		* @see #shouldVibrate(int)
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode that can be queried via {@link #getRingerMode()}.
		*/
		public static final int VIBRATE_TYPE_RINGER = 0;

		@@ -349,6 +357,8 @@ public class AudioManager {
		* @see #setVibrateSetting(int, int)
		* @see #getVibrateSetting(int)
		* @see #shouldVibrate(int)
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode that can be queried via {@link #getRingerMode()}.
		*/
		public static final int VIBRATE_TYPE_NOTIFICATION = 1;

		@@ -357,6 +367,8 @@ public class AudioManager {
		*
		* @see #setVibrateSetting(int, int)
		* @see #getVibrateSetting(int)
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode that can be queried via {@link #getRingerMode()}.
		*/
		public static final int VIBRATE_SETTING_OFF = 0;

		@@ -365,6 +377,8 @@ public class AudioManager {
		*
		* @see #setVibrateSetting(int, int)
		* @see #getVibrateSetting(int)
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode that can be queried via {@link #getRingerMode()}.
		*/
		public static final int VIBRATE_SETTING_ON = 1;

		@@ -374,6 +388,8 @@ public class AudioManager {
		*
		* @see #setVibrateSetting(int, int)
		* @see #getVibrateSetting(int)
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode that can be queried via {@link #getRingerMode()}.
		*/
		public static final int VIBRATE_SETTING_ONLY_SILENT = 2;

		@@ -966,6 +982,8 @@ public class AudioManager {
		* called.
		* @see #setVibrateSetting(int, int)
		* @see #getVibrateSetting(int)
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode that can be queried via {@link #getRingerMode()}.
		*/
		public boolean shouldVibrate(int vibrateType) {
		IAudioService service = getService();
		@@ -991,6 +1009,8 @@ public class AudioManager {
		* {@link #VIBRATE_SETTING_ONLY_SILENT}.
		* @see #setVibrateSetting(int, int)
		* @see #shouldVibrate(int)
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode that can be queried via {@link #getRingerMode()}.
		*/
		public int getVibrateSetting(int vibrateType) {
		IAudioService service = getService();
		@@ -1017,6 +1037,8 @@ public class AudioManager {
		* {@link #VIBRATE_SETTING_ONLY_SILENT}.
		* @see #getVibrateSetting(int)
		* @see #shouldVibrate(int)
		* @deprecated Applications should maintain their own vibrate policy based on
		* current ringer mode that can be queried via {@link #getRingerMode()}.
		*/
		public void setVibrateSetting(int vibrateType, int vibrateSetting) {
		IAudioService service = getService();