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
Todd Poynor
f1c50bf638
init: import init.trace.rc after h/w-specific rc
...
Board-specific .rc file mounts debugfs, then fixup perms on tracing
sysfs files for systrace.
Change-Id: Ifbedb4ecdb543cd6c48df00b1a34415349951b6f
2012-09-24 14:26:31 -07:00
Ben Cheng
c47b772b67
Dump 256 bytes per chunk pointed by general-purpose registers.
...
Bug: 7216522
Change-Id: Iddcec8399b00ad411be6863dd866a3f74377ba03
2012-09-24 14:13:37 -07:00
Elliott Hughes
95cc64b23c
am c611911e
: am 0933c6f4
: (-s ours) am e2a3fe23
: am 2dbef6ae
: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
...
* commit 'c611911e11fbb40c5d4d2904c316e4fe2321df6e':
The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 10:20:11 -07:00
Elliott Hughes
d43c9b9896
am c611911e
: am 0933c6f4
: (-s ours) am e2a3fe23
: am 2dbef6ae
: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
...
* commit 'c611911e11fbb40c5d4d2904c316e4fe2321df6e':
The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 10:19:58 -07:00
Elliott Hughes
c611911e11
am 0933c6f4
: (-s ours) am e2a3fe23
: am 2dbef6ae
: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
...
* commit '0933c6f4d8536eb1c950bb8900ba925dc6b0b00e':
The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 10:16:40 -07:00
The Android Open Source Project
9b87fd6445
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I1589df137a31448329a8904b6ea3a7e3442bf1ca
2012-09-24 10:14:00 -07:00
Elliott Hughes
0933c6f4d8
am e2a3fe23
: am 2dbef6ae
: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
...
* commit 'e2a3fe235e6577b5956e86af3fc8b31845ef54ac':
The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 08:59:35 -07:00
Elliott Hughes
e2a3fe235e
am 2dbef6ae
: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
...
* commit '2dbef6ae08eec8815863b89046653a1a73443a7c':
The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 08:57:47 -07:00
Elliott Hughes
2dbef6ae08
Merge "The localtime_tz and mktime_tz extensions are now in bionic."
2012-09-24 08:41:43 -07:00
Colin Cross
db97f75c35
am b9886558
: libsuspend: force autosleep off during init
...
* commit 'b98865586bcf7779150c461b64e4fe49972f6351':
libsuspend: force autosleep off during init
2012-09-24 08:25:57 -07:00
Colin Cross
f3b3fcb995
am b9886558
: libsuspend: force autosleep off during init
...
* commit 'b98865586bcf7779150c461b64e4fe49972f6351':
libsuspend: force autosleep off during init
2012-09-24 08:25:52 -07:00
The Android Automerger
00f983aa61
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:43:04 -07:00
Colin Cross
b98865586b
libsuspend: force autosleep off during init
...
If autosuspend_autosleep_init is called when autosleep is enabled,
for example after a runtime restart with the screen off, the kernel
autosleep state will be enabled, but autosuspend_enabled is false.
Further calls to autosuspend_disable by the framework will not result
in autosleep being disabled.
Call autosuspend_autosleep_disable from autosuspend_autosleep_init
to get the kernel state into a known state that matches the
autosuspend_enabled flag.
Bug: 7119416
Change-Id: I8611e4fd256838272aad4382c2340508805b0376
2012-09-21 18:39:17 -07:00
Jamie Gennis
4f5cec049d
am 96094ae2
: ANW: fix my fix for a file descriptor leak
...
* commit '96094ae27c4deac8b0dde8e3c6a479b249cecb72':
ANW: fix my fix for a file descriptor leak
2012-09-21 13:35:19 -07:00
Doug Zongker
c4e8a69d70
am 45b0385a
: Merge "remove unneeded import" into jb-mr1-dev
...
* commit '45b0385ac4f192a4a211872dee4a2a5dbd2a56fd':
remove unneeded import
2012-09-21 13:33:45 -07:00
Zhihai Xu
e9659d4a0c
am e16534f8
: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
...
* commit 'e16534f8f7492755aebe4c54089b5298f4b064be':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
2012-09-21 13:33:44 -07:00