commit 98e1566448ddf40ccb5bba7e9e858f21e5492164
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 05 16:45:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 05 16:45:55 2020 +0000
tree e7d795ca511a1925084e7d0d59b42499a5928135
parent e7a37e9328ff7b1faac7715495b1e5f11ce3c094
parent 9bae5c2fb4ddd238f88df4ba716411376aa6632f

Merge "Fix b/160761473 - Broken test: android.nativemidi.cts.NativeMidiEchoTest..."

tests/tests/nativemidi/jni/native-lib.cpp

diff --git a/tests/tests/nativemidi/jni/native-lib.cpp b/tests/tests/nativemidi/jni/native-lib.cpp
index f482eee..5a2f0ca 100644
--- a/tests/tests/nativemidi/jni/native-lib.cpp
+++ b/tests/tests/nativemidi/jni/native-lib.cpp
@@ -278,6 +278,8 @@
 
 JNIEXPORT jlong JNICALL Java_android_nativemidi_cts_NativeMidiEchoTest_allocTestContext(
         JNIEnv* env, jclass) {
+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "allocTestContext()");
+
     TestContext* context = new TestContext;
     if (!context->initN(env)) {
         delete context;
@@ -289,6 +291,7 @@
 
 JNIEXPORT void JNICALL Java_android_nativemidi_cts_NativeMidiEchoTest_freeTestContext(
         JNIEnv*, jclass, jlong context) {
+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "freeTestContext()");
     delete (TestContext*)context;
 }
 
@@ -469,6 +472,11 @@
 
     // __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "++++ startReadingMidi()");
     TestContext* context = (TestContext*)ctx;
+    if (context == nullptr) {
+        __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
+                "Test Context is null in  startReadingMidi()");
+        return AMEDIA_ERROR_INVALID_OBJECT;
+    }
 
     AMidiOutputPort* outputPort;
     media_status_t status = AMidiOutputPort_open(context->nativeDevice, portNumber, &outputPort);
@@ -494,6 +502,11 @@
 
     // __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "++++ stopReadingMidi()");
     TestContext* context = (TestContext*)ctx;
+    if (context == nullptr) {
+        __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
+                "Test Context is null in  stopReadingMidi()");
+        return AMEDIA_ERROR_INVALID_OBJECT;
+    }
     context->mReading = false;
 
     context->mReadThread->join();