Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
diff --git a/services/core/java/com/android/server/tv/TvInputHal.java b/services/core/java/com/android/server/tv/TvInputHal.java
index c12dd63..de271b8 100644
--- a/services/core/java/com/android/server/tv/TvInputHal.java
+++ b/services/core/java/com/android/server/tv/TvInputHal.java
@@ -20,6 +20,7 @@
import android.media.tv.TvStreamConfig;
import android.os.Handler;
import android.os.Message;
+import android.os.MessageQueue;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseIntArray;
@@ -53,7 +54,7 @@
public void onFirstFrameCaptured(int deviceId, int streamId);
}
- private native long nativeOpen();
+ private native long nativeOpen(MessageQueue queue);
private static native int nativeAddOrUpdateStream(long ptr, int deviceId, int streamId,
Surface surface);
@@ -76,7 +77,7 @@
public void init() {
synchronized (mLock) {
- mPtr = nativeOpen();
+ mPtr = nativeOpen(mHandler.getLooper().getQueue());
}
}
diff --git a/services/core/jni/com_android_server_tv_TvInputHal.cpp b/services/core/jni/com_android_server_tv_TvInputHal.cpp
index 5cb0543..dcb5199 100644
--- a/services/core/jni/com_android_server_tv_TvInputHal.cpp
+++ b/services/core/jni/com_android_server_tv_TvInputHal.cpp
@@ -18,6 +18,7 @@
//#define LOG_NDEBUG 0
+#include "android_os_MessageQueue.h"
#include "android_runtime/AndroidRuntime.h"
#include "android_runtime/android_view_Surface.h"
#include "JNIHelp.h"
@@ -27,6 +28,7 @@
#include <utils/Errors.h>
#include <utils/KeyedVector.h>
#include <utils/Log.h>
+#include <utils/Looper.h>
#include <utils/NativeHandle.h>
#include <hardware/tv_input.h>
@@ -233,12 +235,17 @@
public:
~JTvInputHal();
- static JTvInputHal* createInstance(JNIEnv* env, jobject thiz);
+ static JTvInputHal* createInstance(JNIEnv* env, jobject thiz, const sp<Looper>& looper);
int addOrUpdateStream(int deviceId, int streamId, const sp<Surface>& surface);
int removeStream(int deviceId, int streamId);
const tv_stream_config_t* getStreamConfigs(int deviceId, int* numConfigs);
+ void onDeviceAvailable(const tv_input_device_info_t& info);
+ void onDeviceUnavailable(int deviceId);
+ void onStreamConfigurationsChanged(int deviceId);
+ void onCaptured(int deviceId, int streamId, uint32_t seq, bool succeeded);
+
private:
// Connection between a surface and a stream.
class Connection {
@@ -254,28 +261,41 @@
sp<BufferProducerThread> mThread;
};
- JTvInputHal(JNIEnv* env, jobject thiz, tv_input_device_t* dev);
+ class NotifyHandler : public MessageHandler {
+ public:
+ NotifyHandler(JTvInputHal* hal, const tv_input_event_t* event);
+ ~NotifyHandler();
+
+ virtual void handleMessage(const Message& message);
+
+ private:
+ tv_input_event_t mEvent;
+ JTvInputHal* mHal;
+ };
+
+ JTvInputHal(JNIEnv* env, jobject thiz, tv_input_device_t* dev, const sp<Looper>& looper);
static void notify(
tv_input_device_t* dev, tv_input_event_t* event, void* data);
- void onDeviceAvailable(const tv_input_device_info_t& info);
- void onDeviceUnavailable(int deviceId);
- void onStreamConfigurationsChanged(int deviceId);
- void onCaptured(int deviceId, int streamId, uint32_t seq, bool succeeded);
+ static void cloneTvInputEvent(
+ tv_input_event_t* dstEvent, const tv_input_event_t* srcEvent);
Mutex mLock;
jweak mThiz;
tv_input_device_t* mDevice;
tv_input_callback_ops_t mCallback;
+ sp<Looper> mLooper;
KeyedVector<int, KeyedVector<int, Connection> > mConnections;
};
-JTvInputHal::JTvInputHal(JNIEnv* env, jobject thiz, tv_input_device_t* device) {
+JTvInputHal::JTvInputHal(JNIEnv* env, jobject thiz, tv_input_device_t* device,
+ const sp<Looper>& looper) {
mThiz = env->NewWeakGlobalRef(thiz);
mDevice = device;
mCallback.notify = &JTvInputHal::notify;
+ mLooper = looper;
mDevice->initialize(mDevice, &mCallback, this);
}
@@ -288,7 +308,7 @@
mThiz = NULL;
}
-JTvInputHal* JTvInputHal::createInstance(JNIEnv* env, jobject thiz) {
+JTvInputHal* JTvInputHal::createInstance(JNIEnv* env, jobject thiz, const sp<Looper>& looper) {
tv_input_module_t* module = NULL;
status_t err = hw_get_module(TV_INPUT_HARDWARE_MODULE_ID,
(hw_module_t const**)&module);
@@ -309,7 +329,7 @@
return 0;
}
- return new JTvInputHal(env, thiz, device);
+ return new JTvInputHal(env, thiz, device, looper);
}
int JTvInputHal::addOrUpdateStream(int deviceId, int streamId, const sp<Surface>& surface) {
@@ -428,30 +448,20 @@
void JTvInputHal::notify(
tv_input_device_t* dev, tv_input_event_t* event, void* data) {
JTvInputHal* thiz = (JTvInputHal*)data;
- switch (event->type) {
- case TV_INPUT_EVENT_DEVICE_AVAILABLE: {
- thiz->onDeviceAvailable(event->device_info);
- } break;
- case TV_INPUT_EVENT_DEVICE_UNAVAILABLE: {
- thiz->onDeviceUnavailable(event->device_info.device_id);
- } break;
- case TV_INPUT_EVENT_STREAM_CONFIGURATIONS_CHANGED: {
- thiz->onStreamConfigurationsChanged(event->device_info.device_id);
- } break;
- case TV_INPUT_EVENT_CAPTURE_SUCCEEDED: {
- thiz->onCaptured(event->capture_result.device_id,
- event->capture_result.stream_id,
- event->capture_result.seq,
- true /* succeeded */);
- } break;
- case TV_INPUT_EVENT_CAPTURE_FAILED: {
- thiz->onCaptured(event->capture_result.device_id,
- event->capture_result.stream_id,
- event->capture_result.seq,
- false /* succeeded */);
- } break;
- default:
- ALOGE("Unrecognizable event");
+ thiz->mLooper->sendMessage(new NotifyHandler(thiz, event), event->type);
+}
+
+// static
+void JTvInputHal::cloneTvInputEvent(
+ tv_input_event_t* dstEvent, const tv_input_event_t* srcEvent) {
+ memcpy(dstEvent, srcEvent, sizeof(tv_input_event_t));
+ if ((srcEvent->type == TV_INPUT_EVENT_DEVICE_AVAILABLE ||
+ srcEvent->type == TV_INPUT_EVENT_DEVICE_UNAVAILABLE ||
+ srcEvent->type == TV_INPUT_EVENT_STREAM_CONFIGURATIONS_CHANGED) &&
+ srcEvent->device_info.audio_address != NULL){
+ char* audio_address = new char[strlen(srcEvent->device_info.audio_address) + 1];
+ strcpy(audio_address, srcEvent->device_info.audio_address);
+ dstEvent->device_info.audio_address = audio_address;
}
}
@@ -549,10 +559,54 @@
}
}
+JTvInputHal::NotifyHandler::NotifyHandler(JTvInputHal* hal, const tv_input_event_t* event) {
+ mHal = hal;
+ cloneTvInputEvent(&mEvent, event);
+}
+
+JTvInputHal::NotifyHandler::~NotifyHandler() {
+ if ((mEvent.type == TV_INPUT_EVENT_DEVICE_AVAILABLE ||
+ mEvent.type == TV_INPUT_EVENT_DEVICE_UNAVAILABLE ||
+ mEvent.type == TV_INPUT_EVENT_STREAM_CONFIGURATIONS_CHANGED) &&
+ mEvent.device_info.audio_address != NULL) {
+ delete mEvent.device_info.audio_address;
+ }
+}
+
+void JTvInputHal::NotifyHandler::handleMessage(const Message& message) {
+ switch (mEvent.type) {
+ case TV_INPUT_EVENT_DEVICE_AVAILABLE: {
+ mHal->onDeviceAvailable(mEvent.device_info);
+ } break;
+ case TV_INPUT_EVENT_DEVICE_UNAVAILABLE: {
+ mHal->onDeviceUnavailable(mEvent.device_info.device_id);
+ } break;
+ case TV_INPUT_EVENT_STREAM_CONFIGURATIONS_CHANGED: {
+ mHal->onStreamConfigurationsChanged(mEvent.device_info.device_id);
+ } break;
+ case TV_INPUT_EVENT_CAPTURE_SUCCEEDED: {
+ mHal->onCaptured(mEvent.capture_result.device_id,
+ mEvent.capture_result.stream_id,
+ mEvent.capture_result.seq,
+ true /* succeeded */);
+ } break;
+ case TV_INPUT_EVENT_CAPTURE_FAILED: {
+ mHal->onCaptured(mEvent.capture_result.device_id,
+ mEvent.capture_result.stream_id,
+ mEvent.capture_result.seq,
+ false /* succeeded */);
+ } break;
+ default:
+ ALOGE("Unrecognizable event");
+ }
+}
+
////////////////////////////////////////////////////////////////////////////////
-static jlong nativeOpen(JNIEnv* env, jobject thiz) {
- return (jlong)JTvInputHal::createInstance(env, thiz);
+static jlong nativeOpen(JNIEnv* env, jobject thiz, jobject messageQueueObj) {
+ sp<MessageQueue> messageQueue =
+ android_os_MessageQueue_getMessageQueue(env, messageQueueObj);
+ return (jlong)JTvInputHal::createInstance(env, thiz, messageQueue->getLooper());
}
static int nativeAddOrUpdateStream(JNIEnv* env, jclass clazz,
@@ -610,7 +664,7 @@
static JNINativeMethod gTvInputHalMethods[] = {
/* name, signature, funcPtr */
- { "nativeOpen", "()J",
+ { "nativeOpen", "(Landroid/os/MessageQueue;)J",
(void*) nativeOpen },
{ "nativeAddOrUpdateStream", "(JIILandroid/view/Surface;)I",
(void*) nativeAddOrUpdateStream },