Commit Graph

739 Commits

Author SHA1 Message Date
Steve Howard
a272756431 am a08a0a7b: am a13a02cd: New permission for non-purgeable cache downloads.
Merge commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a'

* commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a':
  New permission for non-purgeable cache downloads.
2010-07-26 12:29:49 -07:00
Steve Howard
a08a0a7bee am a13a02cd: New permission for non-purgeable cache downloads.
Merge commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964' into gingerbread-plus-aosp

* commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964':
  New permission for non-purgeable cache downloads.
2010-07-26 12:23:48 -07:00
Steve Howard
a13a02cd0e New permission for non-purgeable cache downloads.
This permission allows an app to use the public download manager API
to download files to the cache partition that won't be automatically
deleted when the download manager needs space.

Change-Id: Id9a5cd61c940df22765b358290b8ad8ceeff493e
2010-07-23 15:16:08 -07:00
Steve Howard
0a9f516497 am 82ab8d95: am 13d08515: Remove SEE_ALL_EXTERNAL permission from Download Manager.
Merge commit '82ab8d9554bac7370d1fe1bba320a740a8813de2'

* commit '82ab8d9554bac7370d1fe1bba320a740a8813de2':
  Remove SEE_ALL_EXTERNAL permission from Download Manager.
2010-07-22 11:35:16 -07:00
Steve Howard
82ab8d9554 am 13d08515: Remove SEE_ALL_EXTERNAL permission from Download Manager.
Merge commit '13d08515f038db45de6028085993ae6076566867' into gingerbread-plus-aosp

* commit '13d08515f038db45de6028085993ae6076566867':
  Remove SEE_ALL_EXTERNAL permission from Download Manager.
2010-07-22 11:31:37 -07:00
Steve Howard
a265083890 am 5e43c5a6: am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746'

* commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:27:02 -07:00
Steve Howard
5e43c5a6e8 am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp

* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:22:58 -07:00
Steve Howard
13d08515f0 Remove SEE_ALL_EXTERNAL permission from Download Manager.
I'm removing this currently unused functionality from the Download
Manager implementation, so the constant might as well go.

Change-Id: I4f0970211201881a8426b83b5275408cd14c3377
2010-07-21 19:49:45 -07:00
Steve Howard
b8e07a51c1 DL manager support for broadcasts + connectivity control
* Additions to DownloadManager to support control of broadcast intents, allowed network types, and roaming control.  This includes new constants and added implementation.
* New DB columns to hold connectivity flags and one to indicate whether the download was initiated through the public API; this is used to change behavior related to broadcast intents and connectivity controls.

Change-Id: I2e8e4ce92cde7889a0f24dc43b86c596c73c0eaa
2010-07-21 19:09:35 -07:00
Jean-Baptiste Queru
99a518ffab resolved conflicts for merge of ca48433a to master
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
2010-07-20 10:40:17 -07:00
The Android Open Source Project
ca48433afc merge from open-source master
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
2010-07-20 10:33:38 -07:00
Daniel Lehmann
156add9575 Replace try-catch code by proper type checking. Saves an exception for each blob.
Change-Id: I208ed0acb754391bd44b52887792563e92b39011
2010-07-19 18:01:28 -07:00
Christian Mehlmauer
798e2d3d0c Replaced /sdcard with Environment.getExternalStorageDirectory()
Change-Id: Id789f44a8569e307b1b7ab15eb266c9ce7ef2029
2010-07-19 15:54:40 -07:00
Vasu Nori
3766ed3eed am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread
2010-07-19 15:29:10 -07:00
Mason Tang
19f845804c Added support for full-text search in Calendar
Change-Id: I716eba966ad072ac62a61f3cfbfe15b623f8ab94
2010-07-19 15:28:23 -07:00
Vasu Nori
345f39a8a3 fix javadoc error which breaks SDK build in gingerbread
Change-Id: I01b90c71e7088f385a73f51144063a2fbe5d466b
2010-07-19 15:25:32 -07:00
Vasu Nori
fb5bccf229 fix javadoc error
Change-Id: I387e2807af2ea6299a976e0763e6ad6f264543fe
2010-07-19 14:11:54 -07:00
Fabrice Di Meglio
b9b918d6e1 Merge "Fix bug #2846543 Delete HIDDEN column from the "Calendars" table" 2010-07-19 12:30:01 -07:00
Mike Lockwood
cbaea35759 Add MTP_OBJECT_ID column name to MediaStore.MediaColumns
This column will be added to the images, audio_meta, video and audio_playlist
tables to cross reference to the MTP objects table.

