Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 345ffa54 authored Apr 18, 2017 by Svetoslav Ganov

Address API council comments

Test: cookie CTS tests pass

bug:37327624
bug:37325276
bug:37323696

Change-Id: I52b10470759e471629ec6772e115df94482eb341

parent 0cb43ef6

api/current.txt

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -10570,6 +10570,7 @@ package android.content.pm {
	method public abstract int checkPermission(java.lang.String, java.lang.String);		method public abstract int checkPermission(java.lang.String, java.lang.String);
	method public abstract int checkSignatures(java.lang.String, java.lang.String);		method public abstract int checkSignatures(java.lang.String, java.lang.String);
	method public abstract int checkSignatures(int, int);		method public abstract int checkSignatures(int, int);
			method public abstract void clearInstantAppCookie();
	method public abstract void clearPackagePreferredActivities(java.lang.String);		method public abstract void clearPackagePreferredActivities(java.lang.String);
	method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);		method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
	method public abstract void extendVerificationTimeout(int, int, long);		method public abstract void extendVerificationTimeout(int, int, long);
	@@ -10598,7 +10599,7 @@ 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> getInstalledPackages(int);
	method public abstract java.lang.String getInstallerPackageName(java.lang.String);		method public abstract java.lang.String getInstallerPackageName(java.lang.String);
	method public abstract byte[] getInstantAppCookie();		method public abstract byte[] getInstantAppCookie();
	method public abstract int getInstantAppCookieMaxSize();		method public abstract int getInstantAppCookieMaxBytes();
	method public abstract android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;		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 getLaunchIntentForPackage(java.lang.String);
	method public abstract android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);		method public abstract android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);
	@@ -10653,7 +10654,7 @@ package android.content.pm {
	method public abstract void setApplicationEnabledSetting(java.lang.String, int, int);		method public abstract void setApplicationEnabledSetting(java.lang.String, int, int);
	method public abstract void setComponentEnabledSetting(android.content.ComponentName, 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 void setInstallerPackageName(java.lang.String, java.lang.String);
	method public abstract boolean setInstantAppCookie(byte[]);		method public abstract void updateInstantAppCookie(byte[]);
	method public abstract void verifyPendingInstall(int, int);		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_DEFAULT = 0; // 0x0
	field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2		field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2
	@@ -40988,6 +40989,7 @@ package android.test.mock {
	method public int checkPermission(java.lang.String, java.lang.String);		method public int checkPermission(java.lang.String, java.lang.String);
	method public int checkSignatures(java.lang.String, java.lang.String);		method public int checkSignatures(java.lang.String, java.lang.String);
	method public int checkSignatures(int, int);		method public int checkSignatures(int, int);
			method public void clearInstantAppCookie();
	method public void clearPackagePreferredActivities(java.lang.String);		method public void clearPackagePreferredActivities(java.lang.String);
	method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);		method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
	method public void extendVerificationTimeout(int, int, long);		method public void extendVerificationTimeout(int, int, long);
	@@ -41017,7 +41019,7 @@ package android.test.mock {
	method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);		method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
	method public java.lang.String getInstallerPackageName(java.lang.String);		method public java.lang.String getInstallerPackageName(java.lang.String);
	method public byte[] getInstantAppCookie();		method public byte[] getInstantAppCookie();
	method public int getInstantAppCookieMaxSize();		method public int getInstantAppCookieMaxBytes();
	method public android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;		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 getLaunchIntentForPackage(java.lang.String);
	method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);		method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);
	@@ -41071,7 +41073,7 @@ package android.test.mock {
	method public void setApplicationEnabledSetting(java.lang.String, int, int);		method public void setApplicationEnabledSetting(java.lang.String, int, int);
	method public void setComponentEnabledSetting(android.content.ComponentName, int, int);		method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
	method public void setInstallerPackageName(java.lang.String, java.lang.String);		method public void setInstallerPackageName(java.lang.String, java.lang.String);
	method public boolean setInstantAppCookie(byte[]);		method public void updateInstantAppCookie(byte[]);
	method public void verifyPendingInstall(int, int);		method public void verifyPendingInstall(int, int);
	}		}

