From e69d1a650fce60934083e1a6d4125ec0fb99e96c Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Wed, 6 Jan 2021 05:41:46 +0000
Subject: [PATCH] Revert "Remove org.apache.http.legacy from Settings"

This reverts commit 02013aeeb6926c4cb0b59ace60fe53fea9eaeaee.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master-without-vendor&target=aosp_arm64-eng&lkgb=7064184&lkbb=7064600&fkbb=7064600, bug 176865269

Change-Id: I49701fb6055b636598998463936b4251e118834a
BUG: 176865269
---
 Android.bp                 | 1 +
 AndroidManifest.xml        | 1 +
 tests/robotests/Android.bp | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Android.bp b/Android.bp
index c84dc1eb453..5470e708143 100644
--- a/Android.bp
+++ b/Android.bp
@@ -82,6 +82,7 @@ android_app {
         "settings-platform-compat-config",
     ],
     static_libs: ["Settings-core"],
+    uses_libs: ["org.apache.http.legacy"],
     resource_dirs: [],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2e7453d6321..c77680dd6f5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -118,6 +118,7 @@
             android:directBootAware="true"
             android:appComponentFactory="androidx.core.app.CoreComponentFactory">
 
+        <uses-library android:name="org.apache.http.legacy" />
         <!-- Settings -->
 
         <activity android:name=".homepage.SettingsHomepageActivity"
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 421b57654c2..c8c6c3840d1 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -49,6 +49,7 @@ android_app {
         "telephony-common",
         "ims-common",
     ],
+    uses_libs: ["org.apache.http.legacy"],
 }
 
 //############################################################