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

Commit 4604b746 authored by Daichi Hirono's avatar Daichi Hirono
Browse files

Prepare for adding MtpDocumentsProvider tests to APCT. 

BUG=25093356

Change-Id: I0c194e6bf3abeb632171e9be49471b9d94a0cb4c
parent 484d009c

packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ class MtpDatabase { 
    private final Map<String, Integer> mMappingMode = new HashMap<>();



    @VisibleForTesting

    MtpDatabase(Context context) {

        mDatabase = new MtpDatabaseInternal(context);

    MtpDatabase(Context context, boolean inMemory) {

        mDatabase = new MtpDatabaseInternal(context, inMemory);

    }



    /**

packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseInternal.java

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import java.util.Objects; 
 */

class MtpDatabaseInternal {

    private static class OpenHelper extends SQLiteOpenHelper {

        public OpenHelper(Context context) {

            super(context, DATABASE_NAME, null, DATABASE_VERSION);

        public OpenHelper(Context context, boolean inMemory) {

            super(context, inMemory ? null : DATABASE_NAME, null, DATABASE_VERSION);

        }



        @Override
@@ -54,8 +54,8 @@ class MtpDatabaseInternal { 


    private final SQLiteDatabase mDatabase;



    MtpDatabaseInternal(Context context) {

        final OpenHelper helper = new OpenHelper(context);

    MtpDatabaseInternal(Context context, boolean inMemory) {

        final OpenHelper helper = new OpenHelper(context, inMemory);

        mDatabase = helper.getWritableDatabase();

    }

packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class MtpDocumentsProvider extends DocumentsProvider { 
        mMtpManager = new MtpManager(getContext());

        mResolver = getContext().getContentResolver();

        mDeviceToolkits = new HashMap<Integer, DeviceToolkit>();

        mDatabase = new MtpDatabase(getContext());

        mDatabase = new MtpDatabase(getContext(), false);

        mRootScanner = new RootScanner(mResolver, mResources, mMtpManager, mDatabase);

        return true;

    }

packages/MtpDocumentsProvider/tests/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,4 @@ 
    <instrumentation android:name="com.android.mtp.TestResultInstrumentation"

        android:targetPackage="com.android.mtp"

        android:label="Tests for MtpDocumentsProvider with the UI for output." />

    <instrumentation android:name="android.test.InstrumentationTestRunner"

        android:targetPackage="com.android.mtp"

        android:label="Tests for MtpDocumentsProvider." />

</manifest>

packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java

+2 −3
Original line number Diff line number Diff line
@@ -22,15 +22,14 @@ import android.mtp.MtpObjectInfo; 
import android.net.Uri;

import android.provider.DocumentsContract;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.MediumTest;



import java.io.IOException;

import java.util.Date;

import java.util.HashMap;

import java.util.Map;

import java.util.concurrent.CountDownLatch;



@SmallTest

@MediumTest

public class DocumentLoaderTest extends AndroidTestCase {

    private BlockableTestMtpManager mManager;

    private TestContentResolver mResolver;