diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-09 16:10:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-09 16:10:27 +0000 |
| commit | c1c71e3933e9d082f2310737f1e3c8504f49536b (patch) | |
| tree | 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d | |
| parent | f6bbe5074af8316030597b379582f714b0e16d41 (diff) | |
| parent | 6c34480ef4f14a0f2afa70f310dec0a728ece7ed (diff) | |
| download | android_packages_apps_KeyChain-c1c71e3933e9d082f2310737f1e3c8504f49536b.tar.gz android_packages_apps_KeyChain-c1c71e3933e9d082f2310737f1e3c8504f49536b.tar.bz2 android_packages_apps_KeyChain-c1c71e3933e9d082f2310737f1e3c8504f49536b.zip | |
am 6c34480e: Merge "KeyChain does not use cleartext network traffic." into mnc-dev
* commit '6c34480ef4f14a0f2afa70f310dec0a728ece7ed':
KeyChain does not use cleartext network traffic.
| -rwxr-xr-x | AndroidManifest.xml | 3 |
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"/> |