summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-09 16:02:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-09 16:02:39 +0000
commit6c34480ef4f14a0f2afa70f310dec0a728ece7ed (patch)
treea33652fdf514807816ce5a7dfe046a84daaa19a3
parent44c777b623d27a75b14dd20f7f1bd102d063c651 (diff)
parentc82150f4547b9383158a553c7f30a1d5b52067b2 (diff)
downloadandroid_packages_apps_KeyChain-6c34480ef4f14a0f2afa70f310dec0a728ece7ed.tar.gz
android_packages_apps_KeyChain-6c34480ef4f14a0f2afa70f310dec0a728ece7ed.tar.bz2
android_packages_apps_KeyChain-6c34480ef4f14a0f2afa70f310dec0a728ece7ed.zip
Merge "KeyChain does not use cleartext network traffic." into mnc-dev
-rwxr-xr-xAndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4658206..3e03c87 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,7 +4,8 @@
android:sharedUserId="android.uid.system"
>
<application android:label="@string/app_name"
- android:allowBackup="false" >
+ android:allowBackup="false"
+ android:usesCleartextTraffic="false" >
<service android:name="com.android.keychain.KeyChainService">
<intent-filter>
<action android:name="android.security.IKeyChainService"/>