summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/IContentProvider.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-02-02 17:05:00 -0800
committerJeff Brown <jeffbrown@google.com>2012-02-02 18:02:16 -0800
commit4c1241df8f8b7fd5ec3dff6c7e0f66271248e76e (patch)
tree36df1bce8fe7295d0ab778ca519232a291a3294f /core/java/android/content/IContentProvider.java
parent8ca8a69d5801ad4b809e7b9dbf53bd728820924b (diff)
downloadframeworks_base-4c1241df8f8b7fd5ec3dff6c7e0f66271248e76e.zip
frameworks_base-4c1241df8f8b7fd5ec3dff6c7e0f66271248e76e.tar.gz
frameworks_base-4c1241df8f8b7fd5ec3dff6c7e0f66271248e76e.tar.bz2
Rename CancellationSignal using preferred spelling.
Bug: 5943637 Change-Id: I12a339f285f4db58e79acb5fd8ec2fc1acda5265
Diffstat (limited to 'core/java/android/content/IContentProvider.java')
-rw-r--r--core/java/android/content/IContentProvider.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/IContentProvider.java b/core/java/android/content/IContentProvider.java
index f52157f..16478b7 100644
--- a/core/java/android/content/IContentProvider.java
+++ b/core/java/android/content/IContentProvider.java
@@ -34,7 +34,7 @@ import java.util.ArrayList;
*/
public interface IContentProvider extends IInterface {
public Cursor query(Uri url, String[] projection, String selection,
- String[] selectionArgs, String sortOrder, ICancelationSignal cancelationSignal)
+ String[] selectionArgs, String sortOrder, ICancellationSignal cancellationSignal)
throws RemoteException;
public String getType(Uri url) throws RemoteException;
public Uri insert(Uri url, ContentValues initialValues)
@@ -51,7 +51,7 @@ public interface IContentProvider extends IInterface {
public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)
throws RemoteException, OperationApplicationException;
public Bundle call(String method, String arg, Bundle extras) throws RemoteException;
- public ICancelationSignal createCancelationSignal() throws RemoteException;
+ public ICancellationSignal createCancellationSignal() throws RemoteException;
// Data interchange.
public String[] getStreamTypes(Uri url, String mimeTypeFilter) throws RemoteException;