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

Commit e6fd3d42 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Change namespace of ACTION_REQUEST_SHUTDOWN." into oc-dev 

am: 670e750b

Change-Id: I974b840bd18fc1d03905d945b824567d5280d7a9
parents 04f5cb80 670e750b

core/java/android/content/Intent.java

+2 −1
Original line number Diff line number Diff line
@@ -2447,7 +2447,8 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * {@hide}

     */

    public static final String ACTION_REQUEST_SHUTDOWN = "android.intent.action.ACTION_REQUEST_SHUTDOWN";

    public static final String ACTION_REQUEST_SHUTDOWN

            = "com.android.internal.intent.action.REQUEST_SHUTDOWN";

    /**

     * Broadcast Action: A sticky broadcast that indicates low storage space

     * condition on the device

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -3464,7 +3464,7 @@ 
            android:theme="@style/Theme.NoDisplay"

            android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.ACTION_REQUEST_SHUTDOWN" />

                <action android:name="com.android.internal.intent.action.REQUEST_SHUTDOWN" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>