diff options
author | Dianne Hackborn <hackbod@google.com> | 2009-08-27 12:51:11 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2009-08-27 12:51:11 -0700 |
commit | fe240ecf85ba4b5e95caa602398587d4cce6459b (patch) | |
tree | fc1a8b3b2ebac5e9d2bb458f03a260a220cf958c | |
parent | aa0a3b09e7a2947130e9a98c459a63349ef2d339 (diff) | |
download | frameworks_base-fe240ecf85ba4b5e95caa602398587d4cce6459b.zip frameworks_base-fe240ecf85ba4b5e95caa602398587d4cce6459b.tar.gz frameworks_base-fe240ecf85ba4b5e95caa602398587d4cce6459b.tar.bz2 |
Change these string constants back to match donut.
Unfortunately we are stuck with the donut ones, can't change these in Eclair
to be the more correct names.
Change-Id: Id8aaa2e90cd21631b18a36bea3755a63d0e6d577
-rw-r--r-- | api/current.xml | 4 | ||||
-rw-r--r-- | core/java/android/content/Intent.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/api/current.xml b/api/current.xml index ea70922..00f85eb 100644 --- a/api/current.xml +++ b/api/current.xml @@ -33436,7 +33436,7 @@ type="java.lang.String" transient="false" volatile="false" - value=""android.intent.action.POWER_CONNECTED"" + value=""android.intent.action.ACTION_POWER_CONNECTED"" static="true" final="true" deprecated="not deprecated" @@ -33447,7 +33447,7 @@ type="java.lang.String" transient="false" volatile="false" - value=""android.intent.action.POWER_DISCONNECTED"" + value=""android.intent.action.ACTION_POWER_DISCONNECTED"" static="true" final="true" deprecated="not deprecated" diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 9dedca6..f991ee3 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1382,7 +1382,7 @@ public class Intent implements Parcelable { * by the system. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String ACTION_POWER_CONNECTED = "android.intent.action.POWER_CONNECTED"; + public static final String ACTION_POWER_CONNECTED = "android.intent.action.ACTION_POWER_CONNECTED"; /** * Broadcast Action: External power has been removed from the device. * This is intended for applications that wish to register specifically to this notification. @@ -1395,13 +1395,13 @@ public class Intent implements Parcelable { */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_POWER_DISCONNECTED = - "android.intent.action.POWER_DISCONNECTED"; + "android.intent.action.ACTION_POWER_DISCONNECTED"; /** * Broadcast Action: Device is shutting down. * This is broadcast when the device is being shut down (completely turned * off, not sleeping). Once the broadcast is complete, the final shutdown * will proceed and all unsaved data lost. Apps will not normally need - * to handle this, since the forground activity will be paused as well. + * to handle this, since the foreground activity will be paused as well. * * <p class="note">This is a protected intent that can only be sent * by the system. |