From 38ed2a471a2291383821fb187bfa18450f0581c2 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 6 Sep 2013 16:17:22 -0700 Subject: Work on issue #10130785: Restore silence and vibrate settings... ...in settings > sound Add a new ContentProvider API to canonicalize URIs, so they can be transported across backup/restore. Change-Id: Ie5af3662f6822a32310e49c7f1e1ff084986c56e --- test-runner/src/android/test/mock/MockContentProvider.java | 10 ++++++++++ test-runner/src/android/test/mock/MockIContentProvider.java | 10 ++++++++++ 2 files changed, 20 insertions(+) (limited to 'test-runner/src') diff --git a/test-runner/src/android/test/mock/MockContentProvider.java b/test-runner/src/android/test/mock/MockContentProvider.java index 596ea0a..28d52b0 100644 --- a/test-runner/src/android/test/mock/MockContentProvider.java +++ b/test-runner/src/android/test/mock/MockContentProvider.java @@ -137,6 +137,16 @@ public class MockContentProvider extends ContentProvider { public ICancellationSignal createCancellationSignal() throws RemoteException { return null; } + + @Override + public Uri canonicalize(String callingPkg, Uri uri) throws RemoteException { + return MockContentProvider.this.canonicalize(uri); + } + + @Override + public Uri uncanonicalize(String callingPkg, Uri uri) throws RemoteException { + return MockContentProvider.this.uncanonicalize(uri); + } } private final InversionIContentProvider mIContentProvider = new InversionIContentProvider(); diff --git a/test-runner/src/android/test/mock/MockIContentProvider.java b/test-runner/src/android/test/mock/MockIContentProvider.java index b14ce49..c0dc7c3 100644 --- a/test-runner/src/android/test/mock/MockIContentProvider.java +++ b/test-runner/src/android/test/mock/MockIContentProvider.java @@ -114,4 +114,14 @@ public class MockIContentProvider implements IContentProvider { public ICancellationSignal createCancellationSignal() throws RemoteException { throw new UnsupportedOperationException("unimplemented mock method"); } + + @Override + public Uri canonicalize(String callingPkg, Uri uri) throws RemoteException { + throw new UnsupportedOperationException("unimplemented mock method"); + } + + @Override + public Uri uncanonicalize(String callingPkg, Uri uri) throws RemoteException { + throw new UnsupportedOperationException("unimplemented mock method"); + } } -- cgit v1.1