commit 1d268428988b376deecee779bdb7a02aba54794d
author Jordan Liu <jminjie@google.com> Mon Aug 07 21:09:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 07 21:09:28 2017 +0000
tree c4bdc6933f9481e51cf7ac977d787d3e74418866
parent ab072976dabe3ccda007d17cf41f7664d6c4f609
parent d4b98a41ea35983ee4b7b10f50a35718f505e370

Merge "Fix crash issue when user uses multi-window mode on VoicemailSettings" am: 1ed70c32f4
am: d4b98a41ea

Change-Id: Ibbf628df95ae59a24905df9f3e2a8e9d64d78494

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7cd6078..c9c18e5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -563,7 +563,7 @@
 
         <activity android:name="com.android.phone.settings.VoicemailSettingsActivity"
             android:label="@string/voicemail"
-            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:configChanges="orientation|screenSize|keyboardHidden|screenLayout"
             android:theme="@style/DialerSettingsLight">
             <intent-filter >
                 <!-- DO NOT RENAME. There are existing apps which use this string. -->