Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ec99ee195c

Change-Id: I9b6c5dfda1a35df8e55c6ae3943fd763456b6d22
This commit is contained in:
Neil Fuller
2018-07-19 12:04:26 -07:00
committed by android-build-merger
parent 43a71788b4 ec99ee195c
commit a234b4579c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/backup/LocalTransport.java
View File

@@ -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