Commit Graph

6462 Commits

Author SHA1 Message Date
Todd Poynor ee549d256f am ff9ec2d9: healthd: perform periodic chores when awake and on battery power
* commit 'ff9ec2d9990fbf9a707df063f3d43e9169bdde16':
  healthd: perform periodic chores when awake and on battery power
2013-09-09 16:53:13 -07:00
Eric Laurent 04c12ca061 Add HOTWORD audio source to audio.h
- This is a complimentary change to the one adding this new source to
  MediaRecorder.java

Bug: 10640877.

Change-Id: Ie213e82b5a60dad2a277cef367c2f5e4df70df06
2013-09-09 15:42:31 -07:00
Todd Poynor ff9ec2d999 healthd: perform periodic chores when awake and on battery power
Monitor battery/charging status at normal awake rate when on battery
power.

Bug: 10650797
Change-Id: I914d24af4963ab9d52b03c0a2615ad653ced9b12
2013-09-09 14:49:53 -07:00
Elliott Hughes 5868e06192 Merge "Add new cert_pin_failure tag that can be used in user-consent filtering." 2013-09-09 21:27:24 +00:00
Andrew Boie d35ce3563b mkbootimg: support longer kernel command lines
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>
2013-09-09 13:13:33 -07:00
Andrew Boie 2e63e71f31 init: support longer command lines
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>
2013-09-09 13:11:34 -07:00
William Luh 5249306ad0 Add new cert_pin_failure tag that can be used in user-consent filtering.
Change-Id: If8a2f9829b3aac4abc33a4623c5f5b4966fd6870
2013-09-09 11:18:33 -07:00
Colin Cross fc600e49bf Initial libmemtrack
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
2013-09-06 18:18:35 -07:00
Szymon Starzycki 585af584f7 Fastbootd: fixed missing file in Android.mk
Change-Id: I10927f488e35c688483f2d1d8c9f5b7ea1d7912d
2013-09-06 15:11:30 -07:00
Szymon Starzycki e160f81713 fastbootd: erase, boot and partitioning commands
Change-Id: I49ba2ba2e002fd5b6bbd37cc3fd0caa106f42010
2013-09-06 14:31:08 -07:00
Colin Cross 783e6c471a am 8da6e9c7: am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."
* commit '8da6e9c717ec5c1076dfedc7a37e9cfbe100977e':
  fix valgrind ioctl warning.
2013-09-05 12:59:16 -07:00
Colin Cross 8da6e9c717 am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."
* commit 'c9ff37144a7943ee1bc247cef3620c8cce22049d':
  fix valgrind ioctl warning.
2013-09-05 12:57:15 -07:00
Colin Cross c9ff37144a am 596e9c63: Merge "fix valgrind ioctl warning."
* commit '596e9c6314e4f2869499bcdbb816680ddb10c88f':
  fix valgrind ioctl warning.
2013-09-05 12:55:33 -07:00
Colin Cross 596e9c6314 Merge "fix valgrind ioctl warning." 2013-09-05 19:54:31 +00:00
Todd Poynor bc10211184 healthd: Add average current property
Change-Id: Ibc901fe1b550c0d72095ef5590e2db8962d1a7b2
2013-09-04 17:41:57 -07:00
Ben Cheng 2d0c5d168f am 61e4b4d5: am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."
* commit '61e4b4d5a8a948c4241c26627cf8d6cb9d0544ca':
  Add -Wno-unused-parameter to suppress the warning.
2013-09-04 14:12:02 -07:00
Ben Cheng 61e4b4d5a8 am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."
* commit '8fb85b37af1753ce6bc5d88a04485a6c805bb3a3':
  Add -Wno-unused-parameter to suppress the warning.
2013-09-04 14:08:55 -07:00
Ben Cheng 8fb85b37af am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."
* commit '2b2f1ae86fb791e9f2fff25f93e7f2c4db010bf6':
  Add -Wno-unused-parameter to suppress the warning.
2013-09-04 14:05:40 -07:00
Ben Cheng 2b2f1ae86f Merge "Add -Wno-unused-parameter to suppress the warning." 2013-09-04 21:03:05 +00:00
Ben Cheng c665df33e0 Add -Wno-unused-parameter to suppress the warning.
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
2013-09-04 13:51:36 -07:00
Colin Cross bf0a6e8309 am d64df296: am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"
* commit 'd64df296998bcb1528067d7e9adc40cf5e47abd1':
  [GNSS] Add AID_GPS to property user white list
2013-09-03 17:15:18 -07:00
Colin Cross d64df29699 am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"
* commit '9dd40e9756de23a25aaa9909c8d4055105621a76':
  [GNSS] Add AID_GPS to property user white list
2013-09-03 17:13:35 -07:00
Colin Cross 9dd40e9756 am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"
* commit 'd171b6567023f7f840b3a145ec27b5723750dc18':
  [GNSS] Add AID_GPS to property user white list
2013-09-03 17:11:41 -07:00
Colin Cross d171b65670 Merge "[GNSS] Add AID_GPS to property user white list" 2013-09-04 00:09:30 +00:00
Nick Kralevich b6dddf24b8 am a9f6cc54: am f487e07b: am 53132840: Merge "init: call restorecon on /sys"
* commit 'a9f6cc54e7330a03e55291bda1d75bc78f3f8f2a':
  init: call restorecon on /sys
2013-09-03 16:53:47 -07:00
Nick Kralevich 22041903a1 am 164a517b: am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"
* commit '164a517bc89dac39dad069c0e8e7693a677ce573':
  init: allow disabling selinux via a kernel command line
2013-09-03 16:53:46 -07:00
Nick Kralevich 025ebae382 am a46286db: am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing mode."
* commit 'a46286db3429d50296f6fb070f948261b21c5c5d':
  init: move SELinux into enforcing mode.
2013-09-03 16:53:46 -07:00
Nick Kralevich a9f6cc54e7 am f487e07b: am 53132840: Merge "init: call restorecon on /sys"
* commit 'f487e07bce49735235b91bf5ee79b6987ff80188':
  init: call restorecon on /sys
2013-09-03 16:47:46 -07:00
Nick Kralevich 164a517bc8 am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"
* commit '49382f12f2e8278a02019d78482df00bb7f7fad7':
  init: allow disabling selinux via a kernel command line
2013-09-03 16:47:45 -07:00
Nick Kralevich a46286db34 am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing mode."
* commit '5fc1acfaabd5de3a8043d0950e4946dda7b6d5c3':
  init: move SELinux into enforcing mode.
2013-09-03 16:47:45 -07:00
Nick Kralevich f487e07bce am 53132840: Merge "init: call restorecon on /sys"
* commit '531328400ed6ce513f9bb4d9d772f02affeeaa26':
  init: call restorecon on /sys
2013-09-03 16:43:01 -07:00
Nick Kralevich 49382f12f2 am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"
* commit '8328edb0a7d9f6eb3af82ea8bcda8bf15ffd75ab':
  init: allow disabling selinux via a kernel command line
2013-09-03 16:43:00 -07:00
Nick Kralevich 5fc1acfaab am b2423399: Merge "init: move SELinux into enforcing mode."
* commit 'b2423399883094ad1a1ddf7e02d798fd72a283a9':
  init: move SELinux into enforcing mode.
2013-09-03 16:42:59 -07:00
Nick Kralevich 531328400e Merge "init: call restorecon on /sys" 2013-09-03 23:41:26 +00:00
Nick Kralevich 8328edb0a7 Merge "init: allow disabling selinux via a kernel command line" 2013-09-03 23:41:19 +00:00
Nick Kralevich b242339988 Merge "init: move SELinux into enforcing mode." 2013-09-03 23:41:09 +00:00
Nick Kralevich ae76f6dbcf init: call restorecon on /sys
Not all files on /sys are not getting labeled properly. Fix them.

Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
2013-09-03 15:55:58 -07:00
Nick Kralevich 935bd3e315 init: allow disabling selinux via a kernel command line
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
b710ed21de .

Change-Id: I912583db8e6a0e9c63380de32ad8ffc47a8a440f
2013-09-03 15:55:00 -07:00
Nick Kralevich 56fa0ac6b6 init: move SELinux into enforcing mode.
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
2013-09-03 15:54:15 -07:00
Lorenzo Colitti b329d19cdd am 6324776b: am f3486134: Switch back to subsystem "net" for netlink events.
* commit '6324776b3efe46903f9a1291d90b52fcf51e7880':
  Switch back to subsystem "net" for netlink events.
2013-09-02 18:11:04 -07:00
Lorenzo Colitti 6324776b3e am f3486134: Switch back to subsystem "net" for netlink events.
* commit 'f34861346d5c207912075fba9874090e4c947869':
  Switch back to subsystem "net" for netlink events.
2013-09-02 18:09:21 -07:00
Lorenzo Colitti f34861346d Switch back to subsystem "net" for netlink events.
The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".

Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.

Bug: 10433320
Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
2013-09-03 00:25:14 +09:00
Jin Wei b815701247 fix valgrind ioctl warning.
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
2013-08-31 18:57:46 -04:00
Todd Poynor aacded7019 init.rc: start lmkd
Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
2013-08-30 15:32:09 -07:00
Todd Poynor 3948f80f2a Add lmkd low memory killer daemon
Move kernel low memory killer logic to new daemon lmkd.  ActivityManager
communicates with this daemon over a named socket.

Change-Id: Ie957da7e9b1f7150e23c689fdadf23ff260b47be
2013-08-30 15:32:09 -07:00
Jeff Sharkey 3912701e5e am 78c984ae: am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev
* commit '78c984aef222654bd337ae7f466a526e23db8f07':
  Only check caller when deriving permissions.
2013-08-30 14:13:44 -07:00
Jeff Sharkey 78c984aef2 am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev
* commit '5835ac9e31aea910adb6b9d2de1d63df771df45b':
  Only check caller when deriving permissions.
2013-08-30 14:08:49 -07:00
Jeff Sharkey 5835ac9e31 Merge "Only check caller when deriving permissions." into klp-dev 2013-08-30 21:03:41 +00:00
Jeff Sharkey 39ff0ae0f6 Only check caller when deriving permissions.
Bug: 10547597
Change-Id: Ied909f9047c2567e93dde0f4658d6e4b9ff161ab
2013-08-30 13:58:13 -07:00
Jeff Sharkey 5c0ae41778 am ab977264: am 5856fd89: Merge "Fix recursive locking bug." into klp-dev
* commit 'ab9772641cad9342e615b21e5a4afb665e40cacf':
  Fix recursive locking bug.
2013-08-30 13:07:44 -07:00