Merge "Implement remaining infrastructure for user disabling apps." (ca1e210d) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -5810,6 +5810,7 @@ package android.content.pm {
		method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
		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 FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";

cmds/pm/src/com/android/commands/pm/Pm.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,11 @@ public final class Pm {
		return;
		}

		if ("disable-user".equals(op)) {
		runSetEnabledSetting(PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER);
		return;
		}

		if ("setInstallLocation".equals(op)) {
		runSetInstallLocation();
		return;
		@@ -970,6 +975,8 @@ public final class Pm {
		return "enabled";
		case PackageManager.COMPONENT_ENABLED_STATE_DISABLED:
		return "disabled";
		case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER:
		return "disabled-user";
		}
		return "unknown";
		}

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -416,6 +416,12 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		*/
		public boolean enabled = true;

		/**
		* For convenient access to the current enabled setting of this app.
		* @hide
		*/
		public int enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;

		/**
		* For convenient access to package's install location.
		* @hide
		@@ -508,6 +514,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		uid = orig.uid;
		targetSdkVersion = orig.targetSdkVersion;
		enabled = orig.enabled;
		enabledSetting = orig.enabledSetting;
		installLocation = orig.installLocation;
		manageSpaceActivityName = orig.manageSpaceActivityName;
		descriptionRes = orig.descriptionRes;
		@@ -544,6 +551,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		dest.writeInt(uid);
		dest.writeInt(targetSdkVersion);
		dest.writeInt(enabled ? 1 : 0);
		dest.writeInt(enabledSetting);
		dest.writeInt(installLocation);
		dest.writeString(manageSpaceActivityName);
		dest.writeString(backupAgentName);
		@@ -581,6 +589,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		uid = source.readInt();
		targetSdkVersion = source.readInt();
		enabled = source.readInt() != 0;
		enabledSetting = source.readInt();
		installLocation = source.readInt();
		manageSpaceActivityName = source.readString();
		backupAgentName = source.readString();

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

+30 −0

Original line number	Diff line number	Diff line
		@@ -224,10 +224,40 @@ public abstract class PackageManager {
		*/
		public static final int SIGNATURE_UNKNOWN_PACKAGE = -4;

		/**
		* Flag for {@link #setApplicationEnabledSetting(String, int, int)}
		* and {@link #setComponentEnabledSetting(ComponentName, int, int)}: This
		* component or application is in its default enabled state (as specified
		* in its manifest).
		*/
		public static final int COMPONENT_ENABLED_STATE_DEFAULT = 0;

		/**
		* Flag for {@link #setApplicationEnabledSetting(String, int, int)}
		* and {@link #setComponentEnabledSetting(ComponentName, int, int)}: This
		* component or application has been explictily enabled, regardless of
		* what it has specified in its manifest.
		*/
		public static final int COMPONENT_ENABLED_STATE_ENABLED = 1;

		/**
		* Flag for {@link #setApplicationEnabledSetting(String, int, int)}
		* and {@link #setComponentEnabledSetting(ComponentName, int, int)}: This
		* component or application has been explicitly disabled, regardless of
		* what it has specified in its manifest.
		*/
		public static final int COMPONENT_ENABLED_STATE_DISABLED = 2;

		/**
		* Flag for {@link #setApplicationEnabledSetting(String, int, int)} only: The
		* user has explicitly disabled the application, regardless of what it has
		* specified in its manifest. Because this is due to the user's request,
		* they may re-enable it if desired through the appropriate system UI. This
		* option currently <strong>can not</strong> be used with
		* {@link #setComponentEnabledSetting(ComponentName, int, int)}.
		*/
		public static final int COMPONENT_ENABLED_STATE_DISABLED_USER = 3;

		/**
		* Flag parameter for {@link #installPackage(android.net.Uri, IPackageInstallObserver, int)} to
		* indicate that this package should be installed as forward locked, i.e. only the app itself

core/java/android/content/pm/PackageParser.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -3128,9 +3128,11 @@ public class PackageParser {
		}
		if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
		ai.enabled = true;
		} else if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
		} else if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED
		\|\| p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
		ai.enabled = false;
		}
		ai.enabledSetting = p.mSetEnabled;
		return ai;
		}