diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-28 16:41:19 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-06-28 16:41:19 -0700 |
| commit | a920f25fe55fc9afc7640902a200f19ce278588b (patch) | |
| tree | d248ebfca6085ff79f1a5cfb91a1778b4617ac82 /keystore/tests/src | |
| parent | 324993abed48843da1cb63063668147151e4db5c (diff) | |
| parent | fca0f92e0a9c121dcf28fa783e884f1fb4993374 (diff) | |
| download | frameworks_base-a920f25fe55fc9afc7640902a200f19ce278588b.zip frameworks_base-a920f25fe55fc9afc7640902a200f19ce278588b.tar.gz frameworks_base-a920f25fe55fc9afc7640902a200f19ce278588b.tar.bz2 | |
resolved conflicts for merge of fca0f92e to stage-aosp-master
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
Diffstat (limited to 'keystore/tests/src')
| -rw-r--r-- | keystore/tests/src/android/security/KeyStoreTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java index 815f4ac..9bf88d3 100644 --- a/keystore/tests/src/android/security/KeyStoreTest.java +++ b/keystore/tests/src/android/security/KeyStoreTest.java @@ -22,7 +22,7 @@ import android.security.KeyStore; import android.test.ActivityUnitTestCase; import android.test.AssertionFailedError; import android.test.suitebuilder.annotation.MediumTest; -import java.nio.charset.Charsets; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Date; import java.util.HashSet; @@ -45,11 +45,11 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { private static final String TEST_KEYNAME = "test-key"; private static final String TEST_KEYNAME1 = "test-key.1"; private static final String TEST_KEYNAME2 = "test-key\02"; - private static final byte[] TEST_KEYVALUE = "test value".getBytes(Charsets.UTF_8); + private static final byte[] TEST_KEYVALUE = "test value".getBytes(StandardCharsets.UTF_8); // "Hello, World" in Chinese private static final String TEST_I18N_KEY = "\u4F60\u597D, \u4E16\u754C"; - private static final byte[] TEST_I18N_VALUE = TEST_I18N_KEY.getBytes(Charsets.UTF_8); + private static final byte[] TEST_I18N_VALUE = TEST_I18N_KEY.getBytes(StandardCharsets.UTF_8); // Test vector data for signatures private static final byte[] TEST_DATA = new byte[256]; |