summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am edeed28b: am 4a280e3d: Merge "Don\'t use control requests to read device ↵jp abgrall2013-09-171-78/+103
|\ | | | | | | | | | | | | serial numbers." * commit 'edeed28bd397f863686ba3e5bb7479f881efc657': Don't use control requests to read device serial numbers.
| * am 4a280e3d: Merge "Don\'t use control requests to read device serial numbers."jp abgrall2013-09-171-78/+103
| |\ | | | | | | | | | | | | * commit '4a280e3dbe002bb5419ec010f89cdc158244e435': Don't use control requests to read device serial numbers.
| | * Merge "Don't use control requests to read device serial numbers."jp abgrall2013-09-171-78/+103
| | |\
| | | * Don't use control requests to read device serial numbers.Mark Wachsler2013-09-161-78/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of sending control requests to all devices to read their serial numbers, read the cached strings from sysfs. This fixes two problems: 1) The control requests sometimes timed out, causing devices to show up as "????????????????", and 2) a control request could mess up devices which were in the middle of being flashed. Also enumerate by walking sysfs rather than devs so that we can avoid opening host controller devices, which can be slow. On a system with 10 EHCI controllers, fastboot devices now takes 7 msec instead of 700 msec. Change-Id: I2ad2d58b48268d7950bd279fd6a6753dc2f79514
* | | | am 3a0d4b34: Merge "property_service: better validate property names" into ↵Nick Kralevich2013-09-161-4/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '3a0d4b34816d65e21951f44e4d98a954c5c855ae': property_service: better validate property names
| * \ \ \ Merge "property_service: better validate property names" into klp-devNick Kralevich2013-09-161-4/+37
| |\ \ \ \
| | * | | | property_service: better validate property namesNick Kralevich2013-09-161-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow unexpected characters in property names. Don't allow double dots in property names. Bug: 10733330 Change-Id: I8d69740d697efb791f2f201f90989576e13bac81
* | | | | | am c0ce002a: Merge "Initial libmemtrack" into klp-devRom Lemarchand2013-09-134-0/+503
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c0ce002ae53613f622c3bb2cae258a779e22770c': Initial libmemtrack
| * | | | | Merge "Initial libmemtrack" into klp-devRom Lemarchand2013-09-134-0/+503
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Initial libmemtrackColin Cross2013-09-064-0/+503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmemtrack is an interface to a device-specific Memory Tracker HAL to account for memory that may not show up in the normal memory usage tools that walk /proc/pid/maps. Bug: 10294768 Change-Id: I436f6799898df0bf8bf29747be3bc9dea5721185
* | | | | | am 56b93693: am 6ed51b8a: Merge "mkbootimg: support longer kernel command lines"Dima Zavin2013-09-132-3/+17
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '56b93693fa6e3c470ba48047839555ba23d6a947': mkbootimg: support longer kernel command lines
| * | | | | am 6ed51b8a: Merge "mkbootimg: support longer kernel command lines"Dima Zavin2013-09-132-3/+17
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '6ed51b8a2d6c64a44b58230a0b53a109169edd1a': mkbootimg: support longer kernel command lines
| | * | | | Merge "mkbootimg: support longer kernel command lines"Dima Zavin2013-09-132-3/+17
| | |\ \ \ \
| | | * | | | mkbootimg: support longer kernel command linesAndrew Boie2013-09-092-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't simply increase the value of BOOT_ARGS_SIZE since that would break past binary compatibility; the offset of 'id' would change. This can cause serious problems with incremental OTA updates. Instead, define a supplemental field which stores command line information beyond the first 512 bytes. A value of 1024 was chosen to keep the total size of struct boot_img_hdr under the smallest page size of 2048 bytes. Even if the extra_cmdline field is used, the original cmdline field is still always NULL-terminated to avoid issues with older bootloaders that haven't been updated. Change-Id: I887e6f1db351a5b71a61e3a03363cf8856123d74 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | | | am 5951a369: am b4819e4a: Merge "init: support longer command lines"Dima Zavin2013-09-131-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5951a3691eb0378ec65ea2e6a2e2fe77d24c5e55': init: support longer command lines
| * | | | | | am b4819e4a: Merge "init: support longer command lines"Dima Zavin2013-09-131-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b4819e4adaee86884725754d4966c7b78a61fb11': init: support longer command lines
| | * | | | | Merge "init: support longer command lines"Dima Zavin2013-09-131-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | | * | | init: support longer command linesAndrew Boie2013-09-091-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Linux kernel supports command lines up to 2048 bytes on x86, see COMMAND_LINE_SIZE in asm/setup.h. If any androidboot.xxxx arguments were past the 1024 byte limit here, they were lost. Change-Id: I6247c511a7de04109490fffa0125801d274a5501 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | am 53dc297d: Merge "Add HOTWORD audio source to audio.h" into klp-devEric Laurent2013-09-111-0/+5
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '53dc297dd685aa7498203fddb3f85e60f2cbc7df': Add HOTWORD audio source to audio.h
| * | | | Merge "Add HOTWORD audio source to audio.h" into klp-devEric Laurent2013-09-121-0/+5
| |\ \ \ \
| | * | | | Add HOTWORD audio source to audio.hEric Laurent2013-09-091-0/+5
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This is a complimentary change to the one adding this new source to MediaRecorder.java Bug: 10640877. Change-Id: Ie213e82b5a60dad2a277cef367c2f5e4df70df06
* | | | | am 67b00d8b: init.rc: change mem cgroups permissionsRom Lemarchand2013-09-101-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '67b00d8b2d96e8133c249bcbc0fb63c49e10e022': init.rc: change mem cgroups permissions
| * | | | init.rc: change mem cgroups permissionsRom Lemarchand2013-09-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing mem cgroups permissions to only be accessible by root and system. Bug: 10210529 Bug: 10210900 Change-Id: Ib4fff6f49b33013b3629d40ae98a5e2464571b2d
* | | | | am ff9ec2d9: healthd: perform periodic chores when awake and on battery powerTodd Poynor2013-09-091-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ff9ec2d9990fbf9a707df063f3d43e9169bdde16': healthd: perform periodic chores when awake and on battery power
| * | | | healthd: perform periodic chores when awake and on battery powerTodd Poynor2013-09-091-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monitor battery/charging status at normal awake rate when on battery power. Bug: 10650797 Change-Id: I914d24af4963ab9d52b03c0a2615ad653ced9b12
* | | | am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."Colin Cross2013-09-051-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'c9ff37144a7943ee1bc247cef3620c8cce22049d': fix valgrind ioctl warning.
| * | | am 596e9c63: Merge "fix valgrind ioctl warning."Colin Cross2013-09-051-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '596e9c6314e4f2869499bcdbb816680ddb10c88f': fix valgrind ioctl warning.
| | * | Merge "fix valgrind ioctl warning."Colin Cross2013-09-051-1/+1
| | |\ \
| | | * | fix valgrind ioctl warning.Jin Wei2013-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize local variable to avoid syscall ioctl warning. Change-Id: Ibad5b86cd799f147c71f182d654e61318e2ac15e Origin-Change-Id: Iedf5b128ae1743f633d2821ac3e402942ad6642b Signed-off-by: Jin Wei <wei.a.jin@intel.com> Signed-off-by: Jian Luo <jian.luo@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 62797
* | | | | am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the ↵Ben Cheng2013-09-041-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | warning." * commit '8fb85b37af1753ce6bc5d88a04485a6c805bb3a3': Add -Wno-unused-parameter to suppress the warning.
| * | | | am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."Ben Cheng2013-09-041-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2b2f1ae86fb791e9f2fff25f93e7f2c4db010bf6': Add -Wno-unused-parameter to suppress the warning.
| | * | | Merge "Add -Wno-unused-parameter to suppress the warning."Ben Cheng2013-09-041-2/+2
| | |\ \ \
| | | * | | Add -Wno-unused-parameter to suppress the warning.Ben Cheng2013-09-041-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example in system/core/libcorkscrew/arch-arm/backtrace-arm.c: system/core/libcorkscrew/arch-arm/backtrace-arm.c:555:49: error: unused parameter 'siginfo' [-Werror=unused-parameter] Change-Id: Ibe13e8761a2f57324c0f0d87d9add549a20aa37a
* | | | | am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"Colin Cross2013-09-031-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9dd40e9756de23a25aaa9909c8d4055105621a76': [GNSS] Add AID_GPS to property user white list
| * | | | am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"Colin Cross2013-09-031-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd171b6567023f7f840b3a145ec27b5723750dc18': [GNSS] Add AID_GPS to property user white list
| | * | | Merge "[GNSS] Add AID_GPS to property user white list"Colin Cross2013-09-041-0/+2
| | |\ \ \
| | | * | | [GNSS] Add AID_GPS to property user white listNicolas SUET2013-08-261-0/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "gps." and "persist.gps." to property_perms white list. Change-Id: I7177170676d774c87e08d1548f5264ac27cba3ff Orig-Change-Id: I7a94caa26be4aefd2fe4f155908e2f8f09858bee Signed-off-by: Nicolas SUET <nicolas.suet@intel.com> Signed-off-by: jerome Pantaloni <jeromex.pantaloni@intel.com> Signed-off-by: Jian Luo <jian.luo@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 118091
* | | | | am f487e07b: am 53132840: Merge "init: call restorecon on /sys"Nick Kralevich2013-09-030-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f487e07bce49735235b91bf5ee79b6987ff80188': init: call restorecon on /sys
| * | | | am 53132840: Merge "init: call restorecon on /sys"Nick Kralevich2013-09-033-0/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '531328400ed6ce513f9bb4d9d772f02affeeaa26': init: call restorecon on /sys
| | * | | Merge "init: call restorecon on /sys"Nick Kralevich2013-09-033-0/+17
| | |\ \ \
| | | * | | init: call restorecon on /sysNick Kralevich2013-09-033-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all files on /sys are not getting labeled properly. Fix them. Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
* | | | | | am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel ↵Nick Kralevich2013-09-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command line" * commit '49382f12f2e8278a02019d78482df00bb7f7fad7': init: allow disabling selinux via a kernel command line
| * | | | | am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"Nick Kralevich2013-09-031-3/+48
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '8328edb0a7d9f6eb3af82ea8bcda8bf15ffd75ab': init: allow disabling selinux via a kernel command line
| | * | | | Merge "init: allow disabling selinux via a kernel command line"Nick Kralevich2013-09-031-3/+48
| | |\ \ \ \ | | | |/ / /
| | | * | | init: allow disabling selinux via a kernel command lineNick Kralevich2013-09-031-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
* | | | | | am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing ↵Nick Kralevich2013-09-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode." * commit '5fc1acfaabd5de3a8043d0950e4946dda7b6d5c3': init: move SELinux into enforcing mode.
| * | | | | am b2423399: Merge "init: move SELinux into enforcing mode."Nick Kralevich2013-09-031-21/+20
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b2423399883094ad1a1ddf7e02d798fd72a283a9': init: move SELinux into enforcing mode.
| | * | | | Merge "init: move SELinux into enforcing mode."Nick Kralevich2013-09-031-21/+20
| | |\ \ \ \ | | | |/ / /
| | | * | | init: move SELinux into enforcing mode.Nick Kralevich2013-09-031-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 f3486134: Switch back to subsystem "net" for netlink events.Lorenzo Colitti2013-09-022-4/+9
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit 'f34861346d5c207912075fba9874090e4c947869': Switch back to subsystem "net" for netlink events.
generated by cgit v1.1 at 2025-01-28 03:18:59 +0000