Merge "Add instant cookie APIs" (c869ebff) · Commits · e / os / android_frameworks_base

api/current.txt

+10 −2

Original line number	Diff line number	Diff line
		@@ -10155,6 +10155,8 @@ package android.content.pm {
		method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
		method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
		method public abstract java.lang.String getInstallerPackageName(java.lang.String);
		method public abstract byte[] getInstantAppCookie();
		method public abstract int getInstantAppCookieMaxSize();
		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);
		@@ -10188,6 +10190,7 @@ package android.content.pm {
		method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public abstract boolean hasSystemFeature(java.lang.String);
		method public abstract boolean hasSystemFeature(java.lang.String, int);
		method public abstract boolean isInstantApp();
		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public abstract boolean isSafeMode();
		method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
		@@ -10207,6 +10210,7 @@ package android.content.pm {
		method public abstract void setApplicationEnabledSetting(java.lang.String, int, int);
		method public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);
		method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
		method public abstract boolean setInstantAppCookie(byte[]);
		method public abstract void verifyPendingInstall(int, int);
		field public static final int COMPONENT_ENABLED_STATE_DEFAULT = 0; // 0x0
		field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2
		@@ -15248,11 +15252,11 @@ package android.hardware.display {
		method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);
		field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";
		field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -39670,6 +39674,8 @@ package android.test.mock {
		method public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
		method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
		method public java.lang.String getInstallerPackageName(java.lang.String);
		method public byte[] getInstantAppCookie();
		method public int getInstantAppCookieMaxSize();
		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);
		@@ -39702,6 +39708,7 @@ package android.test.mock {
		method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public boolean hasSystemFeature(java.lang.String);
		method public boolean hasSystemFeature(java.lang.String, int);
		method public boolean isInstantApp();
		method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public boolean isSafeMode();
		method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
		@@ -39721,6 +39728,7 @@ package android.test.mock {
		method public void setApplicationEnabledSetting(java.lang.String, int, int);
		method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
		method public void setInstallerPackageName(java.lang.String, java.lang.String);
		method public boolean setInstantAppCookie(byte[]);
		method public void verifyPendingInstall(int, int);
		}

		@@ -42620,11 +42628,11 @@ package android.view {
		method public boolean isValid();
		method public boolean isWideColorGamut();
		field public static final int DEFAULT_DISPLAY = 0; // 0x0
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_PRESENTATION = 8; // 0x8
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

api/system-current.txt

+10 −2

Original line number	Diff line number	Diff line
		@@ -10628,6 +10628,8 @@ package android.content.pm {
		method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
		method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);
		method public abstract java.lang.String getInstallerPackageName(java.lang.String);
		method public abstract byte[] getInstantAppCookie();
		method public abstract int getInstantAppCookieMaxSize();
		method public abstract android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);
		method public abstract int getIntentVerificationStatusAsUser(java.lang.String, int);
		@@ -10665,6 +10667,7 @@ package android.content.pm {
		method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
		method public abstract boolean hasSystemFeature(java.lang.String);
		method public abstract boolean hasSystemFeature(java.lang.String, int);
		method public abstract boolean isInstantApp();
		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public abstract boolean isSafeMode();
		method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
		@@ -10688,6 +10691,7 @@ package android.content.pm {
		method public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);
		method public abstract boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);
		method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
		method public abstract boolean setInstantAppCookie(byte[]);
		method public abstract boolean updateIntentVerificationStatusAsUser(java.lang.String, int, int);
		method public abstract void updatePermissionFlags(java.lang.String, java.lang.String, int, int, android.os.UserHandle);
		method public abstract void verifyIntentFilter(int, int, java.util.List<java.lang.String>);
		@@ -15826,11 +15830,11 @@ package android.hardware.display {
		method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);
		field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";
		field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -43062,6 +43066,8 @@ package android.test.mock {
		method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
		method public java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);
		method public java.lang.String getInstallerPackageName(java.lang.String);
		method public byte[] getInstantAppCookie();
		method public int getInstantAppCookieMaxSize();
		method public android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);
		method public int getIntentVerificationStatusAsUser(java.lang.String, int);
		@@ -43098,6 +43104,7 @@ package android.test.mock {
		method public void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
		method public boolean hasSystemFeature(java.lang.String);
		method public boolean hasSystemFeature(java.lang.String, int);
		method public boolean isInstantApp();
		method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public boolean isSafeMode();
		method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
		@@ -43120,6 +43127,7 @@ package android.test.mock {
		method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
		method public boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);
		method public void setInstallerPackageName(java.lang.String, java.lang.String);
		method public boolean setInstantAppCookie(byte[]);
		method public boolean updateIntentVerificationStatusAsUser(java.lang.String, int, int);
		method public void updatePermissionFlags(java.lang.String, java.lang.String, int, int, android.os.UserHandle);
		method public void verifyIntentFilter(int, int, java.util.List<java.lang.String>);
		@@ -46023,11 +46031,11 @@ package android.view {
		method public boolean isValid();
		method public boolean isWideColorGamut();
		field public static final int DEFAULT_DISPLAY = 0; // 0x0
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_PRESENTATION = 8; // 0x8
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

api/test-current.txt

+10 −2

Original line number	Diff line number	Diff line
		@@ -10186,6 +10186,8 @@ package android.content.pm {
		method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
		method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
		method public abstract java.lang.String getInstallerPackageName(java.lang.String);
		method public abstract byte[] getInstantAppCookie();
		method public abstract int getInstantAppCookieMaxSize();
		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);
		@@ -10219,6 +10221,7 @@ package android.content.pm {
		method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public abstract boolean hasSystemFeature(java.lang.String);
		method public abstract boolean hasSystemFeature(java.lang.String, int);
		method public abstract boolean isInstantApp();
		method public abstract boolean isPermissionReviewModeEnabled();
		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public abstract boolean isSafeMode();
		@@ -10239,6 +10242,7 @@ package android.content.pm {
		method public abstract void setApplicationEnabledSetting(java.lang.String, int, int);
		method public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);
		method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
		method public abstract boolean setInstantAppCookie(byte[]);
		method public abstract void verifyPendingInstall(int, int);
		field public static final int COMPONENT_ENABLED_STATE_DEFAULT = 0; // 0x0
		field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2
		@@ -15282,11 +15286,11 @@ package android.hardware.display {
		method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);
		field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";
		field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -39808,6 +39812,8 @@ package android.test.mock {
		method public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
		method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
		method public java.lang.String getInstallerPackageName(java.lang.String);
		method public byte[] getInstantAppCookie();
		method public int getInstantAppCookieMaxSize();
		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);
		@@ -39840,6 +39846,7 @@ package android.test.mock {
		method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public boolean hasSystemFeature(java.lang.String);
		method public boolean hasSystemFeature(java.lang.String, int);
		method public boolean isInstantApp();
		method public boolean isPermissionReviewModeEnabled();
		method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public boolean isSafeMode();
		@@ -39860,6 +39867,7 @@ package android.test.mock {
		method public void setApplicationEnabledSetting(java.lang.String, int, int);
		method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
		method public void setInstallerPackageName(java.lang.String, java.lang.String);
		method public boolean setInstantAppCookie(byte[]);
		method public void verifyPendingInstall(int, int);
		}

		@@ -42924,11 +42932,11 @@ package android.view {
		method public boolean isValid();
		method public boolean isWideColorGamut();
		field public static final int DEFAULT_DISPLAY = 0; // 0x0
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_PRESENTATION = 8; // 0x8
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

core/java/android/app/ApplicationPackageManager.java

+15 −16

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package android.app;

		import android.annotation.DrawableRes;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.StringRes;
		@@ -31,7 +30,7 @@ import android.content.IntentSender;
		import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.ComponentInfo;
		import android.content.pm.EphemeralApplicationInfo;
		import android.content.pm.InstantAppInfo;
		import android.content.pm.FeatureInfo;
		import android.content.pm.IOnPermissionsChangeListener;
		import android.content.pm.IPackageDataObserver;
		@@ -766,10 +765,10 @@ public class ApplicationPackageManager extends PackageManager {
		/** @hide */
		@SuppressWarnings("unchecked")
		@Override
		public List<EphemeralApplicationInfo> getEphemeralApplications() {
		public List<InstantAppInfo> getInstantApps() {
		try {
		ParceledListSlice<EphemeralApplicationInfo> slice =
		mPM.getEphemeralApplications(mContext.getUserId());
		ParceledListSlice<InstantAppInfo> slice =
		mPM.getInstantApps(mContext.getUserId());
		if (slice != null) {
		return slice.getList();
		}
		@@ -781,9 +780,9 @@ public class ApplicationPackageManager extends PackageManager {

		/** @hide */
		@Override
		public Drawable getEphemeralApplicationIcon(String packageName) {
		public Drawable getInstantAppIcon(String packageName) {
		try {
		Bitmap bitmap = mPM.getEphemeralApplicationIcon(
		Bitmap bitmap = mPM.getInstantAppIcon(
		packageName, mContext.getUserId());
		if (bitmap != null) {
		return new BitmapDrawable(null, bitmap);
		@@ -795,26 +794,26 @@ public class ApplicationPackageManager extends PackageManager {
		}

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

		@Override
		public int getEphemeralCookieMaxSizeBytes() {
		public int getInstantAppCookieMaxSize() {
		return Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES,
		DEFAULT_EPHEMERAL_COOKIE_MAX_SIZE_BYTES);
		}

		@Override
		public @NonNull byte[] getEphemeralCookie() {
		public @NonNull byte[] getInstantAppCookie() {
		try {
		final byte[] cookie = mPM.getEphemeralApplicationCookie(
		final byte[] cookie = mPM.getInstantAppCookie(
		mContext.getPackageName(), mContext.getUserId());
		if (cookie != null) {
		return cookie;
		@@ -827,10 +826,10 @@ public class ApplicationPackageManager extends PackageManager {
		}

		@Override
		public boolean setEphemeralCookie(@NonNull byte[] cookie) {
		public boolean setInstantAppCookie(@NonNull byte[] cookie) {
		try {
		return mPM.setEphemeralApplicationCookie(
		mContext.getPackageName(), cookie, mContext.getUserId());
		return mPM.setInstantAppCookie(mContext.getPackageName(),
		cookie, mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/content/pm/ApplicationInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1409,7 +1409,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		/**
		* @hide
		*/
		public boolean isEphemeralApp() {
		public boolean isInstantApp() {
		return (privateFlags & ApplicationInfo.PRIVATE_FLAG_EPHEMERAL) != 0;
		}