diff options
| author | 2017-04-04 01:47:15 +0000 | |
|---|---|---|
| committer | 2017-04-04 01:47:15 +0000 | |
| commit | a66371e9be296f3000331a17bf98c045f4b36172 (patch) | |
| tree | 0ecbb2c50a13e18730e065abf4d4b4c5063e2c1f | |
| parent | 10b9632eacb3cc06a275e6019000b48b10fde08d (diff) | |
| parent | dbcf5279adec30872c05fb3785b90e11c0f0a30f (diff) | |
Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev am: d017221a52
am: dbcf5279ad
Change-Id: Ia98eaa934f9be88cbec1410555e35c773f6e4ff8
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 0ad968e874a5..3b6082a6c657 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10645,6 +10645,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_LEANBACK_ONLY = "android.software.leanback_only"; 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"; diff --git a/api/system-current.txt b/api/system-current.txt index 8b777eeae25f..8bf17e9c6c31 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11301,6 +11301,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_LEANBACK_ONLY = "android.software.leanback_only"; 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"; diff --git a/api/test-current.txt b/api/test-current.txt index 4d7ee25a5ff2..ae6d9d390bdf 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -10684,6 +10684,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_LEANBACK_ONLY = "android.software.leanback_only"; 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"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 17cb027e045d..afa34a099e95 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2167,7 +2167,6 @@ public abstract class PackageManager { * {@link #hasSystemFeature}: The device supports only leanback UI. Only * applications designed for this experience should be run, though this is * not enforced by the system. - * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_LEANBACK_ONLY = "android.software.leanback_only"; |