Merge \"temporarily disable FakeSettingsProviderTest\" into nyc-mr1-dev
am: 2b0b1e5a94
Change-Id: Ic3152624c192074838dd7ebee82d4d4a2bf74533
This commit is contained in:
@@ -24,6 +24,7 @@ import android.test.AndroidTestCase;
|
|||||||
import android.test.mock.MockContentResolver;
|
import android.test.mock.MockContentResolver;
|
||||||
import android.test.mock.MockContext;
|
import android.test.mock.MockContext;
|
||||||
import android.test.suitebuilder.annotation.SmallTest;
|
import android.test.suitebuilder.annotation.SmallTest;
|
||||||
|
import android.test.suitebuilder.annotation.Suppress;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.concurrent.CountDownLatch;
|
||||||
@@ -32,6 +33,7 @@ import java.util.concurrent.TimeUnit;
|
|||||||
/**
|
/**
|
||||||
* Unit tests for FakeSettingsProvider.
|
* Unit tests for FakeSettingsProvider.
|
||||||
*/
|
*/
|
||||||
|
@Suppress
|
||||||
public class FakeSettingsProviderTest extends AndroidTestCase {
|
public class FakeSettingsProviderTest extends AndroidTestCase {
|
||||||
|
|
||||||
private MockContentResolver mCr;
|
private MockContentResolver mCr;
|
||||||
|
|||||||
Reference in New Issue
Block a user