diff options
| author | maxwelb <maxwelb@google.com> | 2017-07-25 12:48:49 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-07-25 14:00:26 -0700 |
| commit | 56026e3065b2450b9f1ffa6c5f75ef5c0f67e3c1 (patch) | |
| tree | 1767fba754a11130efffa3e9426c0812619d8c78 /java/com/android/voicemail | |
| parent | 5b83320cf9cc718a8665ef7c3bc1fc0026560608 (diff) | |
Automated g4 rollback of changelist 161418474.
*** Reason for rollback ***
Checking if this broke the uses-library value for pixel devices
*** Original change description ***
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: 163109133
Change-Id: Id04c51bf3fcb66314c7b27ad96d38b3cae0df230
Diffstat (limited to 'java/com/android/voicemail')
| -rw-r--r-- | java/com/android/voicemail/impl/AndroidManifest.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml index d3c7a4a01..fd591bedf 100644 --- a/java/com/android/voicemail/impl/AndroidManifest.xml +++ b/java/com/android/voicemail/impl/AndroidManifest.xml @@ -18,7 +18,11 @@ package="com.android.voicemail.impl"> <application - android:supportsRtl="true"> + android:allowBackup="false" + android:supportsRtl="true" + android:usesCleartextTraffic="true" + android:defaultToDeviceProtectedStorage="true" + android:directBootAware="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 |