diff options
| -rw-r--r-- | common/java/com/android/common/GoogleLogTags.logtags | 2 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/common/java/com/android/common/GoogleLogTags.logtags b/common/java/com/android/common/GoogleLogTags.logtags index a5c9bb0..bf6091a 100644 --- a/common/java/com/android/common/GoogleLogTags.logtags +++ b/common/java/com/android/common/GoogleLogTags.logtags @@ -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 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index ed548c5..6aac4b9 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -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. diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index db71b21..5a92dbe 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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> |