Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove flag mDataInjectionMode." into mnc-dev

Browse Source
This commit is contained in:
Aravind Akella
2015-07-07 00:24:03 +00:00
committed by Android (Google) Code Review
parent 2924dc3466 d4cc5ec230
commit adaa79d722
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/SystemSensorManager.java
View File

@@ -47,7 +47,6 @@ public class SystemSensorManager extends SensorManager {
private static boolean sSensorModuleInitialized = false; private static boolean sSensorModuleInitialized = false;
private static InjectEventQueue mInjectEventQueue = null; private static InjectEventQueue mInjectEventQueue = null;
private static boolean mDataInjectionMode = false;
private final Object mLock = new Object(); private final Object mLock = new Object();
@@ -235,7 +234,6 @@ public class SystemSensorManager extends SensorManager {
Log.e(TAG, "Data Injection mode not enabled"); Log.e(TAG, "Data Injection mode not enabled");
return false; return false;
} }
mDataInjectionMode = true;
// Initialize a client for data_injection. // Initialize a client for data_injection.
if (mInjectEventQueue == null) { if (mInjectEventQueue == null) {
mInjectEventQueue = new InjectEventQueue(mMainLooper, this); mInjectEventQueue = new InjectEventQueue(mMainLooper, this);
@@ -254,7 +252,7 @@ public class SystemSensorManager extends SensorManager {
protected boolean injectSensorDataImpl(Sensor sensor, float[] values, int accuracy, protected boolean injectSensorDataImpl(Sensor sensor, float[] values, int accuracy,
long timestamp) { long timestamp) {
synchronized (mLock) { synchronized (mLock) {
if (!mDataInjectionMode) { if (mInjectEventQueue == null) {
Log.e(TAG, "Data injection mode not activated before calling injectSensorData"); Log.e(TAG, "Data injection mode not activated before calling injectSensorData");
return false; return false;
} }
@@ -264,7 +262,6 @@ public class SystemSensorManager extends SensorManager {
if (ret != 0) { if (ret != 0) {
mInjectEventQueue.dispose(); mInjectEventQueue.dispose();
mInjectEventQueue = null; mInjectEventQueue = null;
mDataInjectionMode = false;
} }
return ret == 0; return ret == 0;
} }