summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2013-10-13 15:55:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-13 15:55:32 -0700
commit67af9ce31e7642ffc5737b9c29812c4bfdf789e0 (patch)
tree1d055ffdab434c56325c4e009744a9746a717e73 /core/java
parentd428d64387478eb2bd8773450934e53ef3ed11b0 (diff)
parentc73810de2fa9184d808719ccdfe5f1a8b9864135 (diff)
am c73810de: am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev
* commit 'c73810de2fa9184d808719ccdfe5f1a8b9864135': Adding stepcounter & stepdetector feature strings.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/pm/PackageManager.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 8b8c58b87076..c97c2b89304d 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1026,6 +1026,20 @@ public abstract class PackageManager {
/**
* Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device includes a hardware step counter.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_SENSOR_STEP_COUNTER = "android.hardware.sensor.stepcounter";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device includes a hardware step detector.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_SENSOR_STEP_DETECTOR = "android.hardware.sensor.stepdetector";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has a telephony radio with data
* communication support.
*/
@@ -3186,7 +3200,7 @@ public abstract class PackageManager {
/**
* Returns the device identity that verifiers can use to associate their scheme to a particular
* device. This should not be used by anything other than a package verifier.
- *
+ *
* @return identity that uniquely identifies current device
* @hide
*/