Merge "temporarily disable FakeSettingsProviderTest" into nyc-mr1-dev (2b0b1e5a) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/internal/util/FakeSettingsProviderTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.test.AndroidTestCase;
		import android.test.mock.MockContentResolver;
		import android.test.mock.MockContext;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.test.suitebuilder.annotation.Suppress;
		import android.util.Log;

		import java.util.concurrent.CountDownLatch;
		@@ -32,6 +33,7 @@ import java.util.concurrent.TimeUnit;
		/**
		* Unit tests for FakeSettingsProvider.
		*/
		@Suppress
		public class FakeSettingsProviderTest extends AndroidTestCase {

		private MockContentResolver mCr;