Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bug 2673557: rename datamessaging" into froyo

Browse Source
This commit is contained in:
Costin Manolache
2010-05-11 11:42:58 -07:00
committed by Android (Google) Code Review
parent 3e90c76c12 161c75a0f3
commit e2055fe425
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/java/com/android/common/GoogleLogTags.logtags
View File

@@ -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

2
core/java/android/content/Intent.java
View File

@@ -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.

8
core/res/AndroidManifest.xml
View File

@@ -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>