Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo

core/java/android/speech/tts/ITts.aidl

@@ -63,5 +63,7 @@ interface ITts {
 
     int setEngineByPackageName(in String enginePackageName);
 
-    String getDefaultEngine();
+    String getDefaultEngine();
+
+    boolean areDefaultsEnforced();
 }

core/java/android/speech/tts/TextToSpeech.java

@@ -1379,4 +1379,45 @@ public class TextToSpeech {
             }
         }
     }
+
+
+    /**
+     * Returns whether or not the user is forcing their defaults to override the
+     * Text-To-Speech settings set by applications.
+     *
+     * @return Whether or not defaults are enforced.
+     *
+     * @hide
+     */
+    public boolean areDefaultsEnforced() {
+        synchronized (mStartLock) {
+            boolean defaultsEnforced = false;
+            if (!mStarted) {
+                return defaultsEnforced;
+            }
+            try {
+                defaultsEnforced = mITts.areDefaultsEnforced();
+            } catch (RemoteException e) {
+                // TTS died; restart it.
+                Log.e("TextToSpeech.java - areDefaultsEnforced", "RemoteException");
+                e.printStackTrace();
+                mStarted = false;
+                initTts();
+            } catch (NullPointerException e) {
+                // TTS died; restart it.
+                Log.e("TextToSpeech.java - areDefaultsEnforced", "NullPointerException");
+                e.printStackTrace();
+                mStarted = false;
+                initTts();
+            } catch (IllegalStateException e) {
+                // TTS died; restart it.
+                Log.e("TextToSpeech.java - areDefaultsEnforced", "IllegalStateException");
+                e.printStackTrace();
+                mStarted = false;
+                initTts();
+            } finally {
+                return defaultsEnforced;
+            }
+        }
+    }
 }

packages/TtsService/src/android/tts/TtsService.java

@@ -1445,6 +1445,16 @@ public class TtsService extends Service implements OnCompletionListener {
             return mSelf.getDefaultEngine();
         }
 
+        /**
+         * Returns whether or not the user is forcing their defaults to override the
+         * Text-To-Speech settings set by applications.
+         *
+         * @return Whether or not defaults are enforced.
+         */
+        public boolean areDefaultsEnforced() {
+            return mSelf.isDefaultEnforced();
+        }
+
     };
 
 }