Move CancellationSignal to android.os package. (a7771df3) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ 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/ICancellationSignal.aidl \
		core/java/android/content/IClipboard.aidl \
		core/java/android/content/IContentService.aidl \
		core/java/android/content/IIntentReceiver.aidl \
		@@ -126,6 +125,7 @@ LOCAL_SRC_FILES += \
		core/java/android/nfc/INfcAdapter.aidl \
		core/java/android/nfc/INfcAdapterExtras.aidl \
		core/java/android/nfc/INfcTag.aidl \
		core/java/android/os/ICancellationSignal.aidl \
		core/java/android/os/IHardwareService.aidl \
		core/java/android/os/IMessenger.aidl \
		core/java/android/os/INetworkManagementService.aidl \

api/current.txt

+25 −25

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

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

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

		public class ClipData implements android.os.Parcelable {
		ctor public ClipData(java.lang.CharSequence, java.lang.String[], android.content.ClipData.Item);
		ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);
		@@ -5051,7 +5039,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.CancellationSignal);
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.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);
		@@ -5075,7 +5063,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.CancellationSignal) 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.os.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;
		}
		@@ -5162,7 +5150,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.CancellationSignal);
		method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.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);
		@@ -6039,11 +6027,6 @@ package android.content {
		method public int getNumSuccessfulYieldPoints();
		}

		public class OperationCanceledException extends java.lang.RuntimeException {
		ctor public OperationCanceledException();
		ctor public OperationCanceledException(java.lang.String);
		}

		public class PeriodicSync implements android.os.Parcelable {
		ctor public PeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long);
		method public int describeContents();
		@@ -7503,15 +7486,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.CancellationSignal);
		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.os.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.CancellationSignal);
		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.os.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.CancellationSignal);
		method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[], android.os.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.CancellationSignal);
		method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String, android.os.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;
		@@ -7637,7 +7620,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.CancellationSignal);
		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.os.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>);
		@@ -15364,6 +15347,18 @@ package android.os {
		field public static final android.os.Bundle EMPTY;
		}

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

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

		public class ConditionVariable {
		ctor public ConditionVariable();
		ctor public ConditionVariable(boolean);
		@@ -15728,6 +15723,11 @@ package android.os {
		ctor public NetworkOnMainThreadException();
		}

		public class OperationCanceledException extends java.lang.RuntimeException {
		ctor public OperationCanceledException();
		ctor public OperationCanceledException(java.lang.String);
		}

		public final class Parcel {
		method public final void appendFrom(android.os.Parcel, int, int);
		method public final android.os.IBinder[] createBinderArray();

core/java/android/content/AsyncTaskLoader.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.content;

		import android.os.AsyncTask;
		import android.os.Handler;
		import android.os.OperationCanceledException;
		import android.os.SystemClock;
		import android.util.Slog;
		import android.util.TimeUtils;

core/java/android/content/ContentProvider.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,9 @@ import android.net.Uri;
		import android.os.AsyncTask;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.CancellationSignal;
		import android.os.ICancellationSignal;
		import android.os.OperationCanceledException;
		import android.os.ParcelFileDescriptor;
		import android.os.Process;
		import android.os.RemoteException;

core/java/android/content/ContentProviderClient.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ package android.content;
		import android.database.Cursor;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.CancellationSignal;
		import android.os.ICancellationSignal;
		import android.os.RemoteException;
		import android.os.ParcelFileDescriptor;
		import android.content.res.AssetFileDescriptor;