Merge "More work towards triaging missing app behavior." (40700726) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −5

api/system-current.txt

+9 −5

api/test-current.txt

+9 −5

core/java/android/content/Intent.java

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4169,11 +4169,18 @@ public class Intent implements Parcelable, Cloneable {

	/**		/**
	* Internal flag used to indicate that a system component has done their		* Internal flag used to indicate that a system component has done their
	* homework and verified their encryption-aware behavior.		* homework and verified that they correctly handle packages and components
			* that come and go over time. In particular:
			* <ul>
			* <li>Apps installed on external storage, which will appear to be
			* uninstalled while the the device is ejected.
			* <li>Apps with encryption unaware components, which will appear to not
			* exist while the device is locked.
			* </ul>
	*		*
	* @hide		* @hide
	*/		*/
	public static final int FLAG_DEBUG_ENCRYPTION_TRIAGED = 0x00000100;		public static final int FLAG_DEBUG_TRIAGED_MISSING = 0x00000100;

	/**		/**
	* If set, the new activity is not kept in the history stack. As soon as		* If set, the new activity is not kept in the history stack. As soon as

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

+194 −63

File changed.

Preview size limit exceeded, changes collapsed.

Original line number	Original line	Diff line number	Diff line
	@@ -9571,8 +9571,8 @@ package android.content.pm {
	field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";		field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";
	field public static final int GET_ACTIVITIES = 1; // 0x1		field public static final int GET_ACTIVITIES = 1; // 0x1
	field public static final int GET_CONFIGURATIONS = 16384; // 0x4000		field public static final int GET_CONFIGURATIONS = 16384; // 0x4000
	field public static final int GET_DISABLED_COMPONENTS = 512; // 0x200		field public static final deprecated int GET_DISABLED_COMPONENTS = 512; // 0x200
	field public static final int GET_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000		field public static final deprecated int GET_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
	field public static final int GET_GIDS = 256; // 0x100		field public static final int GET_GIDS = 256; // 0x100
	field public static final int GET_INSTRUMENTATION = 16; // 0x10		field public static final int GET_INSTRUMENTATION = 16; // 0x10
	field public static final int GET_INTENT_FILTERS = 32; // 0x20		field public static final int GET_INTENT_FILTERS = 32; // 0x20
	@@ -9584,13 +9584,17 @@ package android.content.pm {
	field public static final int GET_SERVICES = 4; // 0x4		field public static final int GET_SERVICES = 4; // 0x4
	field public static final int GET_SHARED_LIBRARY_FILES = 1024; // 0x400		field public static final int GET_SHARED_LIBRARY_FILES = 1024; // 0x400
	field public static final int GET_SIGNATURES = 64; // 0x40		field public static final int GET_SIGNATURES = 64; // 0x40
	field public static final int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000		field public static final deprecated int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000
	field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800		field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
	field public static final int MATCH_ALL = 131072; // 0x20000		field public static final int MATCH_ALL = 131072; // 0x20000
	field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000		field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
			field public static final int MATCH_DISABLED_COMPONENTS = 512; // 0x200
			field public static final int MATCH_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
			field public static final int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
	field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000		field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
	field public static final int MATCH_ENCRYPTION_AWARE_ONLY = 524288; // 0x80000		field public static final int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
	field public static final int MATCH_ENCRYPTION_UNAWARE_ONLY = 262144; // 0x40000		field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000
			field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000
	field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L		field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
	field public static final int PERMISSION_DENIED = -1; // 0xffffffff		field public static final int PERMISSION_DENIED = -1; // 0xffffffff
	field public static final int PERMISSION_GRANTED = 0; // 0x0		field public static final int PERMISSION_GRANTED = 0; // 0x0

Original line number	Original line	Diff line number	Diff line
	@@ -9887,8 +9887,8 @@ package android.content.pm {
	field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";		field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";
	field public static final int GET_ACTIVITIES = 1; // 0x1		field public static final int GET_ACTIVITIES = 1; // 0x1
	field public static final int GET_CONFIGURATIONS = 16384; // 0x4000		field public static final int GET_CONFIGURATIONS = 16384; // 0x4000
	field public static final int GET_DISABLED_COMPONENTS = 512; // 0x200		field public static final deprecated int GET_DISABLED_COMPONENTS = 512; // 0x200
	field public static final int GET_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000		field public static final deprecated int GET_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
	field public static final int GET_GIDS = 256; // 0x100		field public static final int GET_GIDS = 256; // 0x100
	field public static final int GET_INSTRUMENTATION = 16; // 0x10		field public static final int GET_INSTRUMENTATION = 16; // 0x10
	field public static final int GET_INTENT_FILTERS = 32; // 0x20		field public static final int GET_INTENT_FILTERS = 32; // 0x20
	@@ -9900,7 +9900,7 @@ package android.content.pm {
	field public static final int GET_SERVICES = 4; // 0x4		field public static final int GET_SERVICES = 4; // 0x4
	field public static final int GET_SHARED_LIBRARY_FILES = 1024; // 0x400		field public static final int GET_SHARED_LIBRARY_FILES = 1024; // 0x400
	field public static final int GET_SIGNATURES = 64; // 0x40		field public static final int GET_SIGNATURES = 64; // 0x40
	field public static final int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000		field public static final deprecated int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000
	field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800		field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
	field public static final int INSTALL_FAILED_ALREADY_EXISTS = -1; // 0xffffffff		field public static final int INSTALL_FAILED_ALREADY_EXISTS = -1; // 0xffffffff
	field public static final int INSTALL_FAILED_CONFLICTING_PROVIDER = -13; // 0xfffffff3		field public static final int INSTALL_FAILED_CONFLICTING_PROVIDER = -13; // 0xfffffff3
	@@ -9941,9 +9941,13 @@ package android.content.pm {
	field public static final int MASK_PERMISSION_FLAGS = 255; // 0xff		field public static final int MASK_PERMISSION_FLAGS = 255; // 0xff
	field public static final int MATCH_ALL = 131072; // 0x20000		field public static final int MATCH_ALL = 131072; // 0x20000
	field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000		field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
			field public static final int MATCH_DISABLED_COMPONENTS = 512; // 0x200
			field public static final int MATCH_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
			field public static final int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
	field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000		field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
	field public static final int MATCH_ENCRYPTION_AWARE_ONLY = 524288; // 0x80000		field public static final int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
	field public static final int MATCH_ENCRYPTION_UNAWARE_ONLY = 262144; // 0x40000		field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000
			field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000
	field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L		field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
	field public static final int PERMISSION_DENIED = -1; // 0xffffffff		field public static final int PERMISSION_DENIED = -1; // 0xffffffff
	field public static final int PERMISSION_GRANTED = 0; // 0x0		field public static final int PERMISSION_GRANTED = 0; // 0x0

Original line number	Original line	Diff line number	Diff line
	@@ -9571,8 +9571,8 @@ package android.content.pm {
	field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";		field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";
	field public static final int GET_ACTIVITIES = 1; // 0x1		field public static final int GET_ACTIVITIES = 1; // 0x1
	field public static final int GET_CONFIGURATIONS = 16384; // 0x4000		field public static final int GET_CONFIGURATIONS = 16384; // 0x4000
	field public static final int GET_DISABLED_COMPONENTS = 512; // 0x200		field public static final deprecated int GET_DISABLED_COMPONENTS = 512; // 0x200
	field public static final int GET_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000		field public static final deprecated int GET_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
	field public static final int GET_GIDS = 256; // 0x100		field public static final int GET_GIDS = 256; // 0x100
	field public static final int GET_INSTRUMENTATION = 16; // 0x10		field public static final int GET_INSTRUMENTATION = 16; // 0x10
	field public static final int GET_INTENT_FILTERS = 32; // 0x20		field public static final int GET_INTENT_FILTERS = 32; // 0x20
	@@ -9584,13 +9584,17 @@ package android.content.pm {
	field public static final int GET_SERVICES = 4; // 0x4		field public static final int GET_SERVICES = 4; // 0x4
	field public static final int GET_SHARED_LIBRARY_FILES = 1024; // 0x400		field public static final int GET_SHARED_LIBRARY_FILES = 1024; // 0x400
	field public static final int GET_SIGNATURES = 64; // 0x40		field public static final int GET_SIGNATURES = 64; // 0x40
	field public static final int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000		field public static final deprecated int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000
	field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800		field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
	field public static final int MATCH_ALL = 131072; // 0x20000		field public static final int MATCH_ALL = 131072; // 0x20000
	field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000		field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
			field public static final int MATCH_DISABLED_COMPONENTS = 512; // 0x200
			field public static final int MATCH_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
			field public static final int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
	field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000		field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
	field public static final int MATCH_ENCRYPTION_AWARE_ONLY = 524288; // 0x80000		field public static final int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
	field public static final int MATCH_ENCRYPTION_UNAWARE_ONLY = 262144; // 0x40000		field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000
			field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000
	field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L		field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
	field public static final int PERMISSION_DENIED = -1; // 0xffffffff		field public static final int PERMISSION_DENIED = -1; // 0xffffffff
	field public static final int PERMISSION_GRANTED = 0; // 0x0		field public static final int PERMISSION_GRANTED = 0; // 0x0