summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* Initial check-in for xml-based encoder capabilities retrievalJames Dong2010-02-011-0/+164
| | | | | - Changed the Java API as suggested - Treat /etc/media_profiles.xml as the default xml configurtion file
* Unhide ThumbnailUtils to support Camera unbundling.Ray Chen2010-01-292-185/+230
| | | | http://b/2375978
* API Extension: Support for optionally specifying a map of extra request ↵Andreas Huber2010-01-281-1/+27
| | | | | | | | headers when specifying the uri of media data to be played. related-to-bug: 2393577 Original change by Andrei Popescu <andreip@google.com>
* Fix issue 2378022: AudioService should direct volume control to ↵Eric Laurent2010-01-253-7/+7
| | | | | | | | | STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active. Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream type is playing. Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
* Fix issue 2349345: Media sound output stuck on earpiece rather than speaker.Eric Laurent2010-01-253-5/+86
| | | | | | | | | | This change fixes a problem occuring when an application (for instance a VoIP application) changes the audio mode to MODE_IN_CALL and crashes. In this case, the audio routing policy remains as if we were in call until the audio mode is changed back to MODE_NORMAL, for instance when a new call made or received and terminated. The fix consists in registering a death receipient to the binder that made the setMode() request and resetting the audio mode in case of client process crash.
* Make the media scanner disregard database entries that do not haveMarco Nelissen2010-01-211-17/+32
| | | | | | absolute path names. This allows us to store other things (perhaps with http or content URIs) in the database, without the media scanner removing them again.
* Support for determining the mime type of media via metadata extraction.Andreas Huber2010-01-131-0/+1
|
* am d31d7397: am 663ec308: Fix issue 2361949: A2DP suspend parameters set ↵Eric Laurent2010-01-081-0/+2
|\ | | | | | | | | | | | | | | | | wrongly. Merge commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629' * commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629': Fix issue 2361949: A2DP suspend parameters set wrongly.
| * am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.Eric Laurent2010-01-081-0/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp * commit '663ec308801a34de82db9ab993f0e906da690f89': Fix issue 2361949: A2DP suspend parameters set wrongly.
| | * Fix issue 2361949: A2DP suspend parameters set wrongly.Eric Laurent2010-01-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Move reset of A2DP suspend state from handleSinkStateChange() in BluetoothA2dpService to BluetoothA2dp.ACTION_SINK_STATE_CHANGED intent receiver in AudioService. Previous implementation could cause a false reset of suspend state if a new sink attempted to connect while A2DP was suspended. New implementation only resets A2DP suspend state when a new sink is actually connected.
* | | Add MPEG to the file extensions that scanner caresJames Dong2010-01-061-0/+1
| | |
* | | MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRINGMarco Nelissen2010-01-042-7/+5
| | |
* | | am 68e9014e: am 484d2888: Fix issue 2299360: Change in in-call volume ↵Eric Laurent2009-12-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | affects the Bluetooth in-call volume and vice versa. Merge commit '68e9014e47f7350b3889e1704dde809b2a926968' * commit '68e9014e47f7350b3889e1704dde809b2a926968': Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
| * \ \ am 484d2888: Fix issue 2299360: Change in in-call volume affects the ↵Eric Laurent2009-12-221-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluetooth in-call volume and vice versa. Merge commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e' into eclair-mr2-plus-aosp * commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e': Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
| | * | | Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call ↵Eric Laurent2009-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | volume and vice versa. Add a separate system settings entry for bluetooth SCO volume.
* | | | | Merge change I9120be33Android (Google) Code Review2009-12-231-6/+104
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add OnLoadCompleteListener to SoundPool.
| * | | | | Add OnLoadCompleteListener to SoundPool.Dave Sparks2009-12-231-6/+104
| |/ / / /
* | | | | am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclairEric Laurent2009-12-222-4/+22
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a' * commit 'f31f365a7708c931e955670bc6213fdc8f91a87a': Fix issues 2333450 and 2333559:
| * | | am eb5ffc23: Merge change Id8e98194 into eclairEric Laurent2009-12-222-4/+22
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp * commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c': Fix issues 2333450 and 2333559:
| | * | Fix issues 2333450 and 2333559:Eric Laurent2009-12-222-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | Add new config values to AudioSystem::FOR_DOCK force usage to differenciate car and desk docks. Use a receiver for the sticky Intent.ACTION_DOCK_EVENT in AudioService to detect the type of dock and select force usage accordingly.
| * | | am 86ed86d2: Merge change I0f73439a into eclairJean-Michel Trivi2009-12-092-0/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-plus-aosp * commit '86ed86d2260932bdf2217b1d8431ac9e04d47534': Partially fix bug 2111240 Detect docking / undocking event by reporting
| * | | am 6d42d806: Merge change I9cc489a2 into eclairEric Laurent2009-12-071-3/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-plus-aosp * commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7': Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
| * \ \ \ am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371Ray Chen2009-12-042-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-plus-aosp * commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644': Images.Media.DATE_TAKEN should be in milliseconds.
| * \ \ \ \ am e12de4d5: Merge change Id5fa58cf into eclairRay Chen2009-12-031-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-plus-aosp * commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1': Fix timezone issue to comply with EXIF standard.
| * \ \ \ \ \ am f27eb326: Merge change I0b6ee9fc into eclairRay Chen2009-12-011-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-plus-aosp * commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58': DATE_TAKEN should be in millisecond instead of second.
| * \ \ \ \ \ \ am bb3bb57a: Merge change I524dc046 into eclairEric Laurent2009-11-301-1/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-plus-aosp * commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3': Fix issue 2192673: Music Pausing Even when notifications are set to silent.
| * \ \ \ \ \ \ \ am a0e37e9d: Merge change I941136fd into eclairJean-Michel Trivi2009-11-181-2/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-plus-aosp * commit 'a0e37e9defea04e8c0d97828db02361fe511c53f': Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
| * \ \ \ \ \ \ \ \ am b3f35041: Merge change I86db22ef into eclairRay Chen2009-11-171-1/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-plus-aosp * commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6': Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database.
| * \ \ \ \ \ \ \ \ \ am 1aa9f3ca: Merge change I923d7d72 into eclairEric Laurent2009-11-122-78/+28
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-plus-aosp * commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54': Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
| * \ \ \ \ \ \ \ \ \ \ am d94ed379: Merge change I1dc2ae28 into eclairJean-Michel Trivi2009-11-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp * commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162': Fix bug 2242585 to unhide the new audio recording sources.
| * \ \ \ \ \ \ \ \ \ \ \ am 7ed0ceeb: Merge change I6869df3a into eclairJean-Michel Trivi2009-11-041-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-plus-aosp * commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488': Add new audio sources to support the A1026 recording configurations.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 89889733: Merge change I4e83a76a into eclairJean-Michel Trivi2009-10-281-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-plus-aosp * commit '898897338dfd62a268a89fb55ee900a9bd5a683f': Fix bug 2201417. Whenever the System setting that indicates
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 98de26e0: Merge change I8cc42c52 into eclairDave Sparks2009-10-271-42/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-plus-aosp * commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6': Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge from open-source masterJean-Baptiste Queru2009-10-141-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixed issue #4098: Ringtone#getTitle does not close its cursor.Josh Guilfoyle2009-10-021-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://code.google.com/p/android/issues/detail?id=4098
| * | | | | | | | | | | | | | | | am 521f4f3a: Merge change I3d6cf8aa into eclairgwang@google.com2009-10-072-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '521f4f3af94e3a093a37af887d3e317a526b61a1' into eclair-plus-aosp * commit '521f4f3af94e3a093a37af887d3e317a526b61a1': Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c39d2e3c: Music visualizer support hack. This currently assumes 44k ↵Marco Nelissen2009-10-071-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb. Merge commit 'c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-plus-aosp * commit 'c39d2e3c012fb96999991e30659a474f9f30f789': Music visualizer support hack.
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2Dianne Hackborn2009-12-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp * commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e': Implement API to have new broadcasts replace existing broadcasts.
| * | | | | | | | | | | | | | | | | | Implement API to have new broadcasts replace existing broadcasts.Dianne Hackborn2009-12-141-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use this in various places where it should serve no purpose to deliver both broadcasts. This is intended to reduce somewhat the flurry of broadcasts that we churn through during boot.
* | | | | | | | | | | | | | | | | | | am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclairJean-Michel Trivi2009-12-102-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b' into eclair-mr2-plus-aosp * commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b': Partially fix bug 2111240 Detect docking / undocking event by reporting
| * | | | | | | | | | | | | | | | | | am 86ed86d2: Merge change I0f73439a into eclairJean-Michel Trivi2009-12-102-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-mr2 * commit '86ed86d2260932bdf2217b1d8431ac9e04d47534': Partially fix bug 2111240 Detect docking / undocking event by reporting
| | * | | | | | | | | | | | | | | | | Partially fix bug 2111240 Detect docking / undocking event by reportingJean-Michel Trivi2009-12-072-0/+14
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the AudioPolicyManager a new forced usage AudioSystem::FOR_DOCK which can take the FORCE_NONE, FORCE_BT_DOCK or FORCE_WIRED_ACCESSORY values. This CL is complemented by an update of the APM to take into account the FOR_DOCK usage.
* | | | | | | | | | | | | | | | | | am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclairEric Laurent2009-12-071-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp * commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1': Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
| * | | | | | | | | | | | | | | | | am 6d42d806: Merge change I9cc489a2 into eclairEric Laurent2009-12-071-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2 * commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7': Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
| | * | | | | | | | | | | | | | | | Fix issue 2304669: VoiceIME: starting and canceling voice IME yields ↵Eric Laurent2009-12-071-3/+4
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | persistent "error 8" state on future attempts and breaks voice search. Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e so that an invalid IO handle (0) is returned in case of failure. Applied the same correction to openOutput(). Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes the record start to fail. Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function. Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
* | | | | | | | | | | | | | | | | am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. ↵Ray Chen2009-12-042-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/2297371 Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp * commit '8a576620cdc7257fc026026c77f7c946bfb760d1': Images.Media.DATE_TAKEN should be in milliseconds.
| * | | | | | | | | | | | | | | | am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371Ray Chen2009-12-042-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2 * commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644': Images.Media.DATE_TAKEN should be in milliseconds.
| | * | | | | | | | | | | | | | | Images.Media.DATE_TAKEN should be in milliseconds.Ray Chen2009-12-042-2/+3
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/2297371
* | | | | | | | | | | | | | | | am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclairRay Chen2009-12-031-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp * commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497': Fix timezone issue to comply with EXIF standard.
| * | | | | | | | | | | | | | | am e12de4d5: Merge change Id5fa58cf into eclairRay Chen2009-12-031-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-mr2 * commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1': Fix timezone issue to comply with EXIF standard.