diff options
| author | Matthew Xie <mattx@google.com> | 2013-04-23 15:52:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-23 15:52:53 -0700 |
| commit | 2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76 (patch) | |
| tree | 6f538f6d12f5a22c284ba604803f1d480770efd1 | |
| parent | ef8dc882ec235310737eead979fe913a8ab3465c (diff) | |
| parent | b442d07469aebc07d1d13b5b64b40aa152022e13 (diff) | |
| download | frameworks_base-2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76.zip frameworks_base-2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76.tar.gz frameworks_base-2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76.tar.bz2 | |
am b442d074: Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
* commit 'b442d07469aebc07d1d13b5b64b40aa152022e13':
Add hardware feature android.hardware.bluetooth.le
| -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 4c54565..9125fa5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6949,6 +6949,7 @@ package android.content.pm { 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_BLUETOOTH = "android.hardware.bluetooth"; + field public static final java.lang.String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le"; field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera"; field public static final java.lang.String FEATURE_CAMERA_ANY = "android.hardware.camera.any"; field public static final java.lang.String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 30bdfef..4266d85 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -870,6 +870,14 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device is capable of communicating with + * other devices via Bluetooth Low Energy radio. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device has a camera facing away * from the screen. */ |