diff --git a/Android.mk b/Android.mk index 678ae558d0a1e..eef900acf9230 100644 --- a/Android.mk +++ b/Android.mk @@ -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 \ diff --git a/api/current.txt b/api/current.txt index b9d16f421f5d0..81a7cc5a34b50 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4917,18 +4917,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); @@ -5059,7 +5047,7 @@ package android.content { method public android.os.ParcelFileDescriptor openPipeHelper(android.net.Uri, java.lang.String, android.os.Bundle, T, android.content.ContentProvider.PipeDataWriter) 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); @@ -5083,7 +5071,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; } @@ -5170,7 +5158,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); @@ -6047,11 +6035,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(); @@ -7512,15 +7495,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; @@ -7646,7 +7629,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); @@ -15379,6 +15362,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); @@ -15743,6 +15738,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(); diff --git a/core/java/android/content/AsyncTaskLoader.java b/core/java/android/content/AsyncTaskLoader.java index da5195292f783..f9025d90c0019 100644 --- a/core/java/android/content/AsyncTaskLoader.java +++ b/core/java/android/content/AsyncTaskLoader.java @@ -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; diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 1206056ab67a4..b22179e718435 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -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; diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java index 3ac5e0717a9bc..da2ab94b493d0 100644 --- a/core/java/android/content/ContentProviderClient.java +++ b/core/java/android/content/ContentProviderClient.java @@ -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; diff --git a/core/java/android/content/ContentProviderNative.java b/core/java/android/content/ContentProviderNative.java index 4b31552ef06c6..550a1c984f539 100644 --- a/core/java/android/content/ContentProviderNative.java +++ b/core/java/android/content/ContentProviderNative.java @@ -30,6 +30,7 @@ import android.os.Binder; import android.os.Bundle; import android.os.RemoteException; import android.os.IBinder; +import android.os.ICancellationSignal; import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.Parcelable; diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 722fdc602475d..d4bca0a52bc15 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -33,7 +33,10 @@ import android.database.CursorWrapper; import android.database.IContentObserver; import android.net.Uri; import android.os.Bundle; +import android.os.CancellationSignal; import android.os.IBinder; +import android.os.ICancellationSignal; +import android.os.OperationCanceledException; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.os.ServiceManager; diff --git a/core/java/android/content/CursorLoader.java b/core/java/android/content/CursorLoader.java index aed3728b22031..9f7a1041cf4e0 100644 --- a/core/java/android/content/CursorLoader.java +++ b/core/java/android/content/CursorLoader.java @@ -19,6 +19,8 @@ package android.content; import android.database.ContentObserver; import android.database.Cursor; import android.net.Uri; +import android.os.CancellationSignal; +import android.os.OperationCanceledException; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/core/java/android/content/IContentProvider.java b/core/java/android/content/IContentProvider.java index 16478b7494452..eeba1e07dcaa6 100644 --- a/core/java/android/content/IContentProvider.java +++ b/core/java/android/content/IContentProvider.java @@ -21,6 +21,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.IBinder; +import android.os.ICancellationSignal; import android.os.IInterface; import android.os.ParcelFileDescriptor; import android.os.RemoteException; diff --git a/core/java/android/database/DatabaseUtils.java b/core/java/android/database/DatabaseUtils.java index 40a54cfacee04..a6af5c28b2154 100644 --- a/core/java/android/database/DatabaseUtils.java +++ b/core/java/android/database/DatabaseUtils.java @@ -21,7 +21,6 @@ import org.apache.commons.codec.binary.Hex; import android.content.ContentValues; import android.content.Context; import android.content.OperationApplicationException; -import android.content.OperationCanceledException; import android.database.sqlite.SQLiteAbortException; import android.database.sqlite.SQLiteConstraintException; import android.database.sqlite.SQLiteDatabase; @@ -31,6 +30,7 @@ import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteFullException; import android.database.sqlite.SQLiteProgram; import android.database.sqlite.SQLiteStatement; +import android.os.OperationCanceledException; import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.text.TextUtils; diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java index acdc488d2a7c4..6f7c1f38594a2 100644 --- a/core/java/android/database/sqlite/SQLiteConnection.java +++ b/core/java/android/database/sqlite/SQLiteConnection.java @@ -19,12 +19,12 @@ package android.database.sqlite; import dalvik.system.BlockGuard; import dalvik.system.CloseGuard; -import android.content.CancellationSignal; -import android.content.OperationCanceledException; import android.database.Cursor; import android.database.CursorWindow; import android.database.DatabaseUtils; import android.database.sqlite.SQLiteDebug.DbStats; +import android.os.CancellationSignal; +import android.os.OperationCanceledException; import android.os.ParcelFileDescriptor; import android.util.Log; import android.util.LruCache; diff --git a/core/java/android/database/sqlite/SQLiteConnectionPool.java b/core/java/android/database/sqlite/SQLiteConnectionPool.java index a175662e69a7b..3a1714cedde96 100644 --- a/core/java/android/database/sqlite/SQLiteConnectionPool.java +++ b/core/java/android/database/sqlite/SQLiteConnectionPool.java @@ -18,9 +18,9 @@ package android.database.sqlite; import dalvik.system.CloseGuard; -import android.content.CancellationSignal; -import android.content.OperationCanceledException; import android.database.sqlite.SQLiteDebug.DbStats; +import android.os.CancellationSignal; +import android.os.OperationCanceledException; import android.os.SystemClock; import android.util.Log; import android.util.PrefixPrinter; diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 7bd0c8d92acc2..e2d44f2ab37b6 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -16,16 +16,16 @@ package android.database.sqlite; -import android.content.CancellationSignal; import android.content.ContentValues; -import android.content.OperationCanceledException; import android.database.Cursor; import android.database.DatabaseErrorHandler; import android.database.DatabaseUtils; import android.database.DefaultDatabaseErrorHandler; import android.database.SQLException; import android.database.sqlite.SQLiteDebug.DbStats; +import android.os.CancellationSignal; import android.os.Looper; +import android.os.OperationCanceledException; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; diff --git a/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java b/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java index 294edc425cf9a..797430a4c8ec6 100644 --- a/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java +++ b/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java @@ -16,9 +16,9 @@ package android.database.sqlite; -import android.content.CancellationSignal; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase.CursorFactory; +import android.os.CancellationSignal; /** * A cursor driver that uses the given query directly. diff --git a/core/java/android/database/sqlite/SQLiteProgram.java b/core/java/android/database/sqlite/SQLiteProgram.java index e9b06c67588c2..26e8c318299f3 100644 --- a/core/java/android/database/sqlite/SQLiteProgram.java +++ b/core/java/android/database/sqlite/SQLiteProgram.java @@ -16,8 +16,8 @@ package android.database.sqlite; -import android.content.CancellationSignal; import android.database.DatabaseUtils; +import android.os.CancellationSignal; import java.util.Arrays; diff --git a/core/java/android/database/sqlite/SQLiteQuery.java b/core/java/android/database/sqlite/SQLiteQuery.java index 30e77b57068db..62bcc2060d2ae 100644 --- a/core/java/android/database/sqlite/SQLiteQuery.java +++ b/core/java/android/database/sqlite/SQLiteQuery.java @@ -16,9 +16,9 @@ package android.database.sqlite; -import android.content.CancellationSignal; -import android.content.OperationCanceledException; import android.database.CursorWindow; +import android.os.CancellationSignal; +import android.os.OperationCanceledException; import android.util.Log; /** diff --git a/core/java/android/database/sqlite/SQLiteQueryBuilder.java b/core/java/android/database/sqlite/SQLiteQueryBuilder.java index 6f84b5e2e118e..91884abaf992a 100644 --- a/core/java/android/database/sqlite/SQLiteQueryBuilder.java +++ b/core/java/android/database/sqlite/SQLiteQueryBuilder.java @@ -16,10 +16,10 @@ package android.database.sqlite; -import android.content.CancellationSignal; -import android.content.OperationCanceledException; import android.database.Cursor; import android.database.DatabaseUtils; +import android.os.CancellationSignal; +import android.os.OperationCanceledException; import android.provider.BaseColumns; import android.text.TextUtils; import android.util.Log; diff --git a/core/java/android/database/sqlite/SQLiteSession.java b/core/java/android/database/sqlite/SQLiteSession.java index 9410243f4e8b0..beb5b3a31cfcb 100644 --- a/core/java/android/database/sqlite/SQLiteSession.java +++ b/core/java/android/database/sqlite/SQLiteSession.java @@ -16,10 +16,10 @@ package android.database.sqlite; -import android.content.CancellationSignal; -import android.content.OperationCanceledException; import android.database.CursorWindow; import android.database.DatabaseUtils; +import android.os.CancellationSignal; +import android.os.OperationCanceledException; import android.os.ParcelFileDescriptor; /** diff --git a/core/java/android/content/CancellationSignal.java b/core/java/android/os/CancellationSignal.java similarity index 98% rename from core/java/android/content/CancellationSignal.java rename to core/java/android/os/CancellationSignal.java index dcaeeb7e677d7..dcba9b7758dd0 100644 --- a/core/java/android/content/CancellationSignal.java +++ b/core/java/android/os/CancellationSignal.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package android.content; +package android.os; -import android.os.RemoteException; +import android.os.ICancellationSignal; +import android.os.ICancellationSignal.Stub; /** * Provides the ability to cancel an operation in progress. diff --git a/core/java/android/content/ICancellationSignal.aidl b/core/java/android/os/ICancellationSignal.aidl similarity index 96% rename from core/java/android/content/ICancellationSignal.aidl rename to core/java/android/os/ICancellationSignal.aidl index cf1c5d3a892e1..d92464ca8b3ea 100644 --- a/core/java/android/content/ICancellationSignal.aidl +++ b/core/java/android/os/ICancellationSignal.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.content; +package android.os; /** * @hide diff --git a/core/java/android/content/OperationCanceledException.java b/core/java/android/os/OperationCanceledException.java similarity index 97% rename from core/java/android/content/OperationCanceledException.java rename to core/java/android/os/OperationCanceledException.java index d783a076d90bd..b0cd6637bb6a6 100644 --- a/core/java/android/content/OperationCanceledException.java +++ b/core/java/android/os/OperationCanceledException.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package android.content; +package android.os; + /** * An exception type that is thrown when an operation in progress is canceled. diff --git a/test-runner/src/android/test/mock/MockContentProvider.java b/test-runner/src/android/test/mock/MockContentProvider.java index a8c388e33053a..1e4141636ea7e 100644 --- a/test-runner/src/android/test/mock/MockContentProvider.java +++ b/test-runner/src/android/test/mock/MockContentProvider.java @@ -21,7 +21,6 @@ import android.content.ContentProviderOperation; import android.content.ContentProviderResult; import android.content.ContentValues; import android.content.Context; -import android.content.ICancellationSignal; import android.content.IContentProvider; import android.content.OperationApplicationException; import android.content.pm.PathPermission; @@ -31,6 +30,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.IBinder; +import android.os.ICancellationSignal; import android.os.ParcelFileDescriptor; import android.os.RemoteException; diff --git a/test-runner/src/android/test/mock/MockIContentProvider.java b/test-runner/src/android/test/mock/MockIContentProvider.java index 1aa0448e7fa14..9fcfc22b3897d 100644 --- a/test-runner/src/android/test/mock/MockIContentProvider.java +++ b/test-runner/src/android/test/mock/MockIContentProvider.java @@ -21,12 +21,12 @@ import android.content.ContentProviderResult; import android.content.ContentValues; import android.content.EntityIterator; import android.content.IContentProvider; -import android.content.ICancellationSignal; import android.content.res.AssetFileDescriptor; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.IBinder; +import android.os.ICancellationSignal; import android.os.ParcelFileDescriptor; import android.os.RemoteException; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java index e28866e588913..f770cccf66e23 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java @@ -19,7 +19,6 @@ package com.android.layoutlib.bridge.android; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; import android.content.ContentValues; -import android.content.ICancellationSignal; import android.content.IContentProvider; import android.content.OperationApplicationException; import android.content.res.AssetFileDescriptor; @@ -27,6 +26,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.IBinder; +import android.os.ICancellationSignal; import android.os.ParcelFileDescriptor; import android.os.RemoteException;