diff options
| author | Glenn Kasten <gkasten@google.com> | 2018-05-29 12:21:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-29 12:21:18 -0700 |
| commit | a64203d6085c6a28ccf8d936495f935aced70c61 (patch) | |
| tree | 4de15530943fe237833df783329902ba1e656892 /core/java/android | |
| parent | ecfc6b408bddbc8c3d6137d13258f99c26fc391c (diff) | |
| parent | a5d8c3718d23cbe316cb10106bce95c44bb57489 (diff) | |
Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
am: a5d8c3718d
Change-Id: I7cd068ce53874be19ed4a81e32b87731b0d13c35
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 15aedd7cf502..63de8bf49f8b 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"; |