summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-07-24 02:53:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-24 02:53:59 +0000
commit40481a7126095606865f6b4c172e1f8d9cbf22f3 (patch)
tree8c4c808fed5556bb7e583bbed64f35b2634fe305
parent177a4166252afddbe03a5ed7b2e56b0f9173ef81 (diff)
parentbf7cd01ab0fce5c76364f78e3b9fdba078c197c0 (diff)
downloadframeworks_native-40481a7126095606865f6b4c172e1f8d9cbf22f3.zip
frameworks_native-40481a7126095606865f6b4c172e1f8d9cbf22f3.tar.gz
frameworks_native-40481a7126095606865f6b4c172e1f8d9cbf22f3.tar.bz2
am bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit 'bf7cd01ab0fce5c76364f78e3b9fdba078c197c0': Add FEATURE_FINGERPRINT to PackageManager's feature list
-rw-r--r--data/etc/android.hardware.fingerprint.xml20
1 files changed, 20 insertions, 0 deletions
diff --git a/data/etc/android.hardware.fingerprint.xml b/data/etc/android.hardware.fingerprint.xml
new file mode 100644
index 0000000..3181e7e
--- /dev/null
+++ b/data/etc/android.hardware.fingerprint.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<!-- This is the standard set of features for a biometric fingerprint sensor. -->
+<permissions>
+ <feature name="android.hardware.fingerprint" />
+</permissions>