diff options
author | George Mount <mount@google.com> | 2013-03-15 07:52:15 -0700 |
---|---|---|
committer | George Mount <mount@google.com> | 2013-03-15 08:38:28 -0700 |
commit | b7cc5e99563bc695ec871f897914eb2cb797ad53 (patch) | |
tree | a168b000595a7aacfa404b745347eee4ea963827 /src | |
parent | 2e73dca71ba700f285b23fcab0c8f32b9b3ce5a4 (diff) | |
download | android_packages_apps_Snap-b7cc5e99563bc695ec871f897914eb2cb797ad53.tar.gz android_packages_apps_Snap-b7cc5e99563bc695ec871f897914eb2cb797ad53.tar.bz2 android_packages_apps_Snap-b7cc5e99563bc695ec871f897914eb2cb797ad53.zip |
Use cancellationSignal only on API Level 16 and above.
Bug 8390238
Change-Id: If2dacb1eb74e531d004b6f281d32a81f7cd59139
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/photos/data/PhotoProvider.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/com/android/photos/data/PhotoProvider.java b/src/com/android/photos/data/PhotoProvider.java index 8413206b1..2455580f0 100644 --- a/src/com/android/photos/data/PhotoProvider.java +++ b/src/com/android/photos/data/PhotoProvider.java @@ -30,6 +30,8 @@ import android.net.Uri; import android.os.CancellationSignal; import android.provider.BaseColumns; +import com.android.gallery3d.common.ApiHelper; + import java.util.List; /** @@ -357,9 +359,7 @@ public class PhotoProvider extends SQLiteContentProvider { selection = addIdToSelection(match, selection); selectionArgs = addIdToSelectionArgs(match, uri, selectionArgs); String table = getTableFromMatch(match, uri); - SQLiteDatabase db = getDatabaseHelper().getReadableDatabase(); - return db.query(false, table, projection, selection, selectionArgs, null, null, sortOrder, - null, cancellationSignal); + return query(table, projection, selection, selectionArgs, sortOrder, cancellationSignal); } @Override @@ -563,4 +563,15 @@ public class PhotoProvider extends SQLiteContentProvider { throw new IllegalArgumentException("Operation not allowed on an existing row."); } } + + protected Cursor query(String table, String[] columns, String selection, + String[] selectionArgs, String orderBy, CancellationSignal cancellationSignal) { + SQLiteDatabase db = getDatabaseHelper().getReadableDatabase(); + if (ApiHelper.HAS_CANCELLATION_SIGNAL) { + return db.query(false, table, columns, selection, selectionArgs, null, null, + orderBy, null, cancellationSignal); + } else { + return db.query(table, columns, selection, selectionArgs, null, null, orderBy); + } + } } |