diff options
| author | erfanian <erfanian@google.com> | 2017-07-10 11:36:38 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-07-10 13:36:03 -0700 |
| commit | 503b8f44e36ca00b9b5797f637023b9f743dc9dd (patch) | |
| tree | 42eac0a5d376c3b23378fea7c86ba56f7735c4ab | |
| parent | 64da818099b47d252d5fdd75fe910b062b3ddf31 (diff) | |
| download | android_packages_apps_Dialer-503b8f44e36ca00b9b5797f637023b9f743dc9dd.tar.gz android_packages_apps_Dialer-503b8f44e36ca00b9b5797f637023b9f743dc9dd.tar.bz2 android_packages_apps_Dialer-503b8f44e36ca00b9b5797f637023b9f743dc9dd.zip | |
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
| -rw-r--r-- | java/com/android/voicemail/impl/AndroidManifest.xml | 6 |
1 files changed, 1 insertions, 5 deletions
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 |