Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42eb2484 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to r_aml_300803000 for mainline module file:... 

Make change and version bump to r_aml_300803000 for mainline module file: packages/Tethering/apex/manifest.json

Change-Id: I7a94ebf72bee6df80732d20b68e16cfbf1b65018
parents 61b941a7 6198e0e4

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.

apex/extservices/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.extservices",

  "version": 300802900

  "version": 300803000

}

apex/permission/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.permission",

  "version": 300802900

  "version": 300803000

}

apex/statsd/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.os.statsd",

  "version": 300802900

  "version": 300803000

}

packages/SystemUI/res/xml/media_collapsed.xml

+2 −1
Original line number Diff line number Diff line
@@ -42,10 +42,11 @@ 


    <Constraint

        android:id="@+id/media_seamless"

        android:layout_width="0dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="60dp"

        app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"

        app:layout_constraintHorizontal_bias="1"