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

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

am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo

parents 4f9c9aa8 8579a4d7

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

+1 −1
Original line number 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)



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

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

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



#####

# Google Login Service and Setup Wizard

core/java/android/content/Intent.java

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

     */

    public static final String ACTION_REMOTE_INTENT =

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

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



    /**

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

core/res/AndroidManifest.xml

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

        android:protectionLevel="signature" />



    <!-- Push messaging permission. 

    <!-- Data messaging permission. 

         @hide Used internally.

     -->

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

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

          android:protectionLevel="signature" />

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

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



    <application android:process="system"

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



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

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

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

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

            </intent-filter>

        </receiver>