Merge "Revert "Introduce initOrder for apex-system-services."" (b4e39e5e) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/parsing/component/ParsedApexSystemService.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -35,6 +35,4 @@ public interface ParsedApexSystemService extends Parcelable {
		@Nullable
		String getMaxSdkVersion();

		int getInitOrder();

		}

core/java/android/content/pm/parsing/component/ParsedApexSystemServiceImpl.java

+4 −21

Original line number	Diff line number	Diff line
		@@ -45,11 +45,10 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService {
		@Nullable
		private String maxSdkVersion;

		private int initOrder;

		public ParsedApexSystemServiceImpl() {
		}


		// Code below generated by codegen v1.0.23.
		//
		// DO NOT MODIFY!
		@@ -68,15 +67,13 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService {
		@NonNull String name,
		@Nullable String jarPath,
		@Nullable String minSdkVersion,
		@Nullable String maxSdkVersion,
		int initOrder) {
		@Nullable String maxSdkVersion) {
		this.name = name;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, name);
		this.jarPath = jarPath;
		this.minSdkVersion = minSdkVersion;
		this.maxSdkVersion = maxSdkVersion;
		this.initOrder = initOrder;

		// onConstructed(); // You can define this method to get a callback
		}
		@@ -101,11 +98,6 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService {
		return maxSdkVersion;
		}

		@DataClass.Generated.Member
		public int getInitOrder() {
		return initOrder;
		}

		@DataClass.Generated.Member
		public @NonNull ParsedApexSystemServiceImpl setName(@NonNull String value) {
		name = value;
		@@ -132,12 +124,6 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService {
		return this;
		}

		@DataClass.Generated.Member
		public @NonNull ParsedApexSystemServiceImpl setInitOrder( int value) {
		initOrder = value;
		return this;
		}

		@DataClass.Generated.Member
		static Parcelling<String> sParcellingForName =
		Parcelling.Cache.get(
		@@ -197,7 +183,6 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService {
		sParcellingForJarPath.parcel(jarPath, dest, flags);
		sParcellingForMinSdkVersion.parcel(minSdkVersion, dest, flags);
		sParcellingForMaxSdkVersion.parcel(maxSdkVersion, dest, flags);
		dest.writeInt(initOrder);
		}

		@Override
		@@ -216,7 +201,6 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService {
		String _jarPath = sParcellingForJarPath.unparcel(in);
		String _minSdkVersion = sParcellingForMinSdkVersion.unparcel(in);
		String _maxSdkVersion = sParcellingForMaxSdkVersion.unparcel(in);
		int _initOrder = in.readInt();

		this.name = _name;
		com.android.internal.util.AnnotationValidations.validate(
		@@ -224,7 +208,6 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService {
		this.jarPath = _jarPath;
		this.minSdkVersion = _minSdkVersion;
		this.maxSdkVersion = _maxSdkVersion;
		this.initOrder = _initOrder;

		// onConstructed(); // You can define this method to get a callback
		}
		@@ -244,10 +227,10 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService {
		};

		@DataClass.Generated(
		time = 1641307133386L,
		time = 1638903241144L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/content/pm/parsing/component/ParsedApexSystemServiceImpl.java",
		inputSignatures = "private @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.NonNull java.lang.String name\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String jarPath\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String minSdkVersion\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String maxSdkVersion\nprivate int initOrder\nclass ParsedApexSystemServiceImpl extends java.lang.Object implements [android.content.pm.parsing.component.ParsedApexSystemService]\n@com.android.internal.util.DataClass(genGetters=true, genAidl=false, genSetters=true, genParcelable=true)")
		inputSignatures = "private @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.NonNull java.lang.String name\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String jarPath\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String minSdkVersion\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String maxSdkVersion\nclass ParsedApexSystemServiceImpl extends java.lang.Object implements [android.content.pm.parsing.component.ParsedApexSystemService]\n@com.android.internal.util.DataClass(genGetters=true, genAidl=false, genSetters=true, genParcelable=true)")
		@Deprecated
		private void __metadata() {}

core/java/android/content/pm/parsing/component/ParsedApexSystemServiceUtils.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -53,13 +53,10 @@ public class ParsedApexSystemServiceUtils {
		R.styleable.AndroidManifestApexSystemService_minSdkVersion);
		String maxSdkVersion = sa.getString(
		R.styleable.AndroidManifestApexSystemService_maxSdkVersion);
		int initOrder = sa.getInt(R.styleable.AndroidManifestApexSystemService_initOrder, 0);

		systemService.setName(className)
		.setMinSdkVersion(minSdkVersion)
		.setMaxSdkVersion(maxSdkVersion)
		.setInitOrder(initOrder);

		.setMaxSdkVersion(maxSdkVersion);
		if (!TextUtils.isEmpty(jarPath)) {
		systemService.setJarPath(jarPath);
		}

core/res/res/values/attrs_manifest.xml

+0 −8

Original line number	Diff line number	Diff line
		@@ -2829,14 +2829,6 @@
		<attr name="path" />
		<attr name="minSdkVersion" />
		<attr name="maxSdkVersion" />
		<!-- The order in which the apex system services are initiated. When there are dependencies
		among apex system services, setting this attribute for each of them ensures that they are
		created in the order required by those dependencies. The apex-system-services that are
		started manually within SystemServer ignore the initOrder and are not considered for
		automatic starting of the other services.
		The value is a simple integer, with higher number being initialized first. If not specified,
		the default order is 0. -->
		<attr name="initOrder" format="integer" />
		</declare-styleable>

		<!-- The <code>receiver</code> tag declares an

services/core/java/com/android/server/pm/ApexManager.java

+11 −18

Original line number	Diff line number	Diff line
		@@ -413,11 +413,9 @@ public abstract class ApexManager {
		throws PackageManagerException;

		/**
		* Get a list of apex system services implemented in an apex.
		*
		* <p>The list is sorted by initOrder for consistency.
		* Get a map of system services defined in an apex mapped to the jar files they reside in.
		*/
		public abstract List<ApexSystemServiceInfo> getApexSystemServices();
		public abstract Map<String, String> getApexSystemServices();

		/**
		* Dumps various state information to the provided {@link PrintWriter} object.
		@@ -450,7 +448,7 @@ public abstract class ApexManager {
		* Map of all apex system services to the jar files they are contained in.
		*/
		@GuardedBy("mLock")
		private List<ApexSystemServiceInfo> mApexSystemServices = new ArrayList<>();
		private Map<String, String> mApexSystemServices = new ArrayMap<>();

		/**
		* Contains the list of {@code packageName}s of apks-in-apex for given
		@@ -606,19 +604,14 @@ public abstract class ApexManager {
		}

		String name = service.getName();
		for (ApexSystemServiceInfo info : mApexSystemServices) {
		if (info.getName().equals(name)) {
		if (mApexSystemServices.containsKey(name)) {
		throw new IllegalStateException(String.format(
		"Duplicate apex-system-service %s from %s, %s",
		name, info.mJarPath, service.getJarPath()));
		}
		name, mApexSystemServices.get(name), service.getJarPath()));
		}

		ApexSystemServiceInfo info = new ApexSystemServiceInfo(
		service.getName(), service.getJarPath(), service.getInitOrder());
		mApexSystemServices.add(info);
		mApexSystemServices.put(name, service.getJarPath());
		}
		Collections.sort(mApexSystemServices);
		mPackageNameToApexModuleName.put(packageInfo.packageName, ai.moduleName);
		if (ai.isActive) {
		if (activePackagesSet.contains(packageInfo.packageName)) {
		@@ -1139,7 +1132,7 @@ public abstract class ApexManager {
		}

		@Override
		public List<ApexSystemServiceInfo> getApexSystemServices() {
		public Map<String, String> getApexSystemServices() {
		synchronized (mLock) {
		Preconditions.checkState(mApexSystemServices != null,
		"APEX packages have not been scanned");
		@@ -1425,10 +1418,10 @@ public abstract class ApexManager {
		}

		@Override
		public List<ApexSystemServiceInfo> getApexSystemServices() {
		public Map<String, String> getApexSystemServices() {
		// TODO(satayev): we can't really support flattened apex use case, and need to migrate
		// the manifest entries into system's manifest asap.
		return Collections.emptyList();
		return Collections.emptyMap();
		}

		@Override