diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-29 15:57:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-29 15:57:52 -0700 |
| commit | ce783749b191a58e4fed9a397066376915c1db65 (patch) | |
| tree | fe7bbae9d9db880b5e69d82d96cdffa5d4040ed9 /test-runner | |
| parent | b042f2d9908e20852e4077878e50a0c07b8eee79 (diff) | |
| parent | f3b4c93e0da9af2db9e16864faa734cf70fecfe3 (diff) | |
| download | frameworks_base-ce783749b191a58e4fed9a397066376915c1db65.zip frameworks_base-ce783749b191a58e4fed9a397066376915c1db65.tar.gz frameworks_base-ce783749b191a58e4fed9a397066376915c1db65.tar.bz2 | |
am f3b4c93e: am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev
* commit 'f3b4c93e0da9af2db9e16864faa734cf70fecfe3':
Fix (mostly) issue #5109947: Race condition between retrieving a...
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/src/android/test/mock/MockContentResolver.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test-runner/src/android/test/mock/MockContentResolver.java b/test-runner/src/android/test/mock/MockContentResolver.java index 65eb21b..715da0f 100644 --- a/test-runner/src/android/test/mock/MockContentResolver.java +++ b/test-runner/src/android/test/mock/MockContentResolver.java @@ -118,6 +118,11 @@ public class MockContentResolver extends ContentResolver { return releaseProvider(icp); } + /** @hide */ + @Override + public void unstableProviderDied(IContentProvider icp) { + } + /** * Overrides {@link android.content.ContentResolver#notifyChange(Uri, ContentObserver, boolean) * ContentResolver.notifChange(Uri, ContentObserver, boolean)}. All parameters are ignored. |