Commit Graph

4536 Commits

Author SHA1 Message Date
Nick Kralevich 569182a2ab am 7f3de6a4: am d282dfc4: Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev
* commit '7f3de6a450f025245bb27fdc13f5bbc1dc22624d':
  init: Set ADDR_COMPAT_LAYOUT before spawning processes.
2012-10-05 12:14:11 -07:00
Nick Kralevich 7f3de6a450 am d282dfc4: Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev
* commit 'd282dfc4e9bd5b5479511eb4ffdf64407606dc40':
  init: Set ADDR_COMPAT_LAYOUT before spawning processes.
2012-10-05 12:12:35 -07:00
Nick Kralevich d282dfc4e9 Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev 2012-10-05 12:10:38 -07:00
Nick Kralevich 01b1dee0ab init: Set ADDR_COMPAT_LAYOUT before spawning processes.
Some Android programs have problems with memory which grows
from the top down.  Temporarily set ADDR_COMPAT_LAYOUT to
avoid breaking those programs.

Bug: 7188322
Change-Id: I61760500e670b4563838c63b82d4a0b6e354a86e
2012-10-05 12:02:46 -07:00
The Android Open Source Project e21cbe0db2 Reconcile with jb-mr1-release - do not merge
Change-Id: I01fd1df9c6d8814ac0a8a92da1f04ca21c6779cb
2012-10-05 08:18:38 -07:00
The Android Automerger 6fe9240d8c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-05 07:00:32 -07:00
Matthew Xie 4e49ca4692 am 124bbe39: am 9eca69b0: Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev
* commit '124bbe39ed9de8880be2dfee6d78dbc504348f59':
  Create bluetooth stack aid for sharing gid between all bluetooth processes
2012-10-04 23:24:41 -07:00
Matthew Xie 124bbe39ed am 9eca69b0: Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev
* commit '9eca69b08334701d3ec64029087691054c59729f':
  Create bluetooth stack aid for sharing gid between all bluetooth processes
2012-10-04 23:22:59 -07:00
Matthew Xie 9eca69b083 Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev 2012-10-04 23:21:01 -07:00
Matthew Xie 971153aa4a Create bluetooth stack aid for sharing gid between all bluetooth processes
bug 6925422

Change-Id: I8d371f8307dd6bea3909a56643819413ea829a98
2012-10-04 12:38:51 -07:00
Nick Kralevich 474cb0e33a am 33045b3d: am f9c05970: Merge "init: harden property service."
* commit '33045b3d7bd965f67e2e0b175976cf9934fb924f':
  init: harden property service.
2012-10-04 11:47:06 -07:00
Nick Kralevich 33045b3d7b am f9c05970: Merge "init: harden property service."
* commit 'f9c059700ce91dfca05d44ec67938209a69bbd39':
  init: harden property service.
2012-10-04 11:45:17 -07:00
Nick Kralevich f9c059700c Merge "init: harden property service." 2012-10-04 11:01:06 -07:00
Nick Kralevich 7ecfe6a94b init: harden property service.
Don't create temporary files in a well-known location. Rather,
use mkstemp().

Don't read persistent property files from insecure files.

Change-Id: I81e2aca674a2a7ca54869f088737fb228d3af6d2
2012-10-04 10:47:05 -07:00
The Android Open Source Project b78ced24c6 Reconcile with jb-mr1-release - do not merge
Change-Id: Ic30692b569b80fb34ed2d2960007f76b01e0c398
2012-10-04 07:50:22 -07:00
The Android Automerger 6800ae9fd3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 07:00:35 -07:00
Ken Sumrall e17c821e36 am 608634a1: am 48f3b576: Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev
* commit '608634a1cb68ca89bb033d476d43b58b2e487cf7':
  Update fastboot to wipe ext4 partitions before flashing
2012-10-03 13:54:01 -07:00
Ken Sumrall 608634a1cb am 48f3b576: Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev
* commit '48f3b576846734b76db849f17c3ba2a2cc3f1265':
  Update fastboot to wipe ext4 partitions before flashing
2012-10-03 12:34:10 -07:00
Ken Sumrall 48f3b57684 Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev 2012-10-03 12:31:52 -07:00
Ken Sumrall 5ee5d389d6 Update fastboot to wipe ext4 partitions before flashing
To prevent false error reports from e2fsck, update fastboot to erase
a partition identified as being ext4 partition before flashing an image
to it.

bug: 7259359

Change-Id: I85e9963aa8247b4b33fdd57f994cdb3ee72b670f
2012-10-02 19:10:51 -07:00
The Android Open Source Project 449a7d0d78 Reconcile with jb-mr1-release - do not merge
Change-Id: Ib099b57a16a13bb5d7b4785b547146130e67109d
2012-10-02 09:20:58 -07:00
The Android Automerger 8183fc4e45 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-02 07:00:26 -07:00
Jesse Hall f86728647a am 069f5dad: am bc930eda: Move dequeue-buffer-and-wait out-of-line
* commit '069f5dadbef13947229ea9ea189ebcb493594198':
  Move dequeue-buffer-and-wait out-of-line
2012-10-01 23:33:15 -07:00
Jesse Hall 069f5dadbe am bc930eda: Move dequeue-buffer-and-wait out-of-line
* commit 'bc930eda3985cf50bb568aeb098cd0585d0c0ce0':
  Move dequeue-buffer-and-wait out-of-line
2012-10-01 23:30:48 -07:00
Jesse Hall bc930eda39 Move dequeue-buffer-and-wait out-of-line
The dequeueBuffer_DEPRECATED function also waits for the buffer fence,
so we can just call that. That way the wait call is compiled into our
code (instead of driver code) and we can see/modify it for debugging.

