summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in lmp-release history after reset to ↵studio-master-dev_before_26911779studio-1.5studio-1.4gradle_1.5.0gradle_1.3.1gradle_1.3.0-beta4gradle_1.3.0-beta3gradle_1.3.0-beta2gradle_1.3.0-beta1gradle_1.2.3gradle_1.2.2gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0-beta1gradle_1.2.0gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1The Android Automerger2014-10-210-0/+0
|\ | | | | | | afe2b1fadd29149ceed639357e44e06e97c3a5ca
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-210-0/+0
| |\ | | | | | | | | | 649bafb7ba2c3204295bc3451ff7af7e28e714ed
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-190-0/+0
| | |\ | | | | | | | | | | | | 0b6acb2231baed861488f2d181621272d0658d25
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-160-0/+0
| | | |\ | | | | | | | | | | | | | | | 60fd3feecab4336d964ca8e31c7c3220e1afb558
| | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-150-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | 3454f123d0a10bd0ce0760828996aa26c80a8fd4
| | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-140-0/+0
| | | | | |\ | | | | |/ / | | | | | | | | | | | | 3454f123d0a10bd0ce0760828996aa26c80a8fd4
| | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-130-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | ffb497743831ae4857b674629b58ea3c46d01431
| | | | | | * Improve ANR diagnostics.Jeff Brown2014-10-122-51/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print more details about the exact reason that an ANR has occurred. Also start checking that the window actually has a registered input connection that is not in a broken state. These windows are supposed to be cleaned up by the window manager promptly as if the app had crashed but the pattern of ANRs we are observing suggests that broken windows might be sticking around longer than they should. Bug: 17721767 Change-Id: Ie2803a3fa9642381ecadc198fec15e1b70d93c20
| | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-120-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | 9ea09757fa63ad2a9bea9c846b51c1210d69c79f
| | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-090-0/+0
| | | | | | | |\ | | | | | | |/ / | | | | | | | | | | | | | | | | 9ea09757fa63ad2a9bea9c846b51c1210d69c79f
| | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-080-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 7830ef3dd0ff3749d974c2dd85a8fa59dc47aeca
| | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-070-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78639c22acfa5e56d87fd6fe8340d083536b29fc
| | | | | | | | | * Parcel: extra validation/debug code for writeDupFileDescriptorJesse Hall2014-10-061-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary extra debug validation for b/17477219: a Parcel recipient is getting a positive but invalid fd unexpectedly. Trying to track down where it's coming from. Debug code for bug: 17477219 Change-Id: Idb1e71621025a3928c7adc88fd44790e1abd2a01
| | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-060-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7eb4b74f74423dafd88adf94a7984ae927c3a23
| | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-050-0/+0
| | | | | | | | | | |\ | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | a7eb4b74f74423dafd88adf94a7984ae927c3a23
| | | | | | | | | | * Surface: cancel the dequeued buffer when requestBuffer failsJesse Hall2014-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial fix for bug: 17477219 Change-Id: Ibf5a9e26e02c4be8854925a77a70f5c9c7dcf6f2
| | | | | | | | | | * add OMX_VIDEO_AVCLevel52 constantLajos Molnar2014-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17676461 Change-Id: I120041e9b2ffe2a232a2419bcb5fe88cb49961cb
| | | | | | | | | | * Add more logging for dup(fd) failureMichael Lentine2014-10-021-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17477219 Change-Id: Ide0ae16d777c9af783023c705c18a93c00999147
| | | | | | | | | | * merge in lmp-release history after reset to lmp-devThe Android Automerger2014-10-020-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ee2c9d20c0fbecf6b4a482eb8d8bfdf85d0d424
| | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-300-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deb71b2812702318900c36b7bcfa9759525ea7cc
| | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | deb71b2812702318900c36b7bcfa9759525ea7cc
| | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71e351d96b551ccdbc39b52a0c66da86cae83701
| | | | | | | | | | | | | | * Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when ↵Aravind Akella2014-09-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the connection is removed from mActiveConnections." This reverts commit 5105960d49bfa86efeeea8f87c87aa96b5771c37. Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0
| | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 728a8da14638e718ede11a7a894705524fc9d171
| | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5105960d49bfa86efeeea8f87c87aa96b5771c37
* | | | | | | | | | | | | | | | | surfaceflinger: don't close fence fds after passing to queueBufferJesse Hall2014-10-211-3/+1
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANativeWindow::queueBuffer takes ownership of the fence fd passed to it, and will close it before returning. SurfaceFlinger's screenshot code was also closing the syncFd it passed to queueBuffer. Most of the time this meant the second close() silently failed, but in a rare race condition the file descriptor could be reused between the two close()s. Bug: 17946343 Change-Id: Ib74fcb1dce52cc21328059c99b7c4c76f41aa3a5
* | | | | | | | | | | | | | | | Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT ↵Jesse Hall2014-10-201-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE)" into lmp-dev
| * | | | | | | | | | | | | | | bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)Jesse Hall2014-10-191-1/+6
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On one device there is a bug, not yet root-caused, that causes fence fds to not make it across binder from producer to consumer in the IGraphicBufferProducer::queueBuffer call. Rather than returning an error, which the producer typically treats as a fatal error, this change allows the buffer to be queued with no fence. This avoids an application crash at the risk of (likely single-frame) visible corruption. Bug: 17946343 Change-Id: I9ca89f94098c455e1e90f5f58d5336c936b04a9c
* | | | | | | | | | | | | | | Add version number to SensorService dump output.Aravind Akella2014-10-191-1/+2
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64f9482ade523ec3fafe14bff14db7196e32413f
* | | | | | | | | | | | | | Migrate CA certificates to all usersRobin Lee2014-10-153-35/+144
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copies the /data/misc/keychain/cacert-* directories to all users on the device, whereas previously they were simply copied to user 0. This is a shallow copy so anything that wasn't supposed to be there will disappear. Bug: 17811821 Change-Id: Iae5909ab8d5efdb83c9c8fdf0e10ab7060d022cc
* | | | | | | | | | | | | media: add kMetadataBufferTypeGraphicBufferLajos Molnar2014-10-131-0/+18
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935149 Change-Id: I1c26d1e83d8fa0a9ccdb25f6f3b19a86b1dc6f37
* | | | | | | | | | | | Improve ANR diagnostics.Jeff Brown2014-10-102-51/+71
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print more details about the exact reason that an ANR has occurred. Also start checking that the window actually has a registered input connection that is not in a broken state. These windows are supposed to be cleaned up by the window manager promptly as if the app had crashed but the pattern of ANRs we are observing suggests that broken windows might be sticking around longer than they should. Bug: 17721767 Change-Id: Ie2803a3fa9642381ecadc198fec15e1b70d93c20
* | | | | | | | | | | Fix broken error check in Parcel::readBlobNarayan Kamath2014-10-081-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mmap returns MAP_FAILED (which is -1) and not NULL on failure. Diagnosed by cferris. bug: 17909809 Change-Id: I609788ebf94742ef88af002d2d3f3bc9b9e520ac
* | | | | | | | | | Change ordering of memory allocation and calling Thread::run().Aravind Akella2014-10-071-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases this is causing a crash as device.poll is called with NULL. Bug: 17896339 Change-Id: Id431599f2c661338c355c7081b6602f8449a9198
* | | | | | | | | Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into ↵Jesse Hall2014-10-061-0/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | Parcel: extra validation/debug code for writeDupFileDescriptorJesse Hall2014-10-061-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary extra debug validation for b/17477219: a Parcel recipient is getting a positive but invalid fd unexpectedly. Trying to track down where it's coming from. Debug code for bug: 17477219 Change-Id: Idb1e71621025a3928c7adc88fd44790e1abd2a01
* | | | | | | | | Merge "Fix sockfd leakage in SensorService." into lmp-devAravind Akella2014-10-034-40/+142
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix sockfd leakage in SensorService.Aravind Akella2014-10-024-40/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) Call removeFd() only if the fd in the BitTube has been previously added to the Looper. Use a flag to determine whether the fd has been previously added or not. ii) Increment mPendingFlushEventsToSend after holding a connectionLock. iii) Store the number of acks that are pending in SensorEventQueue and send them all at once. Bug: 17472228 Change-Id: I1ec834fea1112a9cfbd9cddd2198438793698502
* | | | | | | | | Generate the SurfaceFlinger shader cache on initializationRiley Andrews2014-10-032-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blobcache is not yet enabled for surfaceflinger (as it should be). As a temporary workaround, generate all needed shaders during surfaceflinger initialization instead of doing the compilation on-demand during ui transitions. Change-Id: I14455b20a3f85f177d85c9c8b76d8ccc35379b39
* | | | | | | | | Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into ↵Jesse Hall2014-10-021-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | | Surface: cancel the dequeued buffer when requestBuffer failsJesse Hall2014-10-021-0/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Partial fix for bug: 17477219 Change-Id: Ibf5a9e26e02c4be8854925a77a70f5c9c7dcf6f2
* | | | | | | | | Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-devLajos Molnar2014-10-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add OMX_VIDEO_AVCLevel52 constantLajos Molnar2014-10-011-0/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17676461 Change-Id: I120041e9b2ffe2a232a2419bcb5fe88cb49961cb
* | | | | | | | | Merge "Add more logging for dup(fd) failure" into lmp-devMichael Lentine2014-10-021-3/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add more logging for dup(fd) failureMichael Lentine2014-10-021-3/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17477219 Change-Id: Ide0ae16d777c9af783023c705c18a93c00999147
* | | | | | | | Merge "Accept socket connection before tracing." into lmp-devChristopher Ferris2014-10-021-3/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Accept socket connection before tracing.Christopher Ferris2014-10-011-3/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes dumping threads takes a long time and bugreport times out. This change will cause us to accept the bugreport socket connection before dumping threads and should avoid the failed to connect to dumpstate service problems we've seen. Bug: 17758374 Change-Id: I80afa0353cf1c340873f481a8d1d7faffff54120
* | | | | | | Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-devMichael Lentine2014-10-012-4/+12
|\ \ \ \ \ \ \
| * | | | | | | When eglMakeCurrent fails we need to fix the egl state.Michael Lentine2014-10-012-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16676660 Change-Id: Ie7bee9c78378b9e9206060444319e6ee35e1ab74