From 07d5c5b3efdcfd3d41eb49c7a59818c72aa42e3b Mon Sep 17 00:00:00 2001
From: nathch <nathch@google.com>
Date: Fri, 11 Oct 2019 18:10:42 +0100
Subject: [PATCH] Revert "Route backup data through
 IntermediateEncryptingTransport"

This is a revert of the "Route backup data through IntermediateEncryptingTransport" in ag/9447053

This is to fix the possible device crash from the new code till the new
code is fixed

Bug: 142381823
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: I6fb1e513f481fb5d58816057bb69212511239707
---
 .../java/com/android/server/backup/TransportManager.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java
index de48f4b13d7be..30ce4cf2fd3fd 100644
--- a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java
+++ b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java
@@ -93,8 +93,7 @@ public class TransportManager {
         mTransportWhitelist = Preconditions.checkNotNull(whitelist);
         mCurrentTransportName = selectedTransport;
         mTransportStats = new TransportStats();
-        mTransportClientManager = TransportClientManager.createEncryptingClientManager(mUserId,
-                context, mTransportStats);
+        mTransportClientManager = new TransportClientManager(mUserId, context, mTransportStats);
     }
 
     @VisibleForTesting