Snap for 7253016 from 60104529463b2fd0f40097fa00f3e0cb0ef801d8 to sc-release (db873dae) · Commits · e / os / android_frameworks_base

apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -412,11 +412,6 @@ public final class AppSearchImpl implements Closeable {

		String prefix = createPrefix(packageName, databaseName);
		GetSchemaResponse.Builder responseBuilder = new GetSchemaResponse.Builder();
		if (!fullSchema.getTypesList().isEmpty()) {
		// TODO(b/183050495) find a place to store the version for the database, rather
		// than read from a schema.
		responseBuilder.setVersion(fullSchema.getTypes(0).getVersion());
		}
		for (int i = 0; i < fullSchema.getTypesCount(); i++) {
		String typePrefix = getPrefix(fullSchema.getTypes(i).getSchemaType());
		if (!prefix.equals(typePrefix)) {
		@@ -444,6 +439,10 @@ public final class AppSearchImpl implements Closeable {

		AppSearchSchema schema =
		SchemaToProtoConverter.toAppSearchSchema(typeConfigBuilder);

		// TODO(b/183050495) find a place to store the version for the database, rather
		// than read from a schema.
		responseBuilder.setVersion(fullSchema.getTypes(i).getVersion());
		responseBuilder.addSchema(schema);
		}
		return responseBuilder.build();

+1 −1

Original line number	Diff line number	Diff line
		Ie11a0555775a0ab2a39f6ce6d0d8a7b735c416ce
		Ibbd3a92ad091f6911de652e2ba7e44f555a70a72

+10 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,10 @@ public class PowerExemptionManager {
		public static final int REASON_APPOP = 66;
		/** @hide */
		public static final int REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD = 67;
		/** @hide */
		public static final int REASON_OP_ACTIVATE_VPN = 68;
		/** @hide */
		public static final int REASON_OP_ACTIVATE_PLATFORM_VPN = 69;

		/* BG-FGS-launch is allowed by temp-allow-list or system-allow-list.
		Reason code for temp and system allow list starts here.
		@@ -344,6 +348,8 @@ public class PowerExemptionManager {
		REASON_ALLOWLISTED_PACKAGE,
		REASON_APPOP,
		REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD,
		REASON_OP_ACTIVATE_VPN,
		REASON_OP_ACTIVATE_PLATFORM_VPN,
		// temp and system allow list reasons.
		REASON_GEOFENCING,
		REASON_PUSH_MESSAGING,
		@@ -603,6 +609,10 @@ public class PowerExemptionManager {
		return "APPOP";
		case REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD:
		return "ACTIVITY_VISIBILITY_GRACE_PERIOD";
		case REASON_OP_ACTIVATE_VPN:
		return "OP_ACTIVATE_VPN";
		case REASON_OP_ACTIVATE_PLATFORM_VPN:
		return "OP_ACTIVATE_PLATFORM_VPN";
		case REASON_GEOFENCING:
		return "GEOFENCING";
		case REASON_PUSH_MESSAGING:

+11 −2

Original line number	Diff line number	Diff line
		@@ -629,7 +629,16 @@ public final class MediaTranscodeManager {
		/* Writes the TranscodingRequest to a parcel. */
		private TranscodingRequestParcel writeToParcel(@NonNull Context context) {
		TranscodingRequestParcel parcel = new TranscodingRequestParcel();
		parcel.priority = mPriority;
		switch (mPriority) {
		case PRIORITY_OFFLINE:
		parcel.priority = TranscodingSessionPriority.kUnspecified;
		break;
		case PRIORITY_REALTIME:
		case PRIORITY_UNKNOWN:
		default:
		parcel.priority = TranscodingSessionPriority.kNormal;
		break;
		}
		parcel.transcodingType = mType;
		parcel.sourceFilePath = mSourceUri.toString();
		parcel.sourceFd = mSourceFileDescriptor;
		@@ -1578,7 +1587,7 @@ public final class MediaTranscodeManager {
		result = "RESULT_SUCCESS";
		break;
		case RESULT_ERROR:
		result = "RESULT_ERROR";
		result = "RESULT_ERROR(" + mErrorCode + ")";
		break;
		case RESULT_CANCELED:
		result = "RESULT_CANCELED";

+20 −3

Original line number	Diff line number	Diff line
		@@ -23,7 +23,24 @@ package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		boot_image {
		name: "framework-boot-image",
		image_name: "boot",
		// This module provides access to information Soong has related to the
		// whole platform bootclasspath. Currently, that information is provided solely
		// through configuration but additional information will be added here.
		//
		// This will provide support for the following:
		// * Hidden API processing for those parts of the bootclasspath that are not
		// part of an APEX.
		// * Compatibility checking to ensure that the hidden API bits encoded into the
		// dex files by the modularized hidden API processing is compatible with the
		// runtimes of earlier releases which expect the bits to have been computed
		// over the entirety of the bootclasspath in one go not separately.
		// * Dexpreopting apps and other libraries not on the platform bootclasspath.
		// * Generating and installing the appropriate files to the device which will
		// allow it to generate the bootclasspath related environment variables
		// dynamically.
		//
		// This module needs to be present in the build for the above processing to be
		// done correctly.
		platform_bootclasspath {
		name: "platform-bootclasspath",
		}