Merge change 8886

import android.content.ContentProvider;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;

import android.test.mock.MockContext;

import android.test.mock.MockContentResolver;

import android.database.DatabaseUtils;

    private IsolatedContext mProviderContext;

    private MockContentResolver mResolver;

       private class MockContext2 extends MockContext {

        @Override

        public Resources getResources() {

            return getContext().getResources();

        }

    }

    public ProviderTestCase2(Class<T> providerClass, String providerAuthority) {

        mProviderClass = providerClass;

        mProviderAuthority = providerAuthority;

        mResolver = new MockContentResolver();

        final String filenamePrefix = "test.";

        RenamingDelegatingContext targetContextWrapper = new RenamingDelegatingContext(

                new MockContext(), // The context that most methods are delegated to

                new MockContext2(), // The context that most methods are delegated to

                getContext(), // The context that file methods are delegated to

                filenamePrefix);

        mProviderContext = new IsolatedContext(mResolver, targetContextWrapper);