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

Commit 82c93357 authored by Tim Kilbourn's avatar Tim Kilbourn Committed by Android Git Automerger
Browse files

am 05c581ac: Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev 

* commit '05c581ac':
  DO NOT MERGE Hide more leanback stuff.
parents 0ff8f796 05c581ac

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -6449,7 +6449,6 @@ package android.content { 
    field public static final java.lang.String CATEGORY_HOME = "android.intent.category.HOME";

    field public static final java.lang.String CATEGORY_INFO = "android.intent.category.INFO";

    field public static final java.lang.String CATEGORY_LAUNCHER = "android.intent.category.LAUNCHER";

    field public static final java.lang.String CATEGORY_LEANBACK_LAUNCHER = "android.intent.category.LEANBACK_LAUNCHER";

    field public static final java.lang.String CATEGORY_LE_DESK_DOCK = "android.intent.category.LE_DESK_DOCK";

    field public static final java.lang.String CATEGORY_MONKEY = "android.intent.category.MONKEY";

    field public static final java.lang.String CATEGORY_OPENABLE = "android.intent.category.OPENABLE";
@@ -7032,7 +7031,6 @@ package android.content.pm { 
    field public static final int FLAG_HAS_CODE = 4; // 0x4

    field public static final int FLAG_INSTALLED = 8388608; // 0x800000

    field public static final int FLAG_IS_DATA_ONLY = 16777216; // 0x1000000

    field public static final int FLAG_IS_GAME = 33554432; // 0x2000000

    field public static final int FLAG_KILL_AFTER_RESTORE = 65536; // 0x10000

    field public static final int FLAG_LARGE_HEAP = 1048576; // 0x100000

    field public static final int FLAG_PERSISTENT = 8; // 0x8

core/java/android/content/Intent.java

+1 −0
Original line number Diff line number Diff line
@@ -2790,6 +2790,7 @@ public class Intent implements Parcelable, Cloneable { 
    /**

     * Indicates an activity optimized for Leanback mode, and that should

     * be displayed in the Leanback launcher.

     * @hide

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)

    public static final String CATEGORY_LEANBACK_LAUNCHER = "android.intent.category.LEANBACK_LAUNCHER";

core/java/android/content/pm/ApplicationInfo.java

+3 −1
Original line number Diff line number Diff line
@@ -317,6 +317,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    /**

     * Value for {@link #flags}: true if the application was declared to be a game, or

     * false if it is a non-game application.

     *

     * {@hide}

     */

    public static final int FLAG_IS_GAME = 1<<25;
@@ -369,7 +371,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * {@link #FLAG_SUPPORTS_LARGE_SCREENS}, {@link #FLAG_SUPPORTS_XLARGE_SCREENS},

     * {@link #FLAG_RESIZEABLE_FOR_SCREENS},

     * {@link #FLAG_SUPPORTS_SCREEN_DENSITIES}, {@link #FLAG_VM_SAFE_MODE},

     * {@link #FLAG_INSTALLED}, {@link #FLAG_IS_GAME}.

     * {@link #FLAG_INSTALLED}.

     */

    public int flags = 0;