am 3a314333: Merge "PicoTTS: Set mNativeSynth prior to TextToSpeechService#onCreate"

* commit '3a3143335fffff727e1b5596a5992a3705dfc065':
  PicoTTS: Set mNativeSynth prior to TextToSpeechService#onCreate

1 files changed, 7 insertions, 1 deletions

diff --git a/pico/compat/src/com/android/tts/compat/CompatTtsService.java b/pico/compat/src/com/android/tts/compat/CompatTtsService.java
index 475afaf..dde706b 100755
--- a/pico/compat/src/com/android/tts/compat/CompatTtsService.java
+++ b/pico/compat/src/com/android/tts/compat/CompatTtsService.java
@@ -37,7 +37,6 @@ public abstract class CompatTtsService extends TextToSpeechService {
     @Override
     public void onCreate() {
         if (DBG) Log.d(TAG, "onCreate()");
-        super.onCreate();
 
         String soFilename = getSoFilename();
 
@@ -71,6 +70,13 @@ public abstract class CompatTtsService extends TextToSpeechService {
             c.close();
         }
         mNativeSynth = new SynthProxy(soFilename, engineConfig);
+
+        // mNativeSynth is used by TextToSpeechService#onCreate so it must be set prior
+        // to that call.
+        // getContentResolver() is also moved prior to super.onCreate(), and it works
+        // because the super method don't sets a field or value that affects getContentResolver();
+        // (including the content resolver itself).
+        super.onCreate();
     }
 
     @Override