Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69866cea authored by Charles Chen's avatar Charles Chen
Browse files

resolved conflicts for merge of 5158cc55 to master

parents afed82bc 5158cc55

core/java/android/content/Intent.java

+9 −0
Original line number Diff line number Diff line
@@ -1593,6 +1593,15 @@ public class Intent implements Parcelable { 
    public static final String ACTION_REMOTE_INTENT =

            "android.intent.action.REMOTE_INTENT";



    /**

     * @hide

     * TODO: This will be unhidden in a later CL.

     * Broadcast Action: The TextToSpeech synthesizer has completed processing 

     * all of the text in the speech queue.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_TTS_QUEUE_PROCESSING_COMPLETED =

            "android.intent.action.TTS_QUEUE_PROCESSING_COMPLETED";



    // ---------------------------------------------------------------------

    // ---------------------------------------------------------------------