Merge "add "splitName" attribute" (425a129f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9759,6 +9759,7 @@ package android.content.pm {
		field public boolean enabled;
		field public boolean exported;
		field public java.lang.String processName;
		field public java.lang.String splitName;
		}

		public class ConfigurationInfo implements android.os.Parcelable {

+1 −0

Original line number	Diff line number	Diff line
		@@ -10163,6 +10163,7 @@ package android.content.pm {
		field public boolean enabled;
		field public boolean exported;
		field public java.lang.String processName;
		field public java.lang.String splitName;
		}

		public class ConfigurationInfo implements android.os.Parcelable {

+1 −0

Original line number	Diff line number	Diff line
		@@ -9786,6 +9786,7 @@ package android.content.pm {
		field public boolean enabled;
		field public boolean exported;
		field public java.lang.String processName;
		field public java.lang.String splitName;
		}

		public class ConfigurationInfo implements android.os.Parcelable {

+5 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,11 @@ public class ComponentInfo extends PackageItemInfo {
		*/
		public boolean directBootAware = false;

		/**
		* The name of the split that contains the code for this component.
		*/
		public String splitName;

		/** @removed */
		@Deprecated
		public boolean encryptionAware = false;

+9 −0

Original line number	Diff line number	Diff line
		@@ -3899,6 +3899,9 @@ public class PackageParser {
		a.info.taskAffinity = buildTaskAffinityName(owner.applicationInfo.packageName,
		owner.applicationInfo.taskAffinity, str, outError);

		a.info.splitName =
		sa.getNonConfigurationString(R.styleable.AndroidManifestActivity_splitName, 0);

		a.info.flags = 0;
		if (sa.getBoolean(
		R.styleable.AndroidManifestActivity_multiprocess, false)) {
		@@ -4520,6 +4523,9 @@ public class PackageParser {
		com.android.internal.R.styleable.AndroidManifestProvider_initOrder,
		0);

		p.info.splitName =
		sa.getNonConfigurationString(R.styleable.AndroidManifestProvider_splitName, 0);

		p.info.flags = 0;

		if (sa.getBoolean(
		@@ -4816,6 +4822,9 @@ public class PackageParser {
		s.info.permission = str.length() > 0 ? str.toString().intern() : null;
		}

		s.info.splitName =
		sa.getNonConfigurationString(R.styleable.AndroidManifestService_splitName, 0);

		s.info.flags = 0;
		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestService_stopWithTask,