summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Detect and handle premature termination of a recording session" into ↵James Dong2010-05-144-8/+19
|\ | | | | | | kraken
| * Detect and handle premature termination of a recording sessionJames Dong2010-05-144-8/+19
| | | | | | | | Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
* | Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." ↵Nick Kralevich2010-05-141-1/+1
|\ \ | | | | | | | | | into kraken
| * | Forgot to fix one -Wformat-security in my previous change. Fixed.Nick Kralevich2010-05-141-1/+1
| | | | | | | | | | | | Change-Id: Ice7459b30e1d7dbfe400b68d27ebc04fcca78bae
* | | Merge "Fix deadlock if the last reference of ICameraClient is removed in ↵Chih-Chung Chang2010-05-141-1/+6
|\ \ \ | | | | | | | | | | | | ICamera::connect()" into kraken
| * | | Fix deadlock if the last reference of ICameraClient is removed inChih-Chung Chang2010-05-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | ICamera::connect() Change-Id: I34ab3e4f07435c62168175e9bb159022c8fb99f4
* | | | am 6d8e4fd8: am b83a283a: docs: add dev guide for backupScott Main2010-05-144-16/+791
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken * commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf': docs: add dev guide for backup
| * \ \ \ am b83a283a: docs: add dev guide for backupScott Main2010-05-144-16/+791
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp * commit 'b83a283ac178ab0a72f1d811189d79b26097835e': docs: add dev guide for backup
| | * | | | docs: add dev guide for backupScott Main2010-05-144-16/+791
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
* | | | | | Merge "Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related ↵Ray Chen2010-05-141-7/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | codes." into kraken
| * | | | | Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes.Ray Chen2010-05-141-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a509d957a7b67ee1f59dc4ef5139c4e28adeb9c
* | | | | | Audio/video initial recording time synchronizationJames Dong2010-05-142-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a
* | | | | | Handle recording file size and/or duration limitJames Dong2010-05-146-1/+124
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc
* | | | | am 1d628c5d: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken * commit '1d628c5d3dd7998b29c339292a2dc391015d0782': Accept media files by file extension in case insensitive manner.
| * | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
| | * \ \ \ Merge "Accept media files by file extension in case insensitive manner."Jean-Baptiste Queru2010-05-141-1/+1
| | |\ \ \ \
| | | * | | | Accept media files by file extension in case insensitive manner.Atsushi Eno2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e246010c96802ae87960797607fc8f8f2ab6031
* | | | | | | Merge "AudioFlinger: rename variables to clarify reference to track channel ↵Eric Laurent2010-05-143-34/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | count or channel mask" into kraken
| * | | | | | | AudioFlinger: rename variables to clarify reference to track channel count ↵Eric Laurent2010-05-143-34/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or channel mask Some variables and structure members should be renamed to reflect the fact that they contain the number of channels in a track (channel count) or the actual channels used by a track (channel mask). Especially member "channels" of track control block (struct audio_track_cblk_t) is actually the number of channels (channels count). Change-Id: I220c8dede9fc00c8a5693389e790073b6ed307b8
* | | | | | | | Merge "Remove libdrm2. This code appears to be unused." into krakenNick Kralevich2010-05-14123-19517/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove libdrm2. This code appears to be unused.Nick Kralevich2010-05-13123-19517/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code generates warnings when compiled with -Wformat-security, and since it isn't being used, I figured it's better to just delete it. As always, this code can be restored by reverting this change. Change-Id: I1da2049f41312b6eae5fa42892beb4a2036eb12f
* | | | | | | | | am 9167ba50: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken * commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1': Corrected debug message in WindowManager Put the wifi status icon in the right place.
| * | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
| | * | | | | | | Merge "Put the wifi status icon in the right place."Joe Onorato2010-05-131-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Put the wifi status icon in the right place.Steve Kondik2010-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the inconsistency where all network-related icons appear on the right side of the volume/vibrate icon except for the wifi icon, which appears on the left. Thanks to Kevin Purdy @ Lifehacker for kicking my OCD in :)
| | * | | | | | | | Merge "Corrected debug message in WindowManager"Dianne Hackborn2010-05-131-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Corrected debug message in WindowManagerJohan Alfven2010-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When WindowManager reports "Key dispatching timed out" it prints out information about the window state that was present at the time the key was sent to that window. There is a minor error in the class representing the recorded window state so that the currently focused window is printed instead of the recorded focused window. Change-Id: I29a5471ef725e30f812ffd57fd4597ce81c0c7f2
* | | | | | | | | | | Get rid of warnings when compiled with -Wformat-securityNick Kralevich2010-05-141-19/+19
| |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd814d894ff0eba26b01932b9865098b7bb26f95
* | | | | | | | | | am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature ↵Dirk Dougherty2010-05-131-3/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description" into froyo Merge commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken * commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad': Doc change: adjustments for ndk feature description
| * | | | | | | | | am fb473bb6: Merge "Doc change: adjustments for ndk feature description" ↵Dirk Dougherty2010-05-131-3/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp * commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60': Doc change: adjustments for ndk feature description
| | * | | | | | | | Merge "Doc change: adjustments for ndk feature description" into froyoDirk Dougherty2010-05-131-3/+4
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Doc change: adjustments for ndk feature descriptionDirk Dougherty2010-05-131-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3eb35c3d5ad756b7fa71c256b531f262e7940d90
* | | | | | | | | | | am d317edab: am a0711e7b: Doc change: Add compatibility article.Dirk Dougherty2010-05-133-34/+294
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd317edabe158312981eb73355f77c36566d89627' into kraken * commit 'd317edabe158312981eb73355f77c36566d89627': Doc change: Add compatibility article.
| * | | | | | | | | am a0711e7b: Doc change: Add compatibility article.Dirk Dougherty2010-05-133-34/+294
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp * commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99': Doc change: Add compatibility article.
| | * | | | | | | | Doc change: Add compatibility article.Dirk Dougherty2010-05-133-34/+294
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6671813eb88bc8cb92575726f8fcf69eb558d08
* | | | | | | | | Merge "Remove dummy surface in CameraSource" into krakenJames Dong2010-05-133-50/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove dummy surface in CameraSourceJames Dong2010-05-133-50/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 2680919 Change-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f
* | | | | | | | | | am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when ↵Suchi Amalapurapu2010-05-132-3/+49
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabling disabling packages." into froyo Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken * commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810': Fix 2672155
| * | | | | | | | | am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling ↵Suchi Amalapurapu2010-05-132-3/+49
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packages." into froyo Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp * commit 'c928a11e34678296511d5ea34582292be7368618': Fix 2672155
| | * | | | | | | | Merge "Fix 2672155 Check the code path when enabling disabling packages." ↵Suchi Amalapurapu2010-05-132-3/+49
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo
| | | * | | | | | | | Fix 2672155Suchi Amalapurapu2010-05-132-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the code path when enabling disabling packages. Add unit test Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
* | | | | | | | | | | Merge "Get rid of warnings when compiled with -Wformat-security" into krakenNick Kralevich2010-05-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Get rid of warnings when compiled with -Wformat-securityNick Kralevich2010-05-131-2/+2
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a7ad5be2aaf0fa0d164204d3c1bebf02ec55745
* | | | | | | | | | | am b1110149: merge from open-source masterThe Android Open Source Project2010-05-134-2/+298
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken * commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9': Use integer for loop counter instead of float New test in FrameworkTest for the VelocityTracker class Preserve '+' in phone numbers imported from SIM.
| * | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-134-2/+298
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
| | * | | | | | | | | Use integer for loop counter instead of floatKenny Root2010-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b
| | * | | | | | | | | Merge "New test in FrameworkTest for the VelocityTracker class"Jean-Baptiste Queru2010-05-131-0/+285
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | New test in FrameworkTest for the VelocityTracker classMarc Capdevielle2010-05-121-0/+285
| | | | | | | | | | | |
| | * | | | | | | | | | Merge "Preserve '+' in phone numbers imported from SIM."Jean-Baptiste Queru2010-05-132-1/+12
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Preserve '+' in phone numbers imported from SIM.Samuel Holmberg2010-05-112-1/+12
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contacts with phonenumbers beginning with '+' lose the '+' in the phonebook when imported from SIM. This was only noticable on ADN-records with unknown NPI-values which isn't very usual. Change-Id: I181249759ae3d4181dd3cf627c7a588394b80419
generated by cgit v1.1 at 2025-04-29 15:12:13 +0000