diff options
| author | Jae Seo <jaeseo@google.com> | 2014-08-28 05:50:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 05:50:19 +0000 |
| commit | 11cfe2c0369820835def8495303189ed398480ea (patch) | |
| tree | 8e2061eb1b12a06d814fec8c7ef8792fc6fc7eaf | |
| parent | a899be4ebd0708f8e789fb0bcbe028c039a4ba58 (diff) | |
| parent | cfd861ec15fe96143c61948d396e747b221a7f9d (diff) | |
| download | frameworks_base-11cfe2c0369820835def8495303189ed398480ea.zip frameworks_base-11cfe2c0369820835def8495303189ed398480ea.tar.gz frameworks_base-11cfe2c0369820835def8495303189ed398480ea.tar.bz2 | |
Merge "Add android.software.live_tv feature" into lmp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 1b3ecc3..2c7a484 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8893,6 +8893,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_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_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_LOCATION = "android.hardware.location"; field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 5492775..fa2bb4d 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1456,6 +1456,15 @@ public abstract class PackageManager { /** * 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 * {@link #hasSystemFeature}: The device supports WiFi (802.11) networking. */ @SdkConstant(SdkConstantType.FEATURE) |