Commit graph

4720 commits

Author SHA1 Message Date
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
243ba6eed7 am 4e49ca46: am 124bbe39: am 9eca69b0: Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev
* commit '4e49ca4692a94b0c333bfb882dc508e3840a1c9f':
  Create bluetooth stack aid for sharing gid between all bluetooth processes
2012-10-04 23:26:19 -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
Dima Zavin
ece565cca2 rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
This is necessary for some HWC hals to be able to communicate with
secure side to grant protected access to hardware owned by the
hwc. This is necessary on some architectures to grant access to
secure buffers to overlay/csc hardware

Change-Id: I4e4becba5b4a80310ce8932edea5d0d046fa9b00
Signed-off-by: Dima Zavin <dima@android.com>
2012-10-04 17:02:28 -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
23b3a05d68 am 474cb0e3: am 33045b3d: am f9c05970: Merge "init: harden property service."
* commit '474cb0e33aa12f7ba11170ad1a6b564bde244151':
  init: harden property service.
2012-10-04 12:28:42 -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
7786467725 am b78ced24: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'b78ced24c6da9d80a4d94017bdf8493dcb3f1f4b':
2012-10-04 07:52:34 -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
656a24cae7 am e17c821e: am 608634a1: am 48f3b576: Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev
* commit 'e17c821e36163695f6d5024a71f8e706bda65fd6':
  Update fastboot to wipe ext4 partitions before flashing
2012-10-03 14:02:38 -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
e72aca6d93 am 449a7d0d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '449a7d0d78ceb71e478e77ac4d339272dee78c1b':
2012-10-02 09:24:40 -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
4b40143385 am f8672864: am 069f5dad: am bc930eda: Move dequeue-buffer-and-wait out-of-line
* commit 'f86728647afd20e371c3bf3176b3a3d9984ab5ef':
  Move dequeue-buffer-and-wait out-of-line
2012-10-01 23:35:33 -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
1dc819b37f am aea4b79d: Merge from jb-mr1-aah-dev
* commit 'aea4b79de103729df9b7aa7f4975dd6470cde0ac':
2012-09-28 17:17:31 -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
4760f98936 am 717a35b5: am d6d47805: Add writable data space for radio.
* commit '717a35b57bd66fb34caa2c150f04a19a79a6c03d':
  Add writable data space for radio.
2012-09-28 15:53:13 -07:00
Jean-Baptiste Queru
cc5aec013d am fe6b1db1: Merge from jb-mr1-aah-dev
* commit 'fe6b1db1084812a5041756cee360bcaaab79d754':
2012-09-28 15:52:34 -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
e6eee6a6a8 am 07266528: am cfd7c2a0: am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"
* commit '07266528740d860ed42ea881214e44cd0411bd6a':
  Rename getline to fs_getline for fs_mgr
2012-09-26 15:05:01 -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
2bc654bbef am cbc2136c: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'cbc2136c28191b943d5ad8a272d6ba39c078946f':
  Dump 256 bytes per chunk pointed by general-purpose registers.
2012-09-26 10:07:34 -07:00
Kenny Root
d5d6d97def Host builds: add fastboot and adb
Add fastboot and adb host utilities to debug builds for debugging
and development purposes.

Change-Id: If77699a27497b8641998930f14d4ee418b856080
2012-09-26 10:01:40 -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
2e1e29e1a9 am 5581c1e3: am 00615f01: Merge "Allow mkdir() race to succeed." into jb-mr1-dev
* commit '5581c1e3e2d359f71b14c20f44c6a58c18e27248':
  Allow mkdir() race to succeed.
2012-09-25 15:52:13 -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
7c3bbcd5db am 507a855c: am 9481266e: init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
* commit '507a855cc34848f0d24a9803ee1e7d2c6b00b79e':
  init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
2012-09-25 15:34:30 -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