From 7f0aafbcba1af6aea466de8fd60d906554107983 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 21 Nov 2013 15:37:28 +0100
Subject: [PATCH] (Android) Camera update - update onCameraPoll Java function -
 remove ret variable - remove FIXME in C camera driver for Android

---
 .../com/retroarch/browser/RetroActivity.java  | 19 +++++++------------
 camera/android.c                              |  1 -
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/android/phoenix/src/com/retroarch/browser/RetroActivity.java b/android/phoenix/src/com/retroarch/browser/RetroActivity.java
index 2fdbcb5de0..6fd87dccc9 100644
--- a/android/phoenix/src/com/retroarch/browser/RetroActivity.java
+++ b/android/phoenix/src/com/retroarch/browser/RetroActivity.java
@@ -36,11 +36,10 @@ public final class RetroActivity extends NativeActivity
 	@SuppressLint("NewApi")
 	public boolean onCameraPoll()
 	{
-		boolean ret;
 		if (texture == null)
 		{
 			Log.i("RetroActivity", "no texture");
-			ret = false;
+			return true;
 		}
 		else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
 		{
@@ -48,23 +47,19 @@ public final class RetroActivity extends NativeActivity
 			{
 				texture.updateTexImage();
 			}
+			
 			long newTimestamp = texture.getTimestamp();
+			
 			if (newTimestamp != lastTimestamp)
 			{
 				lastTimestamp = newTimestamp;
-				ret = true;
+				return true;
 			}
-			else
-			{
-				ret = false;
-			}
-		}
-		else
-		{
-			ret = true;
+			
+			return false;
 		}
 
-		return ret;
+		return true;
 	}
 
 	public void onCameraFree()
diff --git a/camera/android.c b/camera/android.c
index dff4116cbd..1b8fd3fbcf 100644
--- a/camera/android.c
+++ b/camera/android.c
@@ -157,7 +157,6 @@ static bool android_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t
          0.0f, 0.0f, 1.0f
       };
 
-      // FIXME: Still only gets a black picture back
       if (frame_gl_cb)
         frame_gl_cb(androidcamera->tex,
               GL_TEXTURE_EXTERNAL_OES,