From 4b891422565a962162487105de618382a24f2545 Mon Sep 17 00:00:00 2001
From: Niels Egberts <nielse@google.com>
Date: Wed, 12 Apr 2017 10:08:23 +0100
Subject: [PATCH] Save instance to avoid crash opon restore in onCreate.

Bug: 37110223
Test: mmma packages/apps/Settings
Change-Id: I82457880bf310efbb7e999a5776858e47b0660c9
---
 .../android/settings/tts/TextToSpeechSettings.java  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 37993bf2f2a..0dfdab6bebe 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -265,6 +265,19 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
         }
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        // Save the mLocalePreference values, so we can repopulate it with entries.
+        outState.putCharSequenceArray(STATE_KEY_LOCALE_ENTRIES,
+                mLocalePreference.getEntries());
+        outState.putCharSequenceArray(STATE_KEY_LOCALE_ENTRY_VALUES,
+                mLocalePreference.getEntryValues());
+        outState.putCharSequence(STATE_KEY_LOCALE_VALUE,
+                mLocalePreference.getValue());
+    }
+
     private void initSettings() {
         final ContentResolver resolver = getContentResolver();