Merge "Merge "Resolve conflict between javadoc and CDD re: audio output" into... (6d2ef9b7) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1664,7 +1664,8 @@ public abstract class PackageManager {
		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device includes at least one form of audio
		* output, such as speakers, audio jack or streaming over bluetooth
		* output, as defined in the Android Compatibility Definition Document (CDD)
		* <a href="https://source.android.com/compatibility/android-cdd#7_8_audio">section 7.8 Audio</a>.
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output";