api/removed.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,10 @@ package android.content.pm {
	field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1		field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1
	}		}

			public abstract class PackageManager {
			method public abstract boolean setInstantAppCookie(byte[]);
			}

	public final class SharedLibraryInfo implements android.os.Parcelable {		public final class SharedLibraryInfo implements android.os.Parcelable {
	method public boolean isBuiltin();		method public boolean isBuiltin();
	method public boolean isDynamic();		method public boolean isDynamic();

api/system-current.txt

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -11241,6 +11241,7 @@ package android.content.pm {
	method public abstract int checkPermission(java.lang.String, java.lang.String);		method public abstract int checkPermission(java.lang.String, java.lang.String);
	method public abstract int checkSignatures(java.lang.String, java.lang.String);		method public abstract int checkSignatures(java.lang.String, java.lang.String);
	method public abstract int checkSignatures(int, int);		method public abstract int checkSignatures(int, int);
			method public abstract void clearInstantAppCookie();
	method public abstract void clearPackagePreferredActivities(java.lang.String);		method public abstract void clearPackagePreferredActivities(java.lang.String);
	method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);		method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
	method public abstract void extendVerificationTimeout(int, int, long);		method public abstract void extendVerificationTimeout(int, int, long);
	@@ -11272,7 +11273,7 @@ package android.content.pm {
	method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, 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 java.lang.String getInstallerPackageName(java.lang.String);
	method public abstract byte[] getInstantAppCookie();		method public abstract byte[] getInstantAppCookie();
	method public abstract int getInstantAppCookieMaxSize();		method public abstract int getInstantAppCookieMaxBytes();
	method public abstract android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);		method public abstract android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);
	method public abstract android.content.ComponentName getInstantAppInstallerComponent();		method public abstract android.content.ComponentName getInstantAppInstallerComponent();
	method public abstract android.content.ComponentName getInstantAppResolverSettingsComponent();		method public abstract android.content.ComponentName getInstantAppResolverSettingsComponent();
	@@ -11339,8 +11340,8 @@ package android.content.pm {
	method public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);		method public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);
	method public abstract boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);		method public abstract boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);
	method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);		method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
	method public abstract boolean setInstantAppCookie(byte[]);
	method public abstract void setUpdateAvailable(java.lang.String, boolean);		method public abstract void setUpdateAvailable(java.lang.String, boolean);
			method public abstract void updateInstantAppCookie(byte[]);
	method public abstract boolean updateIntentVerificationStatusAsUser(java.lang.String, int, int);		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 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>);		method public abstract void verifyIntentFilter(int, int, java.util.List<java.lang.String>);
	@@ -44543,6 +44544,7 @@ package android.test.mock {
	method public int checkPermission(java.lang.String, java.lang.String);		method public int checkPermission(java.lang.String, java.lang.String);
	method public int checkSignatures(java.lang.String, java.lang.String);		method public int checkSignatures(java.lang.String, java.lang.String);
	method public int checkSignatures(int, int);		method public int checkSignatures(int, int);
			method public void clearInstantAppCookie();
	method public void clearPackagePreferredActivities(java.lang.String);		method public void clearPackagePreferredActivities(java.lang.String);
	method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);		method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
	method public void extendVerificationTimeout(int, int, long);		method public void extendVerificationTimeout(int, int, long);
	@@ -44574,7 +44576,7 @@ package android.test.mock {
	method public java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);		method public java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);
	method public java.lang.String getInstallerPackageName(java.lang.String);		method public java.lang.String getInstallerPackageName(java.lang.String);
	method public byte[] getInstantAppCookie();		method public byte[] getInstantAppCookie();
	method public int getInstantAppCookieMaxSize();		method public int getInstantAppCookieMaxBytes();
	method public android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);		method public android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);
	method public android.content.ComponentName getInstantAppInstallerComponent();		method public android.content.ComponentName getInstantAppInstallerComponent();
	method public android.content.ComponentName getInstantAppResolverSettingsComponent();		method public android.content.ComponentName getInstantAppResolverSettingsComponent();
	@@ -44639,8 +44641,8 @@ package android.test.mock {
	method public void setComponentEnabledSetting(android.content.ComponentName, int, int);		method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
	method public boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);		method public boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);
	method public void setInstallerPackageName(java.lang.String, java.lang.String);		method public void setInstallerPackageName(java.lang.String, java.lang.String);
	method public boolean setInstantAppCookie(byte[]);
	method public void setUpdateAvailable(java.lang.String, boolean);		method public void setUpdateAvailable(java.lang.String, boolean);
			method public void updateInstantAppCookie(byte[]);
	method public boolean updateIntentVerificationStatusAsUser(java.lang.String, int, int);		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 updatePermissionFlags(java.lang.String, java.lang.String, int, int, android.os.UserHandle);
	method public void verifyIntentFilter(int, int, java.util.List<java.lang.String>);		method public void verifyIntentFilter(int, int, java.util.List<java.lang.String>);

