From 503b8f44e36ca00b9b5797f637023b9f743dc9dd Mon Sep 17 00:00:00 2001
From: erfanian <erfanian@google.com>
Date: Mon, 10 Jul 2017 11:36:38 -0700
Subject: Update merge strategy. The legacy strategy is deprecated.

* Don't allow cleartext traffic in the voicemail module. This was being overridden, anyway.

Bug: 62339559
Test: See below.
PiperOrigin-RevId: 161418474
Change-Id: Icd945902ed089bf37b43d93d8fe32983a9f88fea
---
 java/com/android/voicemail/impl/AndroidManifest.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml
index be7dac10d..eabeadbf1 100644
--- a/java/com/android/voicemail/impl/AndroidManifest.xml
+++ b/java/com/android/voicemail/impl/AndroidManifest.xml
@@ -18,11 +18,7 @@
   package="com.android.voicemailomtp">
 
   <application
-    android:allowBackup="false"
-    android:supportsRtl="true"
-    android:usesCleartextTraffic="true"
-    android:defaultToDeviceProtectedStorage="true"
-    android:directBootAware="true">
+    android:supportsRtl="true">
 
     <!-- Causes the "Voicemail" item under "Calls" setting to be hidden. The voicemail module will
       be handling the settings. Has no effect before OC where dialer cannot provide voicemail
-- 
cgit v1.2.3