summaryrefslogtreecommitdiffstats
path: root/test-runner/src
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-05-30 23:51:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-30 23:51:46 +0000
commit43e15653706d667a722a3b813ea89917d00ed42a (patch)
treea00ae4a85c8d04bb94d935d366ad70456c795d66 /test-runner/src
parent92bcf31f541ceb4e5af031d249370c32c5cd4713 (diff)
parent05dc18d69ad64254f2bcdd9c1e208ab54ee664fe (diff)
downloadframeworks_base-43e15653706d667a722a3b813ea89917d00ed42a.zip
frameworks_base-43e15653706d667a722a3b813ea89917d00ed42a.tar.gz
frameworks_base-43e15653706d667a722a3b813ea89917d00ed42a.tar.bz2
am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev
* commit '9a78d4deb2d00dc67b2c11daf76b389e0712b535': Per-app media directories on external storage.
Diffstat (limited to 'test-runner/src')
-rw-r--r--test-runner/src/android/test/mock/MockContext.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index c162bf2..a54936b 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -608,4 +608,9 @@ public class MockContext extends Context {
public File[] getExternalCacheDirs() {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public File[] getExternalMediaDirs() {
+ throw new UnsupportedOperationException();
+ }
}