summaryrefslogtreecommitdiffstats
path: root/services/core/jni
diff options
context:
space:
mode:
authorWonsik Kim <wonsik@google.com>2014-06-20 17:27:32 +0900
committerWonsik Kim <wonsik@google.com>2014-06-23 14:06:19 +0900
commit9e922ca97097cb1aa67ff53219d874ea2503a80d (patch)
treec08df5c69730b115a062438dde2ba6f6e0e649fb /services/core/jni
parent3722c32860bd74007456076e6fbb4c1b744ed967 (diff)
downloadframeworks_base-9e922ca97097cb1aa67ff53219d874ea2503a80d.zip
frameworks_base-9e922ca97097cb1aa67ff53219d874ea2503a80d.tar.gz
frameworks_base-9e922ca97097cb1aa67ff53219d874ea2503a80d.tar.bz2
Fix native calls to null pointer
Since DEVICE_AVAILABLE event fires right after initialization, it could happen before TvInputHal.mPtr is set, which causes calls to null pointer. Fix the bug by allowing TvInputHal to wait for mPtr to be set before calling native methods. Change-Id: Id07f15130beb69f77c16bf3c735285c31ae4a3a4
Diffstat (limited to 'services/core/jni')
-rw-r--r--services/core/jni/com_android_server_tv_TvInputHal.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/jni/com_android_server_tv_TvInputHal.cpp b/services/core/jni/com_android_server_tv_TvInputHal.cpp
index 9cecdf0..7b8e6fd 100644
--- a/services/core/jni/com_android_server_tv_TvInputHal.cpp
+++ b/services/core/jni/com_android_server_tv_TvInputHal.cpp
@@ -75,7 +75,6 @@ public:
static JTvInputHal* createInstance(JNIEnv* env, jobject thiz);
int setSurface(int deviceId, int streamId, const sp<Surface>& surface);
- void getStreamConfigs(int deviceId, jobjectArray* array);
const tv_stream_config_t* getStreamConfigs(int deviceId, int* numConfigs);
private: