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

Commit f9c5c257 authored by Jerry Zhang's avatar Jerry Zhang
Browse files

Add MtpStorageManager for monitoring filesystem events 

MtpStorageManager keeps track of file information and
send notifications for new files. MtpDatabase now uses
this instead of MediaProvider for getting object information,
although some operations are still reflected into MP.

Since MtpStorageManager handles storage ids, remove
that field from StorageVolume and VolumeInfo.

Clean up a lot of the jni code for MtpDatabase.

Bug: 63143623
Test: Test every MtpOperation in a variety of situations on Linux and
Windows. Also use the shell to manipulate files. Verify that the cache
is consistent throughout, and the operations behave as expected. Verify
files created by the shell appear.
Test: adb shell am instrument -w android.mtp /android.support.test.runner.AndroidJUnitRunner
Change-Id: Id4ea810047b0c323399cd833047733e5daafb30a
parent d361a515

core/java/android/os/storage/StorageVolume.java

+2 −41
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.os.storage; 
import android.annotation.Nullable;

import android.content.Context;

import android.content.Intent;

import android.net.TrafficStats;

import android.net.Uri;

import android.os.Environment;

import android.os.Parcel;
@@ -78,13 +77,11 @@ import java.io.File; 
public final class StorageVolume implements Parcelable {



    private final String mId;

    private final int mStorageId;

    private final File mPath;

    private final String mDescription;

    private final boolean mPrimary;

    private final boolean mRemovable;

    private final boolean mEmulated;

    private final long mMtpReserveSize;

    private final boolean mAllowMassStorage;

    private final long mMaxFileSize;

