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

Commit b1a2b594 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 1341f1ee: MTP: Implement date created field in GetObjectInfo 

* commit '1341f1ee':
  MTP: Implement date created field in GetObjectInfo
parents fa4b63b3 1341f1ee

media/java/android/mtp/MtpDatabase.java

+9 −3
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ public class MtpDatabase { 
            Files.FileColumns.FORMAT, // 2

            Files.FileColumns.PARENT, // 3

            Files.FileColumns.DATA, // 4

            Files.FileColumns.DATE_MODIFIED, // 5

            Files.FileColumns.DATE_ADDED, // 5

            Files.FileColumns.DATE_MODIFIED, // 6

    };

    private static final String ID_WHERE = Files.FileColumns._ID + "=?";

    private static final String PATH_WHERE = Files.FileColumns.DATA + "=?";
@@ -840,7 +841,7 @@ public class MtpDatabase { 
    }



    private boolean getObjectInfo(int handle, int[] outStorageFormatParent,

                        char[] outName, long[] outModified) {

                        char[] outName, long[] outCreatedModified) {

        Cursor c = null;

        try {

            c = mMediaProvider.query(mPackageName, mObjectsUri, OBJECT_INFO_PROJECTION,
@@ -861,7 +862,12 @@ public class MtpDatabase { 
                path.getChars(start, end, outName, 0);

                outName[end - start] = 0;



                outModified[0] = c.getLong(5);

                outCreatedModified[0] = c.getLong(5);

                outCreatedModified[1] = c.getLong(6);

                // use modification date as creation date if date added is not set

                if (outCreatedModified[0] == 0) {

                    outCreatedModified[0] = outCreatedModified[1];

                }

                return true;

            }

        } catch (RemoteException e) {

media/jni/android_mtp_MtpDatabase.cpp

+2 −1
Original line number Diff line number Diff line
@@ -775,7 +775,8 @@ MtpResponseCode MyMtpDatabase::getObjectInfo(MtpObjectHandle handle, 
    env->ReleaseIntArrayElements(mIntBuffer, intValues, 0);



    jlong* longValues = env->GetLongArrayElements(mLongBuffer, 0);

    info.mDateModified = longValues[0];

    info.mDateCreated = longValues[0];

    info.mDateModified = longValues[1];

    env->ReleaseLongArrayElements(mLongBuffer, longValues, 0);



//    info.mAssociationType = (format == MTP_FORMAT_ASSOCIATION ?