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
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
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
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
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
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
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
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
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
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
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
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
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
Mathias Agopian
61e6bc5b71
am 37bd30bf: Merge "ANW: fix an fd leak" into jb-mr1-dev
...
* commit '37bd30bfd59a352452aea474ece764a6a14f71a9':
ANW: fix an fd leak
2012-09-21 13:32:36 -07:00
Ying Wang
fdecfc876e
am 81360178: Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev
...
* commit '813601785f9ef37f892034a7722d176deea41eec':
Move AndroidConfig.hs to the build project.
2012-09-21 13:32:35 -07:00
Rebecca Schultz Zavin
ff0156ec2b
am 0d699de0: Merge "Add explicit sync call to ion library" into jb-mr1-dev
...
* commit '0d699de0fca487328e6dfc86847f33a0214ca253':
Add explicit sync call to ion library
2012-09-21 13:32:31 -07:00
Ben Cheng
2a17b52cfe
am fbafa63b: Merge "Print the revision number in the tombstone file." into jb-mr1-dev
...
* commit 'fbafa63b339808bf8082b705c5121e529e8be29f':
Print the revision number in the tombstone file.
2012-09-21 11:05:07 -07:00
Jamie Gennis
96094ae27c
ANW: fix my fix for a file descriptor leak
...
Change-Id: Ief7b973fbdb76920abed19707963a0c3d306af31
2012-09-20 17:25:23 -07:00
Doug Zongker
45b0385ac4
Merge "remove unneeded import" into jb-mr1-dev
2012-09-20 16:46:38 -07:00
Zhihai Xu
e16534f8f7
Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
2012-09-20 16:43:26 -07:00
Doug Zongker
ede5cf6533
remove unneeded import
...
DumpPublicKey doesn't need a base64 encoder for anything; remove the
import to avoid deprecation warnings.
Change-Id: I7e01b9d77bb66bb99cb3357c886cc4e2e63de6ae
2012-09-20 15:55:20 -07:00
Mathias Agopian
37bd30bfd5
Merge "ANW: fix an fd leak" into jb-mr1-dev
2012-09-20 14:09:08 -07:00
Ying Wang
813601785f
Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev
2012-09-20 14:07:52 -07:00
Rebecca Schultz Zavin
0d699de0fc
Merge "Add explicit sync call to ion library" into jb-mr1-dev
2012-09-20 13:59:11 -07:00
Ben Cheng
fbafa63b33
Merge "Print the revision number in the tombstone file." into jb-mr1-dev
2012-09-20 13:18:06 -07:00
Jamie Gennis
9bd8dd3b13
ANW: fix an fd leak
...
Change-Id: Id44cae6732c6694d2f470cbdfa5f59e7474f704f
2012-09-20 11:43:43 -07:00
Zhihai Xu
c2f59d87d8
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
...
remove system/bluetooth stuff.
bug 6849488
Change-Id: I81a94d34a4363562a74fa2e574828fd919cfe18c
2012-09-20 10:55:06 -07:00
Ying Wang
07a56fb0d3
Move AndroidConfig.hs to the build project.
...
Change-Id: I482e36f9e7f665d7cfe43463c9cbc15846e8b20a
2012-09-20 10:05:51 -07:00
Rebecca Schultz Zavin
3cfcc30005
Add explicit sync call to ion library
...
Bug: 6854979
Change-Id: I535d55af897eeb4ed707b5da54f3fbf36afa452c
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-09-20 09:46:19 -07:00
Nick Kralevich
400b89b218
am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev
...
* commit 'e1df9ad215af6e51a2d8fb1d0306e00c7b510b62':
init: Don't read local properties if ro.debuggable=0
2012-09-20 06:20:21 -07:00
Ben Cheng
d7760c1688
Print the revision number in the tombstone file.
...
Bug: 7168261
Change-Id: Icb412760d018e4bbb1a5d742ed7d484d5cf6b470
2012-09-19 19:19:53 -07:00
Nick Kralevich
e1df9ad215
Merge "init: Don't read local properties if ro.debuggable=0" into jb-mr1-dev
2012-09-19 13:05:06 -07:00
Nick Kralevich
32b9023d08
init: Don't read local properties if ro.debuggable=0
...
Bug: 7195965
Change-Id: I29fdad61aa61f2c46d49db227cf7b84d9cc6f25d
2012-09-19 13:03:18 -07:00
Geremy Condra
581c484d2e
am 1683413f: (-s ours) Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev
...
* commit '1683413f413eb1b77f527247db2df31eae93ee3a':
DO NOT MERGE Add event log tag for cert pin failures.
2012-09-18 15:54:31 -07:00
Geremy Condra
1683413f41
Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev
2012-09-18 15:28:38 -07:00
Jeff Sharkey
5e310605a5
am a6cf7746: Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
...
* commit 'a6cf7746cb8732897c3bbafffd52667c7e02d579':
Wrap more system calls in TEMP_FAILURE_RETRY.
2012-09-13 15:15:07 -07:00