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

Commit 98c185e6 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED"

parents a4a48a48 da85e524

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5015,8 +5015,8 @@ package android.content { 
    field public static final java.lang.String ACTION_TIME_CHANGED = "android.intent.action.TIME_SET";

    field public static final java.lang.String ACTION_TIME_TICK = "android.intent.action.TIME_TICK";

    field public static final java.lang.String ACTION_UID_REMOVED = "android.intent.action.UID_REMOVED";

    field public static final java.lang.String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";

    field public static final java.lang.String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";

    field public static final deprecated java.lang.String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";

    field public static final deprecated java.lang.String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";

    field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT";

    field public static final java.lang.String ACTION_VIEW = "android.intent.action.VIEW";

    field public static final java.lang.String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";

core/java/android/content/Intent.java

+4 −2
Original line number Diff line number Diff line
@@ -1654,8 +1654,9 @@ public class Intent implements Parcelable, Cloneable { 
     * This is used mainly for the USB Settings panel.

     * Apps should listen for ACTION_MEDIA_MOUNTED and ACTION_MEDIA_UNMOUNTED broadcasts to be notified

     * when the SD card file system is mounted or unmounted

     * @deprecated

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @Deprecated

    public static final String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";



    /**
@@ -1663,8 +1664,9 @@ public class Intent implements Parcelable, Cloneable { 
     * This is used mainly for the USB Settings panel.

     * Apps should listen for ACTION_MEDIA_MOUNTED and ACTION_MEDIA_UNMOUNTED broadcasts to be notified

     * when the SD card file system is mounted or unmounted

     * @deprecated

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @Deprecated

    public static final String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";



    /**