diff options
| author | Costin Manolache <costin@google.com> | 2010-05-11 11:42:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-11 11:42:58 -0700 |
| commit | e2055fe4258f8085a88328579c852ec26d77bb10 (patch) | |
| tree | 26093b4255098ee542d0539031b710d5e4c5f364 /core | |
| parent | 3e90c76c12803cd1b116030fd124b7b870d25342 (diff) | |
| parent | 161c75a0f3ca5255001f7d737a02a4f9d728f1f4 (diff) | |
| download | frameworks_base-e2055fe4258f8085a88328579c852ec26d77bb10.zip frameworks_base-e2055fe4258f8085a88328579c852ec26d77bb10.tar.gz frameworks_base-e2055fe4258f8085a88328579c852ec26d77bb10.tar.bz2 | |
Merge "Bug 2673557: rename datamessaging" into froyo
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> |