Remove the use of native allocation.

1 files changed, 4 insertions, 19 deletions

diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 362914a..df014cd 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -171,16 +171,12 @@ public class Util {
      * @param uri
      */
     public static Bitmap makeBitmap(int minSideLength, int maxNumOfPixels,
-            Uri uri, ContentResolver cr, boolean useNative) {
+            Uri uri, ContentResolver cr) {
         ParcelFileDescriptor input = null;
         try {
             input = cr.openFileDescriptor(uri, "r");
-            BitmapFactory.Options options = null;
-            if (useNative) {
-                options = createNativeAllocOptions();
-            }
             return makeBitmap(minSideLength, maxNumOfPixels, uri, cr, input,
-                    options);
+                    null);
         } catch (IOException ex) {
             return null;
         } finally {
@@ -189,13 +185,9 @@ public class Util {
     }
 
     public static Bitmap makeBitmap(int minSideLength, int maxNumOfPixels,
-            ParcelFileDescriptor pfd, boolean useNative) {
-        BitmapFactory.Options options = null;
-        if (useNative) {
-            options = createNativeAllocOptions();
-        }
+            ParcelFileDescriptor pfd) {
         return makeBitmap(minSideLength, maxNumOfPixels, null, null, pfd,
-                options);
+                null);
     }
 
     public static Bitmap makeBitmap(int minSideLength, int maxNumOfPixels,
@@ -281,13 +273,6 @@ public class Util {
         return intent;
     }
 
-    // Returns Options that set the puregeable flag for Bitmap decode.
-    public static BitmapFactory.Options createNativeAllocOptions() {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inNativeAlloc = true;
-        return options;
-    }
-
     public static void showFatalErrorAndFinish(
             final Activity activity, String title, String message) {
         DialogInterface.OnClickListener buttonListener =