Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b1ccfe authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22950 into eclair 

* changes:
  Change these string constants back to match donut.
parents 580a2921 fe240ecf

api/current.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

core/java/android/content/Intent.java

+3 −3
Original line number Diff line number Diff line
@@ -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.