commit ec99ee195c8640a1d4be554d58b40dbc0f51f509
author Neil Fuller <nfuller@google.com> Thu Jul 19 09:58:06 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 19 09:58:06 2018 -0700
tree 9a4971060a22325ffedef3fe1c0130c438abcb1e
parent 43a71788b40386716168c674abd055b0edce171f
parent 8b9f98536e827006cf93aa3b2ec1c557a02ee6be

Merge "Use Base64 from android.util in LocalTransport"
am: 8b9f98536e

Change-Id: I8178aea431b41a521346fd40a81ae79a253e5554

core/java/com/android/internal/backup/LocalTransport.java

diff --git a/core/java/com/android/internal/backup/LocalTransport.java b/core/java/com/android/internal/backup/LocalTransport.java
index f4b7032..d0f0272 100644
--- a/core/java/com/android/internal/backup/LocalTransport.java
+++ b/core/java/com/android/internal/backup/LocalTransport.java
@@ -32,10 +32,9 @@
 import android.system.Os;
 import android.system.StructStat;
 import android.util.ArrayMap;
+import android.util.Base64;
 import android.util.Log;
 
-import com.android.org.bouncycastle.util.encoders.Base64;
-
 import libcore.io.IoUtils;
 
 import java.io.BufferedOutputStream;
@@ -323,7 +322,7 @@
         BackupDataInput changeSet = new BackupDataInput(data.getFileDescriptor());
         while (changeSet.readNextHeader()) {
             String key = changeSet.getKey();
-            String base64Key = new String(Base64.encode(key.getBytes()));
+            String base64Key = new String(Base64.encode(key.getBytes(), Base64.NO_WRAP));
             int dataSize = changeSet.getDataSize();
             if (DEBUG) {
                 Log.v(TAG, "  Delta operation key " + key + "   size " + dataSize
@@ -705,7 +704,7 @@
 
         public DecodedFilename(File f) {
             file = f;
-            key = new String(Base64.decode(f.getName()));
+            key = new String(Base64.decode(f.getName(), Base64.DEFAULT));
         }
 
         @Override