Replace use of libcore.io.SizeOf with X.BYTES.

X.BYTES is part of the Android API since API level 24. Since its
introduction, the internal API SizeOf.X is obsolete. This CL
topic removes use of the obsolete API so that it can be dropped
in a follow-up CL.

Bug: 123174577
Test: Ran CtsLibcoreTestCases at a follow-up CL.
Change-Id: I4087c8c4bc8c60afa38103125139d5db689294c4

6 files changed, 6 insertions, 12 deletions

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java
index 80a9be4fc9..a276b02110 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
 import java.nio.CharBuffer;
 import java.nio.DirectByteBuffer;
 import java.nio.NIOAccess;
-import libcore.io.SizeOf;
 
 public class DirectCharBufferTest extends CharBufferTest {
     
@@ -66,7 +65,7 @@ public class DirectCharBufferTest extends CharBufferTest {
 
         // Check if the NIOAccess method adds up the current position value.
         charBuffer.put('b');
-        assertEquals(charBufferBasePointer + SizeOf.CHAR, NIOAccess.getBasePointer(charBuffer));
+        assertEquals(charBufferBasePointer + Character.BYTES, NIOAccess.getBasePointer(charBuffer));
     }
 
     public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java
index f27c897c35..dff392b8b9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
 import java.nio.DirectByteBuffer;
 import java.nio.DoubleBuffer;
 import java.nio.NIOAccess;
-import libcore.io.SizeOf;
 
 public class DirectDoubleBufferTest extends DoubleBufferTest {
     public void setUp(){
@@ -65,7 +64,7 @@ public class DirectDoubleBufferTest extends DoubleBufferTest {
 
         // Check if the NIOAccess method adds up the current position value.
         doubleBuffer.put(1.0);
-        assertEquals(doubleBufferBasePointer + SizeOf.DOUBLE, NIOAccess.getBasePointer(doubleBuffer));
+        assertEquals(doubleBufferBasePointer + Double.BYTES, NIOAccess.getBasePointer(doubleBuffer));
     }
 
     public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java
index ecbd542e8e..c52065cca0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
 import java.nio.DirectByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.NIOAccess;
-import libcore.io.SizeOf;
 
 public class DirectFloatBufferTest extends FloatBufferTest {
     public void setUp(){
@@ -66,7 +65,7 @@ public class DirectFloatBufferTest extends FloatBufferTest {
 
         // Check if the NIOAccess method adds up the current position value.
         floatBuffer.put((float)1);
-        assertEquals(floatBufferBasePointer + SizeOf.FLOAT, NIOAccess.getBasePointer(floatBuffer));
+        assertEquals(floatBufferBasePointer + Float.BYTES, NIOAccess.getBasePointer(floatBuffer));
     }
 
     public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java
index 4421ba077e..0a66e7261c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
 import java.nio.DirectByteBuffer;
 import java.nio.IntBuffer;
 import java.nio.NIOAccess;
-import libcore.io.SizeOf;
 
 public class DirectIntBufferTest extends IntBufferTest {
     public void setUp(){
@@ -66,7 +65,7 @@ public class DirectIntBufferTest extends IntBufferTest {
 
         // Check if the NIOAccess method adds up the current position value.
         intBuffer.put(1);
-        assertEquals(intBufferBasePointer + SizeOf.INT, NIOAccess.getBasePointer(intBuffer));
+        assertEquals(intBufferBasePointer + Integer.BYTES, NIOAccess.getBasePointer(intBuffer));
     }
 
     public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java
index 4bcd1976b2..bd54ee469d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
 import java.nio.DirectByteBuffer;
 import java.nio.LongBuffer;
 import java.nio.NIOAccess;
-import libcore.io.SizeOf;
 
 public class DirectLongBufferTest extends LongBufferTest {
     public void setUp(){
@@ -66,7 +65,7 @@ public class DirectLongBufferTest extends LongBufferTest {
 
         // Check if the NIOAccess method adds up the current position value.
         longBuffer.put(1L);
-        assertEquals(longBufferBasePointer + SizeOf.LONG, NIOAccess.getBasePointer(longBuffer));
+        assertEquals(longBufferBasePointer + Long.BYTES, NIOAccess.getBasePointer(longBuffer));
     }
 
     public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java
index e1b91a8504..e84eb66659 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
 import java.nio.DirectByteBuffer;
 import java.nio.NIOAccess;
 import java.nio.ShortBuffer;
-import libcore.io.SizeOf;
 
 public class DirectShortBufferTest extends ShortBufferTest {
     public void setUp(){
@@ -66,7 +65,7 @@ public class DirectShortBufferTest extends ShortBufferTest {
 
         // Check if the NIOAccess method adds up the current position value.
         shortBuffer.put((short)1);
-        assertEquals(shortBufferBasePointer + SizeOf.SHORT, NIOAccess.getBasePointer(shortBuffer));
+        assertEquals(shortBufferBasePointer + Short.BYTES, NIOAccess.getBasePointer(shortBuffer));
     }
 
     public void testIsDirect() {