diff options
| author | Aravind Akella <aakella@google.com> | 2015-06-10 22:56:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 22:56:33 +0000 |
| commit | 0d07846f0f111bc7afa5a153aa67a12022263a38 (patch) | |
| tree | 9c5a0b762e7882383c18df7a4666a9f396e5c666 /core/java/android/hardware | |
| parent | 1527edbcf93bac258d384da3d0007c810856ea4e (diff) | |
| parent | 1b41cc9567ebe7fc2217357895d1ac17aa6d3bf6 (diff) | |
| download | frameworks_base-0d07846f0f111bc7afa5a153aa67a12022263a38.zip frameworks_base-0d07846f0f111bc7afa5a153aa67a12022263a38.tar.gz frameworks_base-0d07846f0f111bc7afa5a153aa67a12022263a38.tar.bz2 | |
Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/SensorManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/SystemSensorManager.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index fda889f..d6b1142 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -1577,7 +1577,7 @@ public abstract class SensorManager { * Significant Motion, Step Counter etc. * * The tests which call this API need to have {@code - * android.permission.HARDWARE_TEST} permission which isn't + * android.permission.LOCATION_HADWARE} permission which isn't * available for third party applications. * * @param enable True to set the HAL in DATA_INJECTION mode. @@ -1607,7 +1607,7 @@ public abstract class SensorManager { * the HAL is already in data injection mode. * * The tests which call this API need to have {@code - * android.permission.HARDWARE_TEST} permission which isn't + * android.permission.LOCATION_HARDWARE} permission which isn't * available for third party applications. * * @param sensor The sensor to inject. diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index 22a9e9c..d7960af 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -80,7 +80,7 @@ public class SystemSensorManager extends SensorManager { nativeClassInit(); } mHasDataInjectionPermissions = context.checkSelfPermission( - Manifest.permission.HARDWARE_TEST) == PackageManager.PERMISSION_GRANTED; + Manifest.permission.LOCATION_HARDWARE) == PackageManager.PERMISSION_GRANTED; } // initialize the sensor list @@ -233,7 +233,7 @@ public class SystemSensorManager extends SensorManager { protected boolean enableDataInjectionImpl(boolean enable) { if (!mHasDataInjectionPermissions) { throw new SecurityException("Permission denial. Calling enableDataInjection without " - + Manifest.permission.HARDWARE_TEST); + + Manifest.permission.LOCATION_HARDWARE); } synchronized (mLock) { int ret = nativeEnableDataInjection(mNativeInstance, enable); @@ -256,7 +256,7 @@ public class SystemSensorManager extends SensorManager { long timestamp) { if (!mHasDataInjectionPermissions) { throw new SecurityException("Permission denial. Calling injectSensorData without " - + Manifest.permission.HARDWARE_TEST); + + Manifest.permission.LOCATION_HARDWARE); } synchronized (mLock) { if (!mDataInjectionMode) { |