diff options
| author | Makoto Onuki <omakoto@google.com> | 2010-06-04 16:12:15 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2010-06-04 16:14:42 -0700 |
| commit | f6b979a04f38659177e06ff81cf7bc1b87389fe9 (patch) | |
| tree | 35438c24a45d92ebc9b81ecf4a0ef5af9510808b /test-runner/src | |
| parent | 8fd2913a7d893f7b0c07217df246876318739db5 (diff) | |
| download | frameworks_base-f6b979a04f38659177e06ff81cf7bc1b87389fe9.zip frameworks_base-f6b979a04f38659177e06ff81cf7bc1b87389fe9.tar.gz frameworks_base-f6b979a04f38659177e06ff81cf7bc1b87389fe9.tar.bz2 | |
Fix UnsupportedOperationException from MockContext.
Added the new variant of openOrCreateDatabase to RenamingDelegatingContext too.
Bug 2739822
Change-Id: I65868d0975e0a0a87ade6b5a0d625b96676af0ba
Diffstat (limited to 'test-runner/src')
| -rw-r--r-- | test-runner/src/android/test/RenamingDelegatingContext.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/test-runner/src/android/test/RenamingDelegatingContext.java b/test-runner/src/android/test/RenamingDelegatingContext.java index 973b9f2..eee3ad7 100644 --- a/test-runner/src/android/test/RenamingDelegatingContext.java +++ b/test-runner/src/android/test/RenamingDelegatingContext.java @@ -21,6 +21,7 @@ import com.google.android.collect.Sets; import android.content.Context; import android.content.ContextWrapper; import android.content.ContentProvider; +import android.database.DatabaseErrorHandler; import android.database.sqlite.SQLiteDatabase; import android.os.FileUtils; import android.util.Log; @@ -148,6 +149,17 @@ public class RenamingDelegatingContext extends ContextWrapper { } @Override + public SQLiteDatabase openOrCreateDatabase(String name, + int mode, SQLiteDatabase.CursorFactory factory, DatabaseErrorHandler errorHandler) { + final String internalName = renamedFileName(name); + if (!mDatabaseNames.contains(name)) { + mDatabaseNames.add(name); + mFileContext.deleteDatabase(internalName); + } + return mFileContext.openOrCreateDatabase(internalName, mode, factory, errorHandler); + } + + @Override public boolean deleteDatabase(String name) { if (mDatabaseNames.contains(name)) { mDatabaseNames.remove(name); |