Renamed MTP_OBJECT_HANDLE (which is used only by the media scanner) to
MEDIA_SCANNER_NEW_OBJECT_ID to avoid confusion.

Change-Id: I8093485dc0438f408a505e82ffddd0710c7a512c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-19 09:51:56 -04:00
Vasu Nori
df46069627 am bbc2b4e6: am 5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit 'bbc2b4e69a1788987a8fe959cc0105290b431283'

* commit 'bbc2b4e69a1788987a8fe959cc0105290b431283':
  add video/audio chat-compatibility modes to ContactsContract
2010-07-17 18:31:28 -07:00
Vasu Nori
bbc2b4e69a am 5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit '5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp

* commit '5b31498ba1f9874f395d80152304512fa4c0144d':
  add video/audio chat-compatibility modes to ContactsContract
2010-07-17 18:25:20 -07:00
Vasu Nori
5b31498ba1 add video/audio chat-compatibility modes to ContactsContract
Change-Id: Ic0b04017ad4216f1a1c5f07fa9d27e6970ded931
2010-07-17 18:16:31 -07:00
Fabrice Di Meglio
0980de8976 Fix bug #2846543 Delete HIDDEN column from the "Calendars" table
- suppress the "hidden" column from the Calendar API
- add generic "sync5" column which will contain the "hidden" calendar state from the server

Change-Id: Ib2048e9f0fc59f4f544bc6f1787af82fde3984d5
2010-07-16 20:22:28 -07:00
Dmitri Plotnikov
11811612e8 Merge "Resolving a field naming conflict caused by the table join." 2010-07-16 11:21:00 -07:00
Dmitri Plotnikov
86fe839284 Resolving a field naming conflict caused by the table join.
Change-Id: I6f3293fb9aceebea7df9677eb1e6ebc199383e99
2010-07-16 11:19:46 -07:00
Dmitri Plotnikov
6b477fe452 Merge "Hiding new API" 2010-07-16 10:46:40 -07:00
Dmitri Plotnikov
e270c51ea4 Hiding new API
Change-Id: Ie6a108442416fdb27229ff274b631e6f4a6c2370
2010-07-16 10:46:00 -07:00
Dmitri Plotnikov
393e4801d8 Merge "Adding more feature declarations to Directory API." 2010-07-16 10:45:18 -07:00
Dmitri Plotnikov
30b7be333f Adding more feature declarations to Directory API.
Change-Id: Iabec8c4dcbd69212285a6eb9be9db7ebb1b712ed
2010-07-16 10:43:40 -07:00
Steve Howard
9db328463a am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9'

* commit '203ec9fa6eab21621969f36053d4cd59c23977a9':
  Interface support for custom HTTP headers in DL manager
2010-07-15 12:31:29 -07:00
Steve Howard
203ec9fa6e am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp

* commit 'd6343c26b8580f61a257a3045bfa124049201116':
  Interface support for custom HTTP headers in DL manager
2010-07-15 12:28:39 -07:00
Fabrice Di Meglio
25fd875da6 Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)" 2010-07-15 10:23:31 -07:00
Steve Howard
ea9147df00 Interface support for custom HTTP headers in DL manager
* constants for new DB table, keys for including headers in a
  DownloadProvider.insert() call, and new URIs for retrieving headers
* support in DownloadManager to pass headers to the provider
2010-07-15 10:22:50 -07:00
Steve Howard
756088482f am 57de95a5: am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '57de95a51ff5d98fcad0a7735c496be5f647d66f'

* commit '57de95a51ff5d98fcad0a7735c496be5f647d66f':
  Download manager support for file URIs + last modified time
2010-07-14 11:25:32 -07:00
Steve Howard
57de95a51f am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp

* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
  Download manager support for file URIs + last modified time
2010-07-14 11:22:20 -07:00
Steve Howard
adcb697826 Download manager support for file URIs + last modified time
First, in the download manager public API, I'm changing
COLUMN_REQUESTED_TIMESTAMP to COLUMN_LAST_MODIFIED_TIMESTAMP, a field
that already exists in the download manager.  Upon inspection of
existing users of this field, it looks like there are some good use
cases -- for instance, looking at when a download completed.  And if
I'm exposing that timestamp, there's no need to also expose the
requested timestamp.

