From c06a96ae5917af243fb339faefcaa4647226d528 Mon Sep 17 00:00:00 2001
From: Ecco Park <eccopark@google.com>
Date: Tue, 21 Aug 2018 10:53:54 -0700
Subject: [PATCH] passpoint-r2: add trust anchors for WFA Passpoint Release 2.

It is required to authenticate OSU server with OSU Server certificate
singed with one of WFA trust anchors.

Bug: 112052266
Test: live test with Passpoint r2 AP
Change-Id: I01f498c875b067edd03a8bc008644281cb4ab1ff
Signed-off-by: Ecco Park <eccopark@google.com>
---
 packages/OsuLogin/AndroidManifest.xml                 | 1 +
 packages/OsuLogin/res/xml/network_security_config.xml | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 packages/OsuLogin/res/xml/network_security_config.xml

diff --git a/packages/OsuLogin/AndroidManifest.xml b/packages/OsuLogin/AndroidManifest.xml
index f6cd79be6dd6a..bc32d103bdd44 100644
--- a/packages/OsuLogin/AndroidManifest.xml
+++ b/packages/OsuLogin/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:networkSecurityConfig="@xml/network_security_config"
         android:enabled="true"
         android:label="@string/app_name"
         android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/packages/OsuLogin/res/xml/network_security_config.xml b/packages/OsuLogin/res/xml/network_security_config.xml
new file mode 100644
index 0000000000000..3ef4b8432232c
--- /dev/null
+++ b/packages/OsuLogin/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+<base-config cleartextTrafficPermitted="true">
+    <trust-anchors>
+        <certificates src="system" />
+        <certificates src="wfa" />
+    </trust-anchors>
+</base-config>
+</network-security-config>