OSDN Git Service
Eric Laurent [Thu, 1 Apr 2010 06:39:41 +0000 (23:39 -0700)]
am
110c432e: am
3fe1708d: Merge "Fix isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
110c432e6c90c604d955b795f91fe08c35f49e60' into kraken
* commit '
110c432e6c90c604d955b795f91fe08c35f49e60':
Fix isssue
2548710: Native AudioTrack resources never freed.
Eric Laurent [Thu, 1 Apr 2010 06:37:02 +0000 (23:37 -0700)]
am
3fe1708d: Merge "Fix isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
3fe1708d9d204fa63e8abe6e434378d89e963752' into froyo-plus-aosp
* commit '
3fe1708d9d204fa63e8abe6e434378d89e963752':
Fix isssue
2548710: Native AudioTrack resources never freed.
Eric Laurent [Thu, 1 Apr 2010 06:33:52 +0000 (23:33 -0700)]
Merge "Fix isssue
2548710: Native AudioTrack resources never freed." into froyo
Dianne Hackborn [Thu, 1 Apr 2010 06:23:20 +0000 (23:23 -0700)]
am
6ff57ee3: am
db3ea3d0: Merge "Fix issue #
2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Merge commit '
6ff57ee310290715c000fd771cd7e18b1537ccbc' into kraken
* commit '
6ff57ee310290715c000fd771cd7e18b1537ccbc':
Fix issue #
2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
Dianne Hackborn [Thu, 1 Apr 2010 06:23:16 +0000 (23:23 -0700)]
am
2d8d4d7b: am
513ae361: Merge "Fix issue #
2560791: Expose API to go in to car mode." into froyo
Merge commit '
2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken
* commit '
2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
Fix issue #
2560791: Expose API to go in to car mode.
Dianne Hackborn [Thu, 1 Apr 2010 06:23:10 +0000 (23:23 -0700)]
am
025f3933: am
686f7911: Merge "Fix issue #
2561067: Screen Display half faded..." into froyo
Merge commit '
025f3933cfc21655bfc5a5068c69303f1fe321ee' into kraken
* commit '
025f3933cfc21655bfc5a5068c69303f1fe321ee':
Fix issue #
2561067: Screen Display half faded...
Xia Wang [Thu, 1 Apr 2010 06:23:06 +0000 (23:23 -0700)]
am
c2eb4094: am
de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
Merge commit '
c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9' into kraken
* commit '
c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9':
Test connecitvity manager functionality in state change.
Adam Powell [Thu, 1 Apr 2010 06:23:02 +0000 (23:23 -0700)]
am
5af7ef60: am
40cd1cf6: Merge "Fix bug
2562240 and clean up scrollbar behavior" into froyo
Merge commit '
5af7ef60277060b94604a0b9679bb08a4dc1e731' into kraken
* commit '
5af7ef60277060b94604a0b9679bb08a4dc1e731':
Fix bug
2562240 and clean up scrollbar behavior
Suchi Amalapurapu [Thu, 1 Apr 2010 06:22:56 +0000 (23:22 -0700)]
am
1aa64b53: am
ae18171a: Change certificate policy.
Merge commit '
1aa64b53eb9b3cc7904705076a015a5cd0e3b536' into kraken
* commit '
1aa64b53eb9b3cc7904705076a015a5cd0e3b536':
Change certificate policy.
Jaikumar Ganesh [Thu, 1 Apr 2010 06:22:51 +0000 (23:22 -0700)]
am
b8fc825d: am
3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
Merge commit '
b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5' into kraken
* commit '
b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5':
Fix crash while turning bluetooth on, due to a race condition.
Dianne Hackborn [Thu, 1 Apr 2010 06:18:32 +0000 (23:18 -0700)]
am
db3ea3d0: Merge "Fix issue #
2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Merge commit '
db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp
* commit '
db3ea3d0064e0aeae350bca5e548e67f50f06982':
Fix issue #
2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
Dianne Hackborn [Thu, 1 Apr 2010 06:18:28 +0000 (23:18 -0700)]
am
513ae361: Merge "Fix issue #
2560791: Expose API to go in to car mode." into froyo
Merge commit '
513ae3610e5d6eac3af71c3e51a4e5e8b55b5256' into froyo-plus-aosp
* commit '
513ae3610e5d6eac3af71c3e51a4e5e8b55b5256':
Fix issue #
2560791: Expose API to go in to car mode.
Dianne Hackborn [Thu, 1 Apr 2010 06:18:24 +0000 (23:18 -0700)]
am
686f7911: Merge "Fix issue #
2561067: Screen Display half faded..." into froyo
Merge commit '
686f7911a3462d6847d2a9396572eaaf04a9f175' into froyo-plus-aosp
* commit '
686f7911a3462d6847d2a9396572eaaf04a9f175':
Fix issue #
2561067: Screen Display half faded...
Xia Wang [Thu, 1 Apr 2010 06:18:21 +0000 (23:18 -0700)]
am
de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
Merge commit '
de1b1872b33495da0bcd4c29ffeb3783fa7702e9' into froyo-plus-aosp
* commit '
de1b1872b33495da0bcd4c29ffeb3783fa7702e9':
Test connecitvity manager functionality in state change.
Adam Powell [Thu, 1 Apr 2010 06:18:17 +0000 (23:18 -0700)]
am
40cd1cf6: Merge "Fix bug
2562240 and clean up scrollbar behavior" into froyo
Merge commit '
40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705' into froyo-plus-aosp
* commit '
40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705':
Fix bug
2562240 and clean up scrollbar behavior
Suchi Amalapurapu [Thu, 1 Apr 2010 06:18:12 +0000 (23:18 -0700)]
am
ae18171a: Change certificate policy.
Merge commit '
ae18171acd3c70fc6d27fc6bbe85828e0f928fad' into froyo-plus-aosp
* commit '
ae18171acd3c70fc6d27fc6bbe85828e0f928fad':
Change certificate policy.
Jaikumar Ganesh [Thu, 1 Apr 2010 06:18:05 +0000 (23:18 -0700)]
am
3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
Merge commit '
3a0d1d11eba05d74d0461083eb6f31321588a0f6' into froyo-plus-aosp
* commit '
3a0d1d11eba05d74d0461083eb6f31321588a0f6':
Fix crash while turning bluetooth on, due to a race condition.
Dianne Hackborn [Thu, 1 Apr 2010 06:04:22 +0000 (23:04 -0700)]
Merge "Fix issue #
2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Dianne Hackborn [Thu, 1 Apr 2010 06:03:26 +0000 (23:03 -0700)]
Merge "Fix issue #
2560791: Expose API to go in to car mode." into froyo
Dianne Hackborn [Thu, 1 Apr 2010 05:49:30 +0000 (22:49 -0700)]
Merge "Fix issue #
2561067: Screen Display half faded..." into froyo
Xia Wang [Thu, 1 Apr 2010 03:29:10 +0000 (20:29 -0700)]
Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
Adam Powell [Thu, 1 Apr 2010 03:11:33 +0000 (20:11 -0700)]
Merge "Fix bug
2562240 and clean up scrollbar behavior" into froyo
Jaikumar Ganesh [Thu, 1 Apr 2010 01:36:35 +0000 (18:36 -0700)]
Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
Dirk Dougherty [Wed, 31 Mar 2010 23:20:20 +0000 (16:20 -0700)]
am
8557df02: am
058e385b: doc change: fix link in guidelines index.
Merge commit '
8557df02d3aad448823cba5496908a45730d3ef8' into kraken
* commit '
8557df02d3aad448823cba5496908a45730d3ef8':
doc change: fix link in guidelines index.
Dirk Dougherty [Wed, 31 Mar 2010 23:17:36 +0000 (16:17 -0700)]
am
058e385b: doc change: fix link in guidelines index.
Merge commit '
058e385b8bca0376c27a24a54f3b00777ef30e0a' into froyo-plus-aosp
* commit '
058e385b8bca0376c27a24a54f3b00777ef30e0a':
doc change: fix link in guidelines index.
Jeff Brown [Wed, 31 Mar 2010 23:06:53 +0000 (16:06 -0700)]
am
6a3e7dfa: am
c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
Merge commit '
6a3e7dfa87345244190403eaad71e760f11305ba' into kraken
* commit '
6a3e7dfa87345244190403eaad71e760f11305ba':
Fix alarms with negative or very large wakup times.
Jeff Brown [Wed, 31 Mar 2010 23:00:58 +0000 (16:00 -0700)]
am
c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
Merge commit '
c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc' into froyo-plus-aosp
* commit '
c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc':
Fix alarms with negative or very large wakup times.
Jeff Brown [Wed, 31 Mar 2010 22:56:30 +0000 (15:56 -0700)]
Merge "Fix alarms with negative or very large wakup times." into froyo
Dirk Dougherty [Wed, 31 Mar 2010 22:04:25 +0000 (15:04 -0700)]
am
e4fa5d76: am
36b3b5fc: doc change: several fixes for UI Guidelines doc.
Merge commit '
e4fa5d7669bba2cdb6f72379933005407a5bedc5' into kraken
* commit '
e4fa5d7669bba2cdb6f72379933005407a5bedc5':
doc change: several fixes for UI Guidelines doc.
Dirk Dougherty [Wed, 31 Mar 2010 21:58:48 +0000 (14:58 -0700)]
am
36b3b5fc: doc change: several fixes for UI Guidelines doc.
Merge commit '
36b3b5fc9a86a77488ed8b2497621ddca03d3cba' into froyo-plus-aosp
* commit '
36b3b5fc9a86a77488ed8b2497621ddca03d3cba':
doc change: several fixes for UI Guidelines doc.
Dirk Dougherty [Wed, 31 Mar 2010 21:49:19 +0000 (14:49 -0700)]
Dirk Dougherty [Wed, 31 Mar 2010 21:45:50 +0000 (14:45 -0700)]
The Android Open Source Project [Wed, 31 Mar 2010 21:17:32 +0000 (14:17 -0700)]
am
8de2cf4c: merge from open-source master
Merge commit '
8de2cf4cce9ae2e121fccb4732fd23c64aace102' into kraken
* commit '
8de2cf4cce9ae2e121fccb4732fd23c64aace102':
Fix last character of password field being visible after rotation
gl_code : add end of line.
The Android Open Source Project [Wed, 31 Mar 2010 21:01:45 +0000 (14:01 -0700)]
merge from open-source master
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
Jean-Michel Trivi [Wed, 31 Mar 2010 20:49:56 +0000 (13:49 -0700)]
am
93511f38: am
3ce1648f: Merge "Fix bug
2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
Merge commit '
93511f384b1180bf5277a26ceeff568fa6aa858d' into kraken
* commit '
93511f384b1180bf5277a26ceeff568fa6aa858d':
Fix bug
2553575 API REVIEW: android.media Change 1 of 3
Jean-Michel Trivi [Wed, 31 Mar 2010 20:44:20 +0000 (13:44 -0700)]
am
3ce1648f: Merge "Fix bug
2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
Merge commit '
3ce1648fce73496c6ea6a208e5d13141ff7f34e1' into froyo-plus-aosp
* commit '
3ce1648fce73496c6ea6a208e5d13141ff7f34e1':
Fix bug
2553575 API REVIEW: android.media Change 1 of 3
Jean-Michel Trivi [Wed, 31 Mar 2010 20:40:42 +0000 (13:40 -0700)]
Merge "Fix bug
2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
Eric Laurent [Wed, 31 Mar 2010 19:21:17 +0000 (12:21 -0700)]
Fix isssue
2548710: Native AudioTrack resources never freed.
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: I4582aa1d981079ab79be442fb6185f5afaed5cf3
Andreas Huber [Wed, 31 Mar 2010 18:44:01 +0000 (11:44 -0700)]
am
41e8e4a2: am
804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
Merge commit '
41e8e4a29df084e2e82fe13123d603b26a9eaefb' into kraken
* commit '
41e8e4a29df084e2e82fe13123d603b26a9eaefb':
Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Andreas Huber [Wed, 31 Mar 2010 18:38:54 +0000 (11:38 -0700)]
am
804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
Merge commit '
804878f3a3ea40ace5bd572cee98f9e13a0dbf0b' into froyo-plus-aosp
* commit '
804878f3a3ea40ace5bd572cee98f9e13a0dbf0b':
Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Andreas Huber [Wed, 31 Mar 2010 18:33:19 +0000 (11:33 -0700)]
Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
Dianne Hackborn [Wed, 31 Mar 2010 18:17:01 +0000 (11:17 -0700)]
am
bc50bdca: am
e259bc77: Fix issue #
2558391: Package manager problem when not replacing existing system partition app
Merge commit '
bc50bdca0ae1f7d173e4f589db250dc519740c16' into kraken
* commit '
bc50bdca0ae1f7d173e4f589db250dc519740c16':
Fix issue #
2558391: Package manager problem when not replacing existing system partition app
Dianne Hackborn [Wed, 31 Mar 2010 18:14:13 +0000 (11:14 -0700)]
am
e259bc77: Fix issue #
2558391: Package manager problem when not replacing existing system partition app
Merge commit '
e259bc770b3eeb88eb7a03ec0af2522ca9929f58' into froyo-plus-aosp
* commit '
e259bc770b3eeb88eb7a03ec0af2522ca9929f58':
Fix issue #
2558391: Package manager problem when not replacing existing system partition app
Fred Quintana [Wed, 31 Mar 2010 18:07:38 +0000 (11:07 -0700)]
am
fa41ccf1: am
9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Merge commit '
fa41ccf18cfb9b366c859e09112f8f98797bf152' into kraken
* commit '
fa41ccf18cfb9b366c859e09112f8f98797bf152':
added a cleanspec since ActiveSyncInfo.aidl was removed
Patrick Scott [Wed, 31 Mar 2010 18:04:50 +0000 (11:04 -0700)]
am
09c49a8a: am
92534469: Use case insensitive matching.
Merge commit '
09c49a8a6c3670126b2b9c477c5ac19cebdb9510' into kraken
* commit '
09c49a8a6c3670126b2b9c477c5ac19cebdb9510':
Use case insensitive matching.
Fred Quintana [Wed, 31 Mar 2010 18:04:48 +0000 (11:04 -0700)]
am
9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Merge commit '
9b9a89a58f50c3004959c36252489fae54fb9c58' into froyo-plus-aosp
* commit '
9b9a89a58f50c3004959c36252489fae54fb9c58':
added a cleanspec since ActiveSyncInfo.aidl was removed
Fred Quintana [Wed, 31 Mar 2010 18:01:41 +0000 (11:01 -0700)]
Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Patrick Scott [Wed, 31 Mar 2010 18:00:39 +0000 (11:00 -0700)]
am
92534469: Use case insensitive matching.
Merge commit '
9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp
* commit '
9253446922d925f6a5453b60d539beed292921a7':
Use case insensitive matching.
Eric Olsen [Wed, 31 Mar 2010 17:12:26 +0000 (10:12 -0700)]
am
f26cf98f: am
71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit '
f26cf98ffa087670a5ad849d7dd3c568d4f03ec9' into kraken
* commit '
f26cf98ffa087670a5ad849d7dd3c568d4f03ec9':
Add thermal shutdown. If battery temp >= 68C.
Eric Olsen [Wed, 31 Mar 2010 17:07:36 +0000 (10:07 -0700)]
am
71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit '
711065587b46ea0279788757c49a273ff796f844' into froyo-plus-aosp
* commit '
711065587b46ea0279788757c49a273ff796f844':
Add thermal shutdown. If battery temp >= 68C.
Eric Olsen [Wed, 31 Mar 2010 17:04:24 +0000 (10:04 -0700)]
Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Andreas Huber [Wed, 31 Mar 2010 16:54:12 +0000 (09:54 -0700)]
am
c7418149: am
5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Merge commit '
c7418149fafc7ded51a527b1d756028b33af3ac0' into kraken
* commit '
c7418149fafc7ded51a527b1d756028b33af3ac0':
Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
Andreas Huber [Wed, 31 Mar 2010 16:51:33 +0000 (09:51 -0700)]
am
5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Merge commit '
5c1e96bbc7f71fc3512706af878599fdfbdb7690' into froyo-plus-aosp
* commit '
5c1e96bbc7f71fc3512706af878599fdfbdb7690':
Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
Andreas Huber [Wed, 31 Mar 2010 16:48:22 +0000 (09:48 -0700)]
Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Robert Greenwalt [Wed, 31 Mar 2010 15:37:45 +0000 (08:37 -0700)]
am
676f7052: am
0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '
676f70527d9f576f6e8b9e47e0aa7ac145fa81c2' into kraken
* commit '
676f70527d9f576f6e8b9e47e0aa7ac145fa81c2':
Fix HttpProxy.
Robert Greenwalt [Wed, 31 Mar 2010 15:35:16 +0000 (08:35 -0700)]
am
0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '
0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d' into froyo-plus-aosp
* commit '
0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d':
Fix HttpProxy.
Robert Greenwalt [Wed, 31 Mar 2010 15:32:03 +0000 (08:32 -0700)]
Merge "Fix HttpProxy." into froyo
Bjorn Bringert [Wed, 31 Mar 2010 14:26:12 +0000 (07:26 -0700)]
am
86f6f536: am
11a7ba36: Support for apps search in apps provider contract
Merge commit '
86f6f536e04a6f90fddc2695282ffb3842dcbb68' into kraken
* commit '
86f6f536e04a6f90fddc2695282ffb3842dcbb68':
Support for apps search in apps provider contract
Bjorn Bringert [Wed, 31 Mar 2010 14:21:13 +0000 (07:21 -0700)]
am
11a7ba36: Support for apps search in apps provider contract
Merge commit '
11a7ba367f39175f41300f384ec6e984bcc08d53' into froyo-plus-aosp
* commit '
11a7ba367f39175f41300f384ec6e984bcc08d53':
Support for apps search in apps provider contract
Jeff Brown [Wed, 31 Mar 2010 06:49:17 +0000 (23:49 -0700)]
resolved conflicts for merge of
d9ee01a9 to kraken
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
Jeff Brown [Wed, 31 Mar 2010 06:32:12 +0000 (23:32 -0700)]
am
07330791: Show SD unavailable icon for apps on SD when ejected.
Merge commit '
07330791116513710d879c45b2f095cd314cbfd0' into froyo-plus-aosp
* commit '
07330791116513710d879c45b2f095cd314cbfd0':
Show SD unavailable icon for apps on SD when ejected.
Dianne Hackborn [Wed, 31 Mar 2010 04:13:21 +0000 (21:13 -0700)]
am
b19b6fec: am
966fcb81: Revert "fix [
2542425] memory leak during video recording"
Merge commit '
b19b6fec04de14860efb47d59084a66bb288cc98' into kraken
* commit '
b19b6fec04de14860efb47d59084a66bb288cc98':
Revert "fix [
2542425] memory leak during video recording"
Dianne Hackborn [Wed, 31 Mar 2010 04:10:45 +0000 (21:10 -0700)]
am
966fcb81: Revert "fix [
2542425] memory leak during video recording"
Merge commit '
966fcb81eece9096040ccc185bb662335d3964cf' into froyo-plus-aosp
* commit '
966fcb81eece9096040ccc185bb662335d3964cf':
Revert "fix [
2542425] memory leak during video recording"
Dianne Hackborn [Wed, 31 Mar 2010 04:04:17 +0000 (21:04 -0700)]
Revert "fix [
2542425] memory leak during video recording"
This reverts commit
544592e14f8d7643238e40ba9879727497900f35.
Mathias Agopian [Wed, 31 Mar 2010 02:11:25 +0000 (19:11 -0700)]
am
65bfca37: am
544592e1: fix [
2542425] memory leak during video recording
Merge commit '
65bfca37fe36c1caef3153c39aa41a273ab776ef' into kraken
* commit '
65bfca37fe36c1caef3153c39aa41a273ab776ef':
fix [
2542425] memory leak during video recording
Mathias Agopian [Wed, 31 Mar 2010 02:06:51 +0000 (19:06 -0700)]
am
544592e1: fix [
2542425] memory leak during video recording
Merge commit '
544592e14f8d7643238e40ba9879727497900f35' into froyo-plus-aosp
* commit '
544592e14f8d7643238e40ba9879727497900f35':
fix [
2542425] memory leak during video recording
Mathias Agopian [Tue, 30 Mar 2010 23:53:40 +0000 (16:53 -0700)]
fix [
2542425] memory leak during video recording
[Sorted|Keyed]Vector<TYPE> would leak their whole storage when resized
from the end and TYPE had trivial dtor and copy operators.
Change-Id: I8555bb1aa0863df72de27d67ae50e20706e90cf5
Fred Quintana [Wed, 31 Mar 2010 01:42:20 +0000 (18:42 -0700)]
am
4a2f285d: am
77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the initialization
Merge commit '
4a2f285deafc996435ac20162abaeb21838c1c40' into kraken
* commit '
4a2f285deafc996435ac20162abaeb21838c1c40':
- changed periodic sync scheduling to just creating pending
Fred Quintana [Wed, 31 Mar 2010 01:38:46 +0000 (18:38 -0700)]
am
77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the initialization sync extra -
Merge commit '
77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b' into froyo-plus-aosp
* commit '
77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b':
- changed periodic sync scheduling to just creating pending
Fred Quintana [Wed, 31 Mar 2010 01:29:32 +0000 (18:29 -0700)]
am
c21e77fc: am
23243aca: missing current.xml change
Merge commit '
c21e77fc894360885310998a2eae69ab22779c39' into kraken
* commit '
c21e77fc894360885310998a2eae69ab22779c39':
missing current.xml change
Fred Quintana [Wed, 31 Mar 2010 01:29:25 +0000 (18:29 -0700)]
am
344ba661: am
d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync -
Merge commit '
344ba661ab406759a91ecaba1378a4907971b119' into kraken
* commit '
344ba661ab406759a91ecaba1378a4907971b119':
some changes due to an API review
Fred Quintana [Wed, 31 Mar 2010 01:24:19 +0000 (18:24 -0700)]
am
23243aca: missing current.xml change
Merge commit '
23243acabdf8ff6022395cf67632c8387d286989' into froyo-plus-aosp
* commit '
23243acabdf8ff6022395cf67632c8387d286989':
missing current.xml change
Fred Quintana [Wed, 31 Mar 2010 01:24:15 +0000 (18:24 -0700)]
am
d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync - remove the a
Merge commit '
d5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp
* commit '
d5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b':
some changes due to an API review
Mike Lockwood [Wed, 31 Mar 2010 00:35:18 +0000 (17:35 -0700)]
am
835f41da: (-s ours) am
8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Merge commit '
835f41da7581747b6a03227bcd1e073074ea9329' into kraken
* commit '
835f41da7581747b6a03227bcd1e073074ea9329':
Add support for GPS privacy lock. DO NOT MERGE
Mike Lockwood [Wed, 31 Mar 2010 00:32:24 +0000 (17:32 -0700)]
am
8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Merge commit '
8acdb911f4b9c38d1cafd3ab464d6bec54564c84' into froyo-plus-aosp
* commit '
8acdb911f4b9c38d1cafd3ab464d6bec54564c84':
Add support for GPS privacy lock. DO NOT MERGE
Mike Lockwood [Wed, 31 Mar 2010 00:29:41 +0000 (17:29 -0700)]
Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Daniel Lehmann [Wed, 31 Mar 2010 00:05:42 +0000 (17:05 -0700)]
am
1b679754: am
58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:
2546767" into froyo
Merge commit '
1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken
* commit '
1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
Don't load photo if it's id is 0. Saves one database query
Daniel Lehmann [Wed, 31 Mar 2010 00:01:45 +0000 (17:01 -0700)]
am
58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:
2546767" into froyo
Merge commit '
58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp
* commit '
58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
Don't load photo if it's id is 0. Saves one database query
Daniel Lehmann [Tue, 30 Mar 2010 23:58:38 +0000 (16:58 -0700)]
Merge "Don't load photo if it's id is 0. Saves one database query Bug:
2546767" into froyo
Adam Powell [Tue, 30 Mar 2010 23:54:43 +0000 (16:54 -0700)]
am
9ebc9f46: am
3ac51b3d: Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '
9ebc9f464f45ec30003cd30854188a376c6d155f' into kraken
* commit '
9ebc9f464f45ec30003cd30854188a376c6d155f':
Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items
Christopher Tate [Tue, 30 Mar 2010 23:54:39 +0000 (16:54 -0700)]
am
82a8b363: am
27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '
82a8b3632c28d18d58a585160163fbf63d0c9746' into kraken
* commit '
82a8b3632c28d18d58a585160163fbf63d0c9746':
API CHANGE: @hide AbsoluteFileBackupHelper
Adam Powell [Tue, 30 Mar 2010 23:50:41 +0000 (16:50 -0700)]
am
3ac51b3d: Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '
3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45' into froyo-plus-aosp
* commit '
3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45':
Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items
Christopher Tate [Tue, 30 Mar 2010 23:50:36 +0000 (16:50 -0700)]
am
27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '
27a63583bfb8b4668911a819f3c7827ef0cc2ec8' into froyo-plus-aosp
* commit '
27a63583bfb8b4668911a819f3c7827ef0cc2ec8':
API CHANGE: @hide AbsoluteFileBackupHelper
Adam Powell [Tue, 30 Mar 2010 23:46:21 +0000 (16:46 -0700)]
Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Dianne Hackborn [Tue, 30 Mar 2010 23:05:05 +0000 (16:05 -0700)]
am
6d630607: am
5cdd7858: Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo
Merge commit '
6d63060768f9d73c6062a2b603d3c51c7d5f0043' into kraken
* commit '
6d63060768f9d73c6062a2b603d3c51c7d5f0043':
Fix issue #
2553553: API REVIEW: android.context.Context
Dianne Hackborn [Tue, 30 Mar 2010 23:00:41 +0000 (16:00 -0700)]
am
5cdd7858: Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo
Merge commit '
5cdd78589db7f31c59df2e40146bd761a6570d13' into froyo-plus-aosp
* commit '
5cdd78589db7f31c59df2e40146bd761a6570d13':
Fix issue #
2553553: API REVIEW: android.context.Context
Dianne Hackborn [Tue, 30 Mar 2010 22:55:37 +0000 (15:55 -0700)]
Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo
Andreas Huber [Tue, 30 Mar 2010 22:49:38 +0000 (15:49 -0700)]
am
9cfc52d9: am
99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
Merge commit '
9cfc52d9f99f61c573ad845529265d4fb7a5842c' into kraken
* commit '
9cfc52d9f99f61c573ad845529265d4fb7a5842c':
Properly fill in the component name for the software decoders.
Andreas Huber [Tue, 30 Mar 2010 22:44:23 +0000 (15:44 -0700)]
am
99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
Merge commit '
99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc' into froyo-plus-aosp
* commit '
99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc':
Properly fill in the component name for the software decoders.
Andreas Huber [Tue, 30 Mar 2010 22:40:38 +0000 (15:40 -0700)]
Merge "Properly fill in the component name for the software decoders." into froyo
Amith Yamasani [Tue, 30 Mar 2010 22:27:35 +0000 (15:27 -0700)]
am
e1331779: am
95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo
Merge commit '
e133177980b908d183ed8fe46cf3ea33405b8bd5' into kraken
* commit '
e133177980b908d183ed8fe46cf3ea33405b8bd5':
Fix for Never not existing in latest timeout values.
Amith Yamasani [Tue, 30 Mar 2010 22:24:51 +0000 (15:24 -0700)]
am
95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo
Merge commit '
95a321fcde17cbb79d89244eee3c1297c449b1a0' into froyo-plus-aosp
* commit '
95a321fcde17cbb79d89244eee3c1297c449b1a0':
Fix for Never not existing in latest timeout values.
Amith Yamasani [Tue, 30 Mar 2010 22:19:00 +0000 (15:19 -0700)]
Merge "Fix for Never not existing in latest timeout values." into froyo
Grace Kloba [Tue, 30 Mar 2010 21:59:19 +0000 (14:59 -0700)]
am
19c1ea3b: am
eb643f26: Merge "Remove the shadow under url bar." into froyo
Merge commit '
19c1ea3bd05de6f0221b7807053bf03c3cfaaec7' into kraken
* commit '
19c1ea3bd05de6f0221b7807053bf03c3cfaaec7':
Remove the shadow under url bar.
Grace Kloba [Tue, 30 Mar 2010 21:56:14 +0000 (14:56 -0700)]
am
eb643f26: Merge "Remove the shadow under url bar." into froyo
Merge commit '
eb643f2685bd404ef5abb622123cea0aa17939d7' into froyo-plus-aosp
* commit '
eb643f2685bd404ef5abb622123cea0aa17939d7':
Remove the shadow under url bar.
Grace Kloba [Tue, 30 Mar 2010 21:51:48 +0000 (14:51 -0700)]
Merge "Remove the shadow under url bar." into froyo
David Turner [Tue, 30 Mar 2010 21:50:44 +0000 (14:50 -0700)]
Merge "gl_code : add end of line."
Irfan Sheriff [Tue, 30 Mar 2010 20:55:21 +0000 (13:55 -0700)]
Irfan Sheriff [Tue, 30 Mar 2010 20:51:46 +0000 (13:51 -0700)]
Dianne Hackborn [Tue, 30 Mar 2010 20:42:50 +0000 (13:42 -0700)]
am
ab86fc91: am
de2722af: Merge "Package manager optimizations." into froyo
Merge commit '
ab86fc91f5b54b8b730c0f594f04bbfb4c41697a' into kraken
* commit '
ab86fc91f5b54b8b730c0f594f04bbfb4c41697a':
Package manager optimizations.
OSDN Git Service