Second, this change includes support for file URI destinations:

* add DESTINATION_FILE_URI for use by the DownloadManager wrapper
* make DownloadManager use it appropriately

The backend support is in a separate change (since it's in a separate
project).

Also fixing a bug with file URI construction when DownloadManager
fills in COLUMN_LOCAL_URI.

Change-Id: I5bb93a222cd23215c2a03ed9f68d7f140454f7f2
2010-07-13 18:31:41 -07:00
Mike Lockwood
d815f79766 Integrate host to device file transfer with the media provider.
MTP file transfers happen in two stages.  The SendObjectInfo command sends
some information about the file and reserves an ObjectHandle for the new file.
The file transfer is then performed using the SendObject command.

To support this in the media provider, MtpDatabase.beginSendObject receives
the information from SendObjectInfo and creates an row for it in the MTP objects
table for the new file.  After the file transfer has completed, then
MtpDatabase.endSendObject is called.  In endSendObject, we run the media scanner
on the new file, which will add a row to the images, audio, video
or audio playlist table.

To avoid the media scanner creating a second row for the file in the MTP objects
table, we pass the ObjectHandle created in beginSendObject to the media scanner,
which then passes it to the media provider via the content values when it
performs its insert.

Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-12 14:01:22 -04:00
Mike Lockwood
fed161799b MediaProvider: Add constants for media_table and media_id columns in MTP objects table
Change-Id: I47396c637e483ea9c71bbb22898d69cb3d00b256
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-10 08:25:57 -04:00
Fabrice Di Meglio
1f78ea28ad Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)
- introduce "sync4" column into Calendars table to store "selected" from Web calendar

Change-Id: I2dfebb6e4a2ec85e758626a4e2b9c8b1315f095f
2010-07-08 15:43:56 -07:00
Mike Lockwood
d21eac9c70 MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:21:09 -04:00
Fabrice Di Meglio
36f7784a4c Fix bug #2779582 (Columns cleanup for the Calendars table)
- suppress deprecated "url" column
- replace eventsUrl / editUrl / selfUrl columns by sync1 / sync2 / sync3

Change-Id: I2bff61a90655c98ee0964a880934c514b42ac342
2010-07-07 17:28:52 -07:00
Ray Chen
1ba38b600e Fix 2655246 file descriptor leak when accessing thumbnails
http://b/2655246

Moved from kraken to master (https://android-git.corp.google.com/g/#change,51691)

Change-Id: I7d0cffd745311d073415d597eb141e26fe1edcce
2010-06-23 11:32:40 -07:00
Jean-Baptiste Queru
3b9f0a33a1 Recover a handful of commits that were reverted earlier 2010-06-21 13:46:59 -07:00
The Android Open Source Project
6c9a30045b merge from froyo-plus-aosp
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
2010-06-21 11:23:45 -07:00
Jaikumar Ganesh
545e6708ad HID profile.
Change-Id: I52e965a6537bce02c751ba26fe7b44dd03832510
2010-06-17 13:49:25 -07:00
Fabrice Di Meglio
3067771f81 Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)
- suppress references to Calendars.URL

Change-Id: Ic1fa5059516ff294940345addf930554aef0a0a9
2010-06-16 16:35:16 -07:00
Fabrice Di Meglio
505635583b Fix bug# 2772317 (CalendarDatabaseHelper internal cleanup)
- use constants defined into Calendar interfaces

Change-Id: I0cb8f71f7fbad61c9d9ee97db5ffeb307cd8169f
2010-06-16 13:48:45 -07:00
The Android Open Source Project
4138677a72 merge from open-source master
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
2010-06-15 09:30:31 -07:00
Christian Mehlmauer
e6af73e18e Replaced deprecated Inten.toURI method
Change-Id: Iff3200294edbc1cac188502219bfe481133a5d8e
2010-06-14 15:47:15 -07:00
Fabrice Di Meglio
c3cc13306c Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)
- add more properties to Calendars: selfUrl, editUrl, eventsUrl and deleted
- add CalendarsEntity and associated iterator
- cleaup interfaces definition for Calendars / Events columns by factorising  Sync and Account columns

Change-Id: I730e9d377316d458f7d225ce85966c7048ad26a9
2010-06-14 15:08:12 -07:00