summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Change a debug log to a verbose log.Narayan Kamath2014-01-021-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike ALOGV, messages from ALOGD are logged on all configurations. Not finding an entry in a zip file is a "normal" occurrence so using an ALOGD message for it amounts to spam. Change-Id: I2c60d11e8a750be5106afd65c3c5e335f53f01b6
* | | | | | Merge "toolbox-ls: re-introduce clobbered error message"Nick Kralevich2014-01-031-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | toolbox-ls: re-introduce clobbered error messageWilliam Roberts2014-01-031-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 403b1955 clobbered the error message on lstat() calls. Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
* | | | | Merge "Switch ARM back to libcorkscrew temporarily."Elliott Hughes2014-01-021-2/+5
|\ \ \ \ \
| * | | | | Switch ARM back to libcorkscrew temporarily.Elliott Hughes2014-01-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're seeing major stack trace generation performance regression and want to find out whether it's libunwind. Bug: 12181612 Change-Id: I3866ea956859f5cbdfe4f1ee6f20a2b6d39962c4
* | | | | | Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."Nick Kralevich2014-01-021-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.Stephen Smalley2013-12-231-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If checkreqprot == 1, SELinux only checks the protection flags passed by the application, even if the kernel internally adds PROT_EXEC for READ_IMPLIES_EXEC personality flags. Switch to checkreqprot == 0 to check the final protection flags applied by the kernel. Change-Id: Ic39242bbbd104fc9a1bcf2cd2ded7ce1aeadfac4 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | Merge "ueventd: fix a busy loop while reading uevents"Colin Cross2013-12-282-2/+2
|\ \ \ \ \
| * | | | | ueventd: fix a busy loop while reading ueventsAmir Goldstein2013-11-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under certain conditions, poll() may raise the POLLERR flag along with POLLIN, in which case the check for (ufd.revents == POLLIN) results in an endless busy loop. The following fix was applied to hardware/libhardware_legacy/uevent/uevent.c to fix a similar bug: commit 3aabb260ceef10377c31c9e45fb239247f5cfeba Author: Mathias Agopian <mathias@google.com> Date: Mon Oct 1 14:53:18 2012 -0700 fix a typo in uevent_next_eventi Bug: 7114973 Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2 Applying the same fix for two more poll loops in init and ueventd. Change-Id: I50693f6d3c904992ac4b8a9a14a83c7106e6b9e0
* | | | | | Merge "Run the console service shell in the shell domain."Colin Cross2013-12-271-0/+1
|\ \ \ \ \ \
| * | | | | | Run the console service shell in the shell domain.Stephen Smalley2013-12-231-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows it to be permissive in userdebug/eng builds but confined/enforcing in user builds. Change-Id: Ie322eaa0acdbefea2de4e71ae386778c929d042b Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | Merge changes Ie4b641cd,I5502b71d,I68086ce4Colin Cross2013-12-2713-1/+1526
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: libion: add apache license header to ion_test.c libion: initial unit tests libion: update ion_test.h
| * | | | | libion: add apache license header to ion_test.cColin Cross2013-12-191-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4b641cd62b56f713178932cc5c08083c0d2452a
| * | | | | libion: initial unit testsColin Cross2013-12-1910-0/+1506
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5502b71d0c7c24d7fd59e4880033657f840b341a
| * | | | | libion: update ion_test.hColin Cross2013-12-192-1/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ion_test.h to include a padding word to keep the same struct size on 32-bit and 64-bit. Change-Id: I68086ce49ca4cc4ed8e251752eaed331a35fbbd2
* | | | | Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9ddColin Cross2013-12-198-294/+691
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: libion: update to latest uapi header libion: return -errno from ion_close libion: add include for size_t libion: add NULL checks libion: clean up whitespace libion: move ion.h into local include directory
| * | | | | libion: update to latest uapi headerColin Cross2013-12-185-3/+382
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull the uapi headers from android-3.10 directly into libion. No other modules should be directly calling ion kernel interfaces, so there is no reason to have those interfaces exposed. Change-Id: I2d3fef08f6bb381522ecf7bcffea2b8280d5e737
| * | | | | libion: return -errno from ion_closeColin Cross2013-12-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return -errno from ion_close instead of -1 on error. Change-Id: Idb828aa4b4d1a660b79d2dba8be32f306eac959d
| * | | | | libion: add include for size_tColin Cross2013-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sys/types.h include for size_t Change-Id: Ica764b1f5eca2df21d82c86493fc4e0d70b6628a
| * | | | | libion: add NULL checksColin Cross2013-12-181-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for NULL in any library function that takes a pointer. Change-Id: I9ae8887b5ae0f231583173ee6a9dfd2f8c4611ec
| * | | | | libion: clean up whitespaceColin Cross2013-12-183-294/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert everything to 4 space indents, no tabs. Change-Id: I376fad866864f0579b91ffad406e872fcce566ad
| * | | | | libion: move ion.h into local include directoryColin Cross2013-12-182-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export it to users of libion with LOCAL_C_EXPORT_INCLUDE_DIRS Change-Id: I4d00a9dd2e99953723994d0304ca77e0ad50a3a9
* | | | | | Merge "ion: update struct and type definitions to match kernel header"Colin Cross2013-12-193-16/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | ion: update struct and type definitions to match kernel headerRom Lemarchand2013-12-183-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replacing struct ion_handle * with ion_user_handle_t - Replacing heap_mask field name with heap_id_mask Change-Id: Iaba1ccc62b9398a7b37c5a734bc21a9ecbbc8277
* | | | | | Merge "adb: Check sender's socket id when receiving packets."Nick Kralevich2013-12-193-21/+88
|\ \ \ \ \ \
| * | | | | | adb: Check sender's socket id when receiving packets.David 'Digit' Turner2013-12-163-21/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_packet() in adb.c didn't check that when an A_WRTE packet is received, the sender's local-id matches the socket's peer id. This meant that a compromised adbd server could sent packets to the host adb server, spoofing the identity of another connected device if it could "guess" the right host socket id. This patch gets rid of the issue by enforcing even more checks to ensure that all packets comply with the description in protocol.txt. + Fix a bug where closing a local socket associated with a remote one would always send an A_CLSE(0, remote-id, "") message, though protocol.txt says that should only happen for failed opens. The issue was that local_socket_close() called remote_socket_close() after clearing the remote socket's 'peer' field. The fix introduces a new asocket optional callback, named 'shutdown' that is called before that, and is used to send the A_CLSE() message with the right ID in remote_socket_shutdown(). Also add some code in handle_packet() to detect invalid close commands. Change-Id: I9098bc8c6e81f8809334b060e5dca4fc92e6fbc9
* | | | | | | Merge "Make libutils Looper independent of frameworks/native"Brian Carlstrom2013-12-193-122/+211
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Make libutils Looper independent of frameworks/nativeBrian Carlstrom2013-12-183-122/+211
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I1dacca10a3cd7601abc3451b69ed761bf71c38fe
* | | | | | Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"Greg Hackmann2013-12-181-14/+80
|\ \ \ \ \ \
| * | | | | | toolbox: date: use RTC subsystem on devices without /dev/alarmGreg Hackmann2013-12-171-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48c0fd1f4cffef936afb8d48d6d93babf006004d Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | Merge "toolbox: date: fix parameter type warnings"Greg Hackmann2013-12-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | toolbox: date: fix parameter type warningsGreg Hackmann2013-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I810a9abee8bc0061c5007fe08197384f2b85754b Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"Greg Hackmann2013-12-181-4/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | toolbox: uptime: use clock_gettime() on devices without /dev/alarmGreg Hackmann2013-12-171-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id7287ca179cc0b8390c054803a25a961dd550a34 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | Merge "toolbox: uptime: fix unused parameter warnings"Greg Hackmann2013-12-181-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | toolbox: uptime: fix unused parameter warningsGreg Hackmann2013-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id240ce85bf09e1a81f4e2e2a7496ac7952edbf38 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"Greg Hackmann2013-12-181-16/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | SystemClock: use clock_gettime() on devices without /dev/alarmGreg Hackmann2013-12-171-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On devices with an up-to-date kernel, the back-in-time bug affecting clock_gettime() has been fixed and it can safely be used as an alternative to the ANDROID_ALARM_GET_TIME ioctl. To ensure consistent behavior on existing devices, make clock_gettime() a fallback for when the alarm driver isn't available. Change-Id: I384af5e7ec9e73e0bad4b6b0f987a8ea4583cba6 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | Merge "rootdir: add permissions for /dev/rtc0"Greg Hackmann2013-12-181-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | rootdir: add permissions for /dev/rtc0Greg Hackmann2013-12-171-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9d853bdae2399b1e7434f45df375ba1fd6dbe9c Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | Merge "libdiskconfig: Use uintptr_t instead of uint32_t"Elliott Hughes2013-12-171-1/+1
|\ \ \ \ \ \
| * | | | | | libdiskconfig: Use uintptr_t instead of uint32_tAshok Bhat2013-12-171-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use uintptr_t instead of uint32_t when pointer is cast to an integer type. Change-Id: I03dd4c7ff66611661af466dfb7b393d461bb2d7d Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | Merge "AArch64: Correction of struct surface_t"Elliott Hughes2013-12-161-9/+11
|\ \ \ \ \ \
| * | | | | | AArch64: Correction of struct surface_tMarcus Oakland2013-12-101-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The struct in the union with GGLSurface in struct surface_t assumed that the reserved field, which corresponds to the GGLsizei version field in the GGLSurface structure (where GGLsizei is define as being ssize_t in the system/core/include/pixelflinger/pixelflinger.h header file) is uint32_t. That is appropriate to the 32-bit system but is not appropriate to the 64-bit system, where ssize_t is 64-bits rather than 32-bits. The 32-bit system has also been tested and has no regression because of this change. Change-Id: I5cd84fd4a18fa0e63e27975f7b3d3e95b99cea58 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | | | | Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."Elliott Hughes2013-12-1625-12/+4244
|\ \ \ \ \ \ \
| * | | | | | | Pixelflinger: Add AArch64 support to pixelflinger JIT.Ashok Bhat2013-12-1225-12/+4244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the comment-block at the top of Aarch64Assembler.cpp for overview on how AArch64 support has been implemented In addition, this commit contains [x] AArch64 inline asm versions of gglmul series of functions and a new unit test bench to test the functions [x] Assembly implementations of scanline_col32cb16blend and scanline_t32cb16blend for AArch64, with unit test bench Change-Id: I915cded9e1d39d9a2a70bf8a0394b8a0064d1eb4 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"Elliott Hughes2013-12-167-19/+80
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Pixelflinger: Support for handling 64-bit addresses in GGL AssemblerAshok Bhat2013-12-127-19/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GGLAssembler assumes addresses to be 32-bit and uses ARM 32-bit instructions to load/store/manipulate addresses. To support, 64-bit architectures, following changes has been done 1. ARMAssemblerInterface has been extended to support four new operations ADDR_LDR, ADDR_STR, ADDR_SUB, ADDR_ADD. Base class implements these virtual functions to use 32bit equivalent function. This avoids existing 32-bit Assembler backend implementations like ARMAssembler and MIPSAssembler from mapping the new functions to existing equivalent routines. This also allows 64-bit Architectures like AArch64 to override the function in their assembler backend implementations. 2. GGLAssembler code (spread over GGLAssembler.cpp, GGLAssembler.h and texturing.cpp) has been changed to use the new operations for address operations. Change-Id: I3d7eace4691e3e47cef737d97ac67ce6ef4fb18d Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | Merge "Relabel /data/misc/zoneinfo"Nick Kralevich2013-12-161-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Relabel /data/misc/zoneinfoNick Kralevich2013-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files in zoneinfo changed from system_data_file to zoneinfo_data_file. Fixup pre-existing files. Change-Id: Idddbd6c2ecf66cd16b057a9ff288cd586a109949
generated by cgit v1.1 at 2025-01-13 03:04:26 +0000