Merge "Rename CancellationSignal using preferred spelling." (ec99f609) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ LOCAL_SRC_FILES += \
		core/java/android/bluetooth/IBluetoothHealthCallback.aidl \
		core/java/android/bluetooth/IBluetoothPbap.aidl \
		core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
		core/java/android/content/ICancelationSignal.aidl \
		core/java/android/content/ICancellationSignal.aidl \
		core/java/android/content/IClipboard.aidl \
		core/java/android/content/IContentService.aidl \
		core/java/android/content/IIntentReceiver.aidl \

CleanSpec.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/android/content)
		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
		# ************************************************

api/current.txt

+12 −12

Original line number	Diff line number	Diff line
		@@ -4714,15 +4714,15 @@ package android.content {
		method public final void setResultExtras(android.os.Bundle);
		}

		public final class CancelationSignal {
		ctor public CancelationSignal();
		public final class CancellationSignal {
		ctor public CancellationSignal();
		method public void cancel();
		method public boolean isCanceled();
		method public void setOnCancelListener(android.content.CancelationSignal.OnCancelListener);
		method public void setOnCancelListener(android.content.CancellationSignal.OnCancelListener);
		method public void throwIfCanceled();
		}

		public static abstract interface CancelationSignal.OnCancelListener {
		public static abstract interface CancellationSignal.OnCancelListener {
		method public abstract void onCancel();
		}

		@@ -4845,7 +4845,7 @@ package android.content {
		method public android.os.ParcelFileDescriptor openPipeHelper(android.net.Uri, java.lang.String, android.os.Bundle, T, android.content.ContentProvider.PipeDataWriter<T>) throws java.io.FileNotFoundException;
		method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;
		method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.content.CancelationSignal);
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.content.CancellationSignal);
		method protected final void setPathPermissions(android.content.pm.PathPermission[]);
		method protected final void setReadPermission(java.lang.String);
		method protected final void setWritePermission(java.lang.String);
		@@ -4869,7 +4869,7 @@ package android.content {
		method public android.os.ParcelFileDescriptor openFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException, android.os.RemoteException;
		method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException, android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) throws android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.content.CancelationSignal) throws android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.content.CancellationSignal) throws android.os.RemoteException;
		method public boolean release();
		method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
		}
		@@ -4956,7 +4956,7 @@ package android.content {
		method public final java.io.OutputStream openOutputStream(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
		method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;
		method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
		method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.content.CancelationSignal);
		method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.content.CancellationSignal);
		method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver);
		method public static void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle);
		method public static void removeStatusChangeListener(java.lang.Object);
		@@ -7268,15 +7268,15 @@ package android.database.sqlite {
		method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory);
		method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);
		method public android.database.Cursor query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
		method public android.database.Cursor query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.content.CancelationSignal);
		method public android.database.Cursor query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.content.CancellationSignal);
		method public android.database.Cursor query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String);
		method public android.database.Cursor query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
		method public android.database.Cursor queryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
		method public android.database.Cursor queryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.content.CancelationSignal);
		method public android.database.Cursor queryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.content.CancellationSignal);
		method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[]);
		method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[], android.content.CancelationSignal);
		method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[], android.content.CancellationSignal);
		method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String);
		method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String, android.content.CancelationSignal);
		method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String, android.content.CancellationSignal);
		method public static int releaseMemory();
		method public long replace(java.lang.String, java.lang.String, android.content.ContentValues);
		method public long replaceOrThrow(java.lang.String, java.lang.String, android.content.ContentValues) throws android.database.SQLException;
		@@ -7398,7 +7398,7 @@ package android.database.sqlite {
		method public java.lang.String getTables();
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String);
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.content.CancelationSignal);
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.content.CancellationSignal);
		method public void setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory);
		method public void setDistinct(boolean);
		method public void setProjectionMap(java.util.Map<java.lang.String, java.lang.String>);

core/java/android/content/CancelationSignal.java→core/java/android/content/CancellationSignal.java

+29 −23

