Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom (9c711282) · Commits · e / os / android_frameworks_base

api/14.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -759,6 +759,7 @@ package android {
		field public static final int prompt = 16843131; // 0x101017b
		field public static final int propertyName = 16843489; // 0x10102e1
		field public static final int protectionLevel = 16842761; // 0x1010009
		field public static final int publicKey = 16843686; // 0x10103a6
		field public static final int queryActionMsg = 16843227; // 0x10101db
		field public static final int queryAfterZeroResults = 16843394; // 0x1010282
		field public static final int queryHint = 16843608; // 0x1010358
		@@ -5454,6 +5455,7 @@ package android.content {
		field public static final java.lang.String ACTION_PACKAGE_FIRST_LAUNCH = "android.intent.action.PACKAGE_FIRST_LAUNCH";
		field public static final java.lang.String ACTION_PACKAGE_FULLY_REMOVED = "android.intent.action.PACKAGE_FULLY_REMOVED";
		field public static final deprecated java.lang.String ACTION_PACKAGE_INSTALL = "android.intent.action.PACKAGE_INSTALL";
		field public static final java.lang.String ACTION_PACKAGE_NEEDS_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_VERIFICATION";
		field public static final java.lang.String ACTION_PACKAGE_REMOVED = "android.intent.action.PACKAGE_REMOVED";
		field public static final java.lang.String ACTION_PACKAGE_REPLACED = "android.intent.action.PACKAGE_REPLACED";
		field public static final java.lang.String ACTION_PACKAGE_RESTARTED = "android.intent.action.PACKAGE_RESTARTED";
		@@ -6207,11 +6209,13 @@ 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 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
		field public static final int COMPONENT_ENABLED_STATE_DISABLED_USER = 3; // 0x3
		field public static final int COMPONENT_ENABLED_STATE_ENABLED = 1; // 0x1
		field public static final int DONT_KILL_APP = 1; // 0x1
		field public static final java.lang.String EXTRA_VERIFICATION_ID = "android.content.pm.extra.VERIFICATION_ID";
		field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";
		field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
		field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera";
		@@ -6273,6 +6277,8 @@ package android.content.pm {
		field public static final int SIGNATURE_NO_MATCH = -3; // 0xfffffffd
		field public static final int SIGNATURE_SECOND_NOT_SIGNED = -2; // 0xfffffffe
		field public static final int SIGNATURE_UNKNOWN_PACKAGE = -4; // 0xfffffffc
		field public static final int VERIFICATION_ALLOW = 1; // 0x1
		field public static final int VERIFICATION_REJECT = -1; // 0xffffffff
		}

		public static class PackageManager.NameNotFoundException extends android.util.AndroidException {
		@@ -19834,6 +19840,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 void verifyPendingInstall(int, int);
		}

		public class MockResources extends android.content.res.Resources {

api/current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -759,6 +759,7 @@ package android {
		field public static final int prompt = 16843131; // 0x101017b
		field public static final int propertyName = 16843489; // 0x10102e1
		field public static final int protectionLevel = 16842761; // 0x1010009
		field public static final int publicKey = 16843686; // 0x10103a6
		field public static final int queryActionMsg = 16843227; // 0x10101db
		field public static final int queryAfterZeroResults = 16843394; // 0x1010282
		field public static final int queryHint = 16843608; // 0x1010358
		@@ -5454,6 +5455,7 @@ package android.content {
		field public static final java.lang.String ACTION_PACKAGE_FIRST_LAUNCH = "android.intent.action.PACKAGE_FIRST_LAUNCH";
		field public static final java.lang.String ACTION_PACKAGE_FULLY_REMOVED = "android.intent.action.PACKAGE_FULLY_REMOVED";
		field public static final deprecated java.lang.String ACTION_PACKAGE_INSTALL = "android.intent.action.PACKAGE_INSTALL";
		field public static final java.lang.String ACTION_PACKAGE_NEEDS_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_VERIFICATION";
		field public static final java.lang.String ACTION_PACKAGE_REMOVED = "android.intent.action.PACKAGE_REMOVED";
		field public static final java.lang.String ACTION_PACKAGE_REPLACED = "android.intent.action.PACKAGE_REPLACED";
		field public static final java.lang.String ACTION_PACKAGE_RESTARTED = "android.intent.action.PACKAGE_RESTARTED";
		@@ -6207,11 +6209,13 @@ 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 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
		field public static final int COMPONENT_ENABLED_STATE_DISABLED_USER = 3; // 0x3
		field public static final int COMPONENT_ENABLED_STATE_ENABLED = 1; // 0x1
		field public static final int DONT_KILL_APP = 1; // 0x1
		field public static final java.lang.String EXTRA_VERIFICATION_ID = "android.content.pm.extra.VERIFICATION_ID";
		field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";
		field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
		field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera";
		@@ -6273,6 +6277,8 @@ package android.content.pm {
		field public static final int SIGNATURE_NO_MATCH = -3; // 0xfffffffd
		field public static final int SIGNATURE_SECOND_NOT_SIGNED = -2; // 0xfffffffe
		field public static final int SIGNATURE_UNKNOWN_PACKAGE = -4; // 0xfffffffc
		field public static final int VERIFICATION_ALLOW = 1; // 0x1
		field public static final int VERIFICATION_REJECT = -1; // 0xffffffff
		}

		public static class PackageManager.NameNotFoundException extends android.util.AndroidException {
		@@ -19834,6 +19840,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 void verifyPendingInstall(int, int);
		}

		public class MockResources extends android.content.res.Resources {

core/java/android/app/ApplicationPackageManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -954,9 +954,9 @@ final class ApplicationPackageManager extends PackageManager {
		}

		@Override
		public void verifyPendingInstall(int id, boolean verified, String failureMessage) {
		public void verifyPendingInstall(int id, int response) {
		try {
		mPM.verifyPendingInstall(id, verified, failureMessage);
		mPM.verifyPendingInstall(id, response);
		} catch (RemoteException e) {
		// Should never happen!
		}

core/java/android/content/Intent.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -1535,8 +1535,6 @@ public class Intent implements Parcelable, Cloneable {
		* <p class="note">
		* This is a protected intent that can only be sent by the system.
		* </p>
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_PACKAGE_NEEDS_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_VERIFICATION";

core/java/android/content/pm/IPackageManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -359,7 +359,7 @@ interface IPackageManager {
		int flags, in String installerPackageName, in Uri verificationURI,
		in ManifestDigest manifestDigest);

		void verifyPendingInstall(int id, boolean verified, in String message);
		void verifyPendingInstall(int id, int verificationCode);

		VerifierDeviceIdentity getVerifierDeviceIdentity();
		}