Skip to content

Commit a7771df

Browse files
author
Jeff Brown
committed
Move CancellationSignal to android.os package.
Bug: 6427830 Change-Id: I39451bb1e1d4a8d976ed1c671234f0c8c61658dd
1 parent 507f558 commit a7771df

24 files changed

+63
-48
lines changed

‎Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ LOCAL_SRC_FILES += \
9494
core/java/android/bluetooth/IBluetoothHealthCallback.aidl \
9595
core/java/android/bluetooth/IBluetoothPbap.aidl \
9696
core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
97-
core/java/android/content/ICancellationSignal.aidl \
9897
core/java/android/content/IClipboard.aidl \
9998
core/java/android/content/IContentService.aidl \
10099
core/java/android/content/IIntentReceiver.aidl \
@@ -126,6 +125,7 @@ LOCAL_SRC_FILES += \
126125
core/java/android/nfc/INfcAdapter.aidl \
127126
core/java/android/nfc/INfcAdapterExtras.aidl \
128127
core/java/android/nfc/INfcTag.aidl \
128+
core/java/android/os/ICancellationSignal.aidl \
129129
core/java/android/os/IHardwareService.aidl \
130130
core/java/android/os/IMessenger.aidl \
131131
core/java/android/os/INetworkManagementService.aidl \

‎api/current.txt‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4909,18 +4909,6 @@ package android.content {
49094909
method public final void setResultExtras(android.os.Bundle);
49104910
}
49114911

4912-
public final class CancellationSignal {
4913-
ctor public CancellationSignal();
4914-
method public void cancel();
4915-
method public boolean isCanceled();
4916-
method public void setOnCancelListener(android.content.CancellationSignal.OnCancelListener);
4917-
method public void throwIfCanceled();
4918-
}
4919-
4920-
public static abstract interface CancellationSignal.OnCancelListener {
4921-
method public abstract void onCancel();
4922-
}
4923-
49244912
public class ClipData implements android.os.Parcelable {
49254913
ctor public ClipData(java.lang.CharSequence, java.lang.String[], android.content.ClipData.Item);
49264914
ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);
@@ -5051,7 +5039,7 @@ package android.content {
50515039
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;
50525040
method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;
50535041
method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
5054-
method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.content.CancellationSignal);
5042+
method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);
50555043
method protected final void setPathPermissions(android.content.pm.PathPermission[]);
50565044
method protected final void setReadPermission(java.lang.String);
50575045
method protected final void setWritePermission(java.lang.String);
@@ -5075,7 +5063,7 @@ package android.content {
50755063
method public android.os.ParcelFileDescriptor openFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException, android.os.RemoteException;
50765064
method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException, android.os.RemoteException;
50775065
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;
5078-
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;
5066+
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;
50795067
method public boolean release();
50805068
method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
50815069
}
@@ -5162,7 +5150,7 @@ package android.content {
51625150
method public final java.io.OutputStream openOutputStream(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
51635151
method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;
51645152
method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
5165-
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);
5153+
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);
51665154
method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver);
51675155
method public static void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle);
51685156
method public static void removeStatusChangeListener(java.lang.Object);
@@ -6039,11 +6027,6 @@ package android.content {
60396027
method public int getNumSuccessfulYieldPoints();
60406028
}
60416029

6042-
public class OperationCanceledException extends java.lang.RuntimeException {
6043-
ctor public OperationCanceledException();
6044-
ctor public OperationCanceledException(java.lang.String);
6045-
}
6046-
60476030
public class PeriodicSync implements android.os.Parcelable {
60486031
ctor public PeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long);
60496032
method public int describeContents();
@@ -7503,15 +7486,15 @@ package android.database.sqlite {
75037486
method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory);
75047487
method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);
75057488
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);
7506-
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);
7489+
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);
75077490
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);
75087491
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);
75097492
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);
7510-
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);
7493+
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);
75117494
method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[]);
7512-
method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[], android.content.CancellationSignal);
7495+
method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[], android.os.CancellationSignal);
75137496
method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String);
7514-
method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String, android.content.CancellationSignal);
7497+
method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);
75157498
method public static int releaseMemory();
75167499
method public long replace(java.lang.String, java.lang.String, android.content.ContentValues);
75177500
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 {
76377620
method public java.lang.String getTables();
76387621
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);
76397622
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);
7640-
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);
7623+
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);
76417624
method public void setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory);
76427625
method public void setDistinct(boolean);
76437626
method public void setProjectionMap(java.util.Map<java.lang.String, java.lang.String>);
@@ -15364,6 +15347,18 @@ package android.os {
1536415347
field public static final android.os.Bundle EMPTY;
1536515348
}
1536615349