Original line number	Diff line number	Diff line
		@@ -21,15 +21,15 @@ import android.os.RemoteException;
		/**
		* Provides the ability to cancel an operation in progress.
		*/
		public final class CancelationSignal {
		public final class CancellationSignal {
		private boolean mIsCanceled;
		private OnCancelListener mOnCancelListener;
		private ICancelationSignal mRemote;
		private ICancellationSignal mRemote;

		/**
		* Creates a cancelation signal, initially not canceled.
		* Creates a cancellation signal, initially not canceled.
		*/
		public CancelationSignal() {
		public CancellationSignal() {
		}

		/**
		@@ -55,7 +55,7 @@ public final class CancelationSignal {
		}

		/**
		* Cancels the operation and signals the cancelation listener.
		* Cancels the operation and signals the cancellation listener.
		* If the operation has not yet started, then it will be canceled as soon as it does.
		*/
		public void cancel() {
		@@ -76,17 +76,23 @@ public final class CancelationSignal {
		}

		/**
		* Sets the cancelation listener to be called when canceled.
		* If {@link CancelationSignal#cancel} has already been called, then the provided
		* Sets the cancellation listener to be called when canceled.
		*
		* This method is intended to be used by the recipient of a cancellation signal
		* such as a database or a content provider to handle cancellation requests
		* while performing a long-running operation. This method is not intended to be
		* used by applications themselves.
		*
		* If {@link CancellationSignal#cancel} has already been called, then the provided
		* listener is invoked immediately.
		*
		* The listener is called while holding the cancelation signal's lock which is
		* The listener is called while holding the cancellation signal's lock which is
		* also held while registering or unregistering the listener. Because of the lock,
		* it is not possible for the listener to run after it has been unregistered.
		* This design choice makes it easier for clients of {@link CancelationSignal} to
		* This design choice makes it easier for clients of {@link CancellationSignal} to
		* prevent race conditions related to listener registration and unregistration.
		*
		* @param listener The cancelation listener, or null to remove the current listener.
		* @param listener The cancellation listener, or null to remove the current listener.
		*/
		public void setOnCancelListener(OnCancelListener listener) {
		synchronized (this) {
		@@ -104,7 +110,7 @@ public final class CancelationSignal {
		*
		* @hide
		*/
		public void setRemote(ICancelationSignal remote) {
		public void setRemote(ICancellationSignal remote) {
		synchronized (this) {
		mRemote = remote;
		if (mIsCanceled && remote != null) {
		@@ -118,47 +124,47 @@ public final class CancelationSignal {

		/**
		* Creates a transport that can be returned back to the caller of
		* a Binder function and subsequently used to dispatch a cancelation signal.
		* a Binder function and subsequently used to dispatch a cancellation signal.
		*
		* @return The new cancelation signal transport.
		* @return The new cancellation signal transport.
		*
		* @hide
		*/
		public static ICancelationSignal createTransport() {
		public static ICancellationSignal createTransport() {
		return new Transport();
		}

		/**
		* Given a locally created transport, returns its associated cancelation signal.
		* Given a locally created transport, returns its associated cancellation signal.
		*
		* @param transport The locally created transport, or null if none.
		* @return The associated cancelation signal, or null if none.
		* @return The associated cancellation signal, or null if none.
		*
		* @hide
		*/
		public static CancelationSignal fromTransport(ICancelationSignal transport) {
		public static CancellationSignal fromTransport(ICancellationSignal transport) {
		if (transport instanceof Transport) {
		return ((Transport)transport).mCancelationSignal;
		return ((Transport)transport).mCancellationSignal;
		}
		return null;
		}

		/**
		* Listens for cancelation.
		* Listens for cancellation.
		*/
		public interface OnCancelListener {
		/**
		* Called when {@link CancelationSignal#cancel} is invoked.
		* Called when {@link CancellationSignal#cancel} is invoked.
		*/
		void onCancel();
		}

		private static final class Transport extends ICancelationSignal.Stub {
		final CancelationSignal mCancelationSignal = new CancelationSignal();
		private static final class Transport extends ICancellationSignal.Stub {
		final CancellationSignal mCancellationSignal = new CancellationSignal();

		@Override
		public void cancel() throws RemoteException {
		mCancelationSignal.cancel();
		mCancellationSignal.cancel();
		}
		}
		}

core/java/android/content/ContentProvider.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -178,10 +178,10 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		@Override
		public Cursor query(Uri uri, String[] projection,
		String selection, String[] selectionArgs, String sortOrder,
		ICancelationSignal cancelationSignal) {
		ICancellationSignal cancellationSignal) {
		enforceReadPermission(uri);
		return ContentProvider.this.query(uri, projection, selection, selectionArgs, sortOrder,
		CancelationSignal.fromTransport(cancelationSignal));
		CancellationSignal.fromTransport(cancellationSignal));
		}

		@Override
		@@ -263,8 +263,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		}

		@Override
		public ICancelationSignal createCancelationSignal() throws RemoteException {
		return CancelationSignal.createTransport();
		public ICancellationSignal createCancellationSignal() throws RemoteException {
		return CancellationSignal.createTransport();
		}

		private void enforceReadPermission(Uri uri) {
		@@ -557,7 +557,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		String selection, String[] selectionArgs, String sortOrder);

		/**
		* Implement this to handle query requests from clients with support for cancelation.
		* Implement this to handle query requests from clients with support for cancellation.
		* This method can be called from multiple threads, as described in
		* <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
		* and Threads</a>.
		@@ -597,9 +597,9 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		return c;</pre>
		* <p>
		* If you implement this method then you must also implement the version of
		* {@link #query(Uri, String[], String, String[], String)} that does not take a cancelation
		* provider to ensure correct operation on older versions of the Android Framework in
		* which the cancelation signal overload was not available.
		* {@link #query(Uri, String[], String, String[], String)} that does not take a cancellation
		* signal to ensure correct operation on older versions of the Android Framework in
		* which the cancellation signal overload was not available.
		*
		* @param uri The URI to query. This will be the full URI sent by the client;
		* if the client is requesting a specific record, the URI will end in a record number
		@@ -614,14 +614,14 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		* The values will be bound as Strings.
		* @param sortOrder How the rows in the cursor should be sorted.
		* If null then the provider is free to define the sort order.
		* @param cancelationSignal A signal to cancel the operation in progress, or null if none.
		* @param cancellationSignal A signal to cancel the operation in progress, or null if none.
		* If the operation is canceled, then {@link OperationCanceledException} will be thrown
		* when the query is executed.
		* @return a Cursor or null.
		*/
		public Cursor query(Uri uri, String[] projection,
		String selection, String[] selectionArgs, String sortOrder,
		CancelationSignal cancelationSignal) {
		CancellationSignal cancellationSignal) {
		return query(uri, projection, selection, selectionArgs, sortOrder);
		}