diff options
author | Jeff Sharkey <jsharkey@android.com> | 2018-07-12 17:30:20 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-12 17:30:20 -0700 |
commit | 32a92d0a737d42af54f44b9f1128fa7ea676f13a (patch) | |
tree | 1626fbf936b4fa5281ba71deefff3503e5f7469e | |
parent | b2de5829f4c23c55cb72db0cca92ace22134b929 (diff) | |
parent | 84cefc516ed8691b11670b1cfd80216969cfbfef (diff) | |
download | android_packages_providers_DownloadProvider-32a92d0a737d42af54f44b9f1128fa7ea676f13a.tar.gz android_packages_providers_DownloadProvider-32a92d0a737d42af54f44b9f1128fa7ea676f13a.tar.bz2 android_packages_providers_DownloadProvider-32a92d0a737d42af54f44b9f1128fa7ea676f13a.zip |
[automerger] Remove "public" download feature. am: 35e123117b am: 52b9a670b8 am: 7f0b5c44c8 am: 3439b74e4a am: b2db30a21e
am: 84cefc516e
Change-Id: Iabab984d78bad2ca6b5904e31482044e4627d02a
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index d50b394c..35d73c39 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -103,11 +103,6 @@ public final class DownloadProvider extends ContentProvider { private static final int ALL_DOWNLOADS_ID = 4; /** URI matcher constant for the URI of a download's request headers */ private static final int REQUEST_HEADERS_URI = 5; - /** URI matcher constant for the public URI returned by - * {@link DownloadManager#getUriForDownloadedFile(long)} if the given downloaded file - * is publicly accessible. - */ - private static final int PUBLIC_DOWNLOAD_ID = 6; static { sURIMatcher.addURI("downloads", "my_downloads", MY_DOWNLOADS); sURIMatcher.addURI("downloads", "my_downloads/#", MY_DOWNLOADS_ID); @@ -125,9 +120,6 @@ public final class DownloadProvider extends ContentProvider { sURIMatcher.addURI("downloads", "download/#/" + Downloads.Impl.RequestHeaders.URI_SEGMENT, REQUEST_HEADERS_URI); - sURIMatcher.addURI("downloads", - Downloads.Impl.PUBLICLY_ACCESSIBLE_DOWNLOADS_URI_SEGMENT + "/#", - PUBLIC_DOWNLOAD_ID); } /** Different base URIs that could be used to access an individual download */ @@ -523,8 +515,7 @@ public final class DownloadProvider extends ContentProvider { return DOWNLOAD_LIST_TYPE; } case MY_DOWNLOADS_ID: - case ALL_DOWNLOADS_ID: - case PUBLIC_DOWNLOAD_ID: { + case ALL_DOWNLOADS_ID: { // return the mimetype of this id from the database final String id = getDownloadIdFromUri(uri); final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); @@ -1238,8 +1229,7 @@ public final class DownloadProvider extends ContentProvider { int uriMatch) { SqlSelection selection = new SqlSelection(); selection.appendClause(where, whereArgs); - if (uriMatch == MY_DOWNLOADS_ID || uriMatch == ALL_DOWNLOADS_ID || - uriMatch == PUBLIC_DOWNLOAD_ID) { + if (uriMatch == MY_DOWNLOADS_ID || uriMatch == ALL_DOWNLOADS_ID) { selection.appendClause(Downloads.Impl._ID + " = ?", getDownloadIdFromUri(uri)); } if ((uriMatch == MY_DOWNLOADS || uriMatch == MY_DOWNLOADS_ID) |