From 2bdacf4af0455c6b8503c97e95b8220b88ae5a9d Mon Sep 17 00:00:00 2001
From: Mark Chien <markchien@google.com>
Date: Tue, 18 Aug 2020 09:28:57 +0000
Subject: [PATCH] Add usesCleartextTraffic to Tethering

usesCleartextTraffic needs to be true for the networkstack process so
that the NetworkStack module can use no-encrypted probes to detect
captive portals.

When loaded in the networkstack process, all packages in process must
set usesCleartextTraffic=true, otherwise there may be races causing
the flag not to be set for the process.

Bug: 161860610
Test: CtsTetheringTest, TetheringTests

Change-Id: If1ea472e2b7e715ab97851394dc8980ad269b7a1
Merged-In: Ife03ee0c7096ea242eb701b297a69b471e15b436
(cherry picked from commit ed63b6c56d89267d16c64adbabd998443da7a904)
---
 packages/Tethering/AndroidManifestBase.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/Tethering/AndroidManifestBase.xml b/packages/Tethering/AndroidManifestBase.xml
index fa85f66489d7e..97c3988829fe1 100644
--- a/packages/Tethering/AndroidManifestBase.xml
+++ b/packages/Tethering/AndroidManifestBase.xml
@@ -23,6 +23,7 @@
     <application
         android:label="Tethering"
         android:defaultToDeviceProtectedStorage="true"
-        android:directBootAware="true">
+        android:directBootAware="true"
+        android:usesCleartextTraffic="true">
     </application>
 </manifest>