Snap for 6534196 from 97c4cda8317169475b407a0092969034956e8224 to rvc-release (d1f0679a) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -930,6 +930,8 @@ filegroup {
		srcs: [
		"core/java/android/os/incremental/IIncrementalService.aidl",
		"core/java/android/os/incremental/IncrementalNewFileParams.aidl",
		"core/java/android/os/incremental/IStorageHealthListener.aidl",
		"core/java/android/os/incremental/StorageHealthCheckParams.aidl",
		],
		path: "core/java",
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ stubs_defaults {
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		":art-module-public-api-stubs-source",
		":conscrypt.module.public.api.stubs.source",
		":conscrypt.module.public.api{.public.stubs.source}",
		":android_icu4j_public_api_files",
		"test-mock/src/*/.java",
		"test-runner/src/*/.java",

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ stubs_defaults {
		name: "metalava-full-api-stubs-default",
		defaults: ["metalava-base-api-stubs-default"],
		srcs: [
		":conscrypt.module.public.api.stubs.source",
		":conscrypt.module.public.api{.public.stubs.source}",
		":framework-updatable-sources",
		],
		sdk_version: "core_platform",

+4 −1

Original line number	Diff line number	Diff line
		@@ -212,7 +212,10 @@ class BlobMetadata {
		}

		boolean isAccessAllowedForCaller(@NonNull String callingPackage, int callingUid) {
		// TODO: verify blob is still valid (expiryTime is not elapsed)
		// Don't allow the blob to be accessed after it's expiry time has passed.
		if (getBlobHandle().isExpired()) {
		return false;
		}
		synchronized (mMetadataLock) {
		// Check if packageName already holds a lease on the blob.
		for (int i = 0, size = mLeasees.size(); i < size; ++i) {

+12 −0

Original line number	Diff line number	Diff line
		@@ -1059,6 +1059,18 @@ public class BlobStoreManagerService extends SystemService {
		}
		}

		boolean isBlobAvailable(long blobId, int userId) {
		synchronized (mBlobsLock) {
		final ArrayMap<BlobHandle, BlobMetadata> userBlobs = getUserBlobsLocked(userId);
		for (BlobMetadata blobMetadata : userBlobs.values()) {
		if (blobMetadata.getBlobId() == blobId) {
		return true;
		}
		}
		return false;
		}
		}

		@GuardedBy("mBlobsLock")
		private void dumpSessionsLocked(IndentingPrintWriter fout, DumpArgs dumpArgs) {
		for (int i = 0, userCount = mSessions.size(); i < userCount; ++i) {