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

Merge "Return correct value at initDataInjection and avoid crash" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-25 23:18:19 +00:00
committed by Android (Google) Code Review
parent db8f2fc025 d9d4e1bc3b
commit 1c5b71ec1f
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,17 +285,22 @@ public class SystemSensorManager extends SensorManager {
}
// Initialize a client for data_injection.
if (sInjectEventQueue == null) {
sInjectEventQueue = new InjectEventQueue(mMainLooper, this,
mContext.getPackageName());
try {
sInjectEventQueue = new InjectEventQueue(
mMainLooper, this, mContext.getPackageName());
} catch (RuntimeException e) {
Log.e(TAG, "Cannot create InjectEventQueue: " + e);
}
}
return sInjectEventQueue != null;
} else {
// If data injection is being disabled clean up the native resources.
if (sInjectEventQueue != null) {
sInjectEventQueue.dispose();
sInjectEventQueue = null;
}
return true;
}
return true;
}
}

5
core/jni/android_hardware_SensorManager.cpp
View File

@@ -427,6 +427,11 @@ static jlong nativeInitSensorEventQueue(JNIEnv *env, jclass clazz, jlong sensorM
String8 clientName(packageUtf.c_str());
sp<SensorEventQueue> queue(mgr->createEventQueue(clientName, mode));
if (queue == NULL) {
jniThrowRuntimeException(env, "Cannot construct native SensorEventQueue.");
return 0;
}
sp<MessageQueue> messageQueue = android_os_MessageQueue_getMessageQueue(env, msgQ);
if (messageQueue == NULL) {
jniThrowRuntimeException(env, "MessageQueue is not initialized.");