summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Write test timings to /sdcard/glperf.csvJack Palevich2010-07-192-3/+22
| | | | Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
* Keep screen on for whole test.Jack Palevich2010-07-192-8/+15
| | | | | | | | Print only one set of timings per test. Draw blank black screen when done. Change-Id: I963bcbca99ff5975683b15e60437978eb1a8beb8
* An application version of the GL test.Jack Palevich2010-07-197-0/+942
| | | | Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
* am cbbd3a1b: am f23682f1: Merge "fixed parsing issue in BluetoothService so ↵Danica Chang2010-07-191-1/+1
|\ | | | | | | | | | | | | | | | | that it parses the UUID property correctly" into gingerbread Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed' * commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed': fixed parsing issue in BluetoothService so that it parses the UUID property correctly
| * am f23682f1: Merge "fixed parsing issue in BluetoothService so that it ↵Danica Chang2010-07-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | parses the UUID property correctly" into gingerbread Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp * commit 'f23682f128151def4d83d3e2422aea36e0a00061': fixed parsing issue in BluetoothService so that it parses the UUID property correctly
| | * Merge "fixed parsing issue in BluetoothService so that it parses the UUID ↵Danica Chang2010-07-191-1/+1
| | |\ | | | | | | | | | | | | property correctly" into gingerbread
| | | * fixed parsing issue in BluetoothService so that it parses the UUID property ↵Danica Chang2010-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | correctly Change-Id: If46fd3ae1a0e6393cd47a8f0dc913cef45e05441
* | | | Merge "Handle call list in CallManager."John Wang2010-07-191-62/+223
|\ \ \ \
| * | | | Handle call list in CallManager.John Wang2010-07-191-62/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls * 1. APIs to access list of calls * 2. APIs to check if any active call, which has connection other than * disconnected ones, pleaser refer to Call.isIdle() * 3. APIs to return first active call * 4. APIs to return the connections of first active call * 5. APIs to return other property of first active call Change-Id: I195682dbce630eda80144e169bf84c17177f3368
* | | | | am 27dfb307: merge from open-source masterThe Android Open Source Project2010-07-191-13/+14
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '27dfb3070adc90ddfcc398a352de1741f52add03' * commit '27dfb3070adc90ddfcc398a352de1741f52add03': Replaced deprecated calls to setButton and setButton2
| * | | | merge from open-source masterThe Android Open Source Project2010-07-191-13/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
| | * \ \ \ Merge "Replaced deprecated calls to setButton and setButton2"Romain Guy2010-07-191-13/+14
| | |\ \ \ \
| | | * | | | Replaced deprecated calls to setButton and setButton2Christian Mehlmauer2010-06-251-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifcc3f3afc1689406a3298dab7b00a8edb83c115e
* | | | | | | am 9ab60279: merge from open-source masterThe Android Open Source Project2010-07-191-16/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6' * commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6': Replaced deprecated setButton Methodcalls
| * | | | | | merge from open-source masterThe Android Open Source Project2010-07-191-16/+15
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
| | * | | | | Merge "Replaced deprecated setButton Methodcalls"Romain Guy2010-07-191-16/+15
| | |\ \ \ \ \
| | | * | | | | Replaced deprecated setButton MethodcallsChristian Mehlmauer2010-06-251-16/+15
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I8358b2dce25c6d5024550c54d98b4891f41b2a40
* | | | | | | Merge "Fix bug #2846543 Delete HIDDEN column from the "Calendars" table"Fabrice Di Meglio2010-07-191-7/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix bug #2846543 Delete HIDDEN column from the "Calendars" tableFabrice Di Meglio2010-07-161-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | | Merge "MTP: Only send events to host if we have an open session."Mike Lockwood2010-07-191-12/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | MTP: Only send events to host if we have an open session.Mike Lockwood2010-07-191-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b2d0c88c2d2ae0490247703d0fb1b862154db92 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Merge "Add MTP_OBJECT_ID column name to MediaStore.MediaColumns"Mike Lockwood2010-07-192-5/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Add MTP_OBJECT_ID column name to MediaStore.MediaColumnsMike Lockwood2010-07-192-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Merge "Fix sim-eng build."Andy McFadden2010-07-192-4/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix sim-eng build.Andy McFadden2010-07-192-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different handling of libdl. Added sim handling in one place, corrected typo in sim handling in another. Change-Id: I24153ad5b8873083225390ba6a751941d231d092
* | | | | | | | | | am 0a0bb953: (-s ours) am 80e62ac6: Fix the layoutlib Paint.set(Paint) ↵Xavier Ducrohet2010-07-190-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method. Do not merge. Merge commit '0a0bb953f0198e738e3e15a869af21a66a442466' * commit '0a0bb953f0198e738e3e15a869af21a66a442466': Fix the layoutlib Paint.set(Paint) method. Do not merge.
| * | | | | | | | | am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.Xavier Ducrohet2010-07-190-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp * commit '80e62ac61c297452c003919f71c4dcd7063d1b43': Fix the layoutlib Paint.set(Paint) method. Do not merge.
| | * | | | | | | | Fix the layoutlib Paint.set(Paint) method. Do not merge.Xavier Ducrohet2010-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would change the text rendering info but not recompute the Java Font objects. The effect is a broken font rendering in the EditText (which use this method to copy some Paint object before using the copy for the actual drawing) Change-Id: I9e7fbf9bd57b421fd793876a6de4ade1ecac372d
* | | | | | | | | | am 3c6ea955: am 7203272f: Merge "Fixed problems in audio effect volume ↵Eric Laurent2010-07-193-13/+27
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | control." into gingerbread Merge commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57' * commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57': Fixed problems in audio effect volume control.
| * | | | | | | | am 7203272f: Merge "Fixed problems in audio effect volume control." into ↵Eric Laurent2010-07-193-13/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp * commit '7203272f35e40bf9d4b76f1b2f9b0077738df118': Fixed problems in audio effect volume control.
| | * | | | | | | Merge "Fixed problems in audio effect volume control." into gingerbreadEric Laurent2010-07-193-13/+27
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fixed problems in audio effect volume control.Eric Laurent2010-07-193-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the following problems in audio effect volume control in AudioFlinger: - Make sure that the volumes returned by EffectChain::setVolume_l() are correct even is no change is detected since last call - Do not use isEnabled() to validate volume control but mState >= ACTIVE instead as the volume control must be also active in STOPPING and STOPPED states. Change-Id: Id62da3164fad500ee8a5efd6cd78c77e8fdcb541
* | | | | | | | | | am 3d02b48b: merge from open-source masterThe Android Open Source Project2010-07-191-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3d02b48bd95293c767563729264f007dbcff82b3' * commit '3d02b48bd95293c767563729264f007dbcff82b3': Fix the layoutlib Paint.set(Paint) method.
| * | | | | | | | | merge from open-source masterThe Android Open Source Project2010-07-191-0/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
| | * | | | | | | | Fix the layoutlib Paint.set(Paint) method.Xavier Ducrohet2010-07-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would change the text rendering info but not recompute the Java Font objects. The effect is a broken font rendering in the EditText (which use this method to copy some Paint object before using the copy for the actual drawing) Change-Id: I6d8d1bf86f0d77d088f60ad81c71dd3ebab727b0
* | | | | | | | | | am 27ef0f73: am 9714d2c4: Merge "Don\'t throw an exception from ↵Adam Bliss2010-07-192-9/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isProviderEnabled and getLastKnownLocation" into gingerbread Merge commit '27ef0f732c5a97ba88a699b7490045e5370cf51f' * commit '27ef0f732c5a97ba88a699b7490045e5370cf51f': Don't throw an exception from isProviderEnabled and getLastKnownLocation
| * | | | | | | | | am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and ↵Adam Bliss2010-07-192-9/+4
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getLastKnownLocation" into gingerbread Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp * commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599': Don't throw an exception from isProviderEnabled and getLastKnownLocation
| | * | | | | | | | Merge "Don't throw an exception from isProviderEnabled and ↵Adam Bliss2010-07-192-9/+4
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | getLastKnownLocation" into gingerbread
| | | * | | | | | | Don't throw an exception from isProviderEnabled and getLastKnownLocationMike Lockwood2010-07-172-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the location provider does not exist. Instead use the same behavior as if the provider were disabled in settings (return false for isProviderEnabled and null from getLastKnownLocation). This eliminates for a lot of exception handling around some simple queries to the location manager. BUG: 2841014 Change-Id: I4fbe0c088e915c90969e13083201dd3e7f4029cb Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | Cancel test selections when they start if the client hasn't overridden theLeon Clarke2010-07-192-4/+7
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection behavior. http://b/issue?id=2847546 Change-Id: I0d8529add54b3dfbf0af239fda1b15edd7bd32e0
* | | | | | | | | Merge "Added the LayoutTestsRunner class that is responsible for running the ↵Maksymilian Osowski2010-07-1910-15/+787
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests. Also, added some methods to FileFilter."
| * | | | | | | | | Added the LayoutTestsRunner class that is responsible for running the tests. ↵Maksymilian Osowski2010-07-1610-15/+787
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, added some methods to FileFilter. It preloads the tests from the given path, runs them and asks for dumps and diffs. It will also prepare summaries in the future. It delegates most of the work of actually running the individual tests to LayoutTest class and AbstractResult (and its subclasses in the future). Change-Id: I483bf26a380b539e4769e61b4a09fa270ab0e8e9
* | | | | | | | | | am 5e782937: am faf775e7: Fix simulator build (1st attempt)James Dong2010-07-181-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74' * commit '5e782937ead3042255d83f9c1192f2cc7b688d74': Fix simulator build (1st attempt)
| * | | | | | | | | am faf775e7: Fix simulator build (1st attempt)James Dong2010-07-181-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp * commit 'faf775e772e329e821d81ba735474df097b1e1e9': Fix simulator build (1st attempt)
| | * | | | | | | | Fix simulator build (1st attempt)James Dong2010-07-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65a824c17929170b7b2bc75a13e756e92d8fe50a
* | | | | | | | | | am d773bbd7: am 94dab9b1: fix broken api/current.xmlVasu Nori2010-07-171-44/+44
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f' * commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f': fix broken api/current.xml
| * | | | | | | | | am 94dab9b1: fix broken api/current.xmlVasu Nori2010-07-171-44/+44
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '94dab9b13590b714a7400d513f1e4655c62ddfaf' into gingerbread-plus-aosp * commit '94dab9b13590b714a7400d513f1e4655c62ddfaf': fix broken api/current.xml
| | * | | | | | | | fix broken api/current.xmlVasu Nori2010-07-171-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6cc03dddf20228625f18f7a59aed22628f9661fa
* | | | | | | | | | am bbc2b4e6: am 5b31498b: add video/audio chat-compatibility modes to ↵Vasu Nori2010-07-172-0/+104
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactsContract Merge commit 'bbc2b4e69a1788987a8fe959cc0105290b431283' * commit 'bbc2b4e69a1788987a8fe959cc0105290b431283': add video/audio chat-compatibility modes to ContactsContract
| * | | | | | | | | am 5b31498b: add video/audio chat-compatibility modes to ContactsContractVasu Nori2010-07-172-0/+104
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp * commit '5b31498ba1f9874f395d80152304512fa4c0144d': add video/audio chat-compatibility modes to ContactsContract
generated by cgit v1.1 at 2025-02-10 07:43:53 +0000