diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2014-05-12 18:39:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-12 18:39:45 +0000 |
| commit | d6fc5115a656f9d06dd1d455f8bedd5f5eca943b (patch) | |
| tree | a20f5242df52c1da618037aed6e1c67b870a9235 /core/java/android/content/pm | |
| parent | 8028e4a063b49aadfb08fab012d2388a7466a9a1 (diff) | |
| parent | eeeacab5d52dea25adcc5d3e40b5afe7dfa105de (diff) | |
| download | frameworks_base-d6fc5115a656f9d06dd1d455f8bedd5f5eca943b.zip frameworks_base-d6fc5115a656f9d06dd1d455f8bedd5f5eca943b.tar.gz frameworks_base-d6fc5115a656f9d06dd1d455f8bedd5f5eca943b.tar.bz2 | |
Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev
Diffstat (limited to 'core/java/android/content/pm')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index dd6d663..b456cf0 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1245,6 +1245,7 @@ public abstract class PackageManager { * typically used in a living room television experience, but is a software * feature unlike {@link #FEATURE_TELEVISION}. Devices running with this * feature will use resources associated with the "television" UI mode. + * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_LEANBACK = "android.software.leanback"; @@ -1280,9 +1281,7 @@ public abstract class PackageManager { * room television experience: displayed on a big screen, where the user * is sitting far away from it, and the dominant form of input will be * something like a DPAD, not through touch or mouse. - * @deprecated use {@link #FEATURE_LEANBACK} instead. */ - @Deprecated @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_TELEVISION = "android.hardware.type.television"; @@ -1472,7 +1471,7 @@ public abstract class PackageManager { public abstract Intent getLaunchIntentForPackage(String packageName); /** - * Return a "good" intent to launch a front-door Leanback activity in a + * @hide Return a "good" intent to launch a front-door Leanback activity in a * package, for use for example to implement an "open" button when browsing * through packages. The current implementation will look for a main * activity in the category {@link Intent#CATEGORY_LEANBACK_LAUNCHER}, or |