summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2015-06-11 02:35:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-11 02:35:26 +0000
commitcd2e238ead9065bf501b319ea871ffb22a16ab47 (patch)
tree5f756b3ffc33e012f71d9030421fc0754f5b2a9f /services
parent589f374006c8af6285f0cb611b1d3673d3f8ad07 (diff)
parentce5af4b234ed6f5d6c39d47426d4e961bf3c2858 (diff)
downloadframeworks_native-cd2e238ead9065bf501b319ea871ffb22a16ab47.zip
frameworks_native-cd2e238ead9065bf501b319ea871ffb22a16ab47.tar.gz
frameworks_native-cd2e238ead9065bf501b319ea871ffb22a16ab47.tar.bz2
am ce5af4b2: am 52720f45: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
* commit 'ce5af4b234ed6f5d6c39d47426d4e961bf3c2858': Use LOCATION_HARDWARE permission for data injection.
Diffstat (limited to 'services')
-rw-r--r--services/sensorservice/SensorService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index ae8b3b3..cf750ee 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -66,7 +66,7 @@ namespace android {
const char* SensorService::WAKE_LOCK_NAME = "SensorService";
// Permissions.
-static const String16 sDataInjectionPermission("android.permission.HARDWARE_TEST");
+static const String16 sDataInjectionPermission("android.permission.LOCATION_HARDWARE");
static const String16 sDump("android.permission.DUMP");
SensorService::SensorService()