diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-29 19:37:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-29 19:37:59 +0000 |
| commit | 6d2ef9b78d57302ea5119340d1bce13b76398d8b (patch) | |
| tree | c0f43a27c5f2f69c3b3103aa8c50b7d33689ed18 /core/java/android | |
| parent | 4c83b0fb8a77e6d48b62608347baa13fad6c3eab (diff) | |
| parent | d1b71e83317c2826034483f3751890c9c0458f4a (diff) | |
Merge "Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev am: a5d8c3718d am: a64203d608"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 1268beb45e80..aa0cacbacecb 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -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"; |