commit aa5d5b1931b0e83f5a3134aaf469ff9cd5b24ee2
author Stephen Hines <srhines@google.com> Tue Feb 12 22:47:46 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 12 22:47:47 2013 +0000
tree 38cc4ad8a44ab22817355b02c220946923bb4380
parent 004158032af4d930c10d224f63cd915f24f4abd8
parent 5f528becb09b0956bcad15b32639f87b87f40f13

Merge "Check Element in all API levels for copy2DRangeFrom()."

graphics/java/android/renderscript/Allocation.java

diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java
index 7e43a9a..1c83c51 100644
--- a/graphics/java/android/renderscript/Allocation.java
+++ b/graphics/java/android/renderscript/Allocation.java
@@ -899,38 +899,22 @@
      * @param data to be placed into the allocation
      */
     public void copy2DRangeFrom(int xoff, int yoff, int w, int h, byte[] data) {
-        // We can only validate the type on API 18+, since this check was not present in
-        // earlier releases.
-        if (mRS.getApplicationContext().getApplicationInfo().targetSdkVersion >= 18) {
-            validateIsInt8();
-        }
+        validateIsInt8();
         copy2DRangeFromUnchecked(xoff, yoff, w, h, data);
     }
 
     public void copy2DRangeFrom(int xoff, int yoff, int w, int h, short[] data) {
-        // We can only validate the type on API 18+, since this check was not present in
-        // earlier releases.
-        if (mRS.getApplicationContext().getApplicationInfo().targetSdkVersion >= 18) {
-            validateIsInt16();
-        }
+        validateIsInt16();
         copy2DRangeFromUnchecked(xoff, yoff, w, h, data);
     }
 
     public void copy2DRangeFrom(int xoff, int yoff, int w, int h, int[] data) {
-        // We can only validate the type on API 18+, since this check was not present in
-        // earlier releases.
-        if (mRS.getApplicationContext().getApplicationInfo().targetSdkVersion >= 18) {
-            validateIsInt32();
-        }
+        validateIsInt32();
         copy2DRangeFromUnchecked(xoff, yoff, w, h, data);
     }
 
     public void copy2DRangeFrom(int xoff, int yoff, int w, int h, float[] data) {
-        // We can only validate the type on API 18+, since this check was not present in
-        // earlier releases.
-        if (mRS.getApplicationContext().getApplicationInfo().targetSdkVersion >= 18) {
-            validateIsFloat32();
-        }
+        validateIsFloat32();
         copy2DRangeFromUnchecked(xoff, yoff, w, h, data);
     }