Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev (d6fc5115) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −4

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -7310,7 +7309,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";
		@@ -7335,7 +7333,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";
		@@ -24143,7 +24141,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;

core/java/android/app/ApplicationPackageManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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.

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -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

test-runner/src/android/test/mock/MockPackageManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ public class MockPackageManager extends PackageManager {
		throw new UnsupportedOperationException();
		}

		/** @hide */
		@Override
		public Intent getLeanbackLaunchIntentForPackage(String packageName) {
		throw new UnsupportedOperationException();