commit 8334df75c9091a55ed57d59e396817a02f1d9085
author Brian Carlstrom <bdc@google.com> Fri May 27 00:51:17 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri May 27 00:51:17 2011 -0700
tree 67f7cd30ae5fbddb9e54ae3c98552a8b80b188a7
parent 2a85883088558f87a0eb4a88bd5531401396f5b4

Tracking merge of dalvik-dev to master

Change-Id: Idc318eb8f4ca64ea73aa6732e3d4546e7e631019

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index b02dfac..b2a4567 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -41,7 +41,7 @@
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import javax.security.auth.x500.X500Principal;
-import org.apache.harmony.luni.util.Base64;
+import libcore.io.Base64;
 import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
 
 public class KeyChainService extends Service {
@@ -210,7 +210,7 @@
                                              Bundle options) {
             byte[] bytes = new byte[AUTHTOKEN_LENGTH];
             mSecureRandom.nextBytes(bytes);
-            String authToken = Base64.encode(bytes, Charsets.US_ASCII);
+            String authToken = Base64.encode(bytes);
             Bundle bundle = new Bundle();
             bundle.putString(AccountManager.KEY_ACCOUNT_NAME, account.name);
             bundle.putString(AccountManager.KEY_ACCOUNT_TYPE, KeyChain.ACCOUNT_TYPE);