diff options
| -rw-r--r-- | core/java/com/android/internal/backup/LocalTransport.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/com/android/internal/backup/LocalTransport.java b/core/java/com/android/internal/backup/LocalTransport.java index f4b7032a774c..d0f02725b1a0 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.ErrnoException; 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 @@ public class LocalTransport extends BackupTransport { 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 class LocalTransport extends BackupTransport { public DecodedFilename(File f) { file = f; - key = new String(Base64.decode(f.getName())); + key = new String(Base64.decode(f.getName(), Base64.DEFAULT)); } @Override |