    private final UserHandle mOwner;
@@ -121,17 +118,15 @@ public final class StorageVolume implements Parcelable { 
    public static final int STORAGE_ID_PRIMARY = 0x00010001;



    /** {@hide} */

    public StorageVolume(String id, int storageId, File path, String description, boolean primary,

            boolean removable, boolean emulated, long mtpReserveSize, boolean allowMassStorage,

    public StorageVolume(String id, File path, String description, boolean primary,

            boolean removable, boolean emulated, boolean allowMassStorage,

            long maxFileSize, UserHandle owner, String fsUuid, String state) {

        mId = Preconditions.checkNotNull(id);

        mStorageId = storageId;

        mPath = Preconditions.checkNotNull(path);

        mDescription = Preconditions.checkNotNull(description);

        mPrimary = primary;

        mRemovable = removable;

        mEmulated = emulated;

        mMtpReserveSize = mtpReserveSize;

        mAllowMassStorage = allowMassStorage;

        mMaxFileSize = maxFileSize;

        mOwner = Preconditions.checkNotNull(owner);
@@ -141,13 +136,11 @@ public final class StorageVolume implements Parcelable { 


    private StorageVolume(Parcel in) {

        mId = in.readString();

        mStorageId = in.readInt();

        mPath = new File(in.readString());

        mDescription = in.readString();

        mPrimary = in.readInt() != 0;

        mRemovable = in.readInt() != 0;

        mEmulated = in.readInt() != 0;

        mMtpReserveSize = in.readLong();

        mAllowMassStorage = in.readInt() != 0;

        mMaxFileSize = in.readLong();

        mOwner = in.readParcelable(null);
@@ -210,34 +203,6 @@ public final class StorageVolume implements Parcelable { 
        return mEmulated;

    }



    /**

     * Returns the MTP storage ID for the volume.

     * this is also used for the storage_id column in the media provider.

     *

     * @return MTP storage ID

     * @hide

     */

    public int getStorageId() {

        return mStorageId;

    }



    /**

     * Number of megabytes of space to leave unallocated by MTP.

     * MTP will subtract this value from the free space it reports back

     * to the host via GetStorageInfo, and will not allow new files to

     * be added via MTP if there is less than this amount left free in the storage.

     * If MTP has dedicated storage this value should be zero, but if MTP is

     * sharing storage with the rest of the system, set this to a positive value

     * to ensure that MTP activity does not result in the storage being

     * too close to full.

     *

     * @return MTP reserve space

     * @hide

     */

    public int getMtpReserveSpace() {

        return (int) (mMtpReserveSize / TrafficStats.MB_IN_BYTES);

    }



    /**

     * Returns true if this volume can be shared via USB mass storage.

     *
@@ -385,13 +350,11 @@ public final class StorageVolume implements Parcelable { 
        pw.println("StorageVolume:");

        pw.increaseIndent();

        pw.printPair("mId", mId);

        pw.printPair("mStorageId", mStorageId);

        pw.printPair("mPath", mPath);

        pw.printPair("mDescription", mDescription);

        pw.printPair("mPrimary", mPrimary);

        pw.printPair("mRemovable", mRemovable);

        pw.printPair("mEmulated", mEmulated);

        pw.printPair("mMtpReserveSize", mMtpReserveSize);

        pw.printPair("mAllowMassStorage", mAllowMassStorage);

        pw.printPair("mMaxFileSize", mMaxFileSize);

        pw.printPair("mOwner", mOwner);
@@ -420,13 +383,11 @@ public final class StorageVolume implements Parcelable { 
    @Override

    public void writeToParcel(Parcel parcel, int flags) {

        parcel.writeString(mId);

        parcel.writeInt(mStorageId);

        parcel.writeString(mPath.toString());

        parcel.writeString(mDescription);

        parcel.writeInt(mPrimary ? 1 : 0);

        parcel.writeInt(mRemovable ? 1 : 0);

        parcel.writeInt(mEmulated ? 1 : 0);

        parcel.writeLong(mMtpReserveSize);

        parcel.writeInt(mAllowMassStorage ? 1 : 0);

        parcel.writeLong(mMaxFileSize);

        parcel.writeParcelable(mOwner, flags);

core/java/android/os/storage/VolumeInfo.java

+2 −18
Original line number Diff line number Diff line
@@ -343,9 +343,7 @@ public class VolumeInfo implements Parcelable { 


        String description = null;

        String derivedFsUuid = fsUuid;

        long mtpReserveSize = 0;

        long maxFileSize = 0;

        int mtpStorageId = StorageVolume.STORAGE_ID_INVALID;



        if (type == TYPE_EMULATED) {

            emulated = true;
@@ -356,12 +354,6 @@ public class VolumeInfo implements Parcelable { 
                derivedFsUuid = privateVol.fsUuid;

            }



            if (isPrimary()) {

                mtpStorageId = StorageVolume.STORAGE_ID_PRIMARY;

            }



            mtpReserveSize = storage.getStorageLowBytes(userPath);



            if (ID_EMULATED_INTERNAL.equals(id)) {

                removable = false;

            } else {
@@ -374,14 +366,6 @@ public class VolumeInfo implements Parcelable { 


            description = storage.getBestVolumeDescription(this);



            if (isPrimary()) {

                mtpStorageId = StorageVolume.STORAGE_ID_PRIMARY;

            } else {

                // Since MediaProvider currently persists this value, we need a

                // value that is stable over time.

                mtpStorageId = buildStableMtpStorageId(fsUuid);

            }



            if ("vfat".equals(fsType)) {

                maxFileSize = 4294967295L;

            }
@@ -394,8 +378,8 @@ public class VolumeInfo implements Parcelable { 
            description = context.getString(android.R.string.unknownName);

        }



        return new StorageVolume(id, mtpStorageId, userPath, description, isPrimary(), removable,

                emulated, mtpReserveSize, allowMassStorage, maxFileSize, new UserHandle(userId),

        return new StorageVolume(id, userPath, description, isPrimary(), removable,

                emulated, allowMassStorage, maxFileSize, new UserHandle(userId),

                derivedFsUuid, envState);

    }

core/java/android/provider/MediaStore.java

+0 −9
Original line number Diff line number Diff line
@@ -63,15 +63,6 @@ public final class MediaStore { 


    private static final String CONTENT_AUTHORITY_SLASH = "content://" + AUTHORITY + "/";



   /**

     * Broadcast Action:  A broadcast to indicate the end of an MTP session with the host.

     * This broadcast is only sent if MTP activity has modified the media database during the

     * most recent MTP session.

     *

     * @hide

     */

    public static final String ACTION_MTP_SESSION_END = "android.provider.action.MTP_SESSION_END";



    /**

     * The method name used by the media scanner and mtp to tell the media provider to

     * rescan and reclassify that have become unhidden because of renaming folders or

media/java/android/mtp/MtpDatabase.java

+570 −769

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/mtp/MtpPropertyGroup.java

+139 −265

File changed.

Preview size limit exceeded, changes collapsed.