Revert "CTS: Fixes a possible "out of memory" exception"

This reverts commit 7eade134.

This causes the test to fail on Nexus S, so I'm reverting
the change for Gingerbread. However, it will be included in
a future CTS release.

Additional info from Wu-cheng:
"The change made the test faster. If apps call setParameters
right after jpeg callback is received, it will fail. This is
not a regression and I believe it does not impact users."

Change-Id: I14ce1235581dac5543983f60ed047ae9331a754a

tests/tests/hardware/src/android/hardware/cts/CameraTest.java

@@ -331,11 +331,9 @@ public class CameraTest extends ActivityInstrumentationTestCase2<CameraStubActiv
         assertTrue(mShutterCallbackResult);
         assertTrue(mJpegPictureCallbackResult);
         assertNotNull(mJpegData);
-        BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
-        bmpOptions.inJustDecodeBounds = true;
-        BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length, bmpOptions);
-        assertEquals(pictureSize.width, bmpOptions.outWidth);
-        assertEquals(pictureSize.height, bmpOptions.outHeight);
+        Bitmap b = BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length);
+        assertEquals(pictureSize.width, b.getWidth());
+        assertEquals(pictureSize.height, b.getHeight());
     }
 
     @TestTargets({
@@ -763,11 +761,9 @@ public class CameraTest extends ActivityInstrumentationTestCase2<CameraStubActiv
         ExifInterface exif = new ExifInterface(JPEG_PATH);
         assertTrue(exif.hasThumbnail());
         byte[] thumb = exif.getThumbnail();
-        BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
-        bmpOptions.inJustDecodeBounds = true;
-        BitmapFactory.decodeByteArray(thumb, 0, thumb.length, bmpOptions);
-        assertEquals(size.width, bmpOptions.outWidth);
-        assertEquals(size.height, bmpOptions.outHeight);
+        Bitmap b = BitmapFactory.decodeByteArray(thumb, 0, thumb.length);
+        assertEquals(size.width, b.getWidth());
+        assertEquals(size.height, b.getHeight());
 
         // Test no thumbnail case.
         p.setJpegThumbnailSize(0, 0);
@@ -1455,11 +1451,11 @@ public class CameraTest extends ActivityInstrumentationTestCase2<CameraStubActiv
                 waitForSnapshotDone();
                 assertTrue(mJpegPictureCallbackResult);
                 assertNotNull(mJpegData);
-                BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
-                bmpOptions.inJustDecodeBounds = true;
-                BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length, bmpOptions);
-                assertEquals(pictureSize.width, bmpOptions.outWidth);
-                assertEquals(pictureSize.height, bmpOptions.outHeight);
+                Bitmap b = BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length);
+                assertEquals(pictureSize.width, b.getWidth());
+                assertEquals(pictureSize.height, b.getHeight());
+                b.recycle();
+                b = null;
             }
         }
         terminateMessageLooper();