From e778ed3a3a9e8386bf7eef85387acefc8bd9fa8f Mon Sep 17 00:00:00 2001 From: nathch Date: Wed, 25 Sep 2019 12:18:22 +0100 Subject: Route backup data through IntermediateEncryptingTransport The main change is in TransportManager which now uses TransportClientManager.createEncryptingClientManager We do this so that IntermediateEncryptingTransport can encrypt (decrypt) the data when sending it (receiving it) from the real transport. Test: atest -v BackupEncryptionUnitTests Test: atest -v RunBackupFrameworksServicesRoboTests Test: atest -v $(find frameworks/base/services/tests/servicestests/src/com/android/server/backup -name '\''*Test.java'\'')' Test: atest -v CtsBackupTestCases CtsBackupHostTestCases Change-Id: I01a0108da6b1f868ac6cb4591445ecc62316452f --- .../backup/encryption/transport/IntermediateEncryptingTransport.java | 4 ++++ .../encryption/transport/IntermediateEncryptingTransportManager.java | 1 + 2 files changed, 5 insertions(+) (limited to 'packages/BackupEncryption/src') diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransport.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransport.java index da47781d77d1..1d0224d49be7 100644 --- a/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransport.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransport.java @@ -16,7 +16,10 @@ package com.android.server.backup.encryption.transport; +import static com.android.server.backup.encryption.BackupEncryptionService.TAG; + import android.os.RemoteException; +import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.backup.IBackupTransport; @@ -47,6 +50,7 @@ public class IntermediateEncryptingTransport extends DelegatingTransport { } private void connect() throws RemoteException { + Log.i(TAG, "connecting " + mTransportClient); synchronized (mConnectLock) { if (mRealTransport == null) { mRealTransport = mTransportClient.connect("IntermediateEncryptingTransport"); diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManager.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManager.java index 5a8b05c9f0fe..6e6d571aa3c7 100644 --- a/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManager.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManager.java @@ -72,6 +72,7 @@ public class IntermediateEncryptingTransportManager { * Create an instance of {@link IntermediateEncryptingTransport}. */ private IntermediateEncryptingTransport create(Intent realTransportIntent) { + Log.d(TAG, "create: intent:" + realTransportIntent); return new IntermediateEncryptingTransport(mTransportClientManager.getTransportClient( realTransportIntent.getComponent(), realTransportIntent.getExtras(), CALLER)); } -- cgit v1.2.3-59-g8ed1b