api/system-removed.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,10 @@ package android.content.pm {
	field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1		field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1
	}		}

			public abstract class PackageManager {
			method public abstract boolean setInstantAppCookie(byte[]);
			}

	public final class SharedLibraryInfo implements android.os.Parcelable {		public final class SharedLibraryInfo implements android.os.Parcelable {
	method public boolean isBuiltin();		method public boolean isBuiltin();
	method public boolean isDynamic();		method public boolean isDynamic();

api/test-current.txt

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -10607,6 +10607,7 @@ package android.content.pm {
	method public abstract int checkPermission(java.lang.String, java.lang.String);		method public abstract int checkPermission(java.lang.String, java.lang.String);
	method public abstract int checkSignatures(java.lang.String, java.lang.String);		method public abstract int checkSignatures(java.lang.String, java.lang.String);
	method public abstract int checkSignatures(int, int);		method public abstract int checkSignatures(int, int);
			method public abstract void clearInstantAppCookie();
	method public abstract void clearPackagePreferredActivities(java.lang.String);		method public abstract void clearPackagePreferredActivities(java.lang.String);
	method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);		method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
	method public abstract void extendVerificationTimeout(int, int, long);		method public abstract void extendVerificationTimeout(int, int, long);
	@@ -10637,7 +10638,7 @@ 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> getInstalledPackages(int);
	method public abstract java.lang.String getInstallerPackageName(java.lang.String);		method public abstract java.lang.String getInstallerPackageName(java.lang.String);
	method public abstract byte[] getInstantAppCookie();		method public abstract byte[] getInstantAppCookie();
	method public abstract int getInstantAppCookieMaxSize();		method public abstract int getInstantAppCookieMaxBytes();
	method public abstract android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;		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 getLaunchIntentForPackage(java.lang.String);
	method public abstract android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);		method public abstract android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);
	@@ -10693,7 +10694,7 @@ package android.content.pm {
	method public abstract void setApplicationEnabledSetting(java.lang.String, int, int);		method public abstract void setApplicationEnabledSetting(java.lang.String, int, int);
	method public abstract void setComponentEnabledSetting(android.content.ComponentName, 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 void setInstallerPackageName(java.lang.String, java.lang.String);
	method public abstract boolean setInstantAppCookie(byte[]);		method public abstract void updateInstantAppCookie(byte[]);
	method public abstract void verifyPendingInstall(int, int);		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_DEFAULT = 0; // 0x0
	field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2		field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2
	@@ -41183,6 +41184,7 @@ package android.test.mock {
	method public int checkPermission(java.lang.String, java.lang.String);		method public int checkPermission(java.lang.String, java.lang.String);
	method public int checkSignatures(java.lang.String, java.lang.String);		method public int checkSignatures(java.lang.String, java.lang.String);
	method public int checkSignatures(int, int);		method public int checkSignatures(int, int);
			method public void clearInstantAppCookie();
	method public void clearPackagePreferredActivities(java.lang.String);		method public void clearPackagePreferredActivities(java.lang.String);
	method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);		method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
	method public void extendVerificationTimeout(int, int, long);		method public void extendVerificationTimeout(int, int, long);
	@@ -41214,7 +41216,7 @@ package android.test.mock {
	method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);		method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
	method public java.lang.String getInstallerPackageName(java.lang.String);		method public java.lang.String getInstallerPackageName(java.lang.String);
	method public byte[] getInstantAppCookie();		method public byte[] getInstantAppCookie();
	method public int getInstantAppCookieMaxSize();		method public int getInstantAppCookieMaxBytes();
	method public android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;		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 getLaunchIntentForPackage(java.lang.String);
	method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);		method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);
	@@ -41269,7 +41271,7 @@ package android.test.mock {
	method public void setApplicationEnabledSetting(java.lang.String, int, int);		method public void setApplicationEnabledSetting(java.lang.String, int, int);
	method public void setComponentEnabledSetting(android.content.ComponentName, int, int);		method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
	method public void setInstallerPackageName(java.lang.String, java.lang.String);		method public void setInstallerPackageName(java.lang.String, java.lang.String);
	method public boolean setInstantAppCookie(byte[]);		method public void updateInstantAppCookie(byte[]);
	method public void verifyPendingInstall(int, int);		method public void verifyPendingInstall(int, int);
	}		}