Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b3b1ccfe: Merge change 22950 into eclair

Browse Source 
Merge commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352' into eclair-plus-aosp

* commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352':
  Change these string constants back to match donut.
This commit is contained in:
Dianne Hackborn
2009-08-27 12:59:03 -07:00
committed by Android Git Automerger
parent c067ef5f5a b3b1ccfe0e
commit 3d937945a6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.xml
View File

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

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

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