commit d017221a52b36c919d96cd0807a7bbaaa633357d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 04 01:28:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 04 01:28:43 2017 +0000
tree a58f76ea38f1e1315bee4c368d0cc29bbc3659e1
parent b43a5305bddb81881992819a40846b52e72afd3e
parent c40afac294a3d36568e9f460d7a77c4d184efd90

Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 4758b23..1065530 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10645,6 +10645,7 @@
     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";

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index b9ad88b..359c5f3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11298,6 +11298,7 @@
     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";

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 77ec9e7..d0e7a41 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -10684,6 +10684,7 @@
     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";

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

diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 136c13b..a493f33 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2158,7 +2158,6 @@
      * {@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";