drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo

Browse Source 
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
This commit is contained in:
Costin Manolache
2010-05-12 19:06:39 -07:00
committed by Android Git Automerger
parent c99c401d93 8ea9f130d2
commit fa2e3dcd85
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) 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

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

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

8
core/res/AndroidManifest.xml
View File

@ -1225,12 +1225,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"
@ -1314,7 +1314,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>