Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1b71e83 authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev am: a5d8c371 

am: a64203d6

Change-Id: I3ee35bba2cf8e38a2667145ec818dd573da003a2
parents 958f8ed5 a64203d6

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";