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

Commit 2b6b8351 authored by Costin Manolache's avatar Costin Manolache Committed by Android Git Automerger
Browse files

am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename... 

am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
parents d9374209 0c6028c1

common/java/com/android/common/GoogleLogTags.logtags

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ option java_package com.android.common 
204004 gtalk_heartbeat_reset (interval_and_nt|1),(ip|3)

204004 gtalk_heartbeat_reset (interval_and_nt|1),(ip|3)





# This event is logged when an Rmq v2 packet is sent or received.

# This event is logged when an Rmq v2 packet is sent or received.

204005 data_messaging (packet_type|1),(persistent_id|3),(stream_id|1),(last_stream_id|1)

204005 c2dm (packet_type|1),(persistent_id|3),(stream_id|1),(last_stream_id|1)





#####

#####

# Google Login Service and Setup Wizard

# Google Login Service and Setup Wizard

core/java/android/content/Intent.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1866,7 +1866,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @hide

     * @hide

     */

     */

    public static final String ACTION_REMOTE_INTENT =

    public static final String ACTION_REMOTE_INTENT =

            "com.google.android.datamessaging.intent.RECEIVE";

            "com.google.android.c2dm.intent.RECEIVE";





    /**

    /**

     * Broadcast Action: hook for permforming cleanup after a system update.

     * Broadcast Action: hook for permforming cleanup after a system update.

core/res/AndroidManifest.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -1233,12 +1233,12 @@ 
        android:description="@string/permlab_copyProtectedData"

        android:description="@string/permlab_copyProtectedData"

        android:protectionLevel="signature" />

        android:protectionLevel="signature" />





    <!-- Data messaging permission. 

    <!-- C2DM permission. 

         @hide Used internally.

         @hide Used internally.

     -->

     -->

    <permission android:name="android.intent.category.MASTER_CLEAR.permission.DATA_MESSAGE"

    <permission android:name="android.intent.category.MASTER_CLEAR.permission.C2D_MESSAGE"

          android:protectionLevel="signature" />

          android:protectionLevel="signature" />

    <uses-permission android:name="android.intent.category.MASTER_CLEAR.permission.DATA_MESSAGE"/>

    <uses-permission android:name="android.intent.category.MASTER_CLEAR.permission.C2D_MESSAGE"/>





    <application android:process="system"

    <application android:process="system"

                 android:persistent="true"

                 android:persistent="true"
@@ -1322,7 +1322,7 @@ 
                <action android:name="android.intent.action.MASTER_CLEAR" />

                <action android:name="android.intent.action.MASTER_CLEAR" />





                <!-- MCS always uses REMOTE_INTENT: category=MASTER_CLEAR -->

                <!-- MCS always uses REMOTE_INTENT: category=MASTER_CLEAR -->

                <action android:name="com.google.android.datamessaging.intent.RECEIVE" />

                <action android:name="com.google.android.c2dm.intent.RECEIVE" />

                <category android:name="android.intent.category.MASTER_CLEAR" />

                <category android:name="android.intent.category.MASTER_CLEAR" />

            </intent-filter>

            </intent-filter>

        </receiver>

        </receiver>