Snap for 6334680 from d170e878d0b27bf753d5ed8b91c57bf93b672317 to mainline-release (79caa157) · Commits · e / os / android_frameworks_base

apex/Android.bp

+18 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,24 @@ stubs_defaults {
		},
		}

		java_defaults {
		name: "framework-module-stubs-lib-defaults-publicapi",
		installable: false,
		sdk_version: "module_current",
		}

		java_defaults {
		name: "framework-module-stubs-lib-defaults-systemapi",
		installable: false,
		sdk_version: "module_current",
		}

		java_defaults {
		name: "framework-module-stubs-lib-defaults-module_libs_api",
		installable: false,
		sdk_version: "module_current",
		}

		// The defaults for module_libs comes in two parts - defaults for API checks
		// and defaults for stub generation. This is because we want the API txt
		// files to only include the module_libs_api, but the stubs to include

+8 −2

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ class BlobMetadata {
		return mUserId;
		}

		void addCommitter(@NonNull Committer committer) {
		void addOrReplaceCommitter(@NonNull Committer committer) {
		synchronized (mMetadataLock) {
		// We need to override the committer data, so first remove any existing
		// committer before adding the new one.
		@@ -139,6 +139,12 @@ class BlobMetadata {
		}
		}

		void removeCommitter(@NonNull Committer committer) {
		synchronized (mMetadataLock) {
		mCommitters.remove(committer);
		}
		}

		void removeInvalidCommitters(SparseArray<String> packages) {
		synchronized (mMetadataLock) {
		mCommitters.removeIf(committer ->
		@@ -154,7 +160,7 @@ class BlobMetadata {
		}
		}

		void addLeasee(String callingPackage, int callingUid, int descriptionResId,
		void addOrReplaceLeasee(String callingPackage, int callingUid, int descriptionResId,
		CharSequence description, long leaseExpiryTimeMillis) {
		synchronized (mMetadataLock) {
		// We need to override the leasee data, so first remove any existing

+7 −3

Original line number	Diff line number	Diff line
		@@ -401,7 +401,7 @@ public class BlobStoreManagerService extends SystemService {
		throw new LimitExceededException("Total amount of data with an active lease"
		+ " is exceeding the max limit");
		}
		blobMetadata.addLeasee(callingPackage, callingUid,
		blobMetadata.addOrReplaceLeasee(callingPackage, callingUid,
		descriptionResId, description, leaseExpiryTimeMillis);
		if (LOGV) {
		Slog.v(TAG, "Acquired lease on " + blobHandle
		@@ -573,12 +573,16 @@ public class BlobStoreManagerService extends SystemService {
		final Committer newCommitter = new Committer(session.getOwnerPackageName(),
		session.getOwnerUid(), session.getBlobAccessMode());
		final Committer existingCommitter = blob.getExistingCommitter(newCommitter);
		blob.addCommitter(newCommitter);
		blob.addOrReplaceCommitter(newCommitter);
		try {
		writeBlobsInfoLocked();
		session.sendCommitCallbackResult(COMMIT_RESULT_SUCCESS);
		} catch (Exception e) {
		blob.addCommitter(existingCommitter);
		if (existingCommitter == null) {
		blob.removeCommitter(newCommitter);
		} else {
		blob.addOrReplaceCommitter(existingCommitter);
		}
		session.sendCommitCallbackResult(COMMIT_RESULT_ERROR);
		}
		getUserSessionsLocked(UserHandle.getUserId(session.getOwnerUid()))

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		],
		"options": [
		{"include-filter": "com.android.server.DeviceIdleControllerTest"},
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		"name": "FrameworksMockingServicesTests",
		"options": [
		{"include-filter": "com.android.server.DeviceIdleControllerTest"},
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		}