From cef59b95c98d055c78e303a53bdf30a655db85ca Mon Sep 17 00:00:00 2001 From: Bernardo Rufino Date: Tue, 17 Jul 2018 10:17:43 +0100 Subject: [PATCH] Use Base64 from android.util in LocalTransport Stop using bouncycastle as requested in the bug. Bug: 111440841 Test: 1. Without changes a. adb shell bmgr transport android/com.android.internal.backup.LocalTransport b. adb shell bmgr backupnow com.android.providers.settings c. adb shell ls /cache/backup/1/_delta/ #=> Base64 encoded keys 2. Build and flash this CL a. adb shell bmgr restore 1 com.android.providers.settings #=> verify stuff restored b. adb shell rm /cache/backup/1/_delta/com.android.providers.settings/* /data/backup/com.android.internal.backup.LocalTransport/com.android.providers.settings c. adb shell bmgr backupnow com.android.providers.settings d. adb shell ls /cache/backup/1/_delta/com.android.providers.settings # Verify same keys as 1c Merged-In: I305bbae0e0af3639c1d45def19872e6da84624df Change-Id: I305bbae0e0af3639c1d45def19872e6da84624df (cherry picked from commit 7a6e03271995fa20754663a66cd334aebf077e84) --- core/java/com/android/internal/backup/LocalTransport.java | 7 +++---- 1 file 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 543bd0c4913d6..daeb472a43caa 100644 --- a/core/java/com/android/internal/backup/LocalTransport.java +++ b/core/java/com/android/internal/backup/LocalTransport.java @@ -31,10 +31,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; @@ -270,7 +269,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 @@ -652,7 +651,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