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

Commit 98a1942f authored by Jae Seo's avatar Jae Seo Committed by Android Git Automerger
Browse files

am d55533a7: am edf8161e: am 9d86176d: Merge "Add android.software.live_tv feature" into lmp-dev 

* commit 'd55533a7d301205dff23ba2d01cc8d7d7fc47457':
  Add android.software.live_tv feature
parents 4abfc99c 41b12ff4

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -8898,6 +8898,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";

    field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";

    field public static final java.lang.String FEATURE_INPUT_METHODS = "android.software.input_methods";

    field public static final java.lang.String FEATURE_INPUT_METHODS = "android.software.input_methods";

    field public static final java.lang.String FEATURE_LEANBACK = "android.software.leanback";

    field public static final java.lang.String FEATURE_LEANBACK = "android.software.leanback";

    field public static final java.lang.String FEATURE_LIVE_TV = "android.software.live_tv";

    field public static final java.lang.String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";

    field public static final java.lang.String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";

    field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";

    field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";

    field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";

    field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";

core/java/android/content/pm/PackageManager.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -1454,6 +1454,15 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";

    public static final String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";





    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports live TV and can display

     * contents from TV inputs implemented with the

     * {@link android.media.tv.TvInputService} API.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_LIVE_TV = "android.software.live_tv";



    /**

    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports WiFi (802.11) networking.

     * {@link #hasSystemFeature}: The device supports WiFi (802.11) networking.