diff options
| author | Costin Manolache <costin@google.com> | 2010-05-12 07:55:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:55:32 -0700 |
| commit | 8579a4d72697a752fe33445b5c57d09e0151b559 (patch) | |
| tree | 1b807bb6183146454c4fecb966871a5e1bb32172 /core | |
| parent | fd5a747fc8bb12d16224e7d961813bb2d795239f (diff) | |
| parent | 625de488973f262e56d3ee6825a8cf1ebaee089b (diff) | |
| download | frameworks_base-8579a4d72697a752fe33445b5c57d09e0151b559.zip frameworks_base-8579a4d72697a752fe33445b5c57d09e0151b559.tar.gz frameworks_base-8579a4d72697a752fe33445b5c57d09e0151b559.tar.bz2 | |
am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken
* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
Bug 2673557: rename datamessaging
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/Intent.java | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 |
2 files changed, 5 insertions, 5 deletions
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> |