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

Commit ded55c6e authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "MASTER_CLEAR action should not be public" into oc-dev am: baf1d703 

am: 6c608eba

Change-Id: I76776f7f44a855bde12d6967ef4778523ae89f7a
parents c4f4fb1b 6c608eba

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -9327,7 +9327,6 @@ package android.content { 
    field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED";

    field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";

    field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";

    field public static final deprecated java.lang.String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";

    field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";

    field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON";

    field public static final java.lang.String ACTION_MEDIA_CHECKING = "android.intent.action.MEDIA_CHECKING";

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -9361,7 +9361,6 @@ package android.content { 
    field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED";

    field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";

    field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";

    field public static final deprecated java.lang.String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";

    field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";

    field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON";

    field public static final java.lang.String ACTION_MEDIA_CHECKING = "android.intent.action.MEDIA_CHECKING";

core/java/android/content/Intent.java

+2 −0
Original line number Diff line number Diff line
@@ -3424,8 +3424,10 @@ public class Intent implements Parcelable, Cloneable { 


    /**

     * Deprecated - use ACTION_FACTORY_RESET instead.

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";



    /**