From eeeacab5d52dea25adcc5d3e40b5afe7dfa105de Mon Sep 17 00:00:00 2001 From: Tim Kilbourn Date: Tue, 6 May 2014 14:33:02 -0700 Subject: [PATCH] DO NOT MERGE Hide leanback packagemanager apis. Bug: 14116162 Change-Id: I410d720013ba4e2bc1b0f8a6973daba5ca9008c6 --- api/current.txt | 5 +---- core/java/android/app/ApplicationPackageManager.java | 1 + core/java/android/content/pm/PackageManager.java | 5 ++--- test-runner/src/android/test/mock/MockPackageManager.java | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/api/current.txt b/api/current.txt index a3a89381640fd..95790f44f8428 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7244,7 +7244,6 @@ package android.content.pm { method public abstract java.lang.String getInstallerPackageName(java.lang.String); method public abstract android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; method public abstract android.content.Intent getLaunchIntentForPackage(java.lang.String); - method public abstract android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String); method public abstract java.lang.String getNameForUid(int); method public android.content.pm.PackageInfo getPackageArchiveInfo(java.lang.String, int); method public abstract int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; @@ -7309,7 +7308,6 @@ package android.content.pm { field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand"; 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_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"; @@ -7333,7 +7331,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_TELEPHONY = "android.hardware.telephony"; field public static final java.lang.String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma"; field public static final java.lang.String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm"; - field public static final deprecated java.lang.String FEATURE_TELEVISION = "android.hardware.type.television"; + field public static final java.lang.String FEATURE_TELEVISION = "android.hardware.type.television"; field public static final java.lang.String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen"; field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch"; field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct"; @@ -24141,7 +24139,6 @@ package android.test.mock { method public java.lang.String getInstallerPackageName(java.lang.String); method public android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; method public android.content.Intent getLaunchIntentForPackage(java.lang.String); - method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String); method public java.lang.String getNameForUid(int); method public int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; method public android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException; diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 010988e6da526..7c30ecd19cd38 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -128,6 +128,7 @@ final class ApplicationPackageManager extends PackageManager { return intent; } + /** @hide */ @Override public Intent getLeanbackLaunchIntentForPackage(String packageName) { // Try to find a main leanback_launcher activity. diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index e3a036227311f..7957a24b46c07 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1230,6 +1230,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"; @@ -1265,9 +1266,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"; @@ -1457,7 +1456,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 diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java index 89c951bdb2c46..a6b817eb159d0 100644 --- a/test-runner/src/android/test/mock/MockPackageManager.java +++ b/test-runner/src/android/test/mock/MockPackageManager.java @@ -79,6 +79,7 @@ public class MockPackageManager extends PackageManager { throw new UnsupportedOperationException(); } + /** @hide */ @Override public Intent getLeanbackLaunchIntentForPackage(String packageName) { throw new UnsupportedOperationException();