Merge "Create PackageManager.isInstantApp API to query whether a given package... (c4927db3) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −1

api/system-current.txt

+3 −1

api/test-current.txt

+3 −1

core/java/android/app/ApplicationPackageManager.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -805,9 +805,13 @@ public class ApplicationPackageManager extends PackageManager {

	@Override		@Override
	public boolean isInstantApp() {		public boolean isInstantApp() {
			return isInstantApp(mContext.getPackageName());
			}

			@Override
			public boolean isInstantApp(String packageName) {
	try {		try {
	return mPM.isInstantApp(mContext.getPackageName(),		return mPM.isInstantApp(packageName, mContext.getUserId());
	mContext.getUserId());
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowFromSystemServer();
	}		}

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

+18 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3737,16 +3737,30 @@ public abstract class PackageManager {
	public abstract @Nullable Drawable getInstantAppIcon(String packageName);		public abstract @Nullable Drawable getInstantAppIcon(String packageName);

	/**		/**
	* Gets whether the caller is an instant app.		* Gets whether this application is an instant app.
	*		*
	* @return Whether caller is an instant app.		* @return Whether caller is an instant app.
	*		*
			* @see #isInstantApp(String)
	* @see #setInstantAppCookie(byte[])		* @see #setInstantAppCookie(byte[])
	* @see #getInstantAppCookie()		* @see #getInstantAppCookie()
	* @see #getInstantAppCookieMaxSize()		* @see #getInstantAppCookieMaxSize()
	*/		*/
	public abstract boolean isInstantApp();		public abstract boolean isInstantApp();

			/**
			* Gets whether the given package is an instant app.
			*
			* @param packageName The package to check
			* @return Whether the given package is an instant app.
			*
			* @see #isInstantApp()
			* @see #setInstantAppCookie(byte[])
			* @see #getInstantAppCookie()
			* @see #getInstantAppCookieMaxSize()
			*/
			public abstract boolean isInstantApp(String packageName);

	/**		/**
	* Gets the maximum size in bytes of the cookie data an instant app		* Gets the maximum size in bytes of the cookie data an instant app
	* can store on the device.		* can store on the device.
	@@ -3754,6 +3768,7 @@ public abstract class PackageManager {
	* @return The max cookie size in bytes.		* @return The max cookie size in bytes.
	*		*
	* @see #isInstantApp()		* @see #isInstantApp()
			* @see #isInstantApp(String)
	* @see #setInstantAppCookie(byte[])		* @see #setInstantAppCookie(byte[])
	* @see #getInstantAppCookie()		* @see #getInstantAppCookie()
	*/		*/
	@@ -3770,6 +3785,7 @@ public abstract class PackageManager {
	* @return The cookie.		* @return The cookie.
	*		*
	* @see #isInstantApp()		* @see #isInstantApp()
			* @see #isInstantApp(String)
	* @see #setInstantAppCookie(byte[])		* @see #setInstantAppCookie(byte[])
	* @see #getInstantAppCookieMaxSize()		* @see #getInstantAppCookieMaxSize()
	*/		*/
	@@ -3792,6 +3808,7 @@ public abstract class PackageManager {
	* @return Whether the cookie was set.		* @return Whether the cookie was set.
	*		*
	* @see #isInstantApp()		* @see #isInstantApp()
			* @see #isInstantApp(String)
	* @see #getInstantAppCookieMaxSize()		* @see #getInstantAppCookieMaxSize()
	* @see #getInstantAppCookie()		* @see #getInstantAppCookie()
	*/		*/

Original line number	Original line	Diff line number	Diff line
	@@ -10346,6 +10346,7 @@ package android.content.pm {
	method public abstract boolean hasSystemFeature(java.lang.String);		method public abstract boolean hasSystemFeature(java.lang.String);
	method public abstract boolean hasSystemFeature(java.lang.String, int);		method public abstract boolean hasSystemFeature(java.lang.String, int);
	method public abstract boolean isInstantApp();		method public abstract boolean isInstantApp();
			method public abstract boolean isInstantApp(java.lang.String);
	method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
	method public abstract boolean isSafeMode();		method public abstract boolean isSafeMode();
	method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);		method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
	@@ -30126,12 +30127,12 @@ package android.os {
	field public static final int BATTERY_PLUGGED_AC = 1; // 0x1		field public static final int BATTERY_PLUGGED_AC = 1; // 0x1
	field public static final int BATTERY_PLUGGED_USB = 2; // 0x2		field public static final int BATTERY_PLUGGED_USB = 2; // 0x2
	field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4		field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4
	field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6
	field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4		field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4
	field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1		field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1
	field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3		field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3
	field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2		field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2
	field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5		field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5
			field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6
	field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2		field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2
	field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3		field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3
	field public static final int BATTERY_STATUS_FULL = 5; // 0x5		field public static final int BATTERY_STATUS_FULL = 5; // 0x5
	@@ -40376,6 +40377,7 @@ package android.test.mock {
	method public boolean hasSystemFeature(java.lang.String);		method public boolean hasSystemFeature(java.lang.String);
	method public boolean hasSystemFeature(java.lang.String, int);		method public boolean hasSystemFeature(java.lang.String, int);
	method public boolean isInstantApp();		method public boolean isInstantApp();
			method public boolean isInstantApp(java.lang.String);
	method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);		method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
	method public boolean isSafeMode();		method public boolean isSafeMode();
	method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);		method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

Original line number	Original line	Diff line number	Diff line
	@@ -10895,6 +10895,7 @@ package android.content.pm {
	method public abstract boolean hasSystemFeature(java.lang.String);		method public abstract boolean hasSystemFeature(java.lang.String);
	method public abstract boolean hasSystemFeature(java.lang.String, int);		method public abstract boolean hasSystemFeature(java.lang.String, int);
	method public abstract boolean isInstantApp();		method public abstract boolean isInstantApp();
			method public abstract boolean isInstantApp(java.lang.String);
	method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
	method public abstract boolean isSafeMode();		method public abstract boolean isSafeMode();
	method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);		method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
	@@ -32727,12 +32728,12 @@ package android.os {
	field public static final int BATTERY_PLUGGED_AC = 1; // 0x1		field public static final int BATTERY_PLUGGED_AC = 1; // 0x1
	field public static final int BATTERY_PLUGGED_USB = 2; // 0x2		field public static final int BATTERY_PLUGGED_USB = 2; // 0x2
	field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4		field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4
	field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6
	field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4		field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4
	field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1		field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1
	field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3		field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3
	field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2		field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2
	field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5		field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5
			field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6
	field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2		field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2
	field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3		field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3
	field public static final int BATTERY_STATUS_FULL = 5; // 0x5		field public static final int BATTERY_STATUS_FULL = 5; // 0x5
	@@ -43717,6 +43718,7 @@ package android.test.mock {
	method public boolean hasSystemFeature(java.lang.String);		method public boolean hasSystemFeature(java.lang.String);
	method public boolean hasSystemFeature(java.lang.String, int);		method public boolean hasSystemFeature(java.lang.String, int);
	method public boolean isInstantApp();		method public boolean isInstantApp();
			method public boolean isInstantApp(java.lang.String);
	method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);		method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
	method public boolean isSafeMode();		method public boolean isSafeMode();
	method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);		method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

Original line number	Original line	Diff line number	Diff line
	@@ -10380,6 +10380,7 @@ package android.content.pm {
	method public abstract boolean hasSystemFeature(java.lang.String);		method public abstract boolean hasSystemFeature(java.lang.String);
	method public abstract boolean hasSystemFeature(java.lang.String, int);		method public abstract boolean hasSystemFeature(java.lang.String, int);
	method public abstract boolean isInstantApp();		method public abstract boolean isInstantApp();
			method public abstract boolean isInstantApp(java.lang.String);
	method public abstract boolean isPermissionReviewModeEnabled();		method public abstract boolean isPermissionReviewModeEnabled();
	method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
	method public abstract boolean isSafeMode();		method public abstract boolean isSafeMode();
	@@ -30222,12 +30223,12 @@ package android.os {
	field public static final int BATTERY_PLUGGED_AC = 1; // 0x1		field public static final int BATTERY_PLUGGED_AC = 1; // 0x1
	field public static final int BATTERY_PLUGGED_USB = 2; // 0x2		field public static final int BATTERY_PLUGGED_USB = 2; // 0x2
	field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4		field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4
	field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6
	field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4		field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4
	field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1		field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1
	field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3		field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3
	field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2		field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2
	field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5		field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5
			field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6
	field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2		field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2
	field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3		field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3
	field public static final int BATTERY_STATUS_FULL = 5; // 0x5		field public static final int BATTERY_STATUS_FULL = 5; // 0x5
	@@ -40563,6 +40564,7 @@ package android.test.mock {
	method public boolean hasSystemFeature(java.lang.String);		method public boolean hasSystemFeature(java.lang.String);
	method public boolean hasSystemFeature(java.lang.String, int);		method public boolean hasSystemFeature(java.lang.String, int);
	method public boolean isInstantApp();		method public boolean isInstantApp();
			method public boolean isInstantApp(java.lang.String);
	method public boolean isPermissionReviewModeEnabled();		method public boolean isPermissionReviewModeEnabled();
	method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);		method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
	method public boolean isSafeMode();		method public boolean isSafeMode();