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

Commit c26fc744 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Include size of the blobs in BlobInfo." into rvc-dev am: 312ed338 am:... 

Merge "Include size of the blobs in BlobInfo." into rvc-dev am: 312ed338 am: 2457fddc am: ad3cf1a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744169

Change-Id: Ica19782feaa1a9ddf39acc64e3319dadbf5b0b50
parents 7252c5e0 ad3cf1a0

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

+19 −1
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 


package android.app.blob;



import static android.text.format.Formatter.FLAG_IEC_UNITS;



import android.annotation.NonNull;

import android.app.AppGlobals;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.format.Formatter;



import java.util.Collections;

import java.util.List;
@@ -32,13 +36,15 @@ public final class BlobInfo implements Parcelable { 
    private final long mId;

    private final long mExpiryTimeMs;

    private final CharSequence mLabel;

    private final long mSizeBytes;

    private final List<LeaseInfo> mLeaseInfos;



    public BlobInfo(long id, long expiryTimeMs, CharSequence label,

    public BlobInfo(long id, long expiryTimeMs, CharSequence label, long sizeBytes,

            List<LeaseInfo> leaseInfos) {

        mId = id;

        mExpiryTimeMs = expiryTimeMs;

        mLabel = label;

        mSizeBytes = sizeBytes;

        mLeaseInfos = leaseInfos;

    }
@@ -46,6 +52,7 @@ public final class BlobInfo implements Parcelable { 
        mId = in.readLong();

        mExpiryTimeMs = in.readLong();

        mLabel = in.readCharSequence();

        mSizeBytes = in.readLong();

        mLeaseInfos = in.readArrayList(null /* classloader */);

    }
@@ -61,6 +68,10 @@ public final class BlobInfo implements Parcelable { 
        return mLabel;

    }



    public long getSizeBytes() {

        return mSizeBytes;

    }



    public List<LeaseInfo> getLeases() {

        return Collections.unmodifiableList(mLeaseInfos);

    }
@@ -70,6 +81,7 @@ public final class BlobInfo implements Parcelable { 
        dest.writeLong(mId);

        dest.writeLong(mExpiryTimeMs);

        dest.writeCharSequence(mLabel);

        dest.writeLong(mSizeBytes);

        dest.writeList(mLeaseInfos);

    }
@@ -83,10 +95,16 @@ public final class BlobInfo implements Parcelable { 
                + "id: " + mId + ","

                + "expiryMs: " + mExpiryTimeMs + ","

                + "label: " + mLabel + ","

                + "size: " + formatBlobSize(mSizeBytes) + ","

                + "leases: " + LeaseInfo.toShortString(mLeaseInfos) + ","

                + "}";

    }



    private static String formatBlobSize(long sizeBytes) {

        return Formatter.formatFileSize(AppGlobals.getInitialApplication(),

                sizeBytes, FLAG_IEC_UNITS);

    }



    @Override

    public int describeContents() {

        return 0;

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

+2 −1
Original line number Diff line number Diff line
@@ -482,7 +482,8 @@ public class BlobStoreManagerService extends SystemService { 
                            descriptionResId, leasee.description));

                });

                blobInfos.add(new BlobInfo(blobMetadata.getBlobId(),

                        blobHandle.getExpiryTimeMillis(), blobHandle.getLabel(), leaseInfos));

                        blobHandle.getExpiryTimeMillis(), blobHandle.getLabel(),

                        blobMetadata.getSize(), leaseInfos));

            });

        }

        return blobInfos;