diff options
| author | 2014-09-07 01:54:12 +0000 | |
|---|---|---|
| committer | 2014-09-07 01:54:13 +0000 | |
| commit | 68c936f77d836285c255e98b73bdadb78025ade9 (patch) | |
| tree | 4a1bd56e9e7a1a7a6defafefd2463bbf4199fe97 | |
| parent | fdd41b3cbfc16a19c5a16ec9bd56cdd76e179fcf (diff) | |
| parent | 50909f673268aaa477149d5db56379398f9a89db (diff) | |
Merge "Add a hardware feature definition corresponding to audio output support." into lmp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 8f9a5284f0fb..993ada19c47a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8880,6 +8880,7 @@ package android.content.pm { field public static final java.lang.String EXTRA_VERIFICATION_RESULT = "android.content.pm.extra.VERIFICATION_RESULT"; field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets"; field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency"; + field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output"; field public static final java.lang.String FEATURE_BACKUP = "android.software.backup"; field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth"; field public static final java.lang.String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index e87adda50745..748fca2b21e1 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -976,6 +976,14 @@ 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 + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device is capable of communicating with * other devices via Bluetooth. */ |