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

Commit 610f310b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "New permissions UI." into jb-dev

parents 1c873609 0e128bb2

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -5783,7 +5783,7 @@ package android.content { 
    field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";

    field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final java.lang.String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";

    field public static final java.lang.String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";

    field public static final java.lang.String EXTRA_ALLOW_REPLACE = "android.intent.extra.ALLOW_REPLACE";

    field public static final deprecated java.lang.String EXTRA_ALLOW_REPLACE = "android.intent.extra.ALLOW_REPLACE";

    field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";

    field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";

    field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";

    field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";

    field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";

    field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";

core/java/android/content/Intent.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -1240,7 +1240,11 @@ public class Intent implements Parcelable, Cloneable { 
     * Used as a boolean extra field with {@link #ACTION_INSTALL_PACKAGE} to install a

     * Used as a boolean extra field with {@link #ACTION_INSTALL_PACKAGE} to install a

     * package.  Tells the installer UI to skip the confirmation with the user

     * package.  Tells the installer UI to skip the confirmation with the user

     * if the .apk is replacing an existing one.

     * if the .apk is replacing an existing one.

     * @deprecated As of {@link android.os.Build.VERSION_CODES#JELLY_BEAN}, Android

     * will no longer show an interstitial message about updating existing

     * applications so this is no longer needed.

     */

     */

    @Deprecated

    public static final String EXTRA_ALLOW_REPLACE

    public static final String EXTRA_ALLOW_REPLACE

            = "android.intent.extra.ALLOW_REPLACE";

            = "android.intent.extra.ALLOW_REPLACE";