summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libui: Add Rect(uint32_t, uint32_t)Dan Stoza2015-01-211-0/+17
| | | | | | | Adds a Rect constructor that takes uint32_t instead of int32_t, as required by a change to Region and -Werror Change-Id: If91915e5b4ec9ce9e7ba0fb84f03b045d000b023
* am 4ecf6ec9: Merge "Restore Region::set(uint32_t, uint32_t)"Dan Stoza2015-01-222-0/+7
|\ | | | | | | | | * commit '4ecf6ec932644b680d5e13791275dd3bc1a1ee6d': Restore Region::set(uint32_t, uint32_t)
| * Merge "Restore Region::set(uint32_t, uint32_t)"Dan Stoza2015-01-212-0/+7
| |\
| | * Restore Region::set(uint32_t, uint32_t)Bernhard Rosenkraenzer2014-12-222-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Region::set(uint32_t,uint32_t) ABI is used by the Nexus 10 graphics driver blobs. After commit dd883c0b08d2a60f89542b9b9f5fdabcb14885c7, Nexus 10 blobs need a rebuild unless the old ABI is added back Change-Id: I138dcc1cc281b8d3cde0021282bf874054ec4eaf Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | am ef1c17ae: SurfaceFlinger: Make log message 64-bit compatibleDan Stoza2015-01-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * commit 'ef1c17ae9417abc1e21e49dbc629e448efc947dc': SurfaceFlinger: Make log message 64-bit compatible
| * | | SurfaceFlinger: Make log message 64-bit compatibleDan Stoza2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the build on 64-bit targets that complain about using a size_t with a %d in a format string Change-Id: I7dfcd3a49eb0dbc5dffeb82bb7208de7f7925f08
* | | | resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aospDan Stoza2015-01-162-1/+98
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I1f38cbe7019b2b48b1094dee154ad97c23fd22c2
| * | | SurfaceFlinger: Attempt to attribute fds to layersDan Stoza2015-01-162-1/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks fds when layers are created and destroyed in an effort to determine which specific app (if any) is active when fds are leaked Bug: 19017008 Change-Id: I1f1d5a9cbc1399e3df3a2d350324f80b3a4e3477
* | | | am 8f3ade0c: Merge "Follow StrictMode refactoring."Jeff Sharkey2015-01-161-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc': Follow StrictMode refactoring.
| * | | Merge "Follow StrictMode refactoring."Jeff Sharkey2015-01-161-1/+1
| |\ \ \
| | * | | Follow StrictMode refactoring.Jeff Sharkey2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18335678 Change-Id: Iea920cfa26b5ebfd77b4601c9e6e65b21599342a
* | | | | am 1d463883: Merge "Use the timeout stack dump functions."Christopher Ferris2015-01-150-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1d4638838aa09b157a68cb3580b8194f8736b880': Use the timeout stack dump functions.
| * | | | Merge "Use the timeout stack dump functions."Christopher Ferris2015-01-151-5/+13
| |\ \ \ \
| | * | | | Use the timeout stack dump functions.Christopher Ferris2015-01-151-5/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the native stack dumping functions that allows time outs. If debuggerd locks up, before a bugreport would hang forever. Now it will timeout properly and still get all of the other information. Bug: 18766581 (cherry picked from commit 457731f69e3106b5aae8fc04f9565af1d875876c) Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
* | | | | am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""Jeff Davidson2015-01-1510-5256/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4df903dbc71c48e2db6fae9390795b81782470b4': Revert "Revert "Update protobuf library from 2.3 to 2.6.""
| * | | | Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""Jeff Davidson2015-01-1510-5256/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Revert "Revert "Update protobuf library from 2.3 to 2.6.""Jeff Davidson2015-01-1210-5256/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bca4262dac55cc59b28d6fde658d5f8a254fcc2d. Change-Id: I8ecd859340779dfacffba4c6d1a44c5cdbdfceed
* | | | | am 457731f6: Use the timeout stack dump functions.Christopher Ferris2015-01-151-5/+13
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '457731f69e3106b5aae8fc04f9565af1d875876c': Use the timeout stack dump functions.
| * | | | Use the timeout stack dump functions.Christopher Ferris2015-01-141-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the native stack dumping functions that allows time outs. If debuggerd locks up, before a bugreport would hang forever. Now it will timeout properly and still get all of the other information. Bug: 18766581 Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
* | | | | am d195f87b: Fix message when a command times out.Christopher Ferris2015-01-150-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd195f87b2dd4aa731a21ef3acd321e2441c5bffb': Fix message when a command times out.
| * | | | Fix message when a command times out.Christopher Ferris2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version printed out the nanoseconds elapsed, not seconds. Bug: 18766581 (cherry picked from commit 67c5a8af9ed128d8bb56d4723303aef6f0a4500f) Change-Id: Icbaaee83a92767694fd98e3c790f36f4d24681b0
* | | | | am aec92242: Merge "Replace all instances of intptr_t with uintptr_t."Riley Andrews2015-01-131-8/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'aec922426620804768f00a6c5cb902f278f2967f': Replace all instances of intptr_t with uintptr_t.
| * | | | Merge "Replace all instances of intptr_t with uintptr_t."Riley Andrews2015-01-131-8/+8
| |\ \ \ \
| | * | | | Replace all instances of intptr_t with uintptr_t.Riley Andrews2015-01-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling 32 bit binaries against a 64 bit binder interface, implicit promotions of intptr_t types to uint64_t for fields in the binder ioctl structures can result in invalid pointers because of sign extension.
* | | | | | am 41a160c4: Merge "Fix signed/unsigned comparison warnings in driver ↵Riley Andrews2015-01-131-7/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface test." * commit '41a160c4cda1ef2c916028ec2d0801da738b5249': Fix signed/unsigned comparison warnings in driver interface test.
| * | | | | Merge "Fix signed/unsigned comparison warnings in driver interface test."Riley Andrews2015-01-131-7/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix signed/unsigned comparison warnings in driver interface test.Riley Andrews2015-01-121-7/+7
| | | | | |
* | | | | | am 6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"Brian Carlstrom2015-01-133-3/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a': [MIPS] Build libGLES for mips64, mips32r6
| * | | | | Merge "[MIPS] Build libGLES for mips64, mips32r6"Brian Carlstrom2015-01-133-3/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [MIPS] Build libGLES for mips64, mips32r6Duane Sand2015-01-123-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, use generic C code instead of assembler. Change-Id: I604ecdcde2d5373f1f68ab97a63a80667b630846
* | | | | | am 5b730570: Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"Jesse Hall2015-01-121-9/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '5b730570be2bd1f90346a5921d0b70dc11351396': surfaceflinger: use Mutex timedLock instead of tryLock loop
| * | | | | Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"Jesse Hall2015-01-121-9/+6
| |\ \ \ \ \
| | * | | | | surfaceflinger: use Mutex timedLock instead of tryLock loopJesse Hall2015-01-101-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than trying to acquire the state lock without waiting three times at 1 second intervals in SurfaceFlinger::dump(), just try to acquire the lock once with a 1 second timeout. Avoids spurious mutex acquire failures that lead to flaky com.android.cts.jank.opengl.CtsHostJankOpenGl results. Bug: 18842510 Change-Id: I00ce6109647de2aef8831dd2f8fa98652ba7f4e0
* | | | | | | am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""Jeff Davidson2015-01-1210-13/+5256
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '83f14309f17af398ec8ff7f82d9b2f010ea7cd5f': Revert "Update protobuf library from 2.3 to 2.6."
| * | | | | | Merge "Revert "Update protobuf library from 2.3 to 2.6.""Jeff Davidson2015-01-1210-13/+5256
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Revert "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-1210-13/+5256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a42cdf169060e1bb65c77bc8a394d266403d8583. Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6
* | | | | | | am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-1210-5256/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9200d4e3bf0bf9bf21d9bb335e04818364bf12a8': Update protobuf library from 2.3 to 2.6.
| * | | | | | Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-1210-5256/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-0810-5256/+13
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove generated cpp/h files for gltrace.proto as we can use the build system to generate these dynamically. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
* | | | | | am 4f9bfffe: Merge "Fix message when a command times out."Christopher Ferris2015-01-121-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '4f9bfffe23d40fdaabe91ea7c7691e52800edb79': Fix message when a command times out.
| * | | | | Merge "Fix message when a command times out."Christopher Ferris2015-01-121-1/+1
| |\ \ \ \ \
| | * | | | | Fix message when a command times out.Christopher Ferris2015-01-091-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version printed out the nanoseconds elapsed, not seconds. Change-Id: I10f6d7bf7b7a4647658313ed83781fda6fd744a5
* | | | | | am 806f23de: OpenMax IL: Added support for E-AC3 codec configuration paramsRachad2015-01-102-0/+11
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '806f23de71be2494cfabbe08d11c09606966a5d5': OpenMax IL: Added support for E-AC3 codec configuration params
| * | | | | OpenMax IL: Added support for E-AC3 codec configuration paramsRachad2014-12-232-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17883772 Change-Id: Ibf00534607db4bba14c935cf1eaa80eb740297f9
* | | | | | am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the ↵Elliott Hughes2015-01-102-9/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | openssl headers." * commit 'a7dcab6954467fa3726824a099b83d0e7490d6d5': We have POSIX clocks, and we don't need to ask for the openssl headers.
| * | | | | Merge "We have POSIX clocks, and we don't need to ask for the openssl headers."Elliott Hughes2015-01-102-9/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | We have POSIX clocks, and we don't need to ask for the openssl headers.Elliott Hughes2015-01-092-9/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code doesn't need to run on the Mac, and the BoringSSL transition will be easier without references to external/openssl. Change-Id: I14ea11fa2911af0f4e95e69636e6a2c26126cbe0
* | | | | am 96e4409e: Merge "Installd: Disallow relocation for decryption"Andreas Gampe2015-01-071-15/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '96e4409e8c38b1d79285eca9886d44ff850b5748': Installd: Disallow relocation for decryption
| * | | | Merge "Installd: Disallow relocation for decryption"Andreas Gampe2015-01-071-15/+24
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Installd: Disallow relocation for decryptionneo.chae2015-01-071-15/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decrypting a device, a tmpfs is temporarily mounted as /data, the size of which is usually small. When the zygote, system server and necessary apps are brought up, they will be compiled into the tmpfs. If the system image contains prebuilts, they will be relocated instead of compiled. This is unnecessary. In this special situation it is acceptable to run out of the prebuilt oat files without relocation, which can save space in the tmpfs. This patch ensures that apps are not being relocated. Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b Signed-off-by: Hyangseok Chae <neo.chae@lge.com>