summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/ContentResolver.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-05-07 20:06:46 -0700
committerJeff Brown <jeffbrown@google.com>2012-05-07 20:06:46 -0700
commita7771df3696954f0e279407e8894a916a7cb26cc (patch)
tree3615be79c515fad41808d2b84ac0221ba5a7e299 /core/java/android/content/ContentResolver.java
parent507f5586fb48f59f7b4f2fa0ca5387e4d4f2bd8d (diff)
downloadframeworks_base-a7771df3696954f0e279407e8894a916a7cb26cc.zip
frameworks_base-a7771df3696954f0e279407e8894a916a7cb26cc.tar.gz
frameworks_base-a7771df3696954f0e279407e8894a916a7cb26cc.tar.bz2
Move CancellationSignal to android.os package.
Bug: 6427830 Change-Id: I39451bb1e1d4a8d976ed1c671234f0c8c61658dd
Diffstat (limited to 'core/java/android/content/ContentResolver.java')
-rw-r--r--core/java/android/content/ContentResolver.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 722fdc6..d4bca0a 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;