15350+
public final class CancellationSignal {
15351+
ctor public CancellationSignal();
15352+
method public void cancel();
15353+
method public boolean isCanceled();
15354+
method public void setOnCancelListener(android.os.CancellationSignal.OnCancelListener);
15355+
method public void throwIfCanceled();
15356+
}
15357+
15358+
public static abstract interface CancellationSignal.OnCancelListener {
15359+
method public abstract void onCancel();
15360+
}
15361+
1536715362
public class ConditionVariable {
1536815363
ctor public ConditionVariable();
1536915364
ctor public ConditionVariable(boolean);
@@ -15728,6 +15723,11 @@ package android.os {
1572815723
ctor public NetworkOnMainThreadException();
1572915724
}
1573015725

15726+
public class OperationCanceledException extends java.lang.RuntimeException {
15727+
ctor public OperationCanceledException();
15728+
ctor public OperationCanceledException(java.lang.String);
15729+
}
15730+
1573115731
public final class Parcel {
1573215732
method public final void appendFrom(android.os.Parcel, int, int);
1573315733
method public final android.os.IBinder[] createBinderArray();

‎core/java/android/content/AsyncTaskLoader.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import android.os.AsyncTask;
2020
import android.os.Handler;
21+
import android.os.OperationCanceledException;
2122
import android.os.SystemClock;
2223
import android.util.Slog;
2324
import android.util.TimeUtils;

‎core/java/android/content/ContentProvider.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
import android.os.AsyncTask;
3030
import android.os.Binder;
3131
import android.os.Bundle;
32+
import android.os.CancellationSignal;
33+
import android.os.ICancellationSignal;
34+
import android.os.OperationCanceledException;
3235
import android.os.ParcelFileDescriptor;
3336
import android.os.Process;
3437
import android.os.RemoteException;

‎core/java/android/content/ContentProviderClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import android.database.Cursor;
2020
import android.net.Uri;
2121
import android.os.Bundle;
22+
import android.os.CancellationSignal;
23+
import android.os.ICancellationSignal;
2224
import android.os.RemoteException;
2325
import android.os.ParcelFileDescriptor;
2426
import android.content.res.AssetFileDescriptor;

‎core/java/android/content/ContentProviderNative.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import android.os.Bundle;
3131
import android.os.RemoteException;
3232
import android.os.IBinder;
33+
import android.os.ICancellationSignal;
3334
import android.os.Parcel;
3435
import android.os.ParcelFileDescriptor;
3536
import android.os.Parcelable;

‎core/java/android/content/ContentResolver.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@
3333
import android.database.IContentObserver;
3434
import android.net.Uri;
3535
import android.os.Bundle;
36+
import android.os.CancellationSignal;
3637
import android.os.IBinder;
38+
import android.os.ICancellationSignal;
39+
import android.os.OperationCanceledException;
3740
import android.os.ParcelFileDescriptor;
3841
import android.os.RemoteException;
3942
import android.os.ServiceManager;

‎core/java/android/content/CursorLoader.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import android.database.ContentObserver;
2020
import android.database.Cursor;
2121
import android.net.Uri;
22+
import android.os.CancellationSignal;
23+
import android.os.OperationCanceledException;
2224

2325
import java.io.FileDescriptor;
2426
import java.io.PrintWriter;

‎core/java/android/content/IContentProvider.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.net.Uri;
2222
import android.os.Bundle;
2323
import android.os.IBinder;
24+
import android.os.ICancellationSignal;
2425
import android.os.IInterface;
2526
import android.os.ParcelFileDescriptor;
2627
import android.os.RemoteException;

‎core/java/android/database/DatabaseUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import android.content.ContentValues;
2222
import android.content.Context;
2323
import android.content.OperationApplicationException;
24-
import android.content.OperationCanceledException;
2524
import android.database.sqlite.SQLiteAbortException;
2625
import android.database.sqlite.SQLiteConstraintException;
2726
import android.database.sqlite.SQLiteDatabase;
@@ -31,6 +30,7 @@
3130
import android.database.sqlite.SQLiteFullException;
3231
import android.database.sqlite.SQLiteProgram;
3332
import android.database.sqlite.SQLiteStatement;
33+
import android.os.OperationCanceledException;
3434
import android.os.Parcel;
3535
import android.os.ParcelFileDescriptor;
3636
import android.text.TextUtils;

0 commit comments

Comments
 (0)