Projects >> platform_frameworks_base >>69866cea4dff6dfc6ccf36878593ce949faab9ea

Chunk
Conflicting content
            "android.intent.action.REBOOT";

    /**
<<<<<<< HEAD
     * Broadcast Action: a remote intent is to be broadcasted.
     *
     * A remote intent is used for remote RPC between devices. The remote intent
     * is serialized and sent from one device to another device. The receiving
     * device parses the remote intent and broadcasts it. Note that anyone can
     * broadcast a remote intent. However, if the intent receiver of the remote intent
     * does not trust intent broadcasts from arbitrary intent senders, it should require
     * the sender to hold certain permissions so only trusted sender's broadcast will be
     * let through.
     */
    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";
>>>>>>> 5158cc55088fec902320cafc02c746e3bf087a10

    // ---------------------------------------------------------------------
    // ---------------------------------------------------------------------
Solution content
            "android.intent.action.REBOOT";

    /**
     * Broadcast Action: a remote intent is to be broadcasted.
     *
     * A remote intent is used for remote RPC between devices. The remote intent
     * is serialized and sent from one device to another device. The receiving
     * device parses the remote intent and broadcasts it. Note that anyone can
     * broadcast a remote intent. However, if the intent receiver of the remote intent
     * does not trust intent broadcasts from arbitrary intent senders, it should require
     * the sender to hold certain permissions so only trusted sender's broadcast will be
     * let through.
     */
    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";

    // ---------------------------------------------------------------------
    // ---------------------------------------------------------------------
File
Intent.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute
Comment