commit 7b67633543b3202edbd60add5161495540b9ac51
author Alex Klyubin <klyubin@google.com> Wed Dec 16 16:41:41 2015 -0800
committer Narayan Kamath <narayan@google.com> Thu Dec 17 11:06:18 2015 +0000
tree 6512b41c171548372b9cf78b5eb4a35759ac0b3b
parent 11dd66d3cff6e8d7b657a9013b6b93585e554acc

Fix GetDirectBufferAddress for DirectByteBuffer.

ART's GetDirectBufferAddress(java.nio.Buffer) implementation returns
the value stored in the Buffer.address field.
java.nio.DirectByteBuffer was not initializing this field correctly
when slicing buffers from non-zero position.

This change fixes the issue and adds tests. This change also removes
the TODO inside DirectByteBuffer.address() because it is now confirmed
that this method is supposed to return exactly the same value as
GetDirectBufferAddress.

Bug: 26233076
Change-Id: I6e7509d443c8cd8ae50eaf1e4ea42d1c04423883

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index fbff2a6..a9fde9b 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -85,6 +85,7 @@
 core_test_files := \
   luni/src/test/native/dalvik_system_JniTest.cpp \
   luni/src/test/native/libcore_java_io_FileTest.cpp \
+  luni/src/test/native/libcore_java_nio_BufferTest.cpp \
 
 #
 # Build for the target (device).