summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-12 03:44:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-12 03:44:10 +0000
commit38aa961b2734cf1ea7bc5e8979aa7a3a6a2aa4a2 (patch)
treee2fb2cf9f328b8c852b85d45fe54adfe5455af6f
parent253194ab1ff096024f531d2e1dda43f70d24bbac (diff)
parent2fa1e48692e9bc29b81b0333e8b3742a1eb85206 (diff)
downloadframeworks_base-38aa961b2734cf1ea7bc5e8979aa7a3a6a2aa4a2.zip
frameworks_base-38aa961b2734cf1ea7bc5e8979aa7a3a6a2aa4a2.tar.gz
frameworks_base-38aa961b2734cf1ea7bc5e8979aa7a3a6a2aa4a2.tar.bz2
am 2fa1e486: am 7c4ef052: Merge "Fix for CharSequenceCreator test case"
* commit '2fa1e48692e9bc29b81b0333e8b3742a1eb85206': Fix for CharSequenceCreator test case
-rw-r--r--core/tests/coretests/src/android/text/TextUtilsTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/tests/coretests/src/android/text/TextUtilsTest.java b/core/tests/coretests/src/android/text/TextUtilsTest.java
index d494c5d..5a6ef30 100644
--- a/core/tests/coretests/src/android/text/TextUtilsTest.java
+++ b/core/tests/coretests/src/android/text/TextUtilsTest.java
@@ -353,6 +353,7 @@ public class TextUtilsTest extends TestCase {
assertNull("null CharSequence should generate null from parcel", text);
p = Parcel.obtain();
TextUtils.writeToParcel("test", p, 0);
+ p.setDataPosition(0);
text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);
assertEquals("conversion to/from parcel failed", "test", text);
}