Merge "Explicitly list all event types in switch for callback" into mnc-dev

2 files changed, 12 insertions, 0 deletions

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 1e07f78..5bc8b01 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -1291,8 +1291,13 @@ static void audioTrack_callBack_pullFromBuffQueue(int event, void* user, void *i
         audioTrack_handleUnderrun_lockPlay(ap);
         break;
 
+    case android::AudioTrack::EVENT_NEW_IAUDIOTRACK:
+        // ignore for now
+        break;
+
     case android::AudioTrack::EVENT_BUFFER_END:
     case android::AudioTrack::EVENT_LOOP_END:
+    case android::AudioTrack::EVENT_STREAM_END:
         // These are unexpected so fall through
     default:
         // FIXME where does the notification of SL_PLAYEVENT_HEADMOVING fit?
diff --git a/src/android/AudioRecorder_to_android.cpp b/src/android/AudioRecorder_to_android.cpp
index 5ad073f..e63d80a 100644
--- a/src/android/AudioRecorder_to_android.cpp
+++ b/src/android/AudioRecorder_to_android.cpp
@@ -281,6 +281,13 @@ static void audioRecorder_callback(int event, void* user, void *info) {
         audioRecorder_handleNewPos_lockRecord(ar);
         break;
 
+    case android::AudioRecord::EVENT_NEW_IAUDIORECORD:
+        // ignore for now
+        break;
+
+    default:
+        SL_LOGE("Encountered unknown AudioRecord event %d for CAudioRecord %p", event, ar);
+        break;
     }
 
     ar->mCallbackProtector->exitCb();