summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-09 16:23:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-09 16:23:29 +0000
commitbf22e99e2f97a114350ab7d03185254714d88e2b (patch)
treec5b548992826eed2e71ddd5c553d7c97fe6ae0a0
parent09865312b0e54395837302c3e2299cf14afbe155 (diff)
parent6c3380a5e5d5ce112f4ea5991b1f7136d51e5ce7 (diff)
downloadpackages_providers_ContactsProvider-bf22e99e2f97a114350ab7d03185254714d88e2b.zip
packages_providers_ContactsProvider-bf22e99e2f97a114350ab7d03185254714d88e2b.tar.gz
packages_providers_ContactsProvider-bf22e99e2f97a114350ab7d03185254714d88e2b.tar.bz2
am 6c3380a5: Merge "ContactsProvider does not use cleartext network traffic." into mnc-dev
* commit '6c3380a5e5d5ce112f4ea5991b1f7136d51e5ce7': ContactsProvider does not use cleartext network traffic.
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7c25956..4eb2bdf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,8 @@
<application android:process="android.process.acore"
android:label="@string/app_label"
android:icon="@drawable/app_icon"
- android:allowBackup="false">
+ android:allowBackup="false"
+ android:usesCleartextTraffic="false">
<provider android:name="ContactsProvider2"
android:authorities="contacts;com.android.contacts"