commit d4b98a41ea35983ee4b7b10f50a35718f505e370
author Jordan Liu <jminjie@google.com> Mon Aug 07 21:02:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 07 21:02:56 2017 +0000
tree 73f9e7dad40d51e3635014c43dd4256a4639f856
parent df2c2f7020123aee2dfba087d0dd008be2b0061f
parent 1ed70c32f46a346626aab2e9163d3ee8497a798a

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

Change-Id: I875dc580093be0bb8317905da608af727edfc394

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. -->