summaryrefslogtreecommitdiffstats
path: root/test-runner
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 /test-runner
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 'test-runner')
-rw-r--r--test-runner/src/android/test/mock/MockContentProvider.java6
-rw-r--r--test-runner/src/android/test/mock/MockIContentProvider.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/test-runner/src/android/test/mock/MockContentProvider.java b/test-runner/src/android/test/mock/MockContentProvider.java
index 4ff943e..a8c388e 100644
--- a/test-runner/src/android/test/mock/MockContentProvider.java
+++ b/test-runner/src/android/test/mock/MockContentProvider.java
@@ -21,7 +21,7 @@ import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentValues;
import android.content.Context;
-import android.content.ICancelationSignal;
+import android.content.ICancellationSignal;
import android.content.IContentProvider;
import android.content.OperationApplicationException;
import android.content.pm.PathPermission;
@@ -93,7 +93,7 @@ public class MockContentProvider extends ContentProvider {
@Override
public Cursor query(Uri url, String[] projection, String selection, String[] selectionArgs,
- String sortOrder, ICancelationSignal cancelationSignal) throws RemoteException {
+ String sortOrder, ICancellationSignal cancellationSignal) throws RemoteException {
return MockContentProvider.this.query(url, projection, selection,
selectionArgs, sortOrder);
}
@@ -127,7 +127,7 @@ public class MockContentProvider extends ContentProvider {
}
@Override
- public ICancelationSignal createCancelationSignal() throws RemoteException {
+ public ICancellationSignal createCancellationSignal() throws RemoteException {
return null;
}
}
diff --git a/test-runner/src/android/test/mock/MockIContentProvider.java b/test-runner/src/android/test/mock/MockIContentProvider.java
index 41bc27d..1aa0448 100644
--- a/test-runner/src/android/test/mock/MockIContentProvider.java
+++ b/test-runner/src/android/test/mock/MockIContentProvider.java
@@ -21,7 +21,7 @@ import android.content.ContentProviderResult;
import android.content.ContentValues;
import android.content.EntityIterator;
import android.content.IContentProvider;
-import android.content.ICancelationSignal;
+import android.content.ICancellationSignal;
import android.content.res.AssetFileDescriptor;
import android.database.Cursor;
import android.net.Uri;
@@ -73,7 +73,7 @@ public class MockIContentProvider implements IContentProvider {
}
public Cursor query(Uri url, String[] projection, String selection, String[] selectionArgs,
- String sortOrder, ICancelationSignal cancelationSignal) {
+ String sortOrder, ICancellationSignal cancellationSignal) {
throw new UnsupportedOperationException("unimplemented mock method");
}
@@ -106,7 +106,7 @@ public class MockIContentProvider implements IContentProvider {
}
@Override
- public ICancelationSignal createCancelationSignal() throws RemoteException {
+ public ICancellationSignal createCancellationSignal() throws RemoteException {
throw new UnsupportedOperationException("unimplemented mock method");
}
}