Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
formats
  • Loading branch information
BradenBagby committed Feb 28, 2023
commit 6e2a42f6f23341af6e20b1f7c966b34f8ea78a25
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,10 @@ public void setDescriptionWhileRecording(

// See VideoRenderer.java requires API 26 to switch camera while recording
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O) {
result.error("setDescriptionWhileRecordingFailed", "Device does not support switching the camera while recording", null);
result.error(
"setDescriptionWhileRecordingFailed",
"Device does not support switching the camera while recording",
null);
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ public void draw(int viewportWidth, int viewportHeight, float[] texMatrix) {

EGLExt.eglPresentationTimeANDROID(display, surface, uptimeMillis() * 1000000);
if (!EGL14.eglSwapBuffers(display, surface)) {
Log.w(TAG, "eglSwapBuffers() " + GLUtils.getEGLErrorString(EGL14.eglGetError()));
Log.w(TAG, "eglSwapBuffers() " + GLUtils.getEGLErrorString(EGL14.eglGetError()));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,10 @@ public void setDescriptionWhileRecording() {

if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O) {
verify(mockResult, times(1))
.error(eq("setDescriptionWhileRecordingFailed"), eq("Device does not support switching the camera while recording"), eq(null));
.error(
eq("setDescriptionWhileRecordingFailed"),
eq("Device does not support switching the camera while recording"),
eq(null));
} else {
verify(mockResult, times(1)).success(null);
verify(mockResult, never()).error(any(), any(), any());
Expand Down