Snap for 6635529 from 6452044f56ed6fc8e296ff17f4ef12364aad462f to rvc-release (4b622a78) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -459,6 +459,9 @@ public class BlobStoreManagerService extends SystemService {
		synchronized (mBlobsLock) {
		final int leasesCount = getLeasedBlobsCountLocked(callingUid, callingPackage);
		if (leasesCount >= getMaxLeasedBlobs()) {
		FrameworkStatsLog.write(FrameworkStatsLog.BLOB_LEASED, callingUid,
		INVALID_BLOB_ID, INVALID_BLOB_SIZE,
		FrameworkStatsLog.BLOB_LEASED__RESULT__COUNT_LIMIT_EXCEEDED);
		throw new LimitExceededException("Too many leased blobs for the caller: "
		+ leasesCount);
		}
		@@ -691,6 +694,9 @@ public class BlobStoreManagerService extends SystemService {
		deleteSessionLocked(session);
		getUserSessionsLocked(UserHandle.getUserId(session.getOwnerUid()))
		.remove(session.getSessionId());
		FrameworkStatsLog.write(FrameworkStatsLog.BLOB_COMMITTED,
		session.getOwnerUid(), session.getSessionId(), session.getSize(),
		FrameworkStatsLog.BLOB_COMMITTED__RESULT__COUNT_LIMIT_EXCEEDED);
		break;
		}
		final int userId = UserHandle.getUserId(session.getOwnerUid());
		@@ -725,7 +731,7 @@ public class BlobStoreManagerService extends SystemService {
		}
		Slog.d(TAG, "Error committing the blob: " + session, e);
		FrameworkStatsLog.write(FrameworkStatsLog.BLOB_COMMITTED,
		session.getOwnerUid(), blob.getBlobId(), blob.getSize(),
		session.getOwnerUid(), session.getSessionId(), blob.getSize(),
		FrameworkStatsLog.BLOB_COMMITTED__RESULT__ERROR_DURING_COMMIT);
		session.sendCommitCallbackResult(COMMIT_RESULT_ERROR);
		// If the commit fails and this blob data didn't exist before, delete it.

+1 −1

Original line number	Diff line number	Diff line
		@@ -5149,7 +5149,7 @@ package android.view {
		}

		public final class SurfaceControl implements android.os.Parcelable {
		ctor public SurfaceControl(@NonNull android.view.SurfaceControl);
		ctor public SurfaceControl(@NonNull android.view.SurfaceControl, @NonNull String);
		method public static long acquireFrameRateFlexibilityToken();
		method public boolean isSameSurface(@NonNull android.view.SurfaceControl);
		method public static void releaseFrameRateFlexibilityToken(long);

+7 −0

Original line number	Diff line number	Diff line
		@@ -1918,9 +1918,16 @@ public final class StrictMode {
		}

		private static class AndroidCloseGuardReporter implements CloseGuard.Reporter {

		@Override
		public void report(String message, Throwable allocationSite) {
		onVmPolicyViolation(new LeakedClosableViolation(message, allocationSite));
		}

		@Override
		public void report(String message) {
		onVmPolicyViolation(new LeakedClosableViolation(message));
		}
		}

		/** Called from Parcel.writeNoException() */

+5 −0

Original line number	Diff line number	Diff line
		@@ -21,4 +21,9 @@ public final class LeakedClosableViolation extends Violation {
		super(message);
		initCause(allocationSite);
		}

		/** @hide */
		public LeakedClosableViolation(String message) {
		super(message);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ public class InsetsSourceControl implements Parcelable {
		public InsetsSourceControl(InsetsSourceControl other) {
		mType = other.mType;
		if (other.mLeash != null) {
		mLeash = new SurfaceControl(other.mLeash);
		mLeash = new SurfaceControl(other.mLeash, "InsetsSourceControl");
		} else {
		mLeash = null;
		}