summaryrefslogtreecommitdiffstats
path: root/keystore/tests
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-28 16:24:48 -0700
committerElliott Hughes <enh@google.com>2013-06-28 16:24:48 -0700
commitd396a448b2e36e29598c954b64bfddef73f3fae0 (patch)
treec8851235188aa3e48f7069c8a6004e40b304d253 /keystore/tests
parent5216f11e462b9f17704c0ac9e193d2149f3fa755 (diff)
downloadframeworks_base-d396a448b2e36e29598c954b64bfddef73f3fae0.zip
frameworks_base-d396a448b2e36e29598c954b64bfddef73f3fae0.tar.gz
frameworks_base-d396a448b2e36e29598c954b64bfddef73f3fae0.tar.bz2
Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
Bug: 3484927 Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
Diffstat (limited to 'keystore/tests')
-rw-r--r--keystore/tests/src/android/security/KeyStoreTest.java6
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 1de1eaf..0f29800 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];