summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "toolbox: swap utils"Rom Lemarchand2013-07-024-1/+192
|\
| * toolbox: swap utilsRom Lemarchand2013-06-254-1/+192
| | | | | | | | | | | | | | Add swap utilities (mkswap, swapon, swapoff) to the toolbox Change-Id: If5ed6981670a1cdda6b528b587dbc1be7ccdf832 Signed-off-by: Rom Lemarchand <romlem@google.com>
* | fastboot: add support for sparse images in flashall and updateRom Lemarchand2013-07-011-95/+171
| | | | | | | | | | Change-Id: I66a73b16a988a65fc91fb22a26d11986025089de Signed-off-by: Rom Lemarchand <romlem@google.com>
* | fastboot: Remove legacy MINGW workaroundsRom Lemarchand2013-06-283-90/+4
| | | | | | | | | | | | | | | | The version of MINGW we compile with has more advanced POSIX support. Removing legacy MINGW workarounds as those are not needed anymore. Change-Id: Id5d67176b719db6c3667be6d63c41432e0ba9f30 Signed-off-by: Rom Lemarchand <romlem@google.com>
* | Merge "init: allow disabling selinux via a kernel command line"Nick Kralevich2013-06-281-3/+48
|\ \
| * | init: allow disabling selinux via a kernel command lineNick Kralevich2013-06-281-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new "androidboot.selinux" option, to control how userspace handles SELinux. This kernel command line can have three options: * disabled * permissive * enforcing "disabled" completely disables userspace support for SELinux. No policy is ever loaded, nor is the SELinux filesystem /sys/fs/selinux ever mounted. "permissive" loads the SELinux policy, but puts SELinux into permissive mode. SELinux policy violations are logged, but not rejected. "enforcing", the default, loads the SELinux policy, and places SELinux into enforcing mode. Policy violations are rejected. This change addresses post review comments for change b710ed21dec88c0dde8209264df054c842561589 . Change-Id: I912583db8e6a0e9c63380de32ad8ffc47a8a440f
* | | Merge "Add defines for audio offload and non-blocking write"Eric Laurent2013-06-281-1/+33
|\ \ \
| * | | Add defines for audio offload and non-blocking writeRichard Fitzgerald2013-06-271-1/+33
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Defines audio output flags for offloaded playback of compressed streams, and non-blocking HAL write()/drain() - Adds audio_offload_info_t to pass additional information about a compressed stream when offloading Change-Id: I4592d0877edd39e68d0c1035d0652adbd397bf3a Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Signed-off-by: Eric Laurent <elaurent@google.com>
* | | Merge "Do not exit early on errors when -f is specified"Ken Sumrall2013-06-281-4/+11
|\ \ \
| * | | Do not exit early on errors when -f is specifiedKen Sumrall2013-06-261-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running with the -f option, do not stop recursion or proccessing command line args if an error occurs. Continue trying to remove all the items specified on the command line. However, still return an error status if some files could not be removed. Change-Id: I83d66babe833da8a68aad68248647ba0601c5d32
* | | | Merge "Update the touch command to take a human readable timestamp"Ken Sumrall2013-06-281-4/+31
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Update the touch command to take a human readable timestampKen Sumrall2013-06-261-4/+31
| | | | | | | | | | | | | | | | | | | | | Now the -t option to the toolbox touch command takes a timestamp in the form of YYYYMMDD.hhmmss Change-Id: I3812700edaa1a06590a07c15b050721b49e9b7e0
* | | Merge "Revert "fastboot: add preflash command to help with large ↵jp abgrall2013-06-262-21/+10
|\ \ \ | | | | | | | | | | | | downloads+flash""
| * | | Revert "fastboot: add preflash command to help with large downloads+flash"jp abgrall2013-06-262-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6f1cd0b2ad7a16d4ec0b5324f992cae33dc34f34. It causes some devices to fail (b/9581613). Revert for now. Change-Id: I076158c704c2b4f0459322aa157c19ebd0c4615f
* | | | am b1e3bb27: am b1a9f8cf: resolved conflicts for merge of b6c60285 to ↵Colin Cross2013-06-250-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master * commit 'b1e3bb2798bb6002b186081d9b0234bdfa432a14': init: move initial property area allocation into bionic property_service: make /dev/__properties__ readable
| * \ \ \ am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-masterColin Cross2013-06-241-28/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a': init: move initial property area allocation into bionic property_service: make /dev/__properties__ readable
| | * \ \ \ resolved conflicts for merge of b6c60285 to stage-aosp-masterColin Cross2013-06-241-28/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I5afba55b668065499fa28369cf217d4f5eafab4a
| | | * \ \ \ Merge changes Ieb94caab,I762da21eColin Cross2013-06-251-30/+5
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: init: move initial property area allocation into bionic property_service: make /dev/__properties__ readable
| | | | * | | | init: move initial property area allocation into bionicGreg Hackmann2013-06-191-28/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic's __system_property_add() now expands the property area as needed by mapping in more pages. Rather than duplicate the mapping code, move it inside bionic and have bionic's __system_property_area_init() set up the first page. Signed-off-by: Greg Hackmann <ghackmann@google.com> (cherry picked from commit f14eef0c3c456bfe39f7e9d57c8f7ae4ec775972) Change-Id: Ieb94caab1527c71f2155efe3795490b0ea215a29
| | | | * | | | property_service: make /dev/__properties__ readableNick Kralevich2013-06-191-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, system properties are passed via the environment variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed from parent to child. This is insecure for setuid executables, as the environment variable can be changed by the caller. Make the /dev/__properties__ file accessible, so an app can get properties directly from the file, rather than relying on environment variables. Preserve the environment variable for compatibility with pre-existing apps. Bug: 8045561 (cherry picked from commit 7ece0a862cf97e85bbe69458a32a2bd165456874) Change-Id: I762da21ef4075f288745efed0ec7d16c2b71303c
* | | | | | | | Merge "fastboot: add preflash command to help with large downloads+flash"JP Abgrall2013-06-252-10/+21
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | fastboot: add preflash command to help with large downloads+flashJP Abgrall2013-06-252-10/+21
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the partition name, the bootloader would have to store all of the data until the next flash command, which potentially wastes time. To help the bootloader deal with the data more efficiently, we now issue a flashing hint ("preflash:%s", partname). "preflash:" is used to indicate that the following download should ignore any previous "preflash:%s". Bug: 6045918 Change-Id: I4e9708f64f28a4781bde14eb3714d36b281ec5be
* | | | | | | Merge "init: move SELinux into enforcing mode."Nick Kralevich2013-06-251-21/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | init: move SELinux into enforcing mode.Nick Kralevich2013-06-251-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When init starts up, immediately put SELinux into enforcing mode. This is currently a no-op. We currently have everything in the unconfined domain, so this should not break anything. (if it does, I'll roll it back immediately) If the kernel doesn't have SELinux support compiled in, then don't try loading a policy and continue without SELinux protections. Change-Id: Id0279cf82c545ea0f7090137b7566a5bc3ddd641
* | | | | | | am 372d668a: am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-254-15/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | * commit '372d668a279934ff3b2ec2f07a76fe2f351789d5': init: Retain traditional restart behavior for critical and oneshot services. init: Safely restart services to avoid race conditions.
| * | | | | am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '39021a48a0e0687c654423acd5a4c99a1d79440d': init: Retain traditional restart behavior for critical and oneshot services. init: Safely restart services to avoid race conditions.
| | * | | | am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '83ada447aed69dfcd0a88e952eced8db1e4d6584': init: Retain traditional restart behavior for critical and oneshot services. init: Safely restart services to avoid race conditions.
| | | * | | Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | * changes: init: Retain traditional restart behavior for critical and oneshot services. init: Safely restart services to avoid race conditions.
| | | | * | init: Retain traditional restart behavior for critical and oneshot services.Mike Kasick2012-03-224-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an SVC_RESTART state that's used for an explicit "restart" of a running service. This retains the traditional restart behavior for critical and oneshot services (previously altered by 7e36edd8), whereby these services are "simply restarted" instead of counting as a crash (for a critical serivce) or going into the disabled state (for a oneshot service).
| | | | * | init: Safely restart services to avoid race conditions.Mike Kasick2012-03-221-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, service restarts (either an explicit "restart", or a "stop, start" pair) exhibited a race condition whereby the new (restarting) service process was often spawned before the old (stopping) process had terminated. This may have resulted in the new service process failing to acquire a limited resource (file lock, socket bind, etc.) that the old process had not yet released. Now, a stopping service remains in the SVC_RUNNING state until its exiting process has been reaped by waitpid. This prevents a "stop, start" sequence from spawning a second service process before resources held by the first are released. This enables safe service restarts by stopping the service, waiting for the old service process to terminate, and (only then) starting the new service process. In the event of "restarting" an already stopped service, the previous behavior is maintained whereby the service is simply started. This scenario could be special-cased by the restart command, however, we have observed instances where services are, unintentionally, stopped and started "too quickly," and so simultaneous processes for the same service should never be allowed. Note that this commit alters the behaviors for explicit restarts of critical and oneshot services. Previously these serivces would simply be restarted, whereas now, an explicit restart of a critical service counts as a crash (which may result in a recovery reboot) and oneshot services go into the disabled state.
* | | | | | Merge "init: move initial property area allocation into bionic"Greg Hackmann2013-06-191-28/+5
|\ \ \ \ \ \
| * | | | | | init: move initial property area allocation into bionicGreg Hackmann2013-06-181-28/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic's __system_property_add() now expands the property area as needed by mapping in more pages. Rather than duplicate the mapping code, move it inside bionic and have bionic's __system_property_area_init() set up the first page. Change-Id: If9917d5f775c1a82eb89be55b84635395145ca49 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | am 9270f125: am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-190-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9270f12529fdcadaacd9d2bce3ceeeb07d037aa8': toolbox: reimplement watchprops using __system_property_foreach() libcutils: reimplement property_list() using __system_property_foreach()
| * | | | | | am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a44c31cc91bce7124e896adb072a10f2740a96b4': toolbox: reimplement watchprops using __system_property_foreach() libcutils: reimplement property_list() using __system_property_foreach()
| | * | | | | am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e755dfd43812ebd9a0d0d6a2106316f343ffb5a2': toolbox: reimplement watchprops using __system_property_foreach() libcutils: reimplement property_list() using __system_property_foreach()
| | | * | | | Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: toolbox: reimplement watchprops using __system_property_foreach() libcutils: reimplement property_list() using __system_property_foreach()
| | | | * | | | toolbox: reimplement watchprops using __system_property_foreach()Greg Hackmann2013-06-181-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally, replace the watchlist array with a hashmap since the array assumes properties are enumerated in a consistent order and foreach() probably won't. (find_nth() never guaranteed this either but it usually worked in practice.) Signed-off-by: Greg Hackmann <ghackmann@google.com> (cherry picked from commit 389e358017ad15485f2bd9120feebfffa489131b) Change-Id: I1db3137b130474f4bb205f01f0bdcf37cf974764
| | | | * | | | libcutils: reimplement property_list() using __system_property_foreach()Greg Hackmann2013-06-181-10/+19
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Greg Hackmann <ghackmann@google.com> (cherry picked from commit e7bb159d16f9e60850a3c79cc388587959015a65) Change-Id: I0f66144eb8a4a48e04e4fcd125ad37f19ad94b8e
* | | | | | | Merge "debuggerd: Ignore SIGPIPE"Nick Kralevich2013-06-191-1/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | debuggerd: Ignore SIGPIPENick Kralevich2013-06-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The system server may prematurely close the connection to /data/system/ndebugsocket if it's not interested in the data from debuggerd. If it does so, we don't want to die due to a SIGPIPE. Change-Id: Iaef1f497bcd630144e6df6a06644a3293b85b6e0
* | | | | | | toolbox: reimplement watchprops using __system_property_foreach()Greg Hackmann2013-06-181-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally, replace the watchlist array with a hashmap since the array assumes properties are enumerated in a consistent order and foreach() probably won't. (find_nth() never guaranteed this either but it usually worked in practice.) Change-Id: I83843facdd671edd09652edf472e88ec3d1edd3b Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | libcutils: reimplement property_list() using __system_property_foreach()Greg Hackmann2013-06-181-10/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I273fbf7151908ee57b9b951e7d8c5f4925bbc109 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | Merge "Don't use __attribute__(__error__)"Nick Kralevich2013-06-181-2/+1
|\ \ \ \ \ \
| * | | | | | Don't use __attribute__(__error__)Nick Kralevich2013-06-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __attribute(__error__) isn't supported on clang, and generates compiler warnings. Use __errordecl instead, which does the right thing for different compilers. Change-Id: Ifb0797a5de703cc5b3c39dcd97bcfaf404f1cafa
* | | | | | | am 98c02528: am 19188955: am d92e35eb: Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '98c02528a2f8bdc0f31a78a8b0b086f4ae823310': Add Qisda usb config
| * | | | | | am 19188955: am d92e35eb: Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '19188955b50ef6cb133780f66384e9fa055acfac': Add Qisda usb config
| | * | | | | am d92e35eb: Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit 'd92e35eb7b97f349054390cfee1d40154dba6d66': Add Qisda usb config
| | | * | | | Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
| | | |\ \ \ \
| | | | * | | | Add Qisda usb configesther2013-06-181-0/+3
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add Qisda usb config Signed-off-by: esther <esther530@gmail.com> Change-Id: I5b8a0e5bd2218ecdf417de357c9a7d9307c91932 Conflicts: adb/usb_vendors.c
* | | | | | | Merge "Set ATRACE_ENABLE() to '0' if not availble"Stephen Hines2013-06-181-1/+1
|\ \ \ \ \ \ \
generated by cgit v1.1 at 2025-10-25 21:27:37 +0000