summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2013-10-13 15:51:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-13 15:51:59 -0700
commit055558b257e893b50a7dff1d60f6ccc970abe46c (patch)
tree1e7d89babfc990ef5f430a1ad27f868b7a2c47a2
parent44b09f8b55bef56e06ad584db231916c17e30f5b (diff)
parent2d344979eb200b7fb8ba4d811a22c80b1d77b564 (diff)
downloadframeworks_native-055558b257e893b50a7dff1d60f6ccc970abe46c.zip
frameworks_native-055558b257e893b50a7dff1d60f6ccc970abe46c.tar.gz
frameworks_native-055558b257e893b50a7dff1d60f6ccc970abe46c.tar.bz2
am 2d344979: Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev
* commit '2d344979eb200b7fb8ba4d811a22c80b1d77b564': Adding PackageManager feature strings for stepcounter and stepdetector.
-rw-r--r--data/etc/android.hardware.sensor.stepcounter.xml20
-rw-r--r--data/etc/android.hardware.sensor.stepdetector.xml20
2 files changed, 40 insertions, 0 deletions
diff --git a/data/etc/android.hardware.sensor.stepcounter.xml b/data/etc/android.hardware.sensor.stepcounter.xml
new file mode 100644
index 0000000..401ae92
--- /dev/null
+++ b/data/etc/android.hardware.sensor.stepcounter.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Feature for devices with a hardware step counter. -->
+<permissions>
+ <feature name="android.hardware.sensor.stepcounter" />
+</permissions>
diff --git a/data/etc/android.hardware.sensor.stepdetector.xml b/data/etc/android.hardware.sensor.stepdetector.xml
new file mode 100644
index 0000000..7037b9a
--- /dev/null
+++ b/data/etc/android.hardware.sensor.stepdetector.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Feature for devices with a step detector. -->
+<permissions>
+ <feature name="android.hardware.sensor.stepdetector" />
+</permissions>