Bug: 7217641
Change-Id: Ie2ea85ed1543a4ff7986d0162aee773e93591309
2012-10-01 14:02:45 -07:00
The Android Automerger 6babec53ed merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 07:00:29 -07:00
Jean-Baptiste Queru aea4b79de1 Merge from jb-mr1-aah-dev
Change-Id: I585cfc00fe77d26c9b9c407d4c4994a340e8c234
2012-09-28 17:09:42 -07:00
Robert Greenwalt 717a35b57b am d6d47805: Add writable data space for radio.
* commit 'd6d478058fc201bfc70f353019477e17c71a29d4':
  Add writable data space for radio.
2012-09-28 15:49:56 -07:00
Robert Greenwalt 65700be6af am d6d47805: Add writable data space for radio.
* commit 'd6d478058fc201bfc70f353019477e17c71a29d4':
  Add writable data space for radio.
2012-09-28 15:49:45 -07:00
Jean-Baptiste Queru fe6b1db108 Merge from jb-mr1-aah-dev
Change-Id: Icbe58041fdf59c583b15f3d0266f1e0b1e211c9e
2012-09-28 14:38:12 -07:00
Robert Greenwalt d6d478058f Add writable data space for radio.
Storing Premium SMS regex's in /data/misc/sms.
bug:7221402

Change-Id: Ica8ba7be8aa5321f3e6ed820a0dddc01f77d2cfb
2012-09-27 08:16:58 -07:00
Elliott Hughes 0726652874 am cfd7c2a0: am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"
* commit 'cfd7c2a05166a3ff27b2145b007834408d95a2e0':
  Rename getline to fs_getline for fs_mgr
2012-09-26 15:03:19 -07:00
Elliott Hughes cfd7c2a051 am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"
* commit '1c0c52503dcedff1a75775bf8bfffe7ec77b722b':
  Rename getline to fs_getline for fs_mgr
2012-09-26 15:01:25 -07:00
Elliott Hughes 1c0c52503d Merge "Rename getline to fs_getline for fs_mgr" 2012-09-26 13:57:55 -07:00
The Android Open Source Project cbc2136c28 Reconcile with jb-mr1-release - do not merge
Change-Id: I20f10801bb78a9086a381aa1238e7cc693dd8d07
2012-09-26 09:09:00 -07:00
The Android Automerger 67952e61ad merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-26 07:00:29 -07:00
Jeff Sharkey 10f35e876a am 00615f01: Merge "Allow mkdir() race to succeed." into jb-mr1-dev
* commit '00615f017bcc4be5a6ce02f1eeeebe59dbd381df':
  Allow mkdir() race to succeed.
2012-09-25 15:50:01 -07:00
Jeff Sharkey 5581c1e3e2 am 00615f01: Merge "Allow mkdir() race to succeed." into jb-mr1-dev
* commit '00615f017bcc4be5a6ce02f1eeeebe59dbd381df':
  Allow mkdir() race to succeed.
2012-09-25 15:49:52 -07:00
Jeff Sharkey 00615f017b Merge "Allow mkdir() race to succeed." into jb-mr1-dev 2012-09-25 15:48:05 -07:00
Dima Zavin 4c37ff3f71 am 9481266e: init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
* commit '9481266ea360e0a8f326fec1106ea445f2ef883c':
  init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
2012-09-25 15:01:32 -07:00
Dima Zavin 507a855cc3 am 9481266e: init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
* commit '9481266ea360e0a8f326fec1106ea445f2ef883c':
  init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
2012-09-25 15:01:22 -07:00
Dima Zavin 9481266ea3 init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
Bug: 7232205
Change-Id: I0d785302818a37b722e79bf740644ede52c60148
Signed-off-by: Dima Zavin <dima@android.com>
2012-09-25 14:22:04 -07:00
Jeff Sharkey 489609bb44 Allow mkdir() race to succeed.
When two zygotes are starting, they both may try creating a mount
point after checking lstat().  The second mkdir() will result in
EEXIST, which is okay to ignore.

Bug: 7165469
Change-Id: If4411e2621f773c74cd05247899982fa5ebdd020
2012-09-25 13:13:08 -07:00
The Android Automerger 74b6e3dc0e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 07:00:52 -07:00
Ben Cheng fdd2ff45c7 Dump 256 bytes per chunk pointed by general-purpose registers.
Bug: 7216522
Change-Id: Iddcec8399b00ad411be6863dd866a3f74377ba03
2012-09-24 16:48:02 -07:00
Ben Cheng 44dbf623a8 am 0b76d020: Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev
* commit '0b76d0209981fb79350ff6b7ce25d010dddf42fa':
  Dump 256 bytes per chunk pointed by general-purpose registers.
2012-09-24 14:31:13 -07:00
Ben Cheng 2745e3cf6d am 0b76d020: Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev
* commit '0b76d0209981fb79350ff6b7ce25d010dddf42fa':
  Dump 256 bytes per chunk pointed by general-purpose registers.
2012-09-24 14:31:05 -07:00
Ben Cheng 0b76d02099 Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev 2012-09-24 14:30:06 -07:00
Todd Poynor 7fad6f669a am f1c50bf6: init: import init.trace.rc after h/w-specific rc
* commit 'f1c50bf63857b9cdabcf930363c372defc6383a8':
  init: import init.trace.rc after h/w-specific rc
2012-09-24 14:29:48 -07:00
Todd Poynor b31cc865f1 am f1c50bf6: init: import init.trace.rc after h/w-specific rc
* commit 'f1c50bf63857b9cdabcf930363c372defc6383a8':
  init: import init.trace.rc after h/w-specific rc
2012-09-24 14:29:40 -07:00