Snap for 6578268 from 11b584739778d1b86235c5ba844652adc438c842 to rvc-release (cf85e3f9) · Commits · e / os / android_frameworks_base

apex/Android.bp

+28 −10

Original line number	Diff line number	Diff line
		@@ -63,9 +63,9 @@ mainline_service_stubs_args =
		"--hide-annotation android.annotation.Hide " +
		"--hide InternalClasses " // com.android.* classes are okay in this interface

		// Defaults for mainline module provided java_sdk_library instances.
		// Defaults common to all mainline module java_sdk_library instances.
		java_defaults {
		name: "framework-module-defaults",
		name: "framework-module-common-defaults",

		// Additional annotations used for compiling both the implementation and the
		// stubs libraries.
		@@ -88,14 +88,6 @@ java_defaults {
		enabled: true,
		sdk_version: "module_current",
		},
		system: {
		enabled: true,
		sdk_version: "module_current",
		},
		module_lib: {
		enabled: true,
		sdk_version: "module_current",
		},

		// Configure framework module specific metalava options.
		droiddoc_options: [mainline_stubs_args],
		@@ -127,6 +119,32 @@ java_defaults {
		sdk_version: "module_current",
		}

		// Defaults for mainline module provided java_sdk_library instances.
		java_defaults {
		name: "framework-module-defaults",
		defaults: ["framework-module-common-defaults"],

		system: {
		enabled: true,
		sdk_version: "module_current",
		},
		module_lib: {
		enabled: true,
		sdk_version: "module_current",
		},
		}

		// Defaults for mainline module system server provided java_sdk_library instances.
		java_defaults {
		name: "framework-system-server-module-defaults",
		defaults: ["framework-module-common-defaults"],

		system_server: {
		enabled: true,
		sdk_version: "module_current",
		},
		}

		stubs_defaults {
		name: "framework-module-stubs-defaults-publicapi",
		args: mainline_framework_stubs_args,

apex/blobstore/framework/java/android/app/blob/BlobHandle.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -219,7 +219,7 @@ public final class BlobHandle implements Parcelable {
		public void dump(IndentingPrintWriter fout, boolean dumpFull) {
		if (dumpFull) {
		fout.println("algo: " + algorithm);
		fout.println("digest: " + (dumpFull ? encodeDigest() : safeDigest()));
		fout.println("digest: " + (dumpFull ? encodeDigest(digest) : safeDigest(digest)));
		fout.println("label: " + label);
		fout.println("expiryMs: " + expiryTimeMillis);
		fout.println("tag: " + tag);
		@@ -243,19 +243,20 @@ public final class BlobHandle implements Parcelable {
		public String toString() {
		return "BlobHandle {"
		+ "algo:" + algorithm + ","
		+ "digest:" + safeDigest() + ","
		+ "digest:" + safeDigest(digest) + ","
		+ "label:" + label + ","
		+ "expiryMs:" + expiryTimeMillis + ","
		+ "tag:" + tag
		+ "}";
		}

		private String safeDigest() {
		final String digestStr = encodeDigest();
		/** @hide */
		public static String safeDigest(@NonNull byte[] digest) {
		final String digestStr = encodeDigest(digest);
		return digestStr.substring(0, 2) + ".." + digestStr.substring(digestStr.length() - 2);
		}

		private String encodeDigest() {
		private static String encodeDigest(@NonNull byte[] digest) {
		return Base64.encodeToString(digest, Base64.NO_WRAP);
		}

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -478,7 +478,9 @@ public class BlobStoreManagerService extends SystemService {
		? Resources.ID_NULL
		: getDescriptionResourceId(resourcesGetter.apply(leasee.packageName),
		leasee.descriptionResEntryName, leasee.packageName);
		leaseInfos.add(new LeaseInfo(leasee.packageName, leasee.expiryTimeMillis,
		final long expiryTimeMs = leasee.expiryTimeMillis == 0
		? blobHandle.getExpiryTimeMillis() : leasee.expiryTimeMillis;
		leaseInfos.add(new LeaseInfo(leasee.packageName, expiryTimeMs,
		descriptionResId, leasee.description));
		});
		blobInfos.add(new BlobInfo(blobMetadata.getBlobId(),
		@@ -592,6 +594,7 @@ public class BlobStoreManagerService extends SystemService {
		} else {
		blob.addOrReplaceCommitter(existingCommitter);
		}
		Slog.d(TAG, "Error committing the blob", e);
		session.sendCommitCallbackResult(COMMIT_RESULT_ERROR);
		}
		getUserSessionsLocked(UserHandle.getUserId(session.getOwnerUid()))

apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import static android.system.OsConstants.O_RDONLY;
		import static android.system.OsConstants.O_RDWR;
		import static android.system.OsConstants.SEEK_SET;

		import static com.android.server.blob.BlobStoreConfig.LOGV;
		import static com.android.server.blob.BlobStoreConfig.TAG;
		import static com.android.server.blob.BlobStoreConfig.XML_VERSION_ADD_SESSION_CREATION_TIME;
		import static com.android.server.blob.BlobStoreConfig.hasSessionExpired;
		@@ -423,9 +422,10 @@ class BlobStoreSession extends IBlobStoreSession.Stub {
		mState = STATE_VERIFIED_VALID;
		// Commit callback will be sent once the data is persisted.
		} else {
		if (LOGV) {
		Slog.v(TAG, "Digest of the data didn't match the given BlobHandle.digest");
		}
		Slog.d(TAG, "Digest of the data ("
		+ (mDataDigest == null ? "null" : BlobHandle.safeDigest(mDataDigest))
		+ ") didn't match the given BlobHandle.digest ("
		+ BlobHandle.safeDigest(mBlobHandle.digest) + ")");
		mState = STATE_VERIFIED_INVALID;
		sendCommitCallbackResult(COMMIT_RESULT_ERROR);
		}

apex/permission/service/Android.bp

+15 −28

Original line number	Diff line number	Diff line
		@@ -20,14 +20,26 @@ filegroup {
		path: "java",
		}

		java_library {
		java_sdk_library {
		name: "service-permission",
		defaults: ["framework-system-server-module-defaults"],
		visibility: [
		"//frameworks/base/services/core",
		"//frameworks/base/apex/permission",
		"//frameworks/base/apex/permission/testing",
		"//frameworks/base/apex/permission/tests",
		"//frameworks/base/services/tests/mockingservicestests",
		],
		impl_library_visibility: [
		"//visibility:override",
		"//frameworks/base/apex/permission/tests",
		"//frameworks/base/services/tests/mockingservicestests",
		"//frameworks/base/services/tests/servicestests",
		],
		srcs: [
		":service-permission-sources",
		],
		sdk_version: "module_current",
		libs: [
		"framework-annotations-lib",
		"framework-permission",
		],
		apex_available: [
		@@ -36,28 +48,3 @@ java_library {
		],
		installable: true,
		}

		droidstubs {
		name: "service-permission-stubs-srcs",
		srcs: [ ":service-permission-sources" ],
		defaults: ["service-module-stubs-srcs-defaults"],
		check_api: {
		last_released: {
		api_file: ":service-permission.api.system-server.latest",
		removed_api_file: ":service-permission-removed.api.system-server.latest",
		},
		api_lint: {
		new_since: ":service-permission.api.system-server.latest",
		},
		},
		visibility: ["//visibility:private"],
		dist: { dest: "service-permission.txt" },
		}

		java_library {
		name: "service-permission-stubs",
		srcs: [":service-permission-stubs-srcs"],
		defaults: ["service-module-stubs-defaults"],
		visibility: ["//frameworks/base/services/core"],
		dist: { dest: "service-permission.jar" },
		}