History log of /system/core/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
31da9db0d1bf3227e3c383aa6ac28bde3c6409e5 07-Nov-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d1e39491f063626e026304ba8abe084cc43c94da 06-Nov-2012 Xavier Ducrohet <xav@android.com> Add usb vendor id for Teleepoch.

Change-Id: I82bbfed598fc3a886681c4139600cf487034c59c
db/usb_vendors.c
74365b18c1146a77ecd0938106fd53f38a7e5eda 18-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
9f239afc3565770f39ae94c2969addb520af3a40 17-Oct-2012 Zhihai Xu <zhihaixu@google.com> second user doesnot pickup input operations from A2DP

bug 7335014

Change-Id: I39e450d254647f0b84a07f38f2f2571711fca075
ootdir/ueventd.rc
80a99e31a08d8280266feb9621580b59dc4315a3 16-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
7b4aa677b1860b9a83f9cde7d71ca0d5bc193422 16-Oct-2012 Todd Poynor <toddpoynor@google.com> Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev
4ef6e4baa9b0d5aadb6668734881bdfae0ac9464 16-Oct-2012 Todd Poynor <toddpoynor@google.com> init.trace.rc: Set perms for power/clock_set_rate events

Bug: 7351763

Change-Id: I1ee3d7c9b55d1b55df6cafb1bf21f9139d964646
ootdir/init.trace.rc
14075567de367bd109a256514119fc16e8d4cf67 16-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Remove force use definition for remote audio submix" into jb-mr1-dev
a26ee499a7d20c4ae86851aff1d9792c5855c5b4 13-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
209c7b0fad9604d1dde1b74d9f9d577b923469fd 13-Oct-2012 Dima Zavin <dima@android.com> charger: allow devices to skip the initial display blank

The theory behind the blank was that the kernel would not
re-initilize the display on boot (and leave it to whatever
the bootloader configured it to) until after the first
blank request.

On some devices, the bootloader does not turn the screen on,
but it's done by the kernel and thus. This makes the extra blank at
start unnecessary.

Bug: 7319529
Change-Id: I9ad9856186df6e9e23ebbe86e83b641423e16dcb
Signed-off-by: Dima Zavin <dima@android.com>
harger/Android.mk
harger/charger.c
371fc00fc58841bce6ebe0112008fc8a0633dc94 12-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Remove force use definition for remote audio submix

Obsolete.

Bug 7318180

Change-Id: I3421ca554a4131d606bdee698aeb7b2091a5d966
nclude/system/audio_policy.h
f3f1d016759019ec62f5873ddbae0b523199475b 11-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
bdec5ead7417769ba9fc75b6ca86d191b49f2be8 11-Oct-2012 Matthew Xie <mattx@google.com> Change dev/uhid group id from bluetooth to net_bt_stack

Secondary user need that group id to access the file to support hid
bug 7315419

Change-Id: I9d2d3d5a5114d289dc4d83c697421622db4beae6
ootdir/ueventd.rc
035649eb10a0d38c12389229448df00f418a96b8 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
a0941d2c81f24e81e666055bda3d56db31b6ac6b 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
bd0816f54b7041ac367a40ce2b6a5d1a691831f5 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d22b2a1f35153058bbc5ce664fc9740adda8bcb7 09-Oct-2012 Eric Laurent <elaurent@google.com> Merge "audio policy: add forced uses for system" into jb-mr1-dev
4daa843432fa23bcc44c24c65e36c79db0332525 09-Oct-2012 Eric Laurent <elaurent@google.com> audio policy: add forced uses for system

The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService by means of new forced use type
AUDIO_POLICY_FORCE_FOR_SYSTEM with config
AUDIO_POLICY_FORCE_SYSTEM_ENFORCED.

Bug 7032634.

Change-Id: Ib1834ec507f3aa726895b8fd3e8a91cc9cc601a7
nclude/system/audio_policy.h
fb2f28271b79b1725cc52e6620bf17c4e94d38cd 09-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
c6f8bd396614d422d80ac9f24c91fa44a713894a 08-Oct-2012 Dima Zavin <dima@android.com> Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev
33978c428310d4ecbf8cb45cabb3c906e800b3e9 05-Oct-2012 Nick Kralevich <nnk@google.com> 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
nit/init.c
d282dfc4e9bd5b5479511eb4ffdf64407606dc40 05-Oct-2012 Nick Kralevich <nnk@google.com> Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev
01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70 05-Oct-2012 Nick Kralevich <nnk@google.com> 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
nit/init.c
6fe9240d8c5ecc65ae06426e174cba17d3b9918d 05-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
9eca69b08334701d3ec64029087691054c59729f 05-Oct-2012 Matthew Xie <mattx@google.com> Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev
ece565cca2a4babe897f5fd68ab14a7af5071b30 05-Oct-2012 Dima Zavin <dima@android.com> 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>
ootdir/init.rc
971153aa4a65c4fbc8d916c619a17d3912b2cb02 04-Oct-2012 Matthew Xie <mattx@google.com> Create bluetooth stack aid for sharing gid between all bluetooth processes

bug 6925422

Change-Id: I8d371f8307dd6bea3909a56643819413ea829a98
nclude/private/android_filesystem_config.h
ootdir/init.rc
6800ae9fd3b4b2470e061725c66e2bab3c54d62f 04-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
48f3b576846734b76db849f17c3ba2a2cc3f1265 03-Oct-2012 Ken Sumrall <ksumrall@android.com> Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev
5ee5d389d6cb90b3cd2856730f8ff12211bc95d2 29-Sep-2012 Ken Sumrall <ksumrall@android.com> 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
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
8183fc4e45968d8aa6383d5fd40186d64bd2ba95 02-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
bc930eda3985cf50bb568aeb098cd0585d0c0ce0 01-Oct-2012 Jesse Hall <jessehall@google.com> 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
nclude/system/window.h
6babec53edec112f1f88cdbcf530a16c98ef24b7 30-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d6d478058fc201bfc70f353019477e17c71a29d4 27-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Add writable data space for radio.

Storing Premium SMS regex's in /data/misc/sms.
bug:7221402

Change-Id: Ica8ba7be8aa5321f3e6ed820a0dddc01f77d2cfb
ootdir/init.rc
67952e61ad1d9cf7fe8a15da1fcec74241d018e9 26-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
00615f017bcc4be5a6ce02f1eeeebe59dbd381df 26-Sep-2012 Jeff Sharkey <jsharkey@android.com> Merge "Allow mkdir() race to succeed." into jb-mr1-dev
9481266ea360e0a8f326fec1106ea445f2ef883c 25-Sep-2012 Dima Zavin <dima@android.com> init.rc: chmod slabinfo to 440 to capture slabinfo in BRs

Bug: 7232205
Change-Id: I0d785302818a37b722e79bf740644ede52c60148
Signed-off-by: Dima Zavin <dima@android.com>
ootdir/init.rc
489609bb44fe8834c76c772f2cff8f03dbb84e08 25-Sep-2012 Jeff Sharkey <jsharkey@android.com> 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
ibcutils/fs.c
74b6e3dc0ea7af4cb2478d38e4b81ecbfabaae6c 25-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
fdd2ff45c734063f405712a58785deaf19d4abab 24-Sep-2012 Ben Cheng <bccheng@google.com> Dump 256 bytes per chunk pointed by general-purpose registers.

Bug: 7216522
Change-Id: Iddcec8399b00ad411be6863dd866a3f74377ba03
ebuggerd/arm/machine.c
0b76d0209981fb79350ff6b7ce25d010dddf42fa 24-Sep-2012 Ben Cheng <bccheng@google.com> Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev
f1c50bf63857b9cdabcf930363c372defc6383a8 21-Sep-2012 Todd Poynor <toddpoynor@google.com> 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
ootdir/init.rc
c47b772b67a2da5599b712e8c98cb0879dad6e48 24-Sep-2012 Ben Cheng <bccheng@google.com> Dump 256 bytes per chunk pointed by general-purpose registers.

Bug: 7216522
Change-Id: Iddcec8399b00ad411be6863dd866a3f74377ba03
ebuggerd/arm/machine.c
c611911e11fbb40c5d4d2904c316e4fe2321df6e 24-Sep-2012 Elliott Hughes <enh@google.com> 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.
0933c6f4d8536eb1c950bb8900ba925dc6b0b00e 24-Sep-2012 Elliott Hughes <enh@google.com> 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.
e2a3fe235e6577b5956e86af3fc8b31845ef54ac 24-Sep-2012 Elliott Hughes <enh@google.com> 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.
2dbef6ae08eec8815863b89046653a1a73443a7c 24-Sep-2012 Elliott Hughes <enh@google.com> Merge "The localtime_tz and mktime_tz extensions are now in bionic."
00f983aa61ef9a64c90dccd20bfa5aa71a3829a0 22-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
b98865586bcf7779150c461b64e4fe49972f6351 22-Sep-2012 Colin Cross <ccross@android.com> 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
ibsuspend/autosuspend_autosleep.c
638d8053e5f05e541d1bf9c0da379711e800bd6d 21-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
96094ae27c4deac8b0dde8e3c6a479b249cecb72 21-Sep-2012 Jamie Gennis <jgennis@google.com> ANW: fix my fix for a file descriptor leak

Change-Id: Ief7b973fbdb76920abed19707963a0c3d306af31
nclude/system/window.h
45b0385ac4f192a4a211872dee4a2a5dbd2a56fd 21-Sep-2012 Doug Zongker <dougz@google.com> Merge "remove unneeded import" into jb-mr1-dev
e16534f8f7492755aebe4c54089b5298f4b064be 21-Sep-2012 Zhihai Xu <zhihaixu@google.com> Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
ede5cf6533387a02b4a726cf577bfcb22374ad9a 21-Sep-2012 Doug Zongker <dougz@google.com> remove unneeded import

DumpPublicKey doesn't need a base64 encoder for anything; remove the
import to avoid deprecation warnings.

Change-Id: I7e01b9d77bb66bb99cb3357c886cc4e2e63de6ae
ibmincrypt/tools/DumpPublicKey.java
37bd30bfd59a352452aea474ece764a6a14f71a9 20-Sep-2012 Mathias Agopian <mathias@google.com> Merge "ANW: fix an fd leak" into jb-mr1-dev
813601785f9ef37f892034a7722d176deea41eec 20-Sep-2012 Ying Wang <wangying@google.com> Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev
0d699de0fca487328e6dfc86847f33a0214ca253 20-Sep-2012 Rebecca Schultz Zavin <rebecca@android.com> Merge "Add explicit sync call to ion library" into jb-mr1-dev
fbafa63b339808bf8082b705c5121e529e8be29f 20-Sep-2012 Ben Cheng <bccheng@google.com> Merge "Print the revision number in the tombstone file." into jb-mr1-dev
9bd8dd3b13a0d690c9316ed31be7c9a13f3f439f 20-Sep-2012 Jamie Gennis <jgennis@google.com> ANW: fix an fd leak

Change-Id: Id44cae6732c6694d2f470cbdfa5f59e7474f704f
nclude/system/window.h
c2f59d87d85e4c7ec9a7f899dd4f55a36b3627f5 19-Sep-2012 Zhihai Xu <zhihaixu@google.com> ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

remove system/bluetooth stuff.

bug 6849488
Change-Id: I81a94d34a4363562a74fa2e574828fd919cfe18c
nclude/private/android_filesystem_config.h
07a56fb0d372e03818a102c66b34fa5c19f85cef 20-Sep-2012 Ying Wang <wangying@google.com> Move AndroidConfig.hs to the build project.

Change-Id: I482e36f9e7f665d7cfe43463c9cbc15846e8b20a
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-mips/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
3cfcc300058070f0873763abfa604e07ec536da3 20-Sep-2012 Rebecca Schultz Zavin <rebecca@android.com> Add explicit sync call to ion library

Bug: 6854979
Change-Id: I535d55af897eeb4ed707b5da54f3fbf36afa452c
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
nclude/ion/ion.h
ibion/ion.c
c24eac15619b9644a80bd6d8ea87820763f20e2c 20-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d7760c1688f8276a05e33345d81639f8cb5e7c3f 20-Sep-2012 Ben Cheng <bccheng@google.com> Print the revision number in the tombstone file.

Bug: 7168261
Change-Id: Icb412760d018e4bbb1a5d742ed7d484d5cf6b470
ebuggerd/tombstone.c
e1df9ad215af6e51a2d8fb1d0306e00c7b510b62 19-Sep-2012 Nick Kralevich <nnk@google.com> Merge "init: Don't read local properties if ro.debuggable=0" into jb-mr1-dev
32b9023d086e3e22886dd3271f505ef64cd84bc8 19-Sep-2012 Nick Kralevich <nnk@google.com> init: Don't read local properties if ro.debuggable=0

Bug: 7195965
Change-Id: I29fdad61aa61f2c46d49db227cf7b84d9cc6f25d
nit/property_service.c
e580fc63c46e381c6074e9ab58edf0736d0d8ed9 19-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
1683413f413eb1b77f527247db2df31eae93ee3a 19-Sep-2012 Geremy Condra <gcondra@google.com> Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev
7241a04d16f14c2514994c37cc090e967dd6440e 14-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
4a31de849610fc195bf0a48b41f1ecb307635623 13-Sep-2012 Jeff Sharkey <jsharkey@android.com> Wrap system calls in TEMP_FAILURE_RETRY.

fs_prepare_dir() is used heavily during Zygote init, and can easily
run into EINTR.

Bug: 7151474
Change-Id: I7aac43a43483d55db47ca20456fff68ce51bbc46
nclude/cutils/fs.h
ibcutils/fs.c
a6cf7746cb8732897c3bbafffd52667c7e02d579 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
6de702679089fab13ec2d4d435054f68688df545 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> Wrap more system calls in TEMP_FAILURE_RETRY.

Bug: 7151474
Change-Id: I9fe19746104cf392f88ea5cf8061e2e21e334671
ibcutils/fs.c
7918d816401a92456709ba64ccbe60b8e5ffb14c 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
ddb173394430a7b55b0c24896a843556f5f8de7a 13-Sep-2012 Jeff Sharkey <jsharkey@android.com> Wrap system calls in TEMP_FAILURE_RETRY.

fs_prepare_dir() is used heavily during Zygote init, and can easily
run into EINTR.

Bug: 7151474
Change-Id: I7aac43a43483d55db47ca20456fff68ce51bbc46
nclude/cutils/fs.h
ibcutils/fs.c
ad59e0a90ec414ddc59cbe73319039981f433c53 13-Sep-2012 Kenny Root <kroot@google.com> am c92961dc: am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"

* commit 'c92961dccb38c6e6a9dbcf519bd59461bbc0dc7c':
Add shared app gid to fs config
c92961dccb38c6e6a9dbcf519bd59461bbc0dc7c 13-Sep-2012 Kenny Root <kroot@google.com> am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"

* commit 'b905f121c324cfec51f5b8cd424f36fc0f22676d':
Add shared app gid to fs config
b905f121c324cfec51f5b8cd424f36fc0f22676d 13-Sep-2012 Kenny Root <kroot@google.com> am 9796a83a: Merge "Add shared app gid to fs config"

* commit '9796a83a39e757558c07e17bd277ab2694762dfd':
Add shared app gid to fs config
9796a83a39e757558c07e17bd277ab2694762dfd 13-Sep-2012 Kenny Root <kroot@google.com> Merge "Add shared app gid to fs config"
7e41c8420e015f6b96e35e90c8a9a8ebf643cdac 12-Sep-2012 Kenny Root <kroot@google.com> Add shared app gid to fs config

This will allow native tools to be able to know where the shared app
gids start and end.

Change-Id: Ie4529baf36b361c51c42f079b259c352e316647f
nclude/private/android_filesystem_config.h
007ce1d1c03a491bc80eb3471cd58ce09dfe63b0 13-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
4a23e1df12e69c7e7210afc045f085f5ea441d9f 12-Sep-2012 Geremy Condra <gcondra@google.com> DO NOT MERGE Add event log tag for cert pin failures.

Change-Id: Ib93f4eeec35b5754498464ada94faeb2bdb0b896
ogcat/event.logtags
7e014ce6defdfe596d83ff549a13f7215151069e 12-Sep-2012 Elliott Hughes <enh@google.com> am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."

* commit 'cdc4a400b3a47564887ac1220bfb7f6f8312a71e':
Always include <sys/socket.h> before <linux/netlink.h>.
cdc4a400b3a47564887ac1220bfb7f6f8312a71e 12-Sep-2012 Elliott Hughes <enh@google.com> am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."

* commit 'cb71ed3092cef3b1c56d8d873788daea82de7879':
Always include <sys/socket.h> before <linux/netlink.h>.
cb71ed3092cef3b1c56d8d873788daea82de7879 12-Sep-2012 Elliott Hughes <enh@google.com> am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."

* commit '50e2555d6c824bd3c7e664f222061158a83ac705':
Always include <sys/socket.h> before <linux/netlink.h>.
50e2555d6c824bd3c7e664f222061158a83ac705 12-Sep-2012 Elliott Hughes <enh@google.com> Merge "Always include <sys/socket.h> before <linux/netlink.h>."
b77d3d724945f38b39f3116e3aead4edcbd08a36 12-Sep-2012 Elliott Hughes <enh@google.com> Always include <sys/socket.h> before <linux/netlink.h>.

Newer kernel headers files aren't stand alone. (This has long been true of
glibc's copy, but we only recently updated external/kernel-headers.)

Change-Id: Iebcb40902b2f29fe509e207e2f3a9d02a7e40602
harger/charger.c
ibnl_2/genl/genl.c
ibnl_2/msg.c
d03072ffde3279fbb60591a0d07c820d8e792762 11-Sep-2012 Elliott Hughes <enh@google.com> The localtime_tz and mktime_tz extensions are now in bionic.

Bug: 7012465
Change-Id: I5f3d06fe06fad7c3ff6d1950770a30f4f83e56ff
nclude/cutils/tztime.h
ibcutils/Android.mk
ibcutils/private.h
ibcutils/tzfile.h
ibcutils/tzstrftime.c
ibcutils/tztime.c
a95c0fa986cf8e6205e04e26b7069d4eeb1bd6de 11-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
0f5e303c6a88c63fc5a4d325ab675af7ed57b777 11-Sep-2012 Kenny Root <kroot@google.com> Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev
fb4a4c35856ce9c9c6199d26d27bcbc9451f365a 10-Sep-2012 Colin Cross <ccross@android.com> am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"

* commit 'e6b898106c7c6f42529db185481d1d4805e91aff':
fastboot: move help command before usb connect
e6b898106c7c6f42529db185481d1d4805e91aff 10-Sep-2012 Colin Cross <ccross@android.com> am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"

* commit 'eb7ee9c0c513160d8db5c76a82f56ed966ec41c0':
fastboot: move help command before usb connect
eb7ee9c0c513160d8db5c76a82f56ed966ec41c0 10-Sep-2012 Colin Cross <ccross@android.com> am 922b460c: Merge "fastboot: move help command before usb connect"

* commit '922b460cc790722ffc303b200f02958e4066a2de':
fastboot: move help command before usb connect
922b460cc790722ffc303b200f02958e4066a2de 10-Sep-2012 Colin Cross <ccross@android.com> Merge "fastboot: move help command before usb connect"
80f9867431af4632749890b24c0256f0ab07640d 30-Aug-2012 Colin Cross <ccross@android.com> fastboot: move help command before usb connect

Move the help command handling before the call to open_device
so that is doesn't block when no device is connected.

Bug: 7078873
Change-Id: I4e9a4317bd72b4ceb4b9fc838eafd2e57b17a473
astboot/fastboot.c
ae807aaa022196b2f08f64f303b380c1903b77e0 10-Sep-2012 Colin Cross <ccross@android.com> Merge "fastboot: move help command before usb connect" into jb-mr1-dev
bf929a985381c3f148078c5e8f727ee111e0213b 09-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
5054417c1025b0f3f36f4b537e51ddd3eea981c8 09-Sep-2012 Kenny Root <kroot@google.com> Add /data/app-lib for native library sharing

Change-Id: I7419676d987178fd2422c50d74f966e27af9f62e
ootdir/init.rc
64604840debad8f9f24c22b6b90fb572a5dc2d6b 08-Sep-2012 Ian Rogers <irogers@google.com> am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."

* commit '6de267876b9311d635b7fe4eec81a4a859ac1790':
Remove unnecessary compiler pragma.
6de267876b9311d635b7fe4eec81a4a859ac1790 08-Sep-2012 Ian Rogers <irogers@google.com> am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."

* commit '0991797fd6cabc582afb0a35a62ad0cdc9cd6837':
Remove unnecessary compiler pragma.
0991797fd6cabc582afb0a35a62ad0cdc9cd6837 08-Sep-2012 Ian Rogers <irogers@google.com> am 82959f5e: Merge "Remove unnecessary compiler pragma."

* commit '82959f5e46870cb57675d1ebba97294c56508949':
Remove unnecessary compiler pragma.
82959f5e46870cb57675d1ebba97294c56508949 08-Sep-2012 Ian Rogers <irogers@google.com> Merge "Remove unnecessary compiler pragma."
eeeee802e9837c592b0f0f9fd183bcaa9e77732e 28-Aug-2012 Eric Laurent <elaurent@google.com> audio: new audio devices enum values

Each audio device is identified by a bit in a 32 bit field with
16 bits for output devices and 16 bits for input devices.
The number of output devices is now exhausted.
In order to add new devices a new convention for audio device
identification is defined, allowing 31 different input and output
devices: Bit 31 of the bit field is reserved and when set indicates
an input device.

Also added new output device for wifi display and new input devices
for digital and analog docks, USB and wifi display send.

Change-Id: I849bec0b6d46e082e325a3f08890d313c8dc763b
nclude/system/audio.h
38f10f8649940eda42b2336a4757a9dd07e721cf 07-Sep-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Device and mode definitions for remote submix" into jb-mr1-dev
e11866a8799a2357b82c9217c8d6b726726f23fe 17-Aug-2012 Jean-Michel Trivi <jmtrivi@google.com> Device and mode definitions for remote submix

A remote submix is an audio mix of audio streams that
are not going to be played directly through the platform mix,
but rather will be mixed together to be handled in a
different manner. This mix can be obtained by recording
it through the AUDIO_IN_REMOTE_SUBMIX and presenting it
remotely (as opposed to local playback == on the device
itself).

All changes marked "temporary" will be overriden by the
changes to update the audio device definitions for
the 2.0 API.

Change-Id: I9c6da607fc50b7b8545d189ac5b083107369cfb5
nclude/system/audio.h
nclude/system/audio_policy.h
d2f9bf3addaa586c0dbc303508caf02c66dc03b9 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> Merge "Keep /mnt/secure private to default namespace." into jb-mr1-dev
707b2582b345b0ecdd6af0584d52a17fccb22153 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> Bring back ADB_EXTERNAL_STORAGE.

Bug: 7119408
Change-Id: Ic9a23fb6adfb1db771e1e278179586bca69a5edd
db/adb.c
58d3980f314d08f86347ba83db85c2d4c6066599 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> Keep /mnt/secure private to default namespace.

When vold mounts things in /mnt/secure/staging, it expects to MS_MOVE
those mountpoints when vetting is finished. However, the kernel
doesn't allow MS_MOVE when the source is shared to child namespaces.

To work around this, create a tmpfs at /mnt/secure and mark it as
private (not shared). Verified that vold can now successfully move
from the staging area.

Bug: 7094858
Change-Id: I5e05b1005c63efa277935c9bbd18cbf3ffdd47a3
ootdir/init.rc
d8a8979bd932a73378286ecea6a03c7fa8e1b2a6 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev
d6d4286a28b4a9aef902585625ea6656ab06cf52 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> Bring back ADB_EXTERNAL_STORAGE.

Bug: 7119408
Change-Id: Ic9a23fb6adfb1db771e1e278179586bca69a5edd
db/adb.c
83e3842f4efc2647752d85af81869034dda985f6 06-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 7908a68e: (-s ours) Reconcile with jb-release - do not merge

* commit '7908a68e7041459c383513a67fbda8da1bba3177':
7908a68e7041459c383513a67fbda8da1bba3177 06-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release - do not merge

Change-Id: I74a36d0a79723c656b50f36c1d96042e50a0c943
05e2599ffd7793804202466a33cae162ca124c19 06-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
96535ba62044c712f8b017fe569f598a7a2934c2 05-Sep-2012 Ying Wang <wangying@google.com> Dist fastboot and adb for the sdk build.

So they can be downloaded from the build page.
Bug: 7109694

Change-Id: Ibc60d0acbc5d2445c01010fd0bd4654a240b0a88
db/Android.mk
astboot/Android.mk
4b019264e269b2e381fede1a6998f66733f94f25 05-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d932c552eece994786e5684b4fc9bc5b2bb25433 03-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
345ca131bbc17b1ae1073db04f37f6610ccb4c71 01-Sep-2012 Benoit Goby <benoit@android.com> adb: Link statically with libcrypto

Bug: 7063951
Change-Id: I328b76a751aceaae625d64156f22ce3de65678c8
db/Android.mk
59680145c85522e8b4b8cc928a48e105d966a44b 31-Aug-2012 Benoit Goby <benoit@android.com> Merge "adb: Create private key with 0600 mode" into jb-mr1-dev
64b3103017cb9038c5fb7e3601f51c6a458bed06 31-Aug-2012 Benoit Goby <benoit@android.com> adb: Create private key with 0600 mode

Changed key name to force generating new pairs.

Bug: 7092477
Change-Id: I680cb9dd1896ae52b2b29d63533f966e033d823f
db/adb.h
db/adb_auth_host.c
9685194fc94510a33201aee9b80c23f206ccfe67 28-Aug-2012 Jeff Sharkey <jsharkey@android.com> File-system utilities for installd and zygote.

Bug: 7008879
Change-Id: Ia54b8d4ad434e8973f235e2a4728651814bef8a9
nclude/cutils/fs.h
nclude/cutils/multiuser.h
ibcutils/Android.mk
ibcutils/fs.c
ibcutils/multiuser.c
b2c75f76960b53e9f0b5d16f460c5a182c62e718 30-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
c7b75dcc1aa121574d7677c97ff7d9b4ba91e624 30-Aug-2012 Colin Cross <ccross@android.com> fastboot: move help command before usb connect

Move the help command handling before the call to open_device
so that is doesn't block when no device is connected.

Bug: 7078873
Change-Id: I4e9a4317bd72b4ceb4b9fc838eafd2e57b17a473
astboot/fastboot.c
04b5ac36a50a5fdaf3510c3c4c4e89bc35cfe26e 29-Aug-2012 Ian Rogers <irogers@google.com> Remove unnecessary compiler pragma.

With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not
necessary.
Also fix compiler warning about redefinition of LOG_TAG.

Depends upon: https://android-review.googlesource.com/42351

Change-Id: I50f70be31f4bd994b09083e722759464476c70b3
ibpixelflinger/codeflinger/CodeCache.cpp
c4e7e976ffb98722900695044a870f0ae902a838 29-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
98a7c86bb07432f07b5ecf6025d1e758926e8b72 29-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
84ac402fa1860817ed100d189b0613f8c4b0ef2a 29-Aug-2012 Ian Rogers <irogers@google.com> Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
db59e656dab3bc4b261e19153de35638c1d61d77 29-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
5c9da7b65ca32f4268cafeef198f173abb33ec46 29-Aug-2012 Wink Saville <wink@google.com> am e3524293: am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils"

* commit 'e3524293da5d7503dddb00911b9e5b37e9417981':
Export flags needed for ifc_reset_connections API in netutils
e3524293da5d7503dddb00911b9e5b37e9417981 29-Aug-2012 Wink Saville <wink@google.com> am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils"

* commit 'af03b05009863f5d9761864dcec13e4ee6221d69':
Export flags needed for ifc_reset_connections API in netutils
af03b05009863f5d9761864dcec13e4ee6221d69 29-Aug-2012 Wink Saville <wink@google.com> Merge "Export flags needed for ifc_reset_connections API in netutils"
fd7f1b6a50388bb3e21a744af89b184b8f911e9c 29-Aug-2012 Ian Rogers <irogers@google.com> Revert "Revert "Upgrade to dlmalloc 2.8.5.""

This reverts commit 42b83c6df7e4f65461a32a711d5dd4f46b9b85e0.
nclude/cutils/mspace.h
ibcutils/Android.mk
ibcutils/dlmalloc_stubs.c
ibcutils/mspace.c
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/CodeCache.h
59c778e9885f1a1a483bdc1b2287fc2d816c883c 28-Aug-2012 Mike Lockwood <lockwood@google.com> Merge "import init.${ro.hardware}.rc last to allow overriding default USB configuration" into jb-mr1-dev
35ea5e4f2365ad791824ee49d1c999be81b705c5 28-Aug-2012 Mike Lockwood <lockwood@google.com> import init.${ro.hardware}.rc last to allow overriding default USB configuration

Change-Id: I2194466fb7cf7ff5313d146601155ebe6043fd42
ootdir/init.rc
2748e5f455429c7b477ae3f2329fd2ef46ac337f 28-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
8bbc8a2884b11ff4693be72756a90f86b122058d 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 7995b841: am c3c5358b: Merge "Add MIPS support to pixelflinger."

* commit '7995b841483fc45cc762d7dab8a8817a6d97492b':
Add MIPS support to pixelflinger.
7995b841483fc45cc762d7dab8a8817a6d97492b 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c3c5358b: Merge "Add MIPS support to pixelflinger."

* commit 'c3c5358b94f48799fd595c829ce223b43588bac1':
Add MIPS support to pixelflinger.
c3c5358b94f48799fd595c829ce223b43588bac1 27-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Add MIPS support to pixelflinger."
df8ad93acce5a042707e1031c7b9c384e0210a87 27-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d7c8fe6abbf03157242ae104a7aedabf15791da0 24-Aug-2012 Jamie Gennis <jgennis@google.com> Merge "Add an IMPL_DEFINED pixel format." into jb-mr1-dev
1182e61f76f3adf79d82622697ba07a267f4cf71 24-Aug-2012 Stephen Hines <srhines@google.com> Merge "Link directly with libm due to libpng dependency." into jb-mr1-dev
c60e6e7e585551fa97cac2ac71dc1ddf54cd0242 24-Aug-2012 Stephen Hines <srhines@google.com> Link directly with libm due to libpng dependency.

Change-Id: I9a9b8c3db025b8391b6a0e96ca24ed9cda3ab9a2
harger/Android.mk
f824ad7b35c3bf866d60662404be0d55fe753e3d 23-Aug-2012 Wink Saville <wink@google.com> am 582b1152: am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"

* commit '582b11527cd6d968f163fbee73f92d82b679e330':
Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
2bf953a9ba1949815f5022ae831e81061cb5c7e5 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev
5f83cf0bcf96fc58ca7314571ae264353cdee321 22-Aug-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of a6405e9d to jb-mr1-dev

Change-Id: I2c698ec017f29c9ccc89231439cb6c8013914009
23ab200c16923e97e502b282408eb1ed970b3cb1 23-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d5fcafaf41f8ec90986c813f75ec78402096af2d 12-Apr-2012 Benoit Goby <benoit@android.com> adb: Add public key authentification

Secure adb using a public key authentication, to allow USB debugging
only from authorized hosts.

When a device is connected to an unauthorized host, the adb daemon sends
the user public key to the device. A popup is shown to ask the user to
allow debugging once or permanantly from the host. The public key is
installed on the device in the later case. Other keys may be installed
at build time.

On the host, the user public/private key pair is automatically generated,
if it does not exist, when the adb daemon starts and is stored in
$HOME/.android/adb_key(.pub) or in $ANDROID_SDK_HOME on windows. If needed,
the ADB_KEYS_PATH env variable may be set to a :-separated (; under
Windows) list of private keys, e.g. company-wide or vendor keys.

On the device, vendors public keys are installed at build time in
/adb_keys. User-installed keys are stored in /data/misc/adb/adb_keys.

ADB Protocol change:
If the device needs to authenticate the host, it replies to CNXN
packets with an AUTH packet. The AUTH packet payload is a random token.
The host signs the token with one of its private keys and sends an AUTH(0)
packet. If the signature verification succeeds, the device replies with
a CNXN packet. Otherwise, it sends a new AUTH packet with a new token so
that the host can retry with another private key. Once the host has tried
all its keys, it can send an AUTH(1) packet with a public key as
payload. adbd then sends the public key to the framework (if it has been
started) for confirmation.

Change-Id: I4e84d7621da956f66ff657245901bdaefead8395
db/Android.mk
db/adb.c
db/adb.h
db/adb_auth.h
db/adb_auth_client.c
db/adb_auth_host.c
db/protocol.txt
db/sysdeps.h
42a1e6c9d827fc3d64ad3b0750b87de1f4c436e7 23-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Iteration on multi-user external storage." into jb-mr1-dev
582b11527cd6d968f163fbee73f92d82b679e330 23-Aug-2012 Wink Saville <wink@google.com> am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"

* commit 'baba99840400f5b835d44b6d91e2190136277988':
Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
f70c6da41ef13146b85e1101d1e708cd35f81b78 23-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Remove sdcard groups from services." into jb-mr1-dev
baba99840400f5b835d44b6d91e2190136277988 23-Aug-2012 Wink Saville <wink@google.com> Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"
5e3d90c8bea40874ecfe950136029f093ab17824 22-Aug-2012 Brian Carlstrom <bdc@google.com> Revert "Upgrade to dlmalloc 2.8.5."

This reverts commit 2d13791ce7ff61221ca047553891f31a23b2e943.
nclude/cutils/mspace.h
ibcutils/Android.mk
ibcutils/dlmalloc_stubs.c
ibcutils/mspace.c
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/CodeCache.h
8ccaed6a29d7371f614e94f28b68e476064fc959 22-Aug-2012 James Dong <jdong@google.com> Merge "Don't give drmserver read permission to local storage" into jb-mr1-dev
febe9d904fdae52172ea534393929918bf750446 22-Aug-2012 Jamie Gennis <jgennis@google.com> Add an IMPL_DEFINED pixel format.

This change adds a new HAL pixel format that indicates that the specific format
is to be chosen by the gralloc implementation.

Change-Id: I326b5ec7347a20863b42119431ef1e4d22480fec
nclude/system/graphics.h
bfcd810b792f7ffbb2ec1360c0c2662725fd0362 22-Aug-2012 Jeff Sharkey <jsharkey@android.com> Iteration on multi-user external storage.

Define /storage as top-level concept, so that we enforce permissions
uniformly. Moves external storage paths from headers to per-device
environment variables. Added missing mount flags, and we no longer
have adb-specific external storage.

Bug: 6925012
Change-Id: Ic7ca953be2f552d3f0ec9e69f89fef751daa1b29
db/adb.c
nclude/private/android_filesystem_config.h
ootdir/init.rc
oolbox/mount.c
42b83c6df7e4f65461a32a711d5dd4f46b9b85e0 22-Aug-2012 Brian Carlstrom <bdc@google.com> Revert "Upgrade to dlmalloc 2.8.5."

This reverts commit 2d13791ce7ff61221ca047553891f31a23b2e943.
nclude/cutils/mspace.h
ibcutils/Android.mk
ibcutils/dlmalloc_stubs.c
ibcutils/mspace.c
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/CodeCache.h
a6405e9da2200f09c2d23270ab104ee22c25b046 22-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am db56bb4a: Merge "libcorkscrew: avoid future name collisions."

* commit 'db56bb4aebb2aaa63cf33c2f9868a22ea655b38e':
libcorkscrew: avoid future name collisions.
db56bb4aebb2aaa63cf33c2f9868a22ea655b38e 22-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "libcorkscrew: avoid future name collisions."
6e648d9254c5b99bfa8e5df74c22d842db45a91a 22-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
984d35703d5c6738253193bd53da9dedb3b58243 22-Aug-2012 Erik Gilling <konkers@android.com> update libsync to support new timeout semantics

Change-Id: Ibedbd261bb96a84785c4e679b6fc4061287d5d7d
nclude/sync/sync.h
ibsync/sync.c
6302b420554724c1434e27e2cd46cb43f5fb7bca 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile"

* commit '487d6d3db3f504b0120fc605ad3a4155ca214674':
Fixed warnings test_zipfile
a4ad73480896c6bc7960331dcfca87a358cc5782 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 00f06911: am c6620cb3: Merge "Fixing unused param warnings in sync_test"

* commit '00f0691107dfde589bd23a7d079b4e05998833b0':
Fixing unused param warnings in sync_test
487d6d3db3f504b0120fc605ad3a4155ca214674 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 02fd2924: Merge "Fixed warnings test_zipfile"

* commit '02fd29246ab54ee4a0f8fa6358498070e54e5fd0':
Fixed warnings test_zipfile
00f0691107dfde589bd23a7d079b4e05998833b0 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c6620cb3: Merge "Fixing unused param warnings in sync_test"

* commit 'c6620cb3a37e98ceb89f5d11305038786af76650':
Fixing unused param warnings in sync_test
02fd29246ab54ee4a0f8fa6358498070e54e5fd0 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fixed warnings test_zipfile"
c6620cb3a37e98ceb89f5d11305038786af76650 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fixing unused param warnings in sync_test"
c5a4eb547e7e9c443f4a47a450fce95939241dd0 21-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
3fc95a991805feba257a396c13548776fd36f34f 21-Aug-2012 Benoit Goby <benoit@android.com> Revert "adb: Add public key authentification"

This reverts commit f4ed516643ee8ed3a59ad1a8048f7ce5f47f93fb.
db/Android.mk
db/adb.c
db/adb.h
db/adb_auth.h
db/adb_auth_client.c
db/adb_auth_host.c
db/protocol.txt
300d6d65d022c4a4663d097e5271eac745be6278 21-Aug-2012 Benoit Goby <benoit@android.com> Merge "adb: Add public key authentification" into jb-mr1-dev
17687079519c9014ee6c5ad2d13c3163d40a02ce 21-Aug-2012 Brian Carlstrom <bdc@google.com> am e05ac541: am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."

* commit 'e05ac5415e861dee6a3f175c8066ff577736ba1f':
Upgrade to dlmalloc 2.8.5.
e05ac5415e861dee6a3f175c8066ff577736ba1f 21-Aug-2012 Brian Carlstrom <bdc@google.com> am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."

* commit '9d779bf1ea587dc70b74fd1f8798894a8695e78b':
Upgrade to dlmalloc 2.8.5.
9dd0029a05511d5e15c7fdb453b93f50d5b37d04 21-Aug-2012 John Grossman <johngro@google.com> Merge "Replace a segfault with a warning." into jb-mr1-dev
9367f4f973e0d4dfb1fe898709f0246dce6f81aa 21-Aug-2012 John Grossman <johngro@google.com> Replace a segfault with a warning.

Just print a warning if ADB_EXTERNAL_STORAGE is not defined when ADB
runs instead of segfaulting. If we really don't want to continue to
run, we can make this a fatal error instead.

Change-Id: Icfc5fb9e594b0a310029f1dca7e9476f27ceb7bc
db/adb.c
9d779bf1ea587dc70b74fd1f8798894a8695e78b 21-Aug-2012 Brian Carlstrom <bdc@google.com> Merge "Upgrade to dlmalloc 2.8.5."
2d13791ce7ff61221ca047553891f31a23b2e943 18-Aug-2012 Ian Rogers <irogers@google.com> Upgrade to dlmalloc 2.8.5.

Remove mspace functionality from cutils.
Directly declare mspace from dlmalloc in code flinger's code cache, and
manage without using morecore.

Depends upon: https://android-review.googlesource.com/41717

Change-Id: If927254febd4414212c690f16509ef2ee1b44b44
nclude/cutils/mspace.h
ibcutils/Android.mk
ibcutils/dlmalloc_stubs.c
ibcutils/mspace.c
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/CodeCache.h
a8b832a89713dea6d1a82cfc8ecfa624c4fc5783 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 42900c30: am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p"

* commit '42900c30cf39ea4cdc41cc3671584b7f4f39b8bc':
adb: Pick desired product value from command line it follows -p
2ab69388cb4e26855cc7a9f3584935b927a3659e 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag"

* commit '76080925410db41cfa5c70ffcffaa2b3b4d59aad':
vmstat: Fix -n flag
9305892464fc353702345eedcb2180f5e6fb27c0 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 1bcced2b: am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."

* commit '1bcced2bb67a4024035d5303d953c793b857f275':
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
42900c30cf39ea4cdc41cc3671584b7f4f39b8bc 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p"

* commit '0874aa0ec4f413a77a610133c904c2590a2e3ccd':
adb: Pick desired product value from command line it follows -p
76080925410db41cfa5c70ffcffaa2b3b4d59aad 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 52d5dfc8: Merge "vmstat: Fix -n flag"

* commit '52d5dfc8d30890734ee7122c3139f8637e196a1c':
vmstat: Fix -n flag
1bcced2bb67a4024035d5303d953c793b857f275 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."

* commit 'c57689fc7ccadee4f852ad62ac1010e53382a67c':
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
0874aa0ec4f413a77a610133c904c2590a2e3ccd 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "adb: Pick desired product value from command line it follows -p"
61f1359486e578bc0fc12bc4f42c7cd65991fc5c 20-Aug-2012 Jeff Sharkey <jsharkey@android.com> Remove sdcard groups from services.

Even with the groups, services no longer have access.

Change-Id: I2b4871b276ffd309c08c404b1211b33406dbebd5
ootdir/init.rc
52d5dfc8d30890734ee7122c3139f8637e196a1c 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "vmstat: Fix -n flag"
c57689fc7ccadee4f852ad62ac1010e53382a67c 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."
62188564fab23418373295d9f4a942c3094a9f46 14-Aug-2012 Ariel Bernal <ariel.j.bernal@intel.com> Fixed warnings test_zipfile

Fixed implicit declaration of strcmp warning
Fixed switch case of enumeration not handled

Change-Id: Ic3f3690a2e749235b1b0dffd252b119855ad36c0
Author: Ariel Bernal <ariel.j.bernal@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
ibzipfile/test_zipfile.c
a8c2112be672409a81f200c110f901fda4907bde 20-Aug-2012 Jeff Brown <jeffbrown@google.com> Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-dev
5dd0f86fbfed631b31c9055109889f1d9559a3ea 18-Aug-2012 Jeff Sharkey <jsharkey@android.com> Migrate sdcard0 to shell-accessible location.

Also remove mount() from adb, since it can come online long before
data partition is ready. Set EXTERNAL_STORAGE environment variable
to point to owner for backwards compatibility.

Bug: 7005701
Change-Id: I63444f6636624eb7ad89f053daa289663424639e
db/adb.c
nclude/private/android_filesystem_config.h
ootdir/init.rc
ed95159056caffc869e48509f50433789e75ebb4 02-Aug-2012 Doug Zongker <dougz@google.com> add command-line arguments to mkbootimg to move kernel, ramdisk, etc.

Bug: 6918260
Change-Id: I5d4af6314fded027952941110a520dc9aa234a14
kbootimg/mkbootimg.c
bb0d0721e6bc5dcedc9bbbac0ea8fa4e57f487ad 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 94938c9d: am ed2e672f: Merge "Print strerror for file read errors during flashing"

* commit '94938c9d60d6467ec40df4254beadc50bb787934':
Print strerror for file read errors during flashing
c3a4a054a99b62cb4fd593d95f3b2b0017202b20 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"

* commit '3af04b71e51e89af02a1fe526e4fc32dce0100d3':
Extend and document the "wait" command
80da83ac31925326b3a76f10564c05f2043c70f0 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am cd82a6fe: am 36b1399d: Merge "diskconfig: Add missing include for loff_t"

* commit 'cd82a6fea05d1fa06cb0ac56d2dbb27b013b8eaa':
diskconfig: Add missing include for loff_t
94938c9d60d6467ec40df4254beadc50bb787934 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am ed2e672f: Merge "Print strerror for file read errors during flashing"

* commit 'ed2e672f3b929ac49617de11e6530c812b082eb6':
Print strerror for file read errors during flashing
3af04b71e51e89af02a1fe526e4fc32dce0100d3 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 7c386a61: Merge "Extend and document the "wait" command"

* commit '7c386a610d9164c12932452d1ff671e070956ec1':
Extend and document the "wait" command
cd82a6fea05d1fa06cb0ac56d2dbb27b013b8eaa 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 36b1399d: Merge "diskconfig: Add missing include for loff_t"

* commit '36b1399d8cee09d4ffde3bf958322ab9556b8ebe':
diskconfig: Add missing include for loff_t
ed2e672f3b929ac49617de11e6530c812b082eb6 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Print strerror for file read errors during flashing"
7c386a610d9164c12932452d1ff671e070956ec1 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Extend and document the "wait" command"
36b1399d8cee09d4ffde3bf958322ab9556b8ebe 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "diskconfig: Add missing include for loff_t"
2a838647456627faddf9d8bbe464cb2968476522 20-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
ab163a9a1784594b46217576d0fa991496f3d14e 17-Aug-2012 Joe Onorato <joeo@android.com> am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367

* commit 'c56f428530a307c850dc99024d23f7e5ebbf92d3':
Support for multiple modules with the same name is going away.
Fix build by removing TAGS from host module
libext4_utils on host is now called libext4_utils_host so there is no name conflict
c56f428530a307c850dc99024d23f7e5ebbf92d3 17-Aug-2012 Joe Onorato <joeo@android.com> am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367

* commit 'a11f4bcfd4d40673bc97d81eb80e201359ade1e6':
Support for multiple modules with the same name is going away.
Fix build by removing TAGS from host module
libext4_utils on host is now called libext4_utils_host so there is no name conflict
a11f4bcfd4d40673bc97d81eb80e201359ade1e6 17-Aug-2012 Joe Onorato <joeo@android.com> Merge changes I5006b467,I0118cebf,Ibc792367

* changes:
Support for multiple modules with the same name is going away.
Fix build by removing TAGS from host module
libext4_utils on host is now called libext4_utils_host so there is no name conflict
f4ed516643ee8ed3a59ad1a8048f7ce5f47f93fb 12-Apr-2012 Benoit Goby <benoit@android.com> adb: Add public key authentification

Secure adb using a public key authentication, to allow USB debugging
only from authorized hosts.

When a device is connected to an unauthorized host, the adb daemon sends
the user public key to the device. A popup is shown to ask the user to
allow debugging once or permanantly from the host. The public key is
installed on the device in the later case. Other keys may be installed
at build time.

On the host, the user public/private key pair is automatically generated,
if it does not exist, when the adb daemon starts and is stored in
$HOME/.android/adb_key(.pub) or in $ANDROID_SDK_HOME on windows. If needed,
the ADB_KEYS_PATH env variable may be set to a ;-separated list of private
keys, e.g. company-wide or vendor keys.

On the device, vendors public keys are installed at build time in
/adb_keys. User-installed keys are stored in /data/misc/adb/adb_keys.

ADB Protocol change:
If the device needs to authenticate the host, it replies to CNXN
packets with an AUTH packet. The AUTH packet payload is a random token.
The host signs the token with one of its private keys and sends an AUTH(0)
packet. If the signature verification succeeds, the device replies with
a CNXN packet. Otherwise, it sends a new AUTH packet with a new token so
that the host can retry with another private key. Once the host has tried
all its keys, it can send an AUTH(1) packet with a public key as
payload. adbd then sends the public key to the framework (if it has been
started) for confirmation.

Change-Id: Idce931a7bfe4ce878428eaa47838e5184ac6073f
db/Android.mk
db/adb.c
db/adb.h
db/adb_auth.h
db/adb_auth_client.c
db/adb_auth_host.c
db/protocol.txt
de980f27a701eb8f7130218f9bac768fe7155d30 17-Aug-2012 Jeff Sharkey <jsharkey@android.com> Omit multiuser.c from Windows builds.

Change-Id: I0cee35373e33084e4fc65a1d5c0b611c6fa82346
ibcutils/Android.mk
2be5338a84f19b24b6515c0bfcf2f3f7b55262c1 16-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Multi-user external storage support." into jb-mr1-dev
edb2d634b35ec1b0268ac7d9ddab8c8fc082a14e 16-Aug-2012 Scott Anderson <saa@android.com> Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev
60e5cd66bbee04d3d5771e085e8a73257ebff787 16-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
885342a0f2c834a6b680284047c47c9d04b32565 15-Aug-2012 Jeff Sharkey <jsharkey@android.com> Multi-user external storage support.

Remount rootfs as recursively shared, so that mount changes are
propagated into child namespaces. Mount external storage for access
from adb.

Clean multi-user dependencies for use in Dalvik. Also define
external storage paths.

Bug: 6925012
Change-Id: I375de581a63f4f36667894c56a34a9dd45361e8f
db/adb.c
nclude/cutils/multiuser.h
nclude/private/android_filesystem_config.h
ibcutils/Android.mk
ibcutils/multiuser.c
ootdir/init.rc
5069b01e21129fe2d42a28e850645376560f2029 24-Jul-2012 Joe Onorato <joeo@google.com> Support for multiple modules with the same name is going away.

Change-Id: I5006b467978071f9107babe532efa71d05061580
astboot/Android.mk
ibsparse/Android.mk
1926c15a1219bc8426e0b9131633e02c76929fb7 21-Jul-2012 Mike J. Chen <mjchen@google.com> Fix build by removing TAGS from host module

Change-Id: I0118cebff021b435baea0b46dd3c43250ef96632
Signed-off-by: Mike J. Chen <mjchen@google.com>
pttool/Android.mk
2ffe3c8ac4b0d5a0716c4b131743b5983c99ce59 18-Jul-2012 Joe Onorato <joeo@google.com> libext4_utils on host is now called libext4_utils_host so there is no name conflict

Change-Id: Ibc7923676925ed6942b3f672ee764cfaa98ee96e
astboot/Android.mk
091c21c92c6bdb49b56c4045615159ea144a42f0 08-Nov-2011 Alex Yakavenka <ayakav@codeaurora.org> Export flags needed for ifc_reset_connections API in netutils

Code using ifc_reset_connections api needs to have access to
predefined masks for reset_mask parameter

Change-Id: I90bc5e1b62ae4a88501c8ad4e353c0d93d319579
nclude/netutils/ifc.h
ibnetutils/ifc_utils.c
3ad289dca66ce950f417280b2c071a8dd1975598 16-Aug-2012 Scott Anderson <saa@android.com> ueventd.rc: Add /dev/uhid for bluedroid

Change-Id: Ica71265856fce1abc0a0ba9c0b1ca016510c61b7
Signed-off-by: Scott Anderson <saa@android.com>
ootdir/ueventd.rc
81b1996827941070851fbbae04fcef24f371843b 15-Aug-2012 Jeonghoon lim <jeonghoon.lim@lge.com> bluetooth: bring up with bluedroid stack

- change permission of "bluetooth." property to AID_BLUETOOTH

Change-Id: Ifcd97f136cfc3372412fe500e4f800d1bbbd065c
nit/property_service.c
e92372ba9eaa04eb4ed7eb9417ee2be3515bd972 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 2237ca4c to jb-mr1-dev

Change-Id: I04982ff2b092274b940a621b238c2246349aa85e
d7f78e88b5b2c65b8cef21fdcaae3278ec2ed083 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am e3bdaeb6: am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"

* commit 'e3bdaeb603ab7ac941b35b41856c6b8ebf47c6bb':
Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
ef1945f8e9fc3b5aab9bf9b0bda83517a906f4fe 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 417e3041: am 8124e073: Merge "Fix unused parameter warnings"

* commit '417e3041b8b6ba9582c2e4d2003cfcd77435fc21':
Fix unused parameter warnings
5731de9620a632e1b70e19dd816f9807ba84082e 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 83c4398b: am cc12ed32: Merge "[MIPS] debuggerd and libcorkscrew support"

* commit '83c4398b4adb5c2cfaf6487699a8b94901ce0fb1':
[MIPS] debuggerd and libcorkscrew support
2237ca4c6658d73c9fd21cb2fa10eeddff5708da 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 2290dd41: Merge "Fixing signed/unsigned comparison warnings"

* commit '2290dd418b4ddcb12027fa4616affe64eb92ad1e':
Fixing signed/unsigned comparison warnings
e3bdaeb603ab7ac941b35b41856c6b8ebf47c6bb 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"

* commit '2765e4fb39af2f8260de1177027e292f2a7198bd':
Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
417e3041b8b6ba9582c2e4d2003cfcd77435fc21 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8124e073: Merge "Fix unused parameter warnings"

* commit '8124e0736208c47a74767170d31e3c24e0f47504':
Fix unused parameter warnings
83c4398b4adb5c2cfaf6487699a8b94901ce0fb1 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am cc12ed32: Merge "[MIPS] debuggerd and libcorkscrew support"

* commit 'cc12ed3241a4081970cdd70f88d57cb4d3bc19f2':
[MIPS] debuggerd and libcorkscrew support
a8f1e11bcc8144548a5dd0e004f54679d4d66396 15-Aug-2012 Iliyan Malchev <malchev@google.com> Merge "bluetooth: bring up with bluedroid stack" into jb-mr1-dev
2290dd418b4ddcb12027fa4616affe64eb92ad1e 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fixing signed/unsigned comparison warnings"
2765e4fb39af2f8260de1177027e292f2a7198bd 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"
8124e0736208c47a74767170d31e3c24e0f47504 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fix unused parameter warnings"
cc12ed3241a4081970cdd70f88d57cb4d3bc19f2 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "[MIPS] debuggerd and libcorkscrew support"
651bdbafc2cbd5071f81b4010d746d6af3122f99 15-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
e953e9657c482d83ad487a4b861026a16f6bbb64 15-Aug-2012 Jeonghoon lim <jeonghoon.lim@lge.com> bluetooth: bring up with bluedroid stack

- change permission of "bluetooth." property to AID_BLUETOOTH

Change-Id: Ifcd97f136cfc3372412fe500e4f800d1bbbd065c
nit/property_service.c
847cb4d125fa9eeb4272a0676e1dac847d4b8a96 15-Aug-2012 Keun-young Park <keunyoung@google.com> am 8f19b11a: am c4c731e7: Merge "[MIPS] Enable SD-card functionality to work"

* commit '8f19b11a42423ecd4ac8373041f64cb3001caf78':
[MIPS] Enable SD-card functionality to work
8f19b11a42423ecd4ac8373041f64cb3001caf78 15-Aug-2012 Keun-young Park <keunyoung@google.com> am c4c731e7: Merge "[MIPS] Enable SD-card functionality to work"

* commit 'c4c731e78ca1a3527093a35280381616d1cb667d':
[MIPS] Enable SD-card functionality to work
c4c731e78ca1a3527093a35280381616d1cb667d 15-Aug-2012 Keun-young Park <keunyoung@google.com> Merge "[MIPS] Enable SD-card functionality to work"
5c8574b51210be53efbb488965db0b8591c8d1cf 15-Aug-2012 Benoit Goby <benoit@android.com> init: Fix mkdir command when using ISUID or ISGID bit

On first boot, the directory is created with root:root ownership and
then chowned. chown clears the ISUID and ISGID bits, so we need to chmod
the directory again after chown.

Change-Id: I02dfe7a19a637678256b4e7cc09e6b5431e6f11e
nit/builtins.c
6736eb1829abd57a6304c6efaa54a6f23cb8115d 10-Jul-2012 Chris Dearman <chris@mips.com> Use sigemptyset to initialise signal mask as it is more portable.
Referencing sa_restorer fails on MIPS

Change-Id: I81c9ed5ef027a9d5258942ffcecb96e3f787e93c
Signed-off-by: Chris Dearman <chris@mips.com>
nit/signal_handler.c
cb83dc33f5cde8a76bad147cd7f28ceccea248b2 15-Aug-2012 James Dong <jdong@google.com> Don't give drmserver read permission to local storage

o related-to-bug: 6426185

Change-Id: Ibacd9210d10f95e3b5586dfa671c0b32d24f47de
ootdir/init.rc
90b80de5a7b9b4557985eb2ec21d2d82b44eb83b 14-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Support shared-subtree and bind mount flags." into jb-mr1-dev
e50ac5f7771872331df70251d23d6bd8155da4a7 14-Aug-2012 Jeff Sharkey <jsharkey@android.com> Support shared-subtree and bind mount flags.

Bug: 6925012
Change-Id: Id8d887d17c6b1b2f90cfd1a1de991ccaba730b7d
s_mgr/fs_mgr.c
nit/builtins.c
29bdc876e498a193f61ea3bdadce5bf8a35cb250 27-Jul-2012 Edwin Vane <edwin.vane@intel.com> Fixing signed/unsigned comparison warnings

Clang turned up some signed/unsigned comparison warnings. These warnings
have been fixed by cleaning up sdcard slightly:
- Don't use negative numbers for invalid gid/uid.
- sdcard takes a fixed number of arguments now so assert on that instead
of using a for loop.
- Also fixed usage string to reflect this fact.

Change-Id: Iee58a8e9aaedb3d40ad7dfeef63d8cd1fe1cd248
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
dcard/sdcard.c
96539e8153dadeccb8b7d334cda8b2acaaa68f06 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am ee0d281a: am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup."

* commit 'ee0d281a3e5fe611bdda23db18fa0e5684ee43ed':
Char device /dev/dri/card0 was not created during startup.
ee0d281a3e5fe611bdda23db18fa0e5684ee43ed 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup."

* commit 'c95c15b1923611f48c44c18ad158e57b9d915fdf':
Char device /dev/dri/card0 was not created during startup.
c95c15b1923611f48c44c18ad158e57b9d915fdf 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Char device /dev/dri/card0 was not created during startup."
85d07f1de7e59bb4fcadf4a1bc8501a8a00b06ba 14-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
70e995fb8c5f51e91766cd8765a6733d19b1d37a 14-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Source and destination paths for sdcard." into jb-mr1-dev
e169bd05ec70f68c0db5e61c93b71e1746eb6c56 14-Aug-2012 Jeff Sharkey <jsharkey@android.com> Source and destination paths for sdcard.

Enables init.rc to provide both paths, instead of hard-coding the
destination.

Bug: 6925012
Change-Id: I666cde710baad965b98619b68fcbcbb104973da3
dcard/sdcard.c
93be76f5c019f4e3c125b75bc64f99685a0d2135 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am e8e73b01: am 311a4758: Merge "Remove system/core\'s remnants of SH support."

* commit 'e8e73b01399e8d3c3fc6b94d26ef9cc49b33dda8':
Remove system/core's remnants of SH support.
ba822edb30d5221934137052d42a81ad993b3ea9 14-Aug-2012 Kenny Root <kroot@android.com> am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static."

* commit '02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c':
Make setenforce usage function static.
2a1067d144be5437df98ddb0f2d3680f03dafa5f 14-Aug-2012 Stephen Hines <srhines@google.com> am 753b96cf: am dd56039c: Merge "Fixed an unused param warning in logcat"

* commit '753b96cf67f3eaf716510600516c3c593a1ae5e1':
Fixed an unused param warning in logcat
e8e73b01399e8d3c3fc6b94d26ef9cc49b33dda8 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 311a4758: Merge "Remove system/core\'s remnants of SH support."

* commit '311a47585cb14984d2169c7e8f59949cec30fd85':
Remove system/core's remnants of SH support.
311a47585cb14984d2169c7e8f59949cec30fd85 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Remove system/core's remnants of SH support."
02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c 13-Aug-2012 Kenny Root <kroot@android.com> am 53dab583: Merge "Make setenforce usage function static."

* commit '53dab583c448ae97c3472c06609c2c31d6549c07':
Make setenforce usage function static.
53dab583c448ae97c3472c06609c2c31d6549c07 13-Aug-2012 Kenny Root <kroot@android.com> Merge "Make setenforce usage function static."
753b96cf67f3eaf716510600516c3c593a1ae5e1 13-Aug-2012 Stephen Hines <srhines@google.com> am dd56039c: Merge "Fixed an unused param warning in logcat"

* commit 'dd56039c881db2efebfa7df6491579e3ae01748f':
Fixed an unused param warning in logcat
492051ed2a06ea902d7b7e8ba1998121ced9b0be 18-Jul-2012 Matt Finifter <finifter@google.com> Make setenforce usage function static.

Change-Id: I6de204dc072418805160a35d799b8948ecb39251
oolbox/setenforce.c
dd56039c881db2efebfa7df6491579e3ae01748f 13-Aug-2012 Stephen Hines <srhines@google.com> Merge "Fixed an unused param warning in logcat"
2bc2b792782b304b15d8c48b54916a9b3fa3a7ac 01-Feb-2012 Paul Lind <plind@mips.com> Add MIPS support to pixelflinger.

See the comment-block at the top of MIPSAssembler.cpp for
implementation overview.

Change-Id: Id492c10610574af8c89c38d19e12fafc3652c28a
ibpixelflinger/Android.mk
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/ARMAssemblerInterface.cpp
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/ARMAssemblerProxy.cpp
ibpixelflinger/codeflinger/ARMAssemblerProxy.h
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/GGLAssembler.h
ibpixelflinger/codeflinger/MIPSAssembler.cpp
ibpixelflinger/codeflinger/MIPSAssembler.h
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/codeflinger/mips_disassem.c
ibpixelflinger/codeflinger/mips_disassem.h
ibpixelflinger/codeflinger/mips_opcode.h
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/scanline.cpp
ibpixelflinger/tests/codegen/codegen.cpp
84dcf091482b8d0f484e665915d354069a8c879b 13-Aug-2012 Jeff Sharkey <jsharkey@android.com> Collapse IMS tags into a prefix check.

Bug: 6497974
Change-Id: I7fba1a07e2552ce16131b81f30d18eb3192de7ef
iblog/logd_write.c
9a7b9aab08e5640a08b312807dc57fcd469a77f2 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 79e30b6c: am ae8927aa: Merge "Fix a print format warning"

* commit '79e30b6c798b482115efb94c2d9978d20c1d4a54':
Fix a print format warning
79e30b6c798b482115efb94c2d9978d20c1d4a54 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am ae8927aa: Merge "Fix a print format warning"

* commit 'ae8927aa05adf9e5a00760b45e4634eecf6340e3':
Fix a print format warning
ae8927aa05adf9e5a00760b45e4634eecf6340e3 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fix a print format warning"
2fec4de5c704afe4dc2a1bb976699a0e363786dd 13-Aug-2012 Kenny Root <kroot@android.com> am 11c783f1: am 9494f297: Merge "Implement SELinux/MAC checks for property service."

* commit '11c783f1ead9f276e8854cb1adaebeed8517e8a1':
Implement SELinux/MAC checks for property service.
605103fb553a8b872aa8dd0aef76ae8b3bfe47fa 13-Aug-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 4dcd52ab to jb-mr1-dev

Change-Id: Ibd0c03a7883a2e31adab18543c016776b7b36866
80b221cb22f37446e76829d2dd0e8953a32f3bda 13-Aug-2012 Edwin Vane <edwin.vane@intel.com> Fixed an unused param warning in logcat

Changed a function to actually use its parameter instead of a global
variable. All callers of the function pass the global variable as an
argument anyway so behaviour is unchanged.

Change-Id: Ib84d45c17d2213c4d441bf2f423feca14e7aa2f4
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
ogcat/logcat.cpp
11c783f1ead9f276e8854cb1adaebeed8517e8a1 13-Aug-2012 Kenny Root <kroot@android.com> am 9494f297: Merge "Implement SELinux/MAC checks for property service."

* commit '9494f2975b32b04b1460a03f5e1285b2721863a7':
Implement SELinux/MAC checks for property service.
4dcd52ab11d25fe3d53aab52b6c233e692da4eae 13-Aug-2012 Kenny Root <kroot@android.com> am 297f802f: Merge "Add support for reloading policy from /data/system."

* commit '297f802f25d093274c1f5fb890ee8dfacfbf159e':
Add support for reloading policy from /data/system.
b6279689edecc898bd9622f4ac562239650815bc 26-Jul-2012 Edwin Vane <edwin.vane@intel.com> Fixing unused param warnings in sync_test

Change-Id: Ia37a0118397ddece376bfbad7627d83263c1993f
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
ibsync/sync_test.c
8d9aa37a503fb9b507654c712a34f05c9dac807d 26-Jul-2012 Edwin Vane <edwin.vane@intel.com> Fix a print format warning

Change-Id: I30a6a9835073a7c0f5751fc34aed958c91a050ee
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
ibzipfile/centraldir.c
9494f2975b32b04b1460a03f5e1285b2721863a7 13-Aug-2012 Kenny Root <kroot@android.com> Merge "Implement SELinux/MAC checks for property service."
297f802f25d093274c1f5fb890ee8dfacfbf159e 13-Aug-2012 Kenny Root <kroot@android.com> Merge "Add support for reloading policy from /data/system."
3360cf83b3089b035b7599bb3c7b7e1b1293be54 13-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
46beebea823878218fc0f14723829d83886af978 26-Jul-2012 Edwin Vane <edwin.vane@intel.com> Fix unused parameter warnings

-Werror is used for this project so these warnings were causing the
clang build to fail.

Change-Id: I18c447ce239645e05f59c3cf0e2b8bb17d9d3030
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Tarea A Siraj <tareq.a.siraj@intel.com>
ibcorkscrew/arch-x86/backtrace-x86.c
ibcorkscrew/arch-x86/ptrace-x86.c
ibcorkscrew/backtrace.c
98ebf1975f68ffeaa43d5c53964c3dabe8655562 11-Aug-2012 Elliott Hughes <enh@google.com> am 2ff60998: am 605f8706: Merge "Add Mips architecture to system/core/include"

* commit '2ff6099854691e3406a17797d4aa83624174e6f4':
Add Mips architecture to system/core/include
2ff6099854691e3406a17797d4aa83624174e6f4 11-Aug-2012 Elliott Hughes <enh@google.com> am 605f8706: Merge "Add Mips architecture to system/core/include"

* commit '605f8706c88b2cd5d024b0a6b7253a78d968ba72':
Add Mips architecture to system/core/include
6521a41dcf12ed9a7c038c42696695e22feb428b 11-Aug-2012 Elliott Hughes <enh@google.com> Remove system/core's remnants of SH support.

SH support is long dead.

Change-Id: I6be2763ca9f1ad8b3f9b09a8ad2f1d67f1e7f802
nclude/arch/linux-sh/AndroidConfig.h
nclude/cutils/atomic-inline.h
ibcutils/Android.mk
ibcutils/atomic-android-sh.c
605f8706c88b2cd5d024b0a6b7253a78d968ba72 11-Aug-2012 Elliott Hughes <enh@google.com> Merge "Add Mips architecture to system/core/include"
231e3c83a3a70b11160fb0da108ebf2e0e7470e2 11-Aug-2012 Chris Dearman <chris@mips.com> [MIPS] debuggerd and libcorkscrew support

Change-Id: I5a241dc2e470148be0ad2c138e31f1aba5ab8812
ebuggerd/Android.mk
ebuggerd/debuggerd.c
ebuggerd/mips/crashglue.S
ebuggerd/mips/machine.c
ebuggerd/tombstone.c
nclude/corkscrew/ptrace.h
ibcorkscrew/Android.mk
ibcorkscrew/arch-mips/backtrace-mips.c
ibcorkscrew/arch-mips/ptrace-mips.c
3016e34beba2b977ec1dc1897f4a311ceb7cee2d 11-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 697b6379: am 7b682c47: Merge "Add Mips support to libpixelflinger"

* commit '697b6379c1b0440594eaaa6fa550ed1d0501e13a':
Add Mips support to libpixelflinger
697b6379c1b0440594eaaa6fa550ed1d0501e13a 11-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 7b682c47: Merge "Add Mips support to libpixelflinger"

* commit '7b682c4787e06be193ac3d2a1071e0feb5e4ba58':
Add Mips support to libpixelflinger
7b682c4787e06be193ac3d2a1071e0feb5e4ba58 11-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Add Mips support to libpixelflinger"
831cbc9d2958d1553acd4f58e52569fab4fd64c5 09-Aug-2012 Jouni Malinen <j@w1.fi> libnl: Add nla_put_u8/u16/u32/u64() wrapper

Change-Id: I9c07bbff1f678b5c406dbd455c830363af093703
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/attr.c
845999d232298043c899820c3e9f56e3c00a5845 09-Aug-2012 Jason Simmons <jsimmons@google.com> Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev
1dd55c53af264b24319d721281fe32c67c053120 21-Jul-2012 Mike J. Chen <mjchen@google.com> Allow adb to listen both on usb and tcp.

(cherry picked from commit ae868a40459a6bcb89d8a4426503fea0c8002b25 in master)

Change-Id: I980c7c5e8affbc8627d17b1d9303b002adcdb29a
Signed-off-by: Mike J. Chen <mjchen@google.com>

Conflicts:

adb/adb.c
db/adb.c
7c7c1b0d8a09645826e0ee4d8ab30a543c246114 09-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 5f6d2529: am 8076b212: Merge "Decode DHCP netmask option correctly"

* commit '5f6d2529bb0657235b56e9abef3787a5ff4d5531':
Decode DHCP netmask option correctly
5f6d2529bb0657235b56e9abef3787a5ff4d5531 09-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8076b212: Merge "Decode DHCP netmask option correctly"

* commit '8076b212574afe39ed6152ddf88a3c8c63b0c87c':
Decode DHCP netmask option correctly
8076b212574afe39ed6152ddf88a3c8c63b0c87c 09-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Decode DHCP netmask option correctly"
c7d2fa0d1e5d63c8885a8a953948ac7cfb24122e 09-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
63207cd20f2156bec937a85e789f07de0d1afa9d 09-Aug-2012 rpcraig <rpcraig@tycho.ncsc.mil> Implement SELinux/MAC checks for property service.

This is a set of changes to the init property service
implementation to apply a SELinux check over who can
change what properties. Also included control hooks
for the 'ctl' keys.

Change-Id: I5a18809bf5536f6459a36b6bf0d622b9f5061aa0
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
nit/init.c
nit/init.h
nit/property_service.c
ae6f3d7c05070f7e0e56fe0056c8923c6ee2f473 01-May-2012 Stephen Smalley <sds@tycho.nsa.gov> Add support for reloading policy from /data/system.

To support runtime policy management, add support for reloading
policy from /data/system. This can be triggered by setting the
selinux.loadpolicy property to 1, whether from init.rc after
mounting /data or from the system_server (e.g. upon invocation of
a new device admin API for provisioning policy). ueventd and
installd are restarted upon policy reloads to pick up the new
policy configurations relevant to their operation.

Change-Id: I97479aecef8cec23b32f60e09cc778cc5520b691
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/devices.c
nit/init.c
nit/init.h
nit/property_service.c
ootdir/init.rc
oolbox/restorecon.c
30f52fea05fb91394b50793c5cb14ef05e5c94d6 09-Aug-2012 Stephen Hines <srhines@google.com> am 67bdfa98: am d25b8502: Merge "Fix unused param warning"

* commit '67bdfa9823dd954fdfaa01721da17d8252fc05d1':
Fix unused param warning
278cded6bef25406fc47a23efab128a4ee522a17 09-Aug-2012 Stephen Hines <srhines@google.com> am d2e826b5: am 65c37c81: Merge "Fixed an unused param warning"

* commit 'd2e826b5192f3b964c893b8230cee1d8bdb84071':
Fixed an unused param warning
4900f436704a8d30007bddc5834d0eb91a9a9678 09-Aug-2012 Stephen Hines <srhines@google.com> am f442cf27: am b3a5343e: Merge "Fixed a discarded const qualifier warning"

* commit 'f442cf27c5d1229eb32973cb499578ccd63ba727':
Fixed a discarded const qualifier warning
5f73a6863f75c54feec73e0f8dad7160e219197e 09-Aug-2012 Stephen Hines <srhines@google.com> am 7accfc2f: am f889f0db: Merge "Trivial signed/unsigned warning fix for adbd"

* commit '7accfc2ffd3d0fb6e6e8985349e8773f1977df59':
Trivial signed/unsigned warning fix for adbd
5d3cf721f438a12de6eec0a2af0bf8041feb14d8 09-Aug-2012 Stephen Hines <srhines@google.com> am e7b2a436: (-s ours) am e551055e: Merge "Fix signed/unsigned comparison warning"

* commit 'e7b2a43638956250d329a9ddb4eda21cd0a16ac7':
Fix signed/unsigned comparison warning
58b6a130c59d757b290f30773c68380514cb89b7 09-Aug-2012 Stephen Hines <srhines@google.com> am 02adb534: am 80bcb489: Merge "Fixed un-initialized variable warnings"

* commit '02adb534dafbd955e3470b8f370b108c5b11ce37':
Fixed un-initialized variable warnings
67bdfa9823dd954fdfaa01721da17d8252fc05d1 09-Aug-2012 Stephen Hines <srhines@google.com> am d25b8502: Merge "Fix unused param warning"

* commit 'd25b8502ea2c1294c0afab97bf7f14fbd2087efd':
Fix unused param warning
d2e826b5192f3b964c893b8230cee1d8bdb84071 09-Aug-2012 Stephen Hines <srhines@google.com> am 65c37c81: Merge "Fixed an unused param warning"

* commit '65c37c81ba64f7ec803dcec976a768d3aac9e6c3':
Fixed an unused param warning
f442cf27c5d1229eb32973cb499578ccd63ba727 09-Aug-2012 Stephen Hines <srhines@google.com> am b3a5343e: Merge "Fixed a discarded const qualifier warning"

* commit 'b3a5343e3ef705e2493a2a8546f6e416d41b1c77':
Fixed a discarded const qualifier warning
7accfc2ffd3d0fb6e6e8985349e8773f1977df59 09-Aug-2012 Stephen Hines <srhines@google.com> am f889f0db: Merge "Trivial signed/unsigned warning fix for adbd"

* commit 'f889f0dba404d0dfb75fb33ad1df152129b0a7d2':
Trivial signed/unsigned warning fix for adbd
e7b2a43638956250d329a9ddb4eda21cd0a16ac7 09-Aug-2012 Stephen Hines <srhines@google.com> am e551055e: Merge "Fix signed/unsigned comparison warning"

* commit 'e551055e17dae5d37f5cb428d63ddcae2e9341a2':
Fix signed/unsigned comparison warning
02adb534dafbd955e3470b8f370b108c5b11ce37 09-Aug-2012 Stephen Hines <srhines@google.com> am 80bcb489: Merge "Fixed un-initialized variable warnings"

* commit '80bcb4893058be698bae1bef59c4b28edda6c744':
Fixed un-initialized variable warnings
6ee3ecc03a7cf9118e6a0b2577f15c76244bc408 18-Jun-2011 Chris Dearman <chris@mips.com> Decode DHCP netmask option correctly

Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ibc288458baf2f75c5b19a46e4c97ee59521cc9a5
ibnetutils/dhcpclient.c
ibnetutils/ifc_utils.c
d25b8502ea2c1294c0afab97bf7f14fbd2087efd 09-Aug-2012 Stephen Hines <srhines@google.com> Merge "Fix unused param warning"
65c37c81ba64f7ec803dcec976a768d3aac9e6c3 09-Aug-2012 Stephen Hines <srhines@google.com> Merge "Fixed an unused param warning"
b3a5343e3ef705e2493a2a8546f6e416d41b1c77 09-Aug-2012 Stephen Hines <srhines@google.com> Merge "Fixed a discarded const qualifier warning"
f889f0dba404d0dfb75fb33ad1df152129b0a7d2 09-Aug-2012 Stephen Hines <srhines@google.com> Merge "Trivial signed/unsigned warning fix for adbd"
e551055e17dae5d37f5cb428d63ddcae2e9341a2 09-Aug-2012 Stephen Hines <srhines@google.com> Merge "Fix signed/unsigned comparison warning"
80bcb4893058be698bae1bef59c4b28edda6c744 09-Aug-2012 Stephen Hines <srhines@google.com> Merge "Fixed un-initialized variable warnings"
ff5c802e6ce489a36ac28e3d93b7e8541b3e4d81 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am faad67fa: am ef3f7fa3: Merge "Set the SELinux security label on new directories."

* commit 'faad67fac68642ca039fe5c29099acebf546f5ee':
Set the SELinux security label on new directories.
21c2c8493a8b72407690935971179f2c4b5b3d41 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am b9994d22: am 8261d271: Merge "restorecon tombstone directory."

* commit 'b9994d22274d95a2234cbd8be8338d5e0c16a290':
restorecon tombstone directory.
8268a75e86c086c4618c2f8d8e9531eb8d7b30f5 08-Aug-2012 Elliott Hughes <enh@google.com> am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT"

* commit 'c5db017cc3d30b1b15544ca9889e66890710f93c':
Conditionally use SIGSTKFLT
e0346fa7fa715f785ea60966f38a474f337278ca 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am b2a32cb9: am 8fb0caa7: Merge "config_mbr: Fix integer overflow"

* commit 'b2a32cb99099b705578f40d1ba509bd48db140af':
config_mbr: Fix integer overflow
faad67fac68642ca039fe5c29099acebf546f5ee 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am ef3f7fa3: Merge "Set the SELinux security label on new directories."

* commit 'ef3f7fa32b451bd6f180c4c1586a98cee41aa296':
Set the SELinux security label on new directories.
b9994d22274d95a2234cbd8be8338d5e0c16a290 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8261d271: Merge "restorecon tombstone directory."

* commit '8261d27115746f58a6bbf37e6dcf18a093ee8c85':
restorecon tombstone directory.
c5db017cc3d30b1b15544ca9889e66890710f93c 08-Aug-2012 Elliott Hughes <enh@google.com> am 63b2c577: Merge "Conditionally use SIGSTKFLT"

* commit '63b2c577526d0c7ae4e90e54bf0f0befb0294456':
Conditionally use SIGSTKFLT
b2a32cb99099b705578f40d1ba509bd48db140af 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8fb0caa7: Merge "config_mbr: Fix integer overflow"

* commit '8fb0caa73b947ec801a5ae975f46560fb813baed':
config_mbr: Fix integer overflow
1d4214900cc5c07eceb3a98618fcfecdfa8dc903 08-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Include to define uid_t." into jb-mr1-dev
46ac0ef00b7df5432d1704b221738e51234bedc5 08-Aug-2012 Jeff Sharkey <jsharkey@android.com> Include to define uid_t.

Change-Id: I02d36346fc3c6236bd64309798b434405f8dfef7
nclude/cutils/multiuser.h
ibcutils/Android.mk
ef3f7fa32b451bd6f180c4c1586a98cee41aa296 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Set the SELinux security label on new directories."
8261d27115746f58a6bbf37e6dcf18a093ee8c85 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "restorecon tombstone directory."
63b2c577526d0c7ae4e90e54bf0f0befb0294456 08-Aug-2012 Elliott Hughes <enh@google.com> Merge "Conditionally use SIGSTKFLT"
8fb0caa73b947ec801a5ae975f46560fb813baed 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "config_mbr: Fix integer overflow"
f2e4d7ff0308171d63e4c133e8769b0dba304ece 08-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Native utils for working with user and app IDs." into jb-mr1-dev
9509d27252b16f69b6fd2ebb2c552201c34e5c0c 08-Aug-2012 Jeff Sharkey <jsharkey@android.com> Native utils for working with user and app IDs.

Bug: 6925012
Change-Id: I56f18826fd324f60b6e446cebd30719258e40990
nclude/cutils/multiuser.h
ibcutils/Android.mk
ibcutils/multiuser.c
eb58dafef5dc6bc74cde95914b37fa9b98cd4c1f 07-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
a8afd723a4bdd68eda34a552a472a6adc0c26369 02-Aug-2012 Ravi Nagarajan <nravi@broadcom.com> Allow AID_BLUETOOTH to update persist.service.bdroid

When devices are provisioned, bd address path is set in ro.bt.bdaddr_path.
On devices where this property is not present, a random bd address is
generated and saved to the property: persist.service.bdroid.bdaddr
This change allows bluetooth process to update this property
bug 6885309

Change-Id: I2e8a2471a0e890da82e6bbec6a2ef67ec8e1f8f4
nit/property_service.c
3f7873358fe7e85a8135f2d844b406da4070ba18 06-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
8127323f145b2de7e1c30bbb7af0d20d783ac76b 05-Aug-2012 Vairavan Srinivasan <vairav@codeaurora.org> adb: Pick desired product value from command line it follows -p

Change-Id: Ic9fb74c99c88479addf3a2cc599b8492ced759d8
db/commandline.c
60479afa182330b42c5be04759b0340d8fd9e7c8 03-Aug-2012 Colin Cross <ccross@google.com> Merge changes I943b04dd,I645b6a2d into jb-mr1-dev

* changes:
init: fix return value for android uid/gid check
init.rc: make last_kmsg readable only by user system and group log
4f97fd91e361c8fc2f5fbcab0fa34e2bd68d3218 03-Aug-2012 Veeren Mandalia <v.mandalia@sta.samsung.com> init: fix return value for android uid/gid check

Now get_android_id function returns -EINVAL if the uid/gid is not in the list
of android ids. This will allow ueventd to catch invalid ids and report the
error.

Change-Id: I943b04dd64d518891623e1ee2d561b8061af4863
Signed-off-by: Veeren Mandalia <v.mandalia@sta.samsung.com>
nit/ueventd.c
b35e36e5a92ac984a57ec15b14dc6ad3b0ecf1c5 03-Aug-2012 Colin Cross <ccross@android.com> init.rc: make last_kmsg readable only by user system and group log

chown /proc/last_kmsg to user system group log during init, and
chmod it to readable only by user and group.

Bug: 6925227
Change-Id: I645b6a2d4fecc01a2bd4b7fa7ed6aae3ef638cb9
ootdir/init.rc
d2babc4d5af615babbbf422e5894f1a9e4557ed2 02-Aug-2012 Doug Zongker <dougz@google.com> add command-line arguments to mkbootimg to move kernel, ramdisk, etc.

Bug: 6918260
Change-Id: I5d4af6314fded027952941110a520dc9aa234a14
kbootimg/mkbootimg.c
b2b46dc48c01c03e824ef49a88fc947ab2a65b28 03-Aug-2012 James Dong <jdong@google.com> Merge "Added a cmd for configuring number of video buffers for camera, if supported" into jb-mr1-dev
cba158a6f69dc0eb942a3fa8e5b42c6e5e51c2ae 03-Aug-2012 Doug Zongker <dougz@google.com> Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." into jb-mr1-dev
dd7fafb34bf86b8fb41043e568bf0dd1005a49dd 02-Aug-2012 Doug Zongker <dougz@google.com> add command-line arguments to mkbootimg to move kernel, ramdisk, etc.

Bug: 6918260
Change-Id: I5d4af6314fded027952941110a520dc9aa234a14
kbootimg/mkbootimg.c
f4de078388242fff9b68c04b122e8a095cab9b0e 02-Aug-2012 Benoit Goby <benoit@android.com> libusbhost: Fix USB device discovery on boot

On some devices, /dev/bus/usb does not exist on boot, it is only created
when the otg port is in host mode. Use inotify to detect when /dev/bus/usb
is created and then start watching subdirectories.

Change-Id: Ic1472a5ea7a7118cdbb560cc7071ade9bcee753a
ibusbhost/usbhost.c
6cc883ca098f34bd126478a6aa19d5cce48d71a9 01-Aug-2012 Benoit Goby <benoit@android.com> libusbhost: Fix possible missed "device added" notification

When a new bus is added, check for existing devices in the bus
directory, since devices may have been added before calling
inotify_add_watch.

Also add missing inotify_rm_watch calls.

Change-Id: Ie69fc995a3e8b18431099b252be86f0054fe5531
ibusbhost/usbhost.c
36f370905c7cc2d7a13ab3db748c75bf3fc7ff68 02-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
62f9ffac1aa4809c0acd29dc4c4872a3b4da2062 26-Jul-2012 Edwin Vane <edwin.vane@intel.com> Fix unused param warning

libsuspend had only a single warning in the clang build. Fixing it to
make the build clean.

Change-Id: Iaac5f9144b6e6cb122141c6416056c1b2c9aa98e
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
ibsuspend/autosuspend_wakeup_count.c
a5db95da3801cd82df80c41996b1e6f69a9acecf 26-Jul-2012 Edwin Vane <edwin.vane@intel.com> Fixed an unused param warning

libnetutils had a single warning. Fixed it to make it clean.

Change-Id: I9297e556657a38dbdd7d1d0ac4bc3574801d5ac9
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
ibnetutils/packet.c
de7f1ad86f532e79ea2a9f77b0147406a9ad971b 26-Jul-2012 Edwin Vane <edwin.vane@intel.com> Fixed a discarded const qualifier warning

Change-Id: I9007924d0bf49705363aa130e6e588a9e0ccdc31
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
nit/util.c
ae06933cdeb61b1145a1245ea3f40a3d159d215b 26-Jul-2012 Edwin Vane <edwin.vane@intel.com> Trivial signed/unsigned warning fix for adbd

Change-Id: Icd674006bb2b526166960b4f90eb274030d80439
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
db/transport_local.c
6c4c66a7670e3a20867866384666380ae7b706c6 02-Aug-2012 James Dong <jdong@google.com> Added a cmd for configuring number of video buffers for camera, if supported

o currently, only available in Camera2

Change-Id: Id9bf157496209af9be65d147e70aa4830158c88d
nclude/system/camera.h
7ac420972adc71d0654d10446078751b571aa301 10-Jul-2012 Chris Dearman <chris@mips.com> Conditionally use SIGSTKFLT

Change-Id: I555b33b5a93df332c556944a1c00fff417825247
oolbox/kill.c
97d2aef6d231b57afb7e08ef871506e98cf1f171 26-Jul-2012 Edwin Vane <edwin.vane@intel.com> Fix signed/unsigned comparison warning

Trivial warning fix.

Change-Id: I93b905b34155214fc2d211a0d9319f06b67fa193
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
db/adb.c
8bcfb8bcfffb1a5b3f81dd09f061d452c8508e8a 20-Jul-2012 Tareq A. Siraj <tareq.a.siraj@intel.com> Fixed un-initialized variable warnings

These un-initialized variables were being used before initialized.

Change-Id: I80c94c5e0c2e959834b99618549377bfb3607272
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
h/eval.c
35fc46d8e338181ee3caedc30f3627bad2ffe35e 01-Aug-2012 Dima Zavin <dima@android.com> am 018227f5: am ce76e2d0: Merge "Modify init.rc and init.goldfish.rc for SE Android."

* commit '018227f5394c3126f4a858596cb85dee1893b895':
Modify init.rc and init.goldfish.rc for SE Android.
018227f5394c3126f4a858596cb85dee1893b895 01-Aug-2012 Dima Zavin <dima@android.com> am ce76e2d0: Merge "Modify init.rc and init.goldfish.rc for SE Android."

* commit 'ce76e2d00e63339083ea693db33de05cbba5600e':
Modify init.rc and init.goldfish.rc for SE Android.
ce76e2d00e63339083ea693db33de05cbba5600e 01-Aug-2012 Dima Zavin <dima@android.com> Merge "Modify init.rc and init.goldfish.rc for SE Android."
f63e4b99dd9530372b9afe66ab36324afae0675d 30-Jul-2012 Ed Heyl <ed@google.com> am 5039dec7: am 3cac204d: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev

* commit '5039dec74a2541f4674d0e1c4fcb9c8076bec6df':
bluetooth: add property permission for bluetooth
Export flags needed for ifc_reset_connections API in netutils
remove an anonymous typedef
HACK: push ramdisk up by 2M
HACK: use /firmware/image as a 3rd choice
libnl_2: compile as shared library as well
5039dec74a2541f4674d0e1c4fcb9c8076bec6df 30-Jul-2012 Ed Heyl <ed@google.com> am 3cac204d: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev

* commit '3cac204d3537c6a356c922bffb07fcb97f5bb0c7':
bluetooth: add property permission for bluetooth
Export flags needed for ifc_reset_connections API in netutils
remove an anonymous typedef
HACK: push ramdisk up by 2M
HACK: use /firmware/image as a 3rd choice
libnl_2: compile as shared library as well
3cac204d3537c6a356c922bffb07fcb97f5bb0c7 28-Jul-2012 Ed Heyl <ed@google.com> Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
aa79a73f9b047872b0d78b7ec8e17ca63178a38b 28-Jul-2012 The Android Open Source Project <initial-contribution@android.com> am f40b247f: am ce8ffda0: am aeec25da: Reconcile with jb-mr0-release

* commit 'f40b247f6602b4f660c41b3850a2466696bf9073':
f40b247f6602b4f660c41b3850a2466696bf9073 28-Jul-2012 The Android Open Source Project <initial-contribution@android.com> am ce8ffda0: am aeec25da: Reconcile with jb-mr0-release

* commit 'ce8ffda06397f4a3f8c75f8e2c41f8883625e4f3':
5779104b831c81b69b26a8f847bf5e3a505fa3c0 28-Jul-2012 Benoit Goby <benoit@android.com> am d23ef40b: am 0245e15b: rootdir: Create /data/misc/adb on boot

* commit 'd23ef40baaf56f2e64415276fa796e8d917d9548':
rootdir: Create /data/misc/adb on boot
4454706f843ffd00950acea3be3a25dfd009c4c3 28-Jul-2012 Benoit Goby <benoit@android.com> am 9f100b8e: am 0574d6b0: init.rc: Add socket for adbd

* commit '9f100b8e754e6bfc6bf664711f2a8ee77e0374e6':
init.rc: Add socket for adbd
d23ef40baaf56f2e64415276fa796e8d917d9548 28-Jul-2012 Benoit Goby <benoit@android.com> am 0245e15b: rootdir: Create /data/misc/adb on boot

* commit '0245e15bb78cf08b3225b31c77bda77d43995bd4':
rootdir: Create /data/misc/adb on boot
9f100b8e754e6bfc6bf664711f2a8ee77e0374e6 28-Jul-2012 Benoit Goby <benoit@android.com> am 0574d6b0: init.rc: Add socket for adbd

* commit '0574d6b07711e90547d8166c222e09d80f702620':
init.rc: Add socket for adbd
ce8ffda06397f4a3f8c75f8e2c41f8883625e4f3 28-Jul-2012 The Android Open Source Project <initial-contribution@android.com> am aeec25da: Reconcile with jb-mr0-release

* commit 'aeec25dabd57ec39208b7e3adefab649e51b86e0':
aeec25dabd57ec39208b7e3adefab649e51b86e0 27-Jul-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr0-release

Change-Id: I0fa1791c1e0a7c501af9e0d87f1263207e134310
0245e15bb78cf08b3225b31c77bda77d43995bd4 10-May-2012 Benoit Goby <benoit@android.com> rootdir: Create /data/misc/adb on boot

Change-Id: I0f8d11391cdcfbaa50f87f637a2962c6663b2767
ootdir/init.rc
0574d6b07711e90547d8166c222e09d80f702620 25-Apr-2012 Benoit Goby <benoit@android.com> init.rc: Add socket for adbd

Change-Id: Ic97fd464440ff4a29fc9da7ad15949ac5215ade3
ootdir/init.rc
ca38f2c7cde05b67bc8d582040210c4aad303298 27-Jul-2012 The Android Automerger <android-build@android.com> merge in jb-mr0-release history after reset to jb-dev
1eee419e7a1c5789f81e1e3a19693403495e70f1 13-Jan-2012 Stephen Smalley <sds@tycho.nsa.gov> Modify init.rc and init.goldfish.rc for SE Android.

Set the security context for the init process.
Restore the security contexts of /cache and /data in case they were reset.
Specify the security context for services launched from the rootfs since
we cannot label their executables.
If on the emulator, set a policy boolean and restore the context of
/sys/qemu_trace to allow accesses not normally permitted on a device.

Change-Id: I166ffc267e8e0543732e7118eb0fd4b031efac3b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/etc/init.goldfish.rc
ootdir/init.rc
64ba258b7a17fd5f0abd788c1b021ad45ad732b9 08-Dec-2011 Matt Gumbel <matthew.k.gumbel@intel.com> Print strerror for file read errors during flashing

Change-Id: I7390867abd00036f19eb4d1a1ce23aa0aca50674
Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
astboot/fastboot.c
0b344e7f111d845f9cbb8d284f62d546645c733e 15-Nov-2011 Andrew Boie <andrew.p.boie@intel.com> config_mbr: Fix integer overflow

The values need to be converted to loff_t *before* performing
the multiplication, else any sector offset past MAX_INT
bytes will overflow.

Change-Id: Ib8992f28aa4119ac7b4ad354b2448c4b0cfaf846
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
ibdiskconfig/config_mbr.c
fcb59e41844c635a289412f5747fe009abb18761 26-Jul-2012 Ken Sumrall <ksumrall@android.com> am bcd18673: am 4e499ef4: am 0d36b260: am 228fc48a: am 5dc5bfef: Mount/unmount filesystems before running e2fsck

* commit 'bcd18673199cf19e36901741be38292f5291aac2':
ecd963081ecdbb67247e47b68b3314bf0cbef632 26-Jul-2012 Doug Zongker <dougz@android.com> am 316f10df: am 56ede7fa: Merge "support e=65537 for libmincrypt, DumpPublicKey"

* commit '316f10dfe1d2f929fbf17573ac6e281c473b624b':
bcd18673199cf19e36901741be38292f5291aac2 26-Jul-2012 Ken Sumrall <ksumrall@android.com> am 4e499ef4: am 0d36b260: am 228fc48a: am 5dc5bfef: Mount/unmount filesystems before running e2fsck

* commit '4e499ef474a533139ee6998c504112cd182e56ed':
316f10dfe1d2f929fbf17573ac6e281c473b624b 26-Jul-2012 Doug Zongker <dougz@android.com> am 56ede7fa: Merge "support e=65537 for libmincrypt, DumpPublicKey"

* commit '56ede7fac536b0daac964ff3b596c3492bd7b552':
support e=65537 for libmincrypt, DumpPublicKey
e096e36e50b4b66638ebc4d3c09c2ee35f538dfa 11-Jun-2012 Stephen Smalley <sds@tycho.nsa.gov> Set the SELinux security label on new directories.

Automatically set the SELinux security label on directories created
by init.rc. This avoids the need to separately call restorecon on
each such directory from the init.rc file. Also restorecon /dev
and /dev/socket after initial policy load so that they are labeled
correctly before any other dev nodes or sockets are created.

Change-Id: If6af6c4887cdead949737cebdd673957e9273ead
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/builtins.c
nit/devices.c
nit/init.c
nit/util.c
nit/util.h
e8b76a36bacd11ab54332ba5a25d8593d9c3f57f 26-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO

Change-Id: I0fbd76aca69059917d363b2dcbfc843bbf4386f8
ootdir/init.rc
4e499ef474a533139ee6998c504112cd182e56ed 26-Jul-2012 Ken Sumrall <ksumrall@android.com> am 0d36b260: am 228fc48a: am 5dc5bfef: Mount/unmount filesystems before running e2fsck

* commit '0d36b2600697c4248add0003c00e8c5542a747b5':
Mount/unmount filesystems before running e2fsck
56ede7fac536b0daac964ff3b596c3492bd7b552 26-Jul-2012 Doug Zongker <dougz@android.com> Merge "support e=65537 for libmincrypt, DumpPublicKey"
0d36b2600697c4248add0003c00e8c5542a747b5 26-Jul-2012 Ken Sumrall <ksumrall@android.com> am 228fc48a: am 5dc5bfef: Mount/unmount filesystems before running e2fsck

* commit '228fc48a5698a1897ee24c99db9e69db6d743430':
Mount/unmount filesystems before running e2fsck
228fc48a5698a1897ee24c99db9e69db6d743430 25-Jul-2012 Ken Sumrall <ksumrall@android.com> am 5dc5bfef: Mount/unmount filesystems before running e2fsck

* commit '5dc5bfefa078f2aded34f85db4613ba91ad49b76':
Mount/unmount filesystems before running e2fsck
c2dcdc2024ac7487f9773b9b9a4d20bf78e5b7a1 25-Jul-2012 Ken Sumrall <ksumrall@android.com> am 5dc5bfef: Mount/unmount filesystems before running e2fsck

* commit '5dc5bfefa078f2aded34f85db4613ba91ad49b76':
Mount/unmount filesystems before running e2fsck
35d9ad5ae72de846967b91aed97060f0e8558661 25-Jul-2012 Doug Zongker <dougz@android.com> support e=65537 for libmincrypt, DumpPublicKey

The output produced by DumpPublicKey now has a version tag on each
line (ie, each key). The existing keys are retroactively dubbed
"version 1", and we add a version 2 for 2048-bit e=65537 keys.

Change-Id: I204ec615c8f2346670220a1aeb99269e4abd5f81
nclude/mincrypt/rsa.h
ibmincrypt/Android.mk
ibmincrypt/rsa.c
ibmincrypt/rsa_e_3.c
ibmincrypt/rsa_e_f4.c
ibmincrypt/tools/DumpPublicKey.java
a7a64579c24b6a6dd41105a85a1fd5901f7cdf14 25-Jul-2012 Colin Cross <ccross@android.com> am 36f2e2ac: am 23ee469c: Merge "fastboot: change default sparse limit to disabled"

* commit '36f2e2ac96f8b2163a37773f5cb92cfff75dede2':
fastboot: change default sparse limit to disabled
a2b3ded589759c413c5231a89111e0349e92ec62 25-Jul-2012 Colin Cross <ccross@android.com> am cecc3186: am f650c075: Merge "fastboot: check argc before using argv"

* commit 'cecc3186ca18ddf7a2d43a12353c45a81ab2baca':
fastboot: check argc before using argv
36f2e2ac96f8b2163a37773f5cb92cfff75dede2 25-Jul-2012 Colin Cross <ccross@android.com> am 23ee469c: Merge "fastboot: change default sparse limit to disabled"

* commit '23ee469c4b790634959e5ccf83134f44e73fb72b':
fastboot: change default sparse limit to disabled
cecc3186ca18ddf7a2d43a12353c45a81ab2baca 25-Jul-2012 Colin Cross <ccross@android.com> am f650c075: Merge "fastboot: check argc before using argv"

* commit 'f650c07586d65ee655eba6d297ebaacffedae29e':
fastboot: check argc before using argv
23ee469c4b790634959e5ccf83134f44e73fb72b 25-Jul-2012 Colin Cross <ccross@android.com> Merge "fastboot: change default sparse limit to disabled"
0bbfb3976e9491b3e1a872ebdaa850ef868a24aa 25-Jul-2012 Colin Cross <ccross@android.com> fastboot: change default sparse limit to disabled

Change the default sparse limit to disabled to prevent resparsing files
unless the bootloader or user specifies a sparse limit. Some
bootloaders issue an erase before every flash command, which causes
earlier parts of the downloaded image to get erased.

Change-Id: Iac6f3b05580aba8b82ed0f2f800979a49c33c691
astboot/fastboot.c
f650c07586d65ee655eba6d297ebaacffedae29e 25-Jul-2012 Colin Cross <ccross@android.com> Merge "fastboot: check argc before using argv"
5dc5bfefa078f2aded34f85db4613ba91ad49b76 24-Jul-2012 Ken Sumrall <ksumrall@android.com> Mount/unmount filesystems before running e2fsck

This works around a performance problem in the firmware of
some emmc chips.

Change-Id: Ia414b4604d11e47ce9cb3f86ac82602e081bb09e
s_mgr/fs_mgr.c
c4236c8b723184ddc2bfc6bbc54655e6c8245c5d 25-Jul-2012 Jeff Sharkey <jsharkey@android.com> Merge "Force IMS logging into radio log."
8fb6e06ba44b92258bf44110ea5361496257e24e 25-Jul-2012 Colin Cross <ccross@android.com> fastboot: check argc before using argv

"fastboot -w" would segfault because *argv was invalid when no
non-option arguments were specified. Check argc > 0 before
dereferencing argv.

Change-Id: I822a799e6a38e4e5c0a4eca48c6343b8a08a6185
astboot/fastboot.c
308bc52d33afa1b7b470e14fa8478045456cbb20 24-Jul-2012 Colin Cross <ccross@android.com> ueventd: fixup /sys permissions on change uevents

Change uevents may be triggered after new files are created on a device
in /sys, run the sys permissions fixup when they occur.

Change-Id: Iec2725c9f8a032e5124190444edaf189a766b0b2
nit/devices.c
237c80bf4cbc8e8fa3936ec8382b247aa4e96be2 24-Jul-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "dhcp_utils: Add -f dhcpcd.conf processing"
96d0a4dda81aaff3f72b9690d88eb40387ee9630 04-Feb-2011 Patrick McCormick <patrickX.m.mccormick@intel.com> Extend and document the "wait" command

The wait command was currently implemented but
undocumented and only used internally. This change
adds a second option toi (optionally) override the default
timeout of 5 seconds.

The wait command can be used to wait for a file to appear
during the boot process, for example a disk or other device,
and is a better alternative than an unconditional sleep.

Change-Id: Ia11d8419c0ea84deec0e1bf5adfca5bc76ff38b7
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
nit/builtins.c
nit/readme.txt
8edbbde249c412e9b620f6ef47d8f44510c16cb4 24-Jul-2012 Colin Cross <ccross@android.com> am 34fd8596: am f58f62eb: Merge "libsparse: fix 32 bit overflow when calculating last chunk"

* commit '34fd8596463832c1ce670f436b31ed851552c8f4':
libsparse: fix 32 bit overflow when calculating last chunk
9630ca7dcefc9abfe456186758c1b91c43b1a3ff 24-Jul-2012 Colin Cross <ccross@android.com> am d4725517: am ec7d9dc7: Merge "Avoid zombies on androidscreencast"

* commit 'd47255175ede1af31aee9132914e5d14549ba577':
Avoid zombies on androidscreencast
34fd8596463832c1ce670f436b31ed851552c8f4 24-Jul-2012 Colin Cross <ccross@android.com> am f58f62eb: Merge "libsparse: fix 32 bit overflow when calculating last chunk"

* commit 'f58f62eb31afb59a74566f60683cbbd1099e3111':
libsparse: fix 32 bit overflow when calculating last chunk
62d6f7486323fd2bd27299940a28f3c6de73f65d 24-Jul-2012 Dmitry Shmidt <dimitrysh@google.com> dhcp_utils: Add -f dhcpcd.conf processing

Change-Id: Idd5c8734fafd27c76f61820f223627af4c71a271
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnetutils/dhcp_utils.c
f58f62eb31afb59a74566f60683cbbd1099e3111 24-Jul-2012 Colin Cross <ccross@android.com> Merge "libsparse: fix 32 bit overflow when calculating last chunk"
f1ec8ac84a8540b92a16f187bfa92b2f3c63917e 24-Jul-2012 Colin Cross <ccross@android.com> libsparse: fix 32 bit overflow when calculating last chunk

last_block * s->block_size can overflow when writing large filesystems,
cast to 64 bits before multiplying.

Change-Id: I3e54097852ce7d0fd271eab53d65e666284898e4
ibsparse/sparse.c
41dfa9b65d5c91c3ee58965c47d62043f43cad27 11-Jul-2012 Andrew Boie <andrew.p.boie@intel.com> diskconfig: Add missing include for loff_t

Change-Id: I76375bfaf3dbab0724fe0be05f7c1172e49287f4
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
nclude/diskconfig/diskconfig.h
e6f8d45da8c61d67dc9fdc1cec53f40594043817 28-Sep-2011 Lukasz Anaczkowski <lukasz.anaczkowski@intel.com> Char device /dev/dri/card0 was not created during startup.

This device is required by libdrm for GPUs like IvyBridge.

Change-Id: I0ac47056a9cec2100f3e6eaa5591571fe6bbc145
Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
nit/devices.c
ootdir/ueventd.rc
22bb8fc5fe7c10fb9c7b8c4cfeb244c837e3e0c7 24-Jul-2012 Dmitry Shmidt <dimitrysh@google.com> netutils: Make visible prefixLengthToIpv4Netmask() function

Change-Id: I316b192ce753daa838ea44001f899ea508adf75c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
nclude/netutils/ifc.h
d47255175ede1af31aee9132914e5d14549ba577 23-Jul-2012 Colin Cross <ccross@android.com> am ec7d9dc7: Merge "Avoid zombies on androidscreencast"

* commit 'ec7d9dc713322bd41b1e348c0ea3b1304a13dba9':
Avoid zombies on androidscreencast
ec7d9dc713322bd41b1e348c0ea3b1304a13dba9 23-Jul-2012 Colin Cross <ccross@android.com> Merge "Avoid zombies on androidscreencast"
5a536efa5b5f5d973232846d5fe6818df84ab5dc 17-Jul-2012 Yuriy Zabroda <yuriy.zabroda@ti.com> Avoid zombies on androidscreencast

When using a third party screen capture program called androidscreencast
(http://code.google.com/p/androidscreencast/) to get the framebuffer of
the device, there are tons of screencap zombie processes got left behind.
The issue is also mentioned here: http://code.google.com/p/android/issues/detail?id=22836.
The cause of the issue is that adbd spawns off screencap processes,
and these child processes were not waited to be finished.
This change fixes the issue.

Change-Id: Ife928d65ecf6a2ff39b8b72ddba930fda6733a00
Signed-off-by: Yuriy Zabroda <yuriy.zabroda@ti.com>
db/framebuffer_service.c
8542f44f68442499f657b997269d873bdffc3a82 19-Jul-2012 Glenn Kasten <gkasten@google.com> Merge "Declare audio_devices_t as uint32_t & enum consts"
7ae3779c76350bed4c15dbab0f0b5602de3d6882 19-Jul-2012 The Android Open Source Project <initial-contribution@android.com> am c2a229fb: Reconcile with jb-mr0-release jb-release

* commit 'c2a229fb376395a3216a20b3db920297f2569b8a':
Grant sdcard_r to ril-daemon.
c2a229fb376395a3216a20b3db920297f2569b8a 19-Jul-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr0-release jb-release

Change-Id: I4a3e1815d4b0b12ace6ee6fc9e3c1711f3edcf63
f1186f3e980f5ebcc3380d8a7f746bf8a45e3531 19-Jul-2012 rpcraig <rpcraig@tycho.ncsc.mil> restorecon tombstone directory.

Restore the security contexts of tombstone directory
when initially created.

Change-Id: I25b53730991576eccb62ca57050decd584acc639
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
ebuggerd/Android.mk
ebuggerd/tombstone.c
4997ed8094758cd4bddd192e1dd234953cd5ff05 19-Jul-2012 Dan Zhang <danielzhang@google.com> Merge "Add Kobo's USB vendor ID to adb"
9a70e5c33891632c89c9f3f03e30d7183227d661 18-Jul-2012 Colin Cross <ccross@android.com> resolved conflicts for merge of 4d72d881 to master

Change-Id: Ic092d27d3fc2bcc4db8a375bbcb5b86c111bf062
4d72d8818e0a60e1f0cb9a2b9de51f16f3e3ebbb 18-Jul-2012 Colin Cross <ccross@android.com> am f694ba5f: Merge changes I6c59381c,I0da088fc,I883572f5,Idc2cfe20,I1a156d10,I177abdb9,I18707bd9,I26744c74,I266f70e1,I75f10db2,I95aa2317,I2f21355b,I5d4ab07f,Ic138ad58,I012d8a42,If664e4fc

* commit 'f694ba5f7fa81f250045c107e919888661a734ae':
fastboot: add support for auto-resparsing large files
fastboot: add fb_getvar
fastboot: use getopt_long
libsparse: rename symbols that conflict with libext4_utils
libsparse: add sparse_file_len
libsparse: add function to resparse a file and a utility to use it
libsparse: add callback output file type
libsparse: pseudo-subclass output_file for normal and gz files
libsparse: add sparse_file read and convert tools to use it
libsparse: fix windows image writing
libsparse: merge adjacent blocks of the same type
libsparse: add error reporting functions
libsparse: add support for including fds
libsparse: cleanups
libsparse: remove static variables
system/core: move libsparse into system/core
f694ba5f7fa81f250045c107e919888661a734ae 18-Jul-2012 Colin Cross <ccross@android.com> Merge changes I6c59381c,I0da088fc,I883572f5,Idc2cfe20,I1a156d10,I177abdb9,I18707bd9,I26744c74,I266f70e1,I75f10db2,I95aa2317,I2f21355b,I5d4ab07f,Ic138ad58,I012d8a42,If664e4fc

* changes:
fastboot: add support for auto-resparsing large files
fastboot: add fb_getvar
fastboot: use getopt_long
libsparse: rename symbols that conflict with libext4_utils
libsparse: add sparse_file_len
libsparse: add function to resparse a file and a utility to use it
libsparse: add callback output file type
libsparse: pseudo-subclass output_file for normal and gz files
libsparse: add sparse_file read and convert tools to use it
libsparse: fix windows image writing
libsparse: merge adjacent blocks of the same type
libsparse: add error reporting functions
libsparse: add support for including fds
libsparse: cleanups
libsparse: remove static variables
system/core: move libsparse into system/core
4be2c38884eeb32be469764c3569f3b7be487189 17-Jul-2012 Wink Saville <wink@google.com> am 6a575430: (-s ours) am b3a67938: (-s ours) Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE

* commit '6a575430e4697c5879457e6ecf6486e313890173':
Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE
6a575430e4697c5879457e6ecf6486e313890173 17-Jul-2012 Wink Saville <wink@google.com> am b3a67938: (-s ours) Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE

* commit 'b3a679386d26677290a09fdf4e3406c57e835fd0':
Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE
3da69b48e09c3cb4cf23b84b88bd47364ba97810 17-Jul-2012 The Android Automerger <android-build@android.com> merge in jb-mr0-release history after reset to jb-dev
b3a679386d26677290a09fdf4e3406c57e835fd0 13-Jun-2012 Wink Saville <wink@google.com> Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE

Change-Id: Ib113b8147d20fee1ec69d68cf6a7a02d59ff4df6
ootdir/init.rc
44e95651dd1e07017ab85d05a542d2372dbb2baa 17-Jul-2012 Jeff Sharkey <jsharkey@android.com> Force IMS logging into radio log.

Bug: 6497974
Change-Id: I4691f287b0abdce03ff211bd5b5b0037b8818ec9
iblog/logd_write.c
4c3ac516ff391d9fc93ec997ce254f83af722a1a 08-Apr-2012 Matthew Xie <mattx@google.com> remove dbus and bluetoothd, create bluedroid data dirs

Change-Id: Ifacd570dbadc075e498a626935e035c76a0d83c4
ootdir/init.rc
8c0350f4eedc85e37655dcfe8b6c5ec14b8c4979 03-Jul-2012 jeonghoon.lim <jeonghoon.lim@lge.com> bluetooth: add property permission for bluetooth

add property permission for bluetooth.

Change-Id: I099f325f533d06c63ad43843dd6477ea81fc9781
nit/property_service.c
76e227b4d851741150250f75cca41b3955e2d9b9 14-Jul-2012 Jeff Sharkey <jsharkey@android.com> Merge "Ported "grep" from NetBSD to toolbox."
d2108a57116831ac8c514ad494ea9a204bccdfa5 14-Jul-2012 Jeff Sharkey <jsharkey@android.com> Merge "Ported "cp" from NetBSD to toolbox."
3e8b1581ff0f2daa934eb9d6362dfe4e2b4fa8c9 14-Jul-2012 Jeff Sharkey <jsharkey@android.com> Ported "grep" from NetBSD to toolbox.

Bug: 6798417
Change-Id: I581c496a726a4814edaaa3672849c090bac8552c
oolbox/Android.mk
oolbox/grep/fastgrep.c
oolbox/grep/file.c
oolbox/grep/grep.c
oolbox/grep/grep.h
oolbox/grep/queue.c
oolbox/grep/util.c
57df14c654a968e5b85d508cbd0871632011cb0e 14-Jul-2012 Jeff Sharkey <jsharkey@android.com> Ported "cp" from NetBSD to toolbox.

Bug: 6798417
Change-Id: I716ab459b9edf4c7405bf042adbee0300b6f51c9
oolbox/Android.mk
oolbox/cp/cp.c
oolbox/cp/extern.h
oolbox/cp/utils.c
b8d3d0e905b82d3fee42d955968c4f57c1776086 13-Jul-2012 Jeff Sharkey <jsharkey@android.com> Grant sdcard_r to ril-daemon.

Bug: 6793799
Change-Id: Ife23c98c30d7b08479d75798c7075005bf281119
ootdir/init.rc
5acf1d6625e3e45ccdc29fd49222defc2788ada0 13-Jul-2012 Jeff Sharkey <jsharkey@android.com> am 87314036: am 55b763ff: Grant sdcard_r to ril-daemon.

* commit '873140368613af2d1c06e18ac2fd6fe24623b9bb':
Grant sdcard_r to ril-daemon.
873140368613af2d1c06e18ac2fd6fe24623b9bb 13-Jul-2012 Jeff Sharkey <jsharkey@android.com> am 55b763ff: Grant sdcard_r to ril-daemon.

* commit '55b763ff7b779d7ee91f245e0887332db8782afe':
Grant sdcard_r to ril-daemon.
cd83e3e27f0003d9066ba62d7acbe548b280b73f 13-Jul-2012 Jeff Sharkey <jsharkey@android.com> am 55b763ff: Grant sdcard_r to ril-daemon.

* commit '55b763ff7b779d7ee91f245e0887332db8782afe':
Grant sdcard_r to ril-daemon.
55b763ff7b779d7ee91f245e0887332db8782afe 13-Jul-2012 Jeff Sharkey <jsharkey@android.com> Grant sdcard_r to ril-daemon.

Bug: 6793799
Change-Id: Ife23c98c30d7b08479d75798c7075005bf281119
ootdir/init.rc
b4ef91b97513434a13d6d84a810512315ecf4768 10-Jul-2012 David 'Digit' Turner <digit@google.com> libcorkscrew: avoid future name collisions.

This is a forward-compatibility patch used to avoid two problems:

1/ The C library <signal.h> is going to be updated to define 'struct sigcontext'
properly soon. Avoid redefining this structure here when it's not really needed
to prevent a type conflict.

2/ Similarly, proper ucontext_t support is going to be added, prevent conflict by
using a macro renaming trick. Mainly because there is a slight chance that the
C library definition will follow a slightly different layout/naming.

For context, see details at:

http://code.google.com/p/android/issues/detail?id=34784
https://android-review.googlesource.com/#/c/38875/1

Change-Id: Ie94eb5d77297f8e0bafd146b65a648bd8805a551
ibcorkscrew/arch-arm/backtrace-arm.c
ibcorkscrew/arch-x86/backtrace-x86.c
14c14bfb7e68594cec19c023d807fd7540283c4b 13-Jul-2012 Ken Sumrall <ksumrall@android.com> Merge "Add the du command to toolbox"
557ed7a487795b2b3ac441bbbbe619788c93b78f 12-Jul-2012 Wink Saville <wink@google.com> Merge commit 'de016eef' into mit

* commit 'de016eef':
Add telephony-common and mms-common to BOOTCLASSPATH
2d9a6281ca4fdacd88098f3b135b89b9d0c65226 10-Jul-2012 Dmitry Shmidt <dimitrysh@google.com> libnl_2: Extend genl_ctrl_resolve() to support "nl80211" name

Change-Id: I46759ba55bdf42baef7c1f43de845b0dc846d502
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/genl/genl.c
de92239055ac87e51ef7e868ed9697d038a72368 10-Jul-2012 Dmitry Shmidt <dimitrysh@google.com> libnl_2: Add nl_socket_set_cb() and nl_socket_get_cb()

Change-Id: Ibc2b4dc9528bd43d3fc85491c4838a33c916330e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/socket.c
f838788e6a4d57634a53eb597ee76a597feffcb5 25-May-2012 Colin Cross <ccross@android.com> fastboot: add support for auto-resparsing large files

Add support to fastboot for automatically using libsparse to break large
files, whether they are in sparse or normal format, into multiple sparse
files that can each fit into the target's memory. Allows flashing
images that are larger than the size of the available memory on the
target.

By default, any file over 512MB will be sparsed into 512MB chunks. The
limit can be modified with the -m argument, or sparsing can be forced
with -S or avoided with -N. If -m is not specified, the target can
override the default by implementing getvar:max-download-size

Change-Id: I6c59381c3d24475c4f2587ea877200b96971cbd7
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
astboot/protocol.c
astboot/util_windows.c
80f2d036a9dff894df27961c4aed300f1a5ebbc4 25-May-2012 Colin Cross <ccross@android.com> fastboot: add fb_getvar

Add an fb_getvar helper that can be used to get values from the
target.

Change-Id: I0da088fcbc8d40076c7bf5ef6e5bbd97fae61471
astboot/engine.c
astboot/fastboot.h
8879f988bac8d4cb46fb82e3d82ad69a9ed89b16 23-May-2012 Colin Cross <ccross@android.com> fastboot: use getopt_long

Modify the fastboot argument parsing to use getopt_long. This
simplifies argument parsing, and permutes all the commands to the end of
argv to allow parsing them later.

Also moves usb initailization between argument and command processing,
to allow commands to query parameters over usb.

Change-Id: I883572f52c4190c80ee3b4aa4511ea2061a6b734
astboot/fastboot.c
6caab4ce959478b96c40955236e13e80ef83145d 10-Jan-2012 Arun Raghavan <arun.raghavan@collabora.co.uk> vmstat: Fix -n flag

The loop condition for the number of iterations basically caused the
argument to -n to be ignored. This fixes the condition appropriately.
oolbox/vmstat.c
b43828b247fd4f1e0373584de0504004c69eeac9 09-Jun-2012 Colin Cross <ccross@android.com> libsparse: rename symbols that conflict with libext4_utils

Until ext4_utils switches to using libsparse, libext4_utils defines some
of the same symbols as libsparse. Fastboot links statically against
both of them, and there is no easy way to make the symbols hidden, so
just rename them in libsparse.

Change-Id: Idc2cfe20efe3c3a7fb8233f453a89bbbeb0dcc8b
ibsparse/output_file.c
ibsparse/output_file.h
ibsparse/sparse.c
317a09e2d47257df5e0972c85f14c2a6ffdbbfd2 25-May-2012 Colin Cross <ccross@android.com> libsparse: add sparse_file_len

Add sparse_file_len, which will compute the size of data that would
be produced if sparse_file_write was called. Useful combined with
sparse_file_callback.

Change-Id: I1a156d1071760f5559483954a5c62ffc20298703
ibsparse/include/sparse/sparse.h
ibsparse/sparse.c
bdc6d39ed6c09199a5d806f29b71b44cbb27c5c2 03-May-2012 Colin Cross <ccross@android.com> libsparse: add function to resparse a file and a utility to use it

Add sparse_file_repsarse, which splits chunks in an existing sparse
file such that the maximum size of a chunk, plus a header and footer,
is smaller than the given size. This will allow multiple smaller
sparse files to result in the same data as a large sparse file.

Change-Id: I177abdb958a23d5afd394ff265c5b0c6a3ff22fa
ibsparse/Android.mk
ibsparse/backed_block.c
ibsparse/backed_block.h
ibsparse/include/sparse/sparse.h
ibsparse/simg2img.c
ibsparse/simg2simg.c
ibsparse/sparse.c
ibsparse/sparse_defs.h
1e17b313a6257b7b5081e178e81435c09d60378e 22-May-2012 Colin Cross <ccross@android.com> libsparse: add callback output file type

Add a new output file subclass that will call a callback for
each block as it is written. Will be used to measure the space
used by each sparse block to allow resparsing files.

Also add sparse_file_callback, which will write out a sparse
file by calling the provided write function.

Change-Id: I18707bd9c357b68da319cc07982e93d1c2b2bee2
ibsparse/include/sparse/sparse.h
ibsparse/output_file.c
ibsparse/output_file.h
ibsparse/sparse.c
b4cd267db30c152245e6308598e0066d87c5c55d 18-May-2012 Colin Cross <ccross@android.com> libsparse: pseudo-subclass output_file for normal and gz files

Create two subclasses of output_file that can handle normal
and gzipped files, and refactor open_output_fd. Will allow
adding support for an output_file type that is not file
backed.

Change-Id: I26744c74d13f205cf17df1ea9caac1eea9c57357
ibsparse/output_file.c
ibsparse/output_file.h
0c4c47f88dfc15cada154a1cf9b4db88b49890f0 26-Apr-2012 Colin Cross <ccross@android.com> libsparse: add sparse_file read and convert tools to use it

Abstract the logic from simg2img into libsparse, and add logic
for reading a regular image into libsparse. simg2img then
becomes a simple wrapper around libsparse.

img2simg was not actually making the file sparse, it was using
sparse files to create multiple files that could be pieced back
together. Replace it with a simple wrapper around libsparse.
Its functionality will be replaced by an simg2simg that can
resparse a file into smaller chunks.

Change-Id: I266f70e1c750454183ce46c71a7bb66bbb033a26
ibsparse/Android.mk
ibsparse/img2simg.c
ibsparse/include/sparse/sparse.h
ibsparse/simg2img.c
ibsparse/sparse_read.c
13a560659381b34ce3edbfa8dbe6c0aa6c076f20 20-Jun-2012 Colin Cross <ccross@android.com> libsparse: fix windows image writing

Fix write_fd_chunk on windows. Uses malloc and read instead of mmap.

Change-Id: I75f10db2e04f19e7f3a6ff46b6978d143cb5254e
ibsparse/output_file.c
ibsparse/output_file.h
be8ddcb35a459481c0bcf5bfe645c1fefe963f5c 26-Apr-2012 Colin Cross <ccross@android.com> libsparse: merge adjacent blocks of the same type

When a block is added that is adjacent to another block and of the same
type, merge it. This will be useful for converting regular images to
sparse images, allowing the reader to add a single block at a time and
letting libsparse optimize into larger blocks as it goes.

Does not support merge two blocks that are backed by a data pointer,
only blocks that are backed by a file for now.

Change-Id: I95aa231714cbe01ac194e868c21385806c0bdb97
ibsparse/backed_block.c
ibsparse/backed_block.h
ibsparse/sparse.c
a21930b6b0dbb04a52948566d58fb48c6db58bab 26-Apr-2012 Colin Cross <ccross@android.com> libsparse: add error reporting functions

Change-Id: I2f21355b6c5339d1d724b4c121ea30d575b2d366
ibsparse/Android.mk
ibsparse/include/sparse/sparse.h
ibsparse/sparse.c
ibsparse/sparse_err.c
ibsparse/sparse_file.h
9e1f17e926fa20255c5f4b4d2f68aa98a964253a 26-Apr-2012 Colin Cross <ccross@android.com> libsparse: add support for including fds

Add sparse_file_add_fd to include all or part of the contents
of an fd in the output file. Will be useful for re-sparsing files
where fd will point to the input sparse file.

Change-Id: I5d4ab07fb37231e8e9c1912f62a2968c8b0a00ef
ibsparse/backed_block.c
ibsparse/backed_block.h
ibsparse/include/sparse/sparse.h
ibsparse/output_file.c
ibsparse/output_file.h
ibsparse/sparse.c
b55dceea986ab24f8b836b5116b389ed619c816e 25-Apr-2012 Colin Cross <ccross@android.com> libsparse: cleanups

Move block loops into sparse.c with iterator helpers in backed_block.c.
Simplify chunk writing by moving skip chunk calls from output_file.c to
sparse.c.
Rename variables to be consistent with new naming.
Remove use of u8, u32, u64.

Change-Id: Ic138ad58bef9f96239266ccee12ee83ea285e7eb
ibsparse/backed_block.c
ibsparse/backed_block.h
ibsparse/output_file.c
ibsparse/output_file.h
ibsparse/sparse.c
ibsparse/sparse_crc32.h
411619e921904b896eddae81c086c1f687c8304d 25-Apr-2012 Colin Cross <ccross@android.com> libsparse: remove static variables

Removes static variables in backed_block.c to allow multiple
sparse files to be open at the same time.

Change-Id: I012d8a424c6e21a7352408416adb7c72ee8add21
ibsparse/backed_block.c
ibsparse/backed_block.h
ibsparse/sparse.c
ibsparse/sparse_file.h
28fa5bc347390480fe190294c6c385b6a9f0d68b 20-May-2012 Colin Cross <ccross@android.com> system/core: move libsparse into system/core

This moves an exact copy of libsparse from
system/extras/ext4_utils/libsparse to system/core/libsparse in
preparation for linking tools in system/core against it.

Change-Id: If664e4fcfd6612844ac745589beb1517e7f9fe58
ibsparse/Android.mk
ibsparse/backed_block.c
ibsparse/backed_block.h
ibsparse/img2simg.c
ibsparse/include/sparse/sparse.h
ibsparse/output_file.c
ibsparse/output_file.h
ibsparse/simg2img.c
ibsparse/simg_dump.py
ibsparse/sparse.c
ibsparse/sparse_crc32.c
ibsparse/sparse_crc32.h
ibsparse/sparse_defs.h
ibsparse/sparse_file.h
ibsparse/sparse_format.h
8103e9148378fb8879e3bc7d8504d267c2d9daa9 10-Jul-2012 Ken Sumrall <ksumrall@android.com> Add the du command to toolbox

The code is from NetBSD, with the -n and -h options removed to make
porting easy. Also, removed support for the BLOCKSIZE environment
variable for the same reason.

Change-Id: Ib927ff3527e02802785fdd7f75bab1f05222918e
oolbox/Android.mk
oolbox/du.c
f53aff69487f2c36f0fa28ed8ce46ee53db662a5 10-Jul-2012 Dan Zhang <danielzhang@google.com> Add Kobo's USB vendor ID to adb

Change-Id: I8b86a851e6478d5e8248df4f1e53f3da4dc4b5e0
db/usb_vendors.c
16a7a0443a59c636ab20a3161ec630d037766ecc 04-Jul-2012 Glenn Kasten <gkasten@google.com> Declare audio_devices_t as uint32_t & enum consts

Declare audio_devices_t as uint32_t to permit bit operations,
and a separate anonymous enum for the constants. This is similar to
audio_channel_mask_t.

Also remove spurious "typedef" on declaration of anonymous enum for
channel mask constants.

Change-Id: Ib4f92e9168261d44a475b3d48fe211e5c70ed441
nclude/system/audio.h
de016eef3366739d69d7908e4e6dbd54785632ab 13-Jun-2012 Wink Saville <wink@google.com> Add telephony-common and mms-common to BOOTCLASSPATH

Change-Id: Ib113b8147d20fee1ec69d68cf6a7a02d59ff4df6
ootdir/init.rc
984410aebe0525e9fe3b80b94d06960094597b18 28-Jun-2012 Rebecca Schultz Zavin <rebecca@android.com> Merge "Modify ion to use new definition of ALLOC ioctl argument"
a50fd5568ea72ea1ad662207ccea512735803174 12-Jun-2012 Rebecca Schultz Zavin <rebecca@android.com> Modify ion to use new definition of ALLOC ioctl argument

Also add ion_alloc_fd helper for when you only want a filedescriptor
and know you won't need to access this handle again by its ion_handle

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

Change-Id: Ia4bae22946b0078084b62f5447fecbf261dfaa83
nclude/ion/ion.h
ibion/ion.c
ibion/ion_test.c
3f2b0a506f1e09e6960c050778870da289fc4702 26-Jun-2012 Nick Kralevich <nnk@google.com> Add mode when open(O_CREAT) is used.

When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a runtime error in a future version of Android.

Change-Id: I00609f37d2ea68e21b6404d542830386be354202
oolbox/dd.c
7c3d1c291ab5f9efb2efcfd5def1baeea1255917 08-Nov-2011 Alex Yakavenka <ayakav@codeaurora.org> Export flags needed for ifc_reset_connections API in netutils

Code using ifc_reset_connections api needs to have access to
predefined masks for reset_mask parameter

Change-Id: I90bc5e1b62ae4a88501c8ad4e353c0d93d319579
nclude/netutils/ifc.h
ibnetutils/ifc_utils.c
22aec573b718c57aea2b9bd91607631a6d521911 14-Jun-2012 Jamie Gennis <jgennis@google.com> ANativeWindow: update queue/dequeue/cancel w/ sync

This change deprecates the existing queueBuffer, dequeueBuffer, lockBuffer, and
cancelBuffer functions, and replaces them with a queueBuffer, dequeueBuffer,
and cancelBuffer function that accepts or returns a libsync fence file
descriptor. It also adds the native_window_dequeue_buffer_and_wait convenience
function.

Change-Id: Ifaac91164d014993d7d1d96e0303e04e429f4d00
nclude/system/window.h
3be33e46187bfb1e42099bb4ba061a494356576c 14-Jun-2012 Jamie Gennis <jgennis@google.com> libsync: remove linux includes from sync/sync.h

This change removes the #includes of "linux/*.h" headers from the libsync
header. It currently does this by copying the needed structs that are in the
linux headers. This is intended to be a temporary solution.

Change-Id: Ie7e1a8e05fcf8809ba4aa0e2427efe141dae5327
nclude/sync/sync.h
ibsync/sync.c
4d4cc9ecc74ca7df7453b73e8ed62ff36c658f09 19-Jun-2012 The Android Open Source Project <initial-contribution@android.com> am 2177c79b: Reconcile with jb-release

* commit '2177c79bddc66e295599d87007d4cbec549e1cac':
2177c79bddc66e295599d87007d4cbec549e1cac 19-Jun-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release

Change-Id: If15d22c16a727b5a57edb82572fef50bab8f28a3
b52e91acf1af1cd91f6f1fc0a7d4e4daa4d9d5b1 15-Jun-2012 Arve Hjønnevåg <arve@android.com> Merge "Add watchdogd"
d97d9074ba818de5af45ce4e0f5c30053ae467d0 14-Jun-2012 Arve Hjønnevåg <arve@android.com> Add watchdogd

"/sbin/watchdogd <interval> <margin>" will open /dev/watchdog, try
to set the timeout to <interval>+<margin> then write to it every
<interval> seconds to reset the watchdog.

Change-Id: I15571980cdb868ec19f20e80bf8274b32107d36d
nit/Android.mk
nit/init.c
nit/watchdogd.c
nit/watchdogd.h
45eabdf2dad13fe3a271bcd44ad94b31c1033929 15-Jun-2012 Colin Cross <ccross@android.com> Merge "libsuspend: wait for earlysuspend transition to finish"
f25dd878dfeba87a3c2b868e07cb550061f670b4 14-Jun-2012 Colin Cross <ccross@android.com> libsuspend: wait for earlysuspend transition to finish

Wait for the early suspend transition to finish to the point where
surfaceflinger would previously have synchronized. This is important
during screen on, to ensure the display early suspend handlers have
completed before surfaceflinger unblanks.

Change-Id: I91ac0253d9655c3f1ae3dd7f1a918c279568b23e
ibsuspend/autosuspend_earlysuspend.c
b59676547f6336f586ee736f4203ad9c477c76ea 14-Jun-2012 Eino-Ville Talvala <etalvala@google.com> Merge "Add HAL_PIXEL_FORMAT_BLOB"
0a052487f42507af7a0dc2c144f9d11eb98aecfe 08-Jun-2012 Eino-Ville Talvala <etalvala@google.com> Add HAL_PIXEL_FORMAT_BLOB

This format describes buffers that are not structured like normal
image data, and can only be meaningfully understood by the endpoints.

As an example, this format is used for transporting JPEG-compressed
image buffers from the Camera HAL to the framework/apps.

Buffers of this format must have a height of 1 and a width equal to
their size in bytes. Otherwise their interpretation is up to the two
endpoints.

Bug: 6243944
Change-Id: Ia81015694cbf3a89e29bfbf3624c3ea2ef4f66fd
nclude/system/graphics.h
29f26a8dc7169b040d5aed28c7e1ee94fb8f6b5a 13-Jun-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
66086a586f80e394674eb171d683d0d9677e3abf 13-Jun-2012 Benoit Goby <benoit@android.com> am 504dccec: am aeceb517: adb: Fix adb tcpip command

* commit '504dccec97c12283f348838ba0bf88536322ee6b':
adb: Fix adb tcpip command
504dccec97c12283f348838ba0bf88536322ee6b 13-Jun-2012 Benoit Goby <benoit@android.com> am aeceb517: adb: Fix adb tcpip command

* commit 'aeceb5174502659cb4fff6de924b54ef7e6cdae7':
adb: Fix adb tcpip command
64b7c2cca044f821e182461127b445f9827c3d60 13-Jun-2012 Benoit Goby <benoit@android.com> am aeceb517: adb: Fix adb tcpip command

* commit 'aeceb5174502659cb4fff6de924b54ef7e6cdae7':
adb: Fix adb tcpip command
aeceb5174502659cb4fff6de924b54ef7e6cdae7 12-Jun-2012 Benoit Goby <benoit@android.com> adb: Fix adb tcpip command

When running "adb tcpip 5555", adb create a service socket named
"tcpip:5555". Only compare the 6 first chars "tcpip:" to decide if
we enable exit_on_close.

Bug: 6650130
Change-Id: I0835973de044f1cfde0e859ff0277c0ccc2630a3
db/sockets.c
d3eb825c4e39f32663154c6e4329968956dd8956 13-Jun-2012 Geremy Condra <gcondra@google.com> Merge "Added logtags for errors in bionic."
c06be8a15d8d89bcc8ac505b25b5e828e90a5be6 12-Jun-2012 Jamie Gennis <jgennis@google.com> am 1e96e16f: am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev

* commit '1e96e16f81ce46adf5329b1db4662b53b927d4e2':
Enable tracing on user builds
1e96e16f81ce46adf5329b1db4662b53b927d4e2 12-Jun-2012 Jamie Gennis <jgennis@google.com> am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev

* commit '0f3974c3d0ee2ffe5e0cb9a56658ba18d511f6ea':
Enable tracing on user builds
26ef0f99cd4d2907366ac30d58e8b25a18e1762c 12-Jun-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
60f3d65c831a40897a942513147039eef20d2149 12-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 2a2e10fb: am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"

* commit '2a2e10fbb38e4f4d7759f619275fa4ebd596259a':
toolbox: rmmod: fix module unloading
2a2e10fbb38e4f4d7759f619275fa4ebd596259a 12-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"

* commit '16d2b6ae4050b1232fd164cef1dbade532fe29a4':
toolbox: rmmod: fix module unloading
16d2b6ae4050b1232fd164cef1dbade532fe29a4 12-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 91e5551f: Merge "toolbox: rmmod: fix module unloading"

* commit '91e5551f88aea5aa64e1b4f8b4b52d7be2b28b64':
toolbox: rmmod: fix module unloading
91e5551f88aea5aa64e1b4f8b4b52d7be2b28b64 12-Jun-2012 Jean-Baptiste Queru <jbq@google.com> Merge "toolbox: rmmod: fix module unloading"
a745aeb821d606335f3ebdaacacd749fc629bbbc 11-Jun-2012 Iliyan Malchev <malchev@google.com> remove an anonymous typedef

Change-Id: I49eab23cde88e8640c188626d9413269c6eef88f
Signed-off-by: Iliyan Malchev <malchev@google.com>
nclude/system/audio.h
497de83856385f86dce2776c37ce937f5974f0a3 08-Jun-2012 Iliyan Malchev <malchev@google.com> HACK: push ramdisk up by 2M

Change-Id: Idb71ebd25c0b8c765ce8767961f362f6deb45547
Signed-off-by: Iliyan Malchev <malchev@google.com>
kbootimg/mkbootimg.c
029d44e6aef334d2f0f03cbc9a5609cddc1b23e3 08-Jun-2012 Iliyan Malchev <malchev@google.com> HACK: use /firmware/image as a 3rd choice

Change-Id: I74af2e2dc872f88b904ead13e300ae32547e70c8
Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
db7462f8d1560b0e24bffab266ea22f146d5dbd1 08-Jun-2012 Iliyan Malchev <malchev@google.com> libnl_2: compile as shared library as well

Change-Id: I103155b08a16b512a582ee2c4ffc9d6f8a1e1c6a
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibnl_2/Android.mk
e2c01bc7b93f3559211102d8f448a5e52643a9f3 09-Jun-2012 Geremy Condra <gcondra@google.com> Added logtags for errors in bionic.

Specifically, this adds tags for errors in FORTIFY_SOURCE'd parts
of bionic and for some indications of DNS spoofing.

Change-Id: I186ee36ae42cb6ba4fd5729ede84e2dcd4a56468
ogcat/event.logtags
0f3974c3d0ee2ffe5e0cb9a56658ba18d511f6ea 11-Jun-2012 Jamie Gennis <jgennis@google.com> Merge "Enable tracing on user builds" into jb-dev
ef9d8d9b0c9bf987e9df788af430bf9ad4f9f6b2 11-Jun-2012 The Android Open Source Project <initial-contribution@android.com> am a6f4e65b: Reconcile with jb-release

* commit 'a6f4e65bc430e2481bf8e1aaff4b2743bfb261dd':
a6f4e65bc430e2481bf8e1aaff4b2743bfb261dd 11-Jun-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release

Change-Id: Ic8df0fdb3f0a3e9eb54bbd37a929b04c394beb28
7452db98905de30cb3205358f2d19440e91d40c3 11-Jun-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
d010d7df298da73c415fdd5408c9fdbd16694c19 09-Jun-2012 Jeff Brown <jeffbrown@google.com> am f87d9c86: am 9cec175c: Remove a stray newline in the backtrace output.

* commit 'f87d9c86982f8873b7f449029d702ba33569e629':
Remove a stray newline in the backtrace output.
f87d9c86982f8873b7f449029d702ba33569e629 09-Jun-2012 Jeff Brown <jeffbrown@google.com> am 9cec175c: Remove a stray newline in the backtrace output.

* commit '9cec175c66100d9edbb1054f3f2977a5c3f80af2':
Remove a stray newline in the backtrace output.
aff446611878960840fb3a631dea361f09b90e81 09-Jun-2012 Jeff Brown <jeffbrown@google.com> am 536b81af: resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp

* commit '536b81afed42ba6be1f824cf90d9a1e17a913c9c':
Enhance native stack dumps.
536b81afed42ba6be1f824cf90d9a1e17a913c9c 09-Jun-2012 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp

Change-Id: Idfef8c26b7a9e1a1a202e21dc5d34022bbaa92cc
1279013dee790c84758e5fc5bed33b5c9df2af9b 07-Jun-2012 Jamie Gennis <jgennis@google.com> Enable tracing on user builds

This change adds init.rc steps to:
* allow kernel tracing to be enabled via adb
* allow a limited set of kernel trace events to be enabled via adb
* allow the kernel trace to be read via adb
* allow all users to write to the kernel trace from userland

Bug: 6513400
Change-Id: Ic3c189b5697aa5edf88d2f507c932971bed6caff
ootdir/init.rc
ootdir/init.trace.rc
9cec175c66100d9edbb1054f3f2977a5c3f80af2 08-Jun-2012 Jeff Brown <jeffbrown@google.com> Remove a stray newline in the backtrace output.

Bug: 6615693
Change-Id: I1ac1746286afb77c3f5c4042c4592333ebb08a51
ebuggerd/backtrace.c
38547c3a545f127997d49f065956ff5352317bed 08-Jun-2012 Colin Cross <ccross@android.com> Merge "libsuspend: always unblock early suspend"
053b865412d1982ad1dc0e840898d82527deeb99 07-Jun-2012 Jeff Brown <jeffbrown@google.com> Enhance native stack dumps.

Provides a new mechanism for dumpstate (while running as root)
to request that debuggerd dump the stacks of native processes that
we care about in bug reports. In this mode, the backtrace
is formatted to look similar to a Dalvik backtrace.

Moved the tombstone generating code into a separate file to
make it easier to maintain.

Fixed a bug where sometimes the stack traces would be incomplete
because we were not waiting for each thread to stop after issuing
PTRACE_ATTACH, only the main thread. So sometimes we were missing
traces for some threads.

Refactored the logging code to prevent accidentally writing data
to logcat when explicitly dumping a tombstone or backtrace from the
console.

Only root or system server can request to dump backtraces but
only root can dump tombstones.

Bug: 6615693
Change-Id: Ib3edcc16f9f3a687e414e3f2d250d9500566123b
ebuggerd/Android.mk
ebuggerd/arm/machine.c
ebuggerd/backtrace.c
ebuggerd/backtrace.h
ebuggerd/debuggerd.c
ebuggerd/machine.h
ebuggerd/tombstone.c
ebuggerd/tombstone.h
ebuggerd/utility.c
ebuggerd/utility.h
ebuggerd/x86/machine.c
nclude/cutils/debugger.h
ibcutils/Android.mk
ibcutils/debugger.c
2146b7f2d7f8e9320d8ec5581c61e14f243ee97c 07-Jun-2012 Colin Cross <ccross@android.com> libsuspend: always unblock early suspend

SurfaceFlinger and PowerManagerService manage their synchronization
without the help of early suspend, and SurfaceFlinger no longer unblocks
early suspend. Add a new thread when early suspend is detected that will
immediately unblock early suspend.

Change-Id: I87ef4984a2ab34cbbb3af8b7762236b9a92dc2ea
ibsuspend/autosuspend_earlysuspend.c
a7fbf8a673e90918d55e441dbd5a29a87615dfa9 08-Jun-2012 Bhanu Chetlapalli <bhanu@mips.com> [MIPS] Enable SD-card functionality to work

Change-Id: I711f533214b9b7bce2ff1000a55d6b8f310f2399
Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
ootdir/Android.mk
51d827aab08573232b312831ead9ed7d06cd957a 07-Jun-2012 JP Abgrall <jpa@google.com> Merge "fastboot: Let "fastboot devices" work in all cases"
3b8f00c9d394fd4de1d506788b81c73c0fb0c184 07-Jun-2012 The Android Open Source Project <initial-contribution@android.com> am d96544ff: Reconcile with jb-release

* commit 'd96544ff69601fe2990245e10e054480f0bd341f':
d96544ff69601fe2990245e10e054480f0bd341f 07-Jun-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release

Change-Id: Ida4b92a5bf99e33e3162186f823b410317d9f6b1
6ba76f019040a0445575deb6995cd32ea72903dd 07-Jun-2012 Arve Hjønnevåg <arve@android.com> Merge "init.rc: Set owner for /sys/power/autosleep"
c29569c5d3c1358983915596267e85e85c7f82e2 07-Jun-2012 Benoit Goby <benoitgoby@google.com> Merge "FunctionFS: initial implementation"
a032dedefe275b1d5a08b9856dfcfcb12579b4a7 06-Jun-2012 JP Abgrall <jpa@google.com> fastboot: Let "fastboot devices" work in all cases

Ignore ANDROID_SERIAL when requesting to list devices, or else it is
impossible to list devices without unsetting the env var. Even
ANDROID_SERIAL= fastboot devices
or
fastboot -s "" devices
won't work.

Change-Id: Ie92f35bda852c6ecea4ebaefb75b8f18c10b6d0c
astboot/fastboot.c
845f106a93d5f8ed710c80293d22d23e1b17ed3c 06-Jun-2012 Scott Anderson <saa@android.com> am 1b7a7e81: adb: Use bionic\'s strtok_r() for Windows

* commit '1b7a7e81195ff06a7482f81cb92b094bb3481cb1':
adb: Use bionic's strtok_r() for Windows
1b7a7e81195ff06a7482f81cb92b094bb3481cb1 06-Jun-2012 Scott Anderson <saa@android.com> adb: Use bionic's strtok_r() for Windows

A recent change use strtok_r which broke the Windows build.
Clear this potential landmine by adding adb_strtok_r to sysdeps.h
in the typical fashion. For Windows, the actual implementation
in sysdeps_win32.c was copied from bionic/libc/string/strtok.c.

Change-Id: Ibb71555bc429f7058c07c3d39e0b62859c79635c
Signed-off-by: Scott Anderson <saa@android.com>
db/adb.c
db/sysdeps.h
db/sysdeps_win32.c
dd32794a29ddd3b630b8eb7f8032c168a13b2cb4 06-Jun-2012 Scott Anderson <saa@android.com> am 866b1bd5: fastboot: Make the format of "devices -l" match adb\'s

* commit '866b1bd5051db4f22b634df1f8a06bc1c9aa2e26':
fastboot: Make the format of "devices -l" match adb's
0e9e13eb46d8ffbb456f937db4a8fb0da02dd5d2 06-Jun-2012 Scott Anderson <saa@android.com> am 2ca3e6b3: adb: Generalizing -s to take qualifiers.

* commit '2ca3e6b35f79136418ebc32fef57580698dbd045':
adb: Generalizing -s to take qualifiers.
3fef581bc7a513defe48329973d14bec722f1293 06-Jun-2012 Scott Anderson <saa@android.com> am e82c2db0: adb: Transmit key properties in banner of connect message

* commit 'e82c2db05cae70a0490a1f84b7211ef42c329671':
adb: Transmit key properties in banner of connect message
866b1bd5051db4f22b634df1f8a06bc1c9aa2e26 05-Jun-2012 Scott Anderson <saa@android.com> fastboot: Make the format of "devices -l" match adb's

Change-Id: Iec7b02fee8298a4437d1827623e9f61688a73f42
Signed-off-by: Scott Anderson <saa@android.com>
astboot/fastboot.c
2ca3e6b35f79136418ebc32fef57580698dbd045 31-May-2012 Scott Anderson <saa@android.com> adb: Generalizing -s to take qualifiers.

Prior to this change, -s could take either a serial number or a
device path (e.g. "-s 01498B1F02015015" or "-s usb:1-4.2"). This
change extends -s to also allow product, model or device names
(e.g. "-s product:mysid"). These new qualifiers will only be
available on devices that are running an adb daemon that provides
properties in the connect message per Change-Id:
I09200decde4facb8fc9b4056fdae910155f2bcb9

The product, model and device are derived from the
ro.product.name, ro.product.model and ro.product.device
properties respectively. They are prefixed with "product:",
"model:" or "device:" as appropriate. In addition, any
non-alphanumerics in the model are changed to underscores.

If the -s parameter matches multiple devices, the result will be
the same as when multiple devices are connected but no -d, -e or
-s option is specified. In general, this means the user will get
"error: more than one device". However for get-state,
get-devpath and get-serialno, they will get "unknown".

The format of "devices -l" was changed to list all of the
qualifiers that are available. The following example output
(with the last digits of the serial numbers replaced with X's) is
with a Galaxy Prime with an older adb daemon and another Galaxy
Prime and Galaxy S both with the enhanced adb daemons:

List of devices attached
016B75D60A0060XX device usb:2-5 product:mysid model:Galaxy_Nexus device:toro
3731B535FAC200XX device usb:1-4.2 product:soju model:Nexus_S device:crespo
01498B1F020150XX device usb:1-4.1

Note that the serial number and state are now column oriented
instead of tab delimited. After the serial number and state, all
qualifiers are listed with each preceded by a space. The output
of the original devices command (without -l) is unchanged.

Change-Id: Iceeb2789874effc25a630d514a375d6f1889dc56
Signed-off-by: Scott Anderson <saa@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/sockets.c
db/transport.c
e82c2db05cae70a0490a1f84b7211ef42c329671 25-May-2012 Scott Anderson <saa@android.com> adb: Transmit key properties in banner of connect message

protocol.txt says that the connect message should have three
fields:

<systemtype>:<serialno>:<banner>

In reality, what is transmitted is simply:

<systemtype>::

The serialno is obtained via other means so doesn't really need
to be a part of the connect message. This change puts the
ro.product.name, ro.product.model and ro.product.device
properties in the <banner> for devices. Each property is
terminated by a semicolon (;) with the key and value separated by
an equals sign (=). Example message:

device::ro.product.name=<prd>;ro.product.model=<mdl>;ro.product.device=<dev>;

Making this change will enable the device list to provide more
information to the user and to give the potential for being able
to select which device to talk to with the -s option.

Change-Id: I09200decde4facb8fc9b4056fdae910155f2bcb9
Signed-off-by: Scott Anderson <saa@android.com>
db/adb.c
db/adb.h
db/protocol.txt
db/transport.c
ba4cf5d09988b16349651e4e7bde5f9b55b39e1a 05-Jun-2012 Dima Zavin <dima@android.com> am 779b12fc: am 5f2d00b0: rootdir: init.rc: remove audio app/sys groups, merge to fg

* commit '779b12fc3511bd241c206a49e85ec1b19fdd681c':
rootdir: init.rc: remove audio app/sys groups, merge to fg
7fa30fb0ab5617d308fa89bee54ff7e6629c7591 05-Jun-2012 Dima Zavin <dima@android.com> am 2b628a3c: am 29319a67: cutils: sched_policy: remove audio app/sys groups, merge into fg

* commit '2b628a3c2ee7d8411b76d37c3db30a0b7da24d73':
cutils: sched_policy: remove audio app/sys groups, merge into fg
ed60e86a1a3d3b452d9b7eebadf998706ee77c19 05-Jun-2012 Dima Zavin <dima@android.com> am 38160c06: am df44b886: core: init.rc: create apps cgroup for fg tasks, move bg under it

* commit '38160c06cabe35330f49eb0f6e0cfcc3f9823f0d':
core: init.rc: create apps cgroup for fg tasks, move bg under it
1a0b4c44ac6cec3c7bbd9a58ac753579fefe0a6b 05-Jun-2012 Dima Zavin <dima@android.com> am 2449c83a: am 13ed76bf: cutils: sched_policy: make bg group be nested under fg

* commit '2449c83a09fe1a5b87f89bd55925a11e79efb2ef':
cutils: sched_policy: make bg group be nested under fg
e545c5341f3364621503b4d5fdb91a0c75952916 05-Jun-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
779b12fc3511bd241c206a49e85ec1b19fdd681c 05-Jun-2012 Dima Zavin <dima@android.com> am 5f2d00b0: rootdir: init.rc: remove audio app/sys groups, merge to fg

* commit '5f2d00b0677cbe9ad42ea0394def0a51aef7bdda':
rootdir: init.rc: remove audio app/sys groups, merge to fg
2b628a3c2ee7d8411b76d37c3db30a0b7da24d73 05-Jun-2012 Dima Zavin <dima@android.com> am 29319a67: cutils: sched_policy: remove audio app/sys groups, merge into fg

* commit '29319a6753569fb3ef160c2de2f1c4d9d1398178':
cutils: sched_policy: remove audio app/sys groups, merge into fg
38160c06cabe35330f49eb0f6e0cfcc3f9823f0d 05-Jun-2012 Dima Zavin <dima@android.com> am df44b886: core: init.rc: create apps cgroup for fg tasks, move bg under it

* commit 'df44b88621f60e933d7d31090bf0bb892e88142c':
core: init.rc: create apps cgroup for fg tasks, move bg under it
2449c83a09fe1a5b87f89bd55925a11e79efb2ef 05-Jun-2012 Dima Zavin <dima@android.com> am 13ed76bf: cutils: sched_policy: make bg group be nested under fg

* commit '13ed76bfbce8e96604e781f88808b4d883891dde':
cutils: sched_policy: make bg group be nested under fg
5f2d00b0677cbe9ad42ea0394def0a51aef7bdda 04-Jun-2012 Dima Zavin <dima@android.com> rootdir: init.rc: remove audio app/sys groups, merge to fg

With this change, the audio rr/fifo threads will just run in
the fg cgroup.

Also, the RR budget for the apps fg/bg threads has been bumped
to 80%. Ideally, the bg budget would be much smaller but there
are legacy libraries that seem to be very sensitive to this so
for now keep it at this value.

Bug: 6528015
Change-Id: I08f295e7ba195a449b96cd79d954b0529cee8636
Signed-off-by: Dima Zavin <dima@android.com>
ootdir/init.rc
29319a6753569fb3ef160c2de2f1c4d9d1398178 04-Jun-2012 Dima Zavin <dima@android.com> cutils: sched_policy: remove audio app/sys groups, merge into fg

Bug: 6528015
Change-Id: I6c2658b62442d811b53c6d18476fbd6cd45f9e3f
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/sched_policy.c
6249b9009f44f2127670eda4d5aa6d5fd3e26e02 26-May-2012 Jeff Brown <jeffbrown@google.com> Make sdcard daemon multi-threaded.

The essential idea here is that a handler thread only needs to
hold a lock on the global node table while it is manipulating
nodes. The actual I/O operation is then performed without
holding any locks.

By default, we use 2 threads but this can be configured on the
command-line. Work is sheduled somewhat arbitrarily by the
handler threads. Whichever thread happens to read() the next
request first wins the right process it. This policy is very
simple but potentially wastes threads when there isn't much
work to be done. We can always improve this later if needed.

Change-Id: Id27a27c2c9b40d4f8e35a6bef9dd84f0dfacf337
dcard/Android.mk
dcard/sdcard.c
fc1e1a0ab48a88dc7e9a93f65da5e6458de622af 26-May-2012 Jeff Brown <jeffbrown@google.com> Refactor request opcode handlers.

This is mostly a structural change. The handlers have been moved
into individual functions, which will help with upcoming changes.

Change-Id: I774739d859e177d6b5d4186d2771444166b734fa
dcard/sdcard.c
7729d2450faeb1a02c72b29f48efc208de1cb444 26-May-2012 Jeff Brown <jeffbrown@google.com> Move buffers into a handler structure.

Also use PATH_MAX instead of PATH_BUFFER to determine the
maximum path length.

Change-Id: Ic78f731d339a2a97766d29d222dd27cac4e620ce
dcard/sdcard.c
6fd921ae03a0fa17acfe118753ecd76d25f02e10 26-May-2012 Jeff Brown <jeffbrown@google.com> Implement FUSE_FSYNC request.

This request is needed for application correctness, without which
data corruption may result.

Bug: 6488845
Change-Id: I3d676c2e40f6e6b37d5d270c7cb40f1bf8c1fa47
dcard/sdcard.c
847158476c1b7662eeec77808d8ecdbb329e6f28 25-May-2012 Jeff Brown <jeffbrown@google.com> More code cleanup.

Use constants to specify MAX_READ and MAX_WRITE buffer sizes and
use that to determine the size of the buffers that we need.

Be more careful about how the request header and data payload are
extracted. For example, the old code did len -= hdr->len, but
since len == hdr->len, this value was always 0. It turns out we
didn't use len thereafter, but we might want to for sanity checking
incoming requests.

Use const to make it clearer what data is coming out of the request.

Removed spurious error reply from FUSE_WRITE. It serves no purpose
and is ignored by the kernel.

Bug: 6488845
Change-Id: Ia328532979868f0aaea43744a49662f2f4511bfe
dcard/sdcard.c
2656735f515a41cf131c87be5f40550b6538ce80 25-May-2012 Jeff Brown <jeffbrown@google.com> Code cleanup.

Removed references to unsupported command-line arguments.

Fixed compiler warnings.

Bug: 6488845
Change-Id: I50cb865609ea0fa5824ae2741b831cd886033055
dcard/sdcard.c
df44b88621f60e933d7d31090bf0bb892e88142c 04-Jun-2012 Dima Zavin <dima@android.com> core: init.rc: create apps cgroup for fg tasks, move bg under it

Bug: 6538553
Change-Id: I7c29975aa376bcdda9d6bbd1fd3e04fdb1c1b1fe
Signed-off-by: Dima Zavin <dima@android.com>
ootdir/init.rc
13ed76bfbce8e96604e781f88808b4d883891dde 04-Jun-2012 Dima Zavin <dima@android.com> cutils: sched_policy: make bg group be nested under fg

Adds an apps cgroup which will contain fg tasks. Move the bg group
nested underneath it.

Bug: 6538553
Change-Id: I55279415da625e15a5bb061c2b45fbe7f7a4c047
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/sched_policy.c
e5867141c9364596fbcd47195aeff5b0f9844435 01-Jun-2012 Scott Anderson <saa@android.com> am 3608d832: adb: Fix two problems with device path implementation.

* commit '3608d832425ca3a6d00c4040f3bb979c5aa49899':
adb: Fix two problems with device path implementation.
a1020825fb8abdff9289a7473260e5312131e7c8 01-Jun-2012 Scott Anderson <saa@android.com> am c7993af6: adb: Fix compiler warning

* commit 'c7993af64baec271a238646bc20aaa846866c4a9':
adb: Fix compiler warning
fd96db17b7f07eb6615af01fd1908b74383bf04b 13-Jan-2012 Andrzej Pietrasiewicz <andrzej.p@samsung.com> FunctionFS: initial implementation

This is the second version of a patch which demonstrates the possibility
of using adbd (Android Debug Bridge daemon) with a generic FunctionFS gadget
instead of a custom adb usb gadget in the Linux kernel. It contains changes
introduced after Benoit's review - thank you Benoit.

The patch adds a new usb access layer to adbd using FunctionFS. The former
usb access method is still available. The method is chosen at runtime
depending if /dev/usb-ffs/adb/ep0 or /dev/android_adb is accessible.

How to use on the target device:

$ insmod g_ffs.ko idVendor=<vendor ID> iSerialNumber=<some string>
$ mount -t functionfs adb /dev/usb-ffs/adb -o uid=2000,gid=2000
$ ./adbd

This patch requires a patch to bionic which adds <linux/usb_functionfs.h>
which is an exact copy of the relevant file in the linux kernel.

Change-Id: I4b42eb267ffa50fca7a5fba46f388a2f083e8b2d
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[benoit@android.com: detect at runtime if functionfs is mounted
or fallback using f_adb]
Signed-off-by: Benoit Goby <benoit@android.com>
db/adb.c
db/adb.h
db/usb_linux_client.c
3608d832425ca3a6d00c4040f3bb979c5aa49899 31-May-2012 Scott Anderson <saa@android.com> adb: Fix two problems with device path implementation.

The commands that use "host-serial:<serial-number>:<request>"
service did not handle "-s usb:<path>". The -s parameter is
passed as the serial number in the protocol and then matched
against either the serial number or device path. However,
skip_host_serial() in sockets.c did not know about the usb:
syntax, the serial number was parsed incorrectly. Before this
change:
$ adb -s usb:1-4.1 get-state
error: unknown host service
After:
$ adb -s usb:1-4.1 get-state
device

Code was added in find_transport() in transport.c to match device
paths, but find_transport() is only used for socket connections
so matching device paths is not needed.

Change-Id: I922cec963659dafadd0fbc8fa36dee3b55fe366c
Signed-off-by: Scott Anderson <saa@android.com>
db/sockets.c
db/transport.c
c7993af64baec271a238646bc20aaa846866c4a9 25-May-2012 Scott Anderson <saa@android.com> adb: Fix compiler warning

system/core/adb/adb.c: In function 'connect_device':
system/core/adb/adb.c:1001: warning: comparison between signed and unsigned integer expressions

Change-Id: I206f85395e1d7ad8d6ef130a26c95dcf0f498696
Signed-off-by: Scott Anderson <saa@android.com>
db/adb.c
a1cd8b94fbcf690a2f60661806e8b013e54689a7 31-May-2012 Robert Greenwalt <rgreenwalt@google.com> am 6f523cda: am 7bb1b958: am ff856a2b: Merge "Add error handling to SocketClient::sendData"

* commit '6f523cda13094bf493cdf37e7ecc480bb5a37a2b':
Add error handling to SocketClient::sendData
6f523cda13094bf493cdf37e7ecc480bb5a37a2b 31-May-2012 Robert Greenwalt <rgreenwalt@google.com> am 7bb1b958: am ff856a2b: Merge "Add error handling to SocketClient::sendData"

* commit '7bb1b9585d2d61beaf05c997971aee27f87ad3f7':
Add error handling to SocketClient::sendData
7bb1b9585d2d61beaf05c997971aee27f87ad3f7 31-May-2012 Robert Greenwalt <rgreenwalt@google.com> am ff856a2b: Merge "Add error handling to SocketClient::sendData"

* commit 'ff856a2b927aaadb189181d2cd9dd08dc98456a4':
Add error handling to SocketClient::sendData
ff856a2b927aaadb189181d2cd9dd08dc98456a4 30-May-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Add error handling to SocketClient::sendData"
068f9f3bf9d09ebca0016cfcbb682d8ca27480f5 25-May-2012 Duane Sand <duanes@mips.com> Add Mips support to libpixelflinger

Change-Id: Ib81cb01b8d90ed1afa1fd54b3cc009d7fec0f814
ibpixelflinger/Android.mk
ibpixelflinger/arch-mips/t32cb16blend.S
ibpixelflinger/scanline.cpp
096041174b1d8cc09b06c51053b2b7e8545bd93f 25-May-2012 Duane Sand <duanes@mips.com> Add Mips architecture to system/core/include

Change-Id: Ief7bdbd8d09cabe3f11f3ed47a932a7faa81cad9
nclude/arch/linux-mips/AndroidConfig.h
nclude/cutils/atomic-inline.h
nclude/cutils/atomic-mips.h
nclude/private/pixelflinger/ggl_context.h
nclude/private/pixelflinger/ggl_fixed.h
393e559ddc06e8698841f8e141f5a5e24cffb942 29-May-2012 Jeff Sharkey <jsharkey@android.com> Enable conv=fdatasync in dd.

Matches behavior of coreutils dd. Also removes unsupported
conversions.

Change-Id: I9ed5a7d43b5b083041b261ce70f6c835b41dc7ac
oolbox/dd.c
oolbox/dd.h
5dd3ec20632287cd559e5503b153383127d92625 29-May-2012 The Android Open Source Project <initial-contribution@android.com> am 99565a9e: Reconcile with jb-release

* commit '99565a9e80882658e1b4ea5b7c610d40d4d7cb0b':
99565a9e80882658e1b4ea5b7c610d40d4d7cb0b 29-May-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release

Change-Id: Idc084816f4d709bf71c761151d548c8136085767
b7eb2cc299c4f713a9a4b141f803ec78b16cf03d 29-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
2e5fcd08ac177e984ebf1fb05bab5dfcf296c5a4 13-May-2011 Mattias Falk <mattias.falk@sonyericsson.com> Add error handling to SocketClient::sendData

Return failure and set errno if mSocket isn't valid.

Change-Id: I579114d435db46d0bb5682167ef34bebe061a8f8
ibsysutils/src/SocketClient.cpp
ac7304eefb2451710f2717cc5e1b1a5bbad0a552 25-May-2012 Jean-Baptiste Queru <jbq@google.com> am 79c71831: am a802b837: am 1d5e7885: Merge "toolbox: implement rm -f flag"

* commit '79c71831ca1ee795c56dab4bb7704d6c835a53ce':
toolbox: implement rm -f flag
79c71831ca1ee795c56dab4bb7704d6c835a53ce 25-May-2012 Jean-Baptiste Queru <jbq@google.com> am a802b837: am 1d5e7885: Merge "toolbox: implement rm -f flag"

* commit 'a802b8374a22da9f52541e1fc286dcbdb1cfa1b4':
toolbox: implement rm -f flag
a802b8374a22da9f52541e1fc286dcbdb1cfa1b4 25-May-2012 Jean-Baptiste Queru <jbq@google.com> am 1d5e7885: Merge "toolbox: implement rm -f flag"

* commit '1d5e7885698ca81241f10d06d475ef4e6075089b':
toolbox: implement rm -f flag
1d5e7885698ca81241f10d06d475ef4e6075089b 25-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "toolbox: implement rm -f flag"
6f1f6985ebcde26fc2042380a74db15f908ebe0f 25-May-2012 Elliott Hughes <enh@google.com> Merge "Mac OS has included dladdr(3) since at least 10.4."
94bb0acd17a88e70a067abf49b7400fff1cc49c3 24-May-2012 Eric Laurent <elaurent@google.com> am 27ca5f14: am 88f11846: audio policy: allow disabling A2DP for media.

* commit '27ca5f14939e763426b8bb1f67d08a39ddcef958':
audio policy: allow disabling A2DP for media.
27ca5f14939e763426b8bb1f67d08a39ddcef958 24-May-2012 Eric Laurent <elaurent@google.com> am 88f11846: audio policy: allow disabling A2DP for media.

* commit '88f11846a621b148387aa09754bc939933793717':
audio policy: allow disabling A2DP for media.
88f11846a621b148387aa09754bc939933793717 21-May-2012 Eric Laurent <elaurent@google.com> audio policy: allow disabling A2DP for media.

Added FORCE_NO_BT_A2DP forced use to allow applications to
override default policy to use A2DP whenever connected.

Bug 6485897.

Change-Id: I0039232ea6cce4121f375961b2c153d1a0d92e49
nclude/system/audio_policy.h
14cea26aa68b49366068cd0fe2cdf4b5a846ade6 24-May-2012 The Android Open Source Project <initial-contribution@android.com> am c79e59ce: Reconcile with jb-release

* commit 'c79e59ce77f30a6da1bb04773f7f63446b378d0b':
c79e59ce77f30a6da1bb04773f7f63446b378d0b 24-May-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release

Change-Id: I76ffcc7449cf140d5598612a6be3e8f7b964dc9b
75d2a79001bb4fb072f8934f7774a25aec24cc23 24-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
5817b033235bac83c8d2108a89e10a1c582777a1 24-May-2012 Elliott Hughes <enh@google.com> Mac OS has included dladdr(3) since at least 10.4.

This is needed by libcorkscrew.

Change-Id: Iacc56b014398da195b33c3cebc420afe6044381c
nclude/arch/darwin-x86/AndroidConfig.h
458409c2bd125d9c60d693f90a2a0736a16dd747 23-May-2012 Irfan Sheriff <isheriff@google.com> am e4cd4512: am ddf07b41: Merge "Reuse system properties for p2p" into jb-dev

* commit 'e4cd4512d684c23a31fbb91c65e2283d7c16d415':
Reuse system properties for p2p
e4cd4512d684c23a31fbb91c65e2283d7c16d415 23-May-2012 Irfan Sheriff <isheriff@google.com> am ddf07b41: Merge "Reuse system properties for p2p" into jb-dev

* commit 'ddf07b41167bbcb4e74d0af5dd43175513963c2d':
Reuse system properties for p2p
ddf07b41167bbcb4e74d0af5dd43175513963c2d 23-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Reuse system properties for p2p" into jb-dev
89f58cf827ecac8e67f5bcdb1dc7a9ed43e69cef 23-May-2012 Irfan Sheriff <isheriff@google.com> Reuse system properties for p2p

p2p interfaces keep increasing. Reuse a single "p2p" phrase to track all
p2p specific properties.

Longer term, we will remove the use of system properties for dhcp

Also, fixed some warnings

Bug: 6522164
Change-Id: Ibe9a68a1b5db9d5b0fe88c854d9f94b1b9930970
ibnetutils/dhcp_utils.c
6b659aec2ef83504b836de211f072d79ad2edc3d 23-May-2012 Elliott Hughes <enh@google.com> Fix a leak I caused in the libcorkscrew test program.

Change-Id: Iecbe006721d462694d48f32bca1606443b9c9714
ibcorkscrew/test.c
cdc6d77beb78bf136df4df24724f2f800022eb7d 22-May-2012 Elliott Hughes <enh@google.com> Merge "Fix libcorkscrew for x86 targets (bionic) as well as the host (glibc)."
cdedc3e3de8457edeb1729f193b9e10f5fac3d6e 21-May-2012 The Android Open Source Project <initial-contribution@android.com> am 8141498d: Reconcile with jb-release nakasi-factoryrom-release

* commit '8141498d2d30ed62183fc790b152f4f6058881fd':
Increase cpu.rt_runtime_us to 10% for fg and bg groups
6b3bab39d128947bf51deefe6a28c247cafd7bae 21-May-2012 Elliott Hughes <enh@google.com> Fix libcorkscrew for x86 targets (bionic) as well as the host (glibc).

Longer term, we might want to offer <ucontext.h> and have that be like glibc's,
but not today. (Note that POSIX says nothing about mcontext_t and glibc,
Mac OS, and the Linux kernel headers are all mutually incompatible.)

Change-Id: Ia074b51f4567cd54e06bbe29721389c8d1278614
ibcorkscrew/arch-x86/backtrace-x86.c
8141498d2d30ed62183fc790b152f4f6058881fd 19-May-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I1f460af608d091f5e9fddcab2953817fee7eec43
04607b8aa91051bb43cd652dca1cef1579ed5dad 19-May-2012 Elliott Hughes <enh@google.com> Test libcorkscrew's ELF symbol table decoder too.

Change-Id: I3180ffe07b44245c698dd03a789a3b337f32872a
ibcorkscrew/test.c
71363a8075e7916c2166cbdd8a0bf5a180ed4d54 18-May-2012 Elliott Hughes <enh@google.com> Support libcorkscrew on x86 hosts in binaries using glibc.

Change-Id: I1f2b7f21cc7f8227dbe7d294fed88cb691a24d09
ibcorkscrew/Android.mk
ibcorkscrew/arch-x86/backtrace-x86.c
ibcorkscrew/backtrace.c
ibcorkscrew/symbol_table.c
ibcorkscrew/test.c
2240bbe647bd129b08fef16c48d6ef69df41755d 18-May-2012 The Android Automerger <android-build@android.com> merge in nakasi-factoryrom-release history after reset to jb-dev
b7fa1fc12d2a9a241a7829ed76a1556ea8e290c3 18-May-2012 Elliott Hughes <enh@google.com> Merge "Add missing #includes."
420a7fa82d0fba6516d76d6024728de010b1cb8d 18-May-2012 Elliott Hughes <enh@google.com> Add missing #includes.

Change-Id: I81405d638f80fc96874ea0b21af3538229aa38a7
nclude/corkscrew/map_info.h
nclude/corkscrew/ptrace.h
nclude/corkscrew/symbol_table.h
ibcorkscrew/map_info.c
ibcorkscrew/ptrace.c
3449836bc5bed68e4f8b9b311e9822d7e2f1027a 18-May-2012 Jean-Baptiste Queru <jbq@google.com> am 5820a99f: Fix build

* commit '5820a99f3f843d718e80bc34bc4879144cce1efe':
Fix build
5a252a03852caad563d88f403e4ad2d05ed79423 18-May-2012 Colin Cross <ccross@android.com> am bbea1446: am 4c48025c: Increase cpu.rt_runtime_us to 10% for fg and bg groups

* commit 'bbea14468edef1b00355478ed094031e70479263':
Increase cpu.rt_runtime_us to 10% for fg and bg groups
5820a99f3f843d718e80bc34bc4879144cce1efe 17-May-2012 Jean-Baptiste Queru <jbq@google.com> Fix build

Change-Id: Ie2af6aab7e236c31bb7a607659813218ef9c5400
ebuggerd/utility.c
90dbf7a87ebe70590fe6ffa37610cede23402fa4 16-May-2012 Colin Cross <ccross@android.com> Increase cpu.rt_runtime_us to 10% for fg and bg groups

GPS on yakju puts SCHED_RR threads in the fg and bg groups, and
is unhappy with 0.1% limits. Increase the limits to 10%.

Change-Id: I971c9b0a815890d41694b965fdd2b023937a4411
ootdir/init.rc
bbea14468edef1b00355478ed094031e70479263 16-May-2012 Colin Cross <ccross@android.com> am 4c48025c: Increase cpu.rt_runtime_us to 10% for fg and bg groups

* commit '4c48025c484e9fb0e10bb9c6a1b9bbd5a2def555':
Increase cpu.rt_runtime_us to 10% for fg and bg groups
4c48025c484e9fb0e10bb9c6a1b9bbd5a2def555 16-May-2012 Colin Cross <ccross@android.com> Increase cpu.rt_runtime_us to 10% for fg and bg groups

GPS on yakju puts SCHED_RR threads in the fg and bg groups, and
is unhappy with 0.1% limits. Increase the limits to 10%.

Change-Id: I971c9b0a815890d41694b965fdd2b023937a4411
ootdir/init.rc
62cf8f1c408a7dffe387a14c3c45c7a431959acd 16-May-2012 The Android Open Source Project <initial-contribution@android.com> am 5e8f8596: Reconcile with jb-release nakasi-factoryrom-release

* commit '5e8f859631f6de0e0b312011771f06e9ead10747':
Increase rt_runtime_us to 1000 for foreground and bg_non_interactive
change /fstab.* perms back to 0644, to unbreak incremental OTAs
5e8f859631f6de0e0b312011771f06e9ead10747 16-May-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I988b644a8fc479af57a19dc947fbb1075e5bc515
678cc32980b092ec90e98f6d62bbeeafb3dd19cb 15-May-2012 Xavier Ducrohet <xav@android.com> am c7a67d0f: resolved conflicts for merge of 246808be to jb-dev-plus-aosp

* commit 'c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690':
Add USB Vendor ID for Yulong Coolpad.
c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690 15-May-2012 Xavier Ducrohet <xav@android.com> resolved conflicts for merge of 246808be to jb-dev-plus-aosp

Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089
1f956d3ecc3afbc3bc8b16e3cbac9f52fd0279c4 15-May-2012 The Android Automerger <android-build@android.com> merge in nakasi-factoryrom-release history after reset to jb-dev
ccd0503137882429d228652fd5a5c77d747cf142 15-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
fc26c0ba59ab1f74251fb95de2ee6837035e74e4 14-May-2012 Vishal Bhoj <vishal.bhoj@linaro.org> toolbox: rmmod: fix module unloading

Replace "-" with "_" in module name. This would keep
rmmod compatible with module-init-tools version of rmmod

Change-Id: I4470d9a98bc2f299acd94859fca4403aee279d2b
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
oolbox/rmmod.c
246808bedfb35ce8abd6cee434ff5b07a6618e8a 15-May-2012 Xavier Ducrohet <xav@android.com> Add USB Vendor ID for Yulong Coolpad.

Bug: 6217375

Change-Id: I8931c42e8d3088cc4df8c6e56b323a7392cad5ef
db/usb_vendors.c
51a958645ce9aeb4f8dc56d66a85d0005273a6ca 14-May-2012 Jean-Baptiste Queru <jbq@google.com> am 9dbcbe08: am 9bdedb59: am a36e1aa3: Merge "adb: usb_windows: fix adb connection lost issue"

* commit '9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3':
adb: usb_windows: fix adb connection lost issue
b6416ff30d4a582840531222932643549f1ba20a 14-May-2012 Jeff Brown <jeffbrown@google.com> am 94cb7adb: am bee7ce20: Merge "Delete dead code." into jb-dev

* commit '94cb7adb899fdfa9b5b6aa8b8dff4ae01631087f':
Delete dead code.
8ae4cb151b4a32184c7d87444f5ec74e999b9db8 14-May-2012 Todd Poynor <toddpoynor@google.com> am 7c7a55ee: am 50efaf2f: Merge "init: Set perms for interactive cpufreq governor boostpulse" into jb-dev

* commit '7c7a55ee82e666cc9279ab3e2a7022ccde52e2e6':
init: Set perms for interactive cpufreq governor boostpulse
3447b11d3e72bdc7409f63ec76ceba1babe06486 14-May-2012 JP Abgrall <jpa@google.com> am 177a74ac: am c1f88106: Merge "fastboot: Change -w to format after the erase of userdata & cache" into jb-dev

* commit '177a74aced971b89c319fb61ee12da0ca40f0c12':
fastboot: Change -w to format after the erase of userdata & cache
b0c4d5350212293522f55e5ca1d35da0934b5234 14-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3 12-May-2012 Jean-Baptiste Queru <jbq@google.com> am 9bdedb59: am a36e1aa3: Merge "adb: usb_windows: fix adb connection lost issue"

* commit '9bdedb599874278abf206230ed31010eeb9b40dd':
adb: usb_windows: fix adb connection lost issue
9bdedb599874278abf206230ed31010eeb9b40dd 12-May-2012 Jean-Baptiste Queru <jbq@google.com> am a36e1aa3: Merge "adb: usb_windows: fix adb connection lost issue"

* commit 'a36e1aa3db254d008f220a45899e1d70f4192619':
adb: usb_windows: fix adb connection lost issue
94cb7adb899fdfa9b5b6aa8b8dff4ae01631087f 12-May-2012 Jeff Brown <jeffbrown@google.com> am bee7ce20: Merge "Delete dead code." into jb-dev

* commit 'bee7ce20a5dad8b04075b3ec6a2ff0dc5d2d0cea':
Delete dead code.
bee7ce20a5dad8b04075b3ec6a2ff0dc5d2d0cea 12-May-2012 Jeff Brown <jeffbrown@google.com> Merge "Delete dead code." into jb-dev
1ee467c7604642139a98123131489aaad4d70221 12-May-2012 Jeff Brown <jeffbrown@google.com> Delete dead code.

This file is not compiled and not used.

Bug: 6435382
Change-Id: I3a08690950f1c77f8b0bc57a9e5cdb6eb402ac77
oolbox/powerd.c
7c7a55ee82e666cc9279ab3e2a7022ccde52e2e6 12-May-2012 Todd Poynor <toddpoynor@google.com> am 50efaf2f: Merge "init: Set perms for interactive cpufreq governor boostpulse" into jb-dev

* commit '50efaf2f7fc87692649497dba5615e54efd9c637':
init: Set perms for interactive cpufreq governor boostpulse
50efaf2f7fc87692649497dba5615e54efd9c637 12-May-2012 Todd Poynor <toddpoynor@google.com> Merge "init: Set perms for interactive cpufreq governor boostpulse" into jb-dev
177a74aced971b89c319fb61ee12da0ca40f0c12 12-May-2012 JP Abgrall <jpa@google.com> am c1f88106: Merge "fastboot: Change -w to format after the erase of userdata & cache" into jb-dev

* commit 'c1f881069de19dfa52aaa4cb06e8b3912c2ad61a':
fastboot: Change -w to format after the erase of userdata & cache
c1f881069de19dfa52aaa4cb06e8b3912c2ad61a 12-May-2012 JP Abgrall <jpa@google.com> Merge "fastboot: Change -w to format after the erase of userdata & cache" into jb-dev
a36e1aa3db254d008f220a45899e1d70f4192619 11-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "adb: usb_windows: fix adb connection lost issue"
5189c300bd3fceee8c753b2b1e6c69ae5ed8b8d0 10-May-2012 Colin Cross <ccross@android.com> Increase rt_runtime_us to 1000 for foreground and bg_non_interactive

rt_runtime_us=0 can cause deadlocks if a SCHED_FIFO/SCHED_RR thread
is moved into the wrong cgroup.

Change-Id: I4633392fb529039dff6ba5d3a6b672e0de9fc2d9
ootdir/init.rc
b8ad0f09d158d872693ed6208476fdb15fc515f9 10-May-2012 Colin Cross <ccross@android.com> am 9752d4ef: am 367e7b19: Increase rt_runtime_us to 1000 for foreground and bg_non_interactive

* commit '9752d4ef4c5ab02af8b04523057e033bb180d4e9':
Increase rt_runtime_us to 1000 for foreground and bg_non_interactive
9752d4ef4c5ab02af8b04523057e033bb180d4e9 10-May-2012 Colin Cross <ccross@android.com> am 367e7b19: Increase rt_runtime_us to 1000 for foreground and bg_non_interactive

* commit '367e7b195b144772464e560352caa2017a53058c':
Increase rt_runtime_us to 1000 for foreground and bg_non_interactive
367e7b195b144772464e560352caa2017a53058c 10-May-2012 Colin Cross <ccross@android.com> Increase rt_runtime_us to 1000 for foreground and bg_non_interactive

rt_runtime_us=0 can cause deadlocks if a SCHED_FIFO/SCHED_RR thread
is moved into the wrong cgroup.

Change-Id: I4633392fb529039dff6ba5d3a6b672e0de9fc2d9
ootdir/init.rc
c8b1ea7d778ec69e8b98cb9dca39d2416fae1507 10-May-2012 Eino-Ville Talvala <etalvala@google.com> am 919f3623: am 67fb73f5: Merge "Camera: Document expected error codes for start face detect." into jb-dev

* commit '919f3623e9c471f2cd80ef4f96bbaa43a0ed3b28':
Camera: Document expected error codes for start face detect.
5d38fd13d02f665d8c12579b3d952148036edd5f 10-May-2012 Doug Zongker <dougz@android.com> am e99ac6eb: am 4fd375b5: Merge "change /fstab.* perms to 0640" into jb-dev

* commit 'e99ac6eba3355e6574407f73c0a24f4aa7056d35':
change /fstab.* perms to 0640
919f3623e9c471f2cd80ef4f96bbaa43a0ed3b28 10-May-2012 Eino-Ville Talvala <etalvala@google.com> am 67fb73f5: Merge "Camera: Document expected error codes for start face detect." into jb-dev

* commit '67fb73f5d5eaa089b63018f55f980631c9ba6749':
Camera: Document expected error codes for start face detect.
e99ac6eba3355e6574407f73c0a24f4aa7056d35 10-May-2012 Doug Zongker <dougz@android.com> am 4fd375b5: Merge "change /fstab.* perms to 0640" into jb-dev

* commit '4fd375b566f0a4536b0afd8a2e4bd1c573a082c9':
change /fstab.* perms to 0640
67fb73f5d5eaa089b63018f55f980631c9ba6749 10-May-2012 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Document expected error codes for start face detect." into jb-dev
4fd375b566f0a4536b0afd8a2e4bd1c573a082c9 10-May-2012 Doug Zongker <dougz@android.com> Merge "change /fstab.* perms to 0640" into jb-dev
98d319a1712508f50c687b48ad1683d501044957 10-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
58cfa8af0ef6ff541a638756866427aced483943 10-May-2012 Eino-Ville Talvala <etalvala@google.com> Camera: Document expected error codes for start face detect.

Clarify when BAD_VALUE is expected from the camera start face detect
command.

Bug: 6459066
Change-Id: Id1b3d5047dee2c509aa6e374a5ed439a776b0b87
nclude/system/camera.h
be9242bbef6ff912a0adfa93ca9c71f35a795edf 09-May-2012 Jamie Gennis <jgennis@google.com> am e4f1246b: am 011b502b: Merge "ANativeWindow: add set_post_transform_crop" into jb-dev

* commit 'e4f1246b444af07876968595754208236f817519':
ANativeWindow: add set_post_transform_crop
e4f1246b444af07876968595754208236f817519 09-May-2012 Jamie Gennis <jgennis@google.com> am 011b502b: Merge "ANativeWindow: add set_post_transform_crop" into jb-dev

* commit '011b502b120b692ccbda140ed2cb3fe768c99eb0':
ANativeWindow: add set_post_transform_crop
011b502b120b692ccbda140ed2cb3fe768c99eb0 09-May-2012 Jamie Gennis <jgennis@google.com> Merge "ANativeWindow: add set_post_transform_crop" into jb-dev
9d27fdce0a8b02cc6bb916af66399b337d442394 09-May-2012 Jeff Brown <jeffbrown@google.com> am 33563c44: am 5b878d24: Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""

* commit '33563c4482f0376b4bccb6fc0e5269742ac46e8b':
Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
f7ca908d44afd0f927954aaad7c5aa34fd52c18d 09-May-2012 Jeff Brown <jeffbrown@google.com> am 82ebb158: am bff8f3fa: Add stubs for host builds.

* commit '82ebb1588158b7cc239a480356b3760c6d0451b2':
Add stubs for host builds.
e3a64bf6eb51b9330b84c118085a57543bc81835 09-May-2012 Jeff Brown <jeffbrown@google.com> am 2f70edf8: am 796a85e2: Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev

* commit '2f70edf80ae906a114fdba46cd362708da25d543':
Revert "Use O_CLOEXEC when opening cgroup fds."
34a714b0040f102c45523700c6cc1dece27ef01c 09-May-2012 Jeff Brown <jeffbrown@google.com> am 295afb36: am 6bdc0ca8: Merge "Use O_CLOEXEC when opening cgroup fds." into jb-dev

* commit '295afb36b5c2551243c73c607e245e30525a6942':
Use O_CLOEXEC when opening cgroup fds.
1c4b760a5d41de3196572d50d1404e453174cf9a 12-Aug-2011 Jack Ren <jack.ren@intel.com> adb: usb_windows: fix adb connection lost issue

Windows adb connection could be lost if the target
side kernel enables the kmemleak.

The root cause is that kmemleak downgrades USB
performance, and lead to Windows adb host application
timeout because usb_write()/usb_read()'s timeout time is
very short. That issue is not reproducible in Linux
host because its usb_write() timeout is 5s and usb_read()
is blocked until return:
usb_write() usb_read()
Linux 5000ms blocked until return
Windows 500+len*8 ms 500+len*8 ms

To fix that issue, extend the Windows adb host usb_write
timeout time to 5 seconds and usb_read() as a blocked routine:
usb_write() usb_read()
Windows 5000ms blocked until return

Change-Id: If54e2b4c396a5a06318c0ee0b3326a00e7661fbc
Signed-off-by: Yu Wang <yu.y.wang@intel.com>
Signed-off-by: Jin Can Zhuang <jin.can.zhuang@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
db/usb_windows.c
f033c6996a01c38e70a645e3b320619560f0da07 09-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
33563c4482f0376b4bccb6fc0e5269742ac46e8b 09-May-2012 Jeff Brown <jeffbrown@google.com> am 5b878d24: Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""

* commit '5b878d24c1f01a5f131d470280b51bcfb5638600':
Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
82ebb1588158b7cc239a480356b3760c6d0451b2 09-May-2012 Jeff Brown <jeffbrown@google.com> am bff8f3fa: Add stubs for host builds.

* commit 'bff8f3fa9848e52e3f3fe773796a03a80133992a':
Add stubs for host builds.
2f70edf80ae906a114fdba46cd362708da25d543 09-May-2012 Jeff Brown <jeffbrown@google.com> am 796a85e2: Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev

* commit '796a85e24511b7926a1fccb7cc695900d3ce0922':
Revert "Use O_CLOEXEC when opening cgroup fds."
295afb36b5c2551243c73c607e245e30525a6942 09-May-2012 Jeff Brown <jeffbrown@google.com> am 6bdc0ca8: Merge "Use O_CLOEXEC when opening cgroup fds." into jb-dev

* commit '6bdc0ca86acd8a50de2df9433a195baefce2b3a7':
Use O_CLOEXEC when opening cgroup fds.
5b878d24c1f01a5f131d470280b51bcfb5638600 09-May-2012 Jeff Brown <jeffbrown@google.com> Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""

This reverts commit 4df54bc4a85eacfff9c81dc0a7ebf3fd88a99982.
ibcutils/sched_policy.c
bff8f3fa9848e52e3f3fe773796a03a80133992a 09-May-2012 Jeff Brown <jeffbrown@google.com> Add stubs for host builds.

Bug: 4466013
Change-Id: I5633c841e71a48357bb04cd7ccc02550c17bde22
ibcutils/sched_policy.c
59c69efafb251bccdfa18a9e51555a7d1db883db 09-May-2012 Colin Cross <ccross@android.com> am 40b2d79a: am 0e92b50f: Merge "libsuspend: create new library to handle triggering suspend" into jb-dev

* commit '40b2d79a40e9d38cb93fe0584f698cbe70e79ffb':
libsuspend: create new library to handle triggering suspend
796a85e24511b7926a1fccb7cc695900d3ce0922 08-May-2012 Jeff Brown <jeffbrown@google.com> Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev
4df54bc4a85eacfff9c81dc0a7ebf3fd88a99982 08-May-2012 Jeff Brown <jeffbrown@google.com> Revert "Use O_CLOEXEC when opening cgroup fds."

This reverts commit e1440d81aef58e8b9983ab1f4540dc1fe5e63ab7
ibcutils/sched_policy.c
6bdc0ca86acd8a50de2df9433a195baefce2b3a7 08-May-2012 Jeff Brown <jeffbrown@google.com> Merge "Use O_CLOEXEC when opening cgroup fds." into jb-dev
e1440d81aef58e8b9983ab1f4540dc1fe5e63ab7 08-May-2012 Jeff Brown <jeffbrown@google.com> Use O_CLOEXEC when opening cgroup fds.

Bug: 4466013
Change-Id: I0d2e915fc550a0ecaccad5e452dd4c87fc878b8b
ibcutils/sched_policy.c
d8d410d1b5362eab05d64a7bb6a455146f495136 08-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
30ae5806e920cb824d019defd856068f09dd0db6 08-May-2012 JP Abgrall <jpa@google.com> fastboot: Change -w to format after the erase of userdata & cache

If the bootloader doesn't support formatting of those partitions
(either because it doesn't support the getvar commands needed or
the partition type is not supported), the errors are printed but
doesn't halt processing of subsequent commands.

Change-Id: I816ac2e5e7593846fcb4fd39c793a8dbdd996f6f
Signed-off-by: Mike J. Chen <mjchen@google.com>
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
0e6056d0126cad2e082b4702e60dfb242aa6bf65 08-May-2012 Doug Zongker <dougz@android.com> change /fstab.* perms to 0640

It's safe to change the permissions on files in the root partitions;
incremental OTA now knows how to handle this case.

This reverts commit 08c370cc50e4bdae5a59f4ddfd1e3874bb36579d.

Change-Id: I503bf8ebd037fa9715494c6539e5430eee47acfe
nclude/private/android_filesystem_config.h
40b2d79a40e9d38cb93fe0584f698cbe70e79ffb 08-May-2012 Colin Cross <ccross@android.com> am 0e92b50f: Merge "libsuspend: create new library to handle triggering suspend" into jb-dev

* commit '0e92b50f0fb432c45b26863394e473916b0ab4ef':
libsuspend: create new library to handle triggering suspend
0e92b50f0fb432c45b26863394e473916b0ab4ef 08-May-2012 Colin Cross <ccross@android.com> Merge "libsuspend: create new library to handle triggering suspend" into jb-dev
a2582c2c4d20684b21aaf50913a27239789bf5eb 04-May-2012 Colin Cross <ccross@android.com> libsuspend: create new library to handle triggering suspend

libsuspend provides functions autosuspend_enable() and
autosuspend_disable() to trigger suspend on a variety of different
kernels.

Change-Id: I5dc28fb51532fa7c514330f1cfde7698d31d734c
ibsuspend/Android.mk
ibsuspend/autosuspend.c
ibsuspend/autosuspend_autosleep.c
ibsuspend/autosuspend_earlysuspend.c
ibsuspend/autosuspend_ops.h
ibsuspend/autosuspend_wakeup_count.c
ibsuspend/include/suspend/autosuspend.h
d21113ac460a2a663396bc6ecd79e5a85e2efc1b 03-May-2012 Jamie Gennis <jgennis@google.com> ANativeWindow: add set_post_transform_crop

This change replaces the set_active_rect function with set_post_transform_crop.
There is a temporary set_active_rect function that calls
set_post_transform_crop for compatibility while commiting to multiple git
repositories.

Change-Id: Ia7c171186fd277d5a36f6068ace93a9ce1c82d28
nclude/system/window.h
72292fddc10141807fdd8d6b33d1a224825559f2 07-May-2012 Jean-Baptiste Queru <jbq@google.com> am 2f1d4e2d: am 254e0d49: am d98c87c9: Merge "init: Fix chown and chmod for write-only files"

* commit '2f1d4e2d2d6d3d8969a6054778d0781766f33de7':
init: Fix chown and chmod for write-only files
2f1d4e2d2d6d3d8969a6054778d0781766f33de7 07-May-2012 Jean-Baptiste Queru <jbq@google.com> am 254e0d49: am d98c87c9: Merge "init: Fix chown and chmod for write-only files"

* commit '254e0d496e11b30cd9e4f9324f3514be7e85f6d4':
init: Fix chown and chmod for write-only files
254e0d496e11b30cd9e4f9324f3514be7e85f6d4 07-May-2012 Jean-Baptiste Queru <jbq@google.com> am d98c87c9: Merge "init: Fix chown and chmod for write-only files"

* commit 'd98c87c95342ed6eade9f1239122dc9e90dcad67':
init: Fix chown and chmod for write-only files
eb62bc81ebc3079afdd8fa4c9c439fbe42aa61f6 06-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
d98c87c95342ed6eade9f1239122dc9e90dcad67 06-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "init: Fix chown and chmod for write-only files"
0ffc5b37e553f4514121d2775879a153e6ea5ecc 04-May-2012 Tanguy Pruvot <tanguy.pruvot@gmail.com> toolbox: implement rm -f flag

this prevent compatibility errors in scripts (file "-f" not found)
The force flag will not return an error if the file doesnt exist.

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

Change-Id: I3267963284ee247629da5ab299e900c6e4a4ac68
oolbox/rm.c
fc53f5ffe46c4a0b8b1eccbcd73ebb44498f7bcd 05-May-2012 Doug Zongker <dougz@android.com> am f3772351: am a865f6d8: fix mkbootfs for systems that lack PATH_MAX

* commit 'f3772351e75ce7e7d117fc4e31bde0c243581316':
fix mkbootfs for systems that lack PATH_MAX
f3772351e75ce7e7d117fc4e31bde0c243581316 05-May-2012 Doug Zongker <dougz@android.com> am a865f6d8: fix mkbootfs for systems that lack PATH_MAX

* commit 'a865f6d85a52d0a77d1aef8d5fb5bece08e3b246':
fix mkbootfs for systems that lack PATH_MAX
a865f6d85a52d0a77d1aef8d5fb5bece08e3b246 05-May-2012 Doug Zongker <dougz@android.com> fix mkbootfs for systems that lack PATH_MAX

Change-Id: I1b841bde6de6c8e762c5fba35e6d6d701f18bb05
pio/mkbootfs.c
4d86de7f7a0d3066645c0f77e73f377244ae9409 05-May-2012 Doug Zongker <dougz@android.com> am 4d755a1b: am 0375fd13: Merge "add -f option to mkbootfs to load file perms from file" into jb-dev

* commit '4d755a1b37f44ec935b06bbc921d128272e9ee96':
add -f option to mkbootfs to load file perms from file
4d755a1b37f44ec935b06bbc921d128272e9ee96 05-May-2012 Doug Zongker <dougz@android.com> am 0375fd13: Merge "add -f option to mkbootfs to load file perms from file" into jb-dev

* commit '0375fd133a95f47d0ea12b16ca3d7ccf04ea6362':
add -f option to mkbootfs to load file perms from file
0375fd133a95f47d0ea12b16ca3d7ccf04ea6362 05-May-2012 Doug Zongker <dougz@android.com> Merge "add -f option to mkbootfs to load file perms from file" into jb-dev
93574c619c96bec7e7e42468ce8573f630c78b21 29-Mar-2012 Benoit Goby <benoit@android.com> init: Fix chown and chmod for write-only files

Change-Id: I570b631ced11ab104aafe7ebfe71bae4e380d8af
nit/builtins.c
af24f60e3283df2399699f283661c8bef3c1a352 05-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
f2c3a8331ca9ec61aba82c4af6c8c7aa75d56f14 04-May-2012 Doug Zongker <dougz@android.com> add -f option to mkbootfs to load file perms from file

mkbootfs uses the compiled in fs_config() function to set the mode
(but not the uid or gid) of the files in the filesystem it is
building. Give it an optional "-f filename" flag to allow loading the
list of file permissions from a file, so we can continue to accurately
recreate old filesystems even when the current fs_config() has changed.

Bug: 6435132
Change-Id: Ife6b25e989301e78e22c34a544738436c96caf6f
pio/mkbootfs.c
96a3d2792afc8ff701cba055fb664c180b2ada41 04-May-2012 Elliott Hughes <enh@google.com> am 34d85c5e: am f82e7411: Make a liblog.so for the host too.

* commit '34d85c5e6cdf3c99b4d46a6036066743799bff0d':
Make a liblog.so for the host too.
34d85c5e6cdf3c99b4d46a6036066743799bff0d 04-May-2012 Elliott Hughes <enh@google.com> am f82e7411: Make a liblog.so for the host too.

* commit 'f82e74116314c4def32013495337c038f6c6ee6c':
Make a liblog.so for the host too.
f82e74116314c4def32013495337c038f6c6ee6c 14-Jul-2011 Elliott Hughes <enh@google.com> Make a liblog.so for the host too.

Change-Id: I0317bb3b80c6555bcb1ff9f2238f32be5f7adedb

Conflicts:

liblog/Android.mk
iblog/Android.mk
4ff10e63c3814f7b40c6e4e672c895135a1b1a3d 04-May-2012 Todd Poynor <toddpoynor@google.com> init: Set perms for interactive cpufreq governor boostpulse

Change-Id: Ia4b028f58f9d48bad2525744497f10884d11c5d6
ootdir/init.rc
350046ef888898374a23a9c3a6a72df1cb0d8d0b 03-May-2012 Doug Zongker <dougz@android.com> change /fstab.* perms back to 0644, to unbreak incremental OTAs

Change-Id: I21a991148fd1de604ecf87abad0b49970d2abe84
nclude/private/android_filesystem_config.h
27843a2a6609cd55410fe930d1f91096f8b5f360 03-May-2012 Doug Zongker <dougz@android.com> am e8b2e618: am 08c370cc: change /fstab.* perms back to 0644, to unbreak incremental OTAs

* commit 'e8b2e6185c46e51ad90091cf26ccdf8e2fac4138':
change /fstab.* perms back to 0644, to unbreak incremental OTAs
e8b2e6185c46e51ad90091cf26ccdf8e2fac4138 03-May-2012 Doug Zongker <dougz@android.com> am 08c370cc: change /fstab.* perms back to 0644, to unbreak incremental OTAs

* commit '08c370cc50e4bdae5a59f4ddfd1e3874bb36579d':
change /fstab.* perms back to 0644, to unbreak incremental OTAs
08c370cc50e4bdae5a59f4ddfd1e3874bb36579d 03-May-2012 Doug Zongker <dougz@android.com> change /fstab.* perms back to 0644, to unbreak incremental OTAs

Change-Id: I21a991148fd1de604ecf87abad0b49970d2abe84
nclude/private/android_filesystem_config.h
668ed7a5127d40e08b052b6479d808202dfaa477 03-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
6ea936b7f4381128b1e826a309b1385831a979bb 03-May-2012 Jeff Sharkey <jsharkey@android.com> am 8f1d4daf: am 982fd17a: Merge "Support full 32 bits for socket tags." into jb-dev

* commit '8f1d4daffd46c122501d22dda864ce6f209657b1':
Support full 32 bits for socket tags.
8f1d4daffd46c122501d22dda864ce6f209657b1 03-May-2012 Jeff Sharkey <jsharkey@android.com> am 982fd17a: Merge "Support full 32 bits for socket tags." into jb-dev

* commit '982fd17ac179787ca5f7a7ece03234629285850f':
Support full 32 bits for socket tags.
982fd17ac179787ca5f7a7ece03234629285850f 03-May-2012 Jeff Sharkey <jsharkey@android.com> Merge "Support full 32 bits for socket tags." into jb-dev
70a163f519db14532b7dcde4bc65d1d658a760e4 03-May-2012 Arve Hjønnevåg <arve@android.com> init.rc: Set owner for /sys/power/autosleep

Change-Id: Ia18cce973c71e7561ca84b23e37b0b8e056a7143
ootdir/init.rc
e34b91719c031f273d43781e5d96363a10ab44bd 03-May-2012 Jeff Sharkey <jsharkey@android.com> Support full 32 bits for socket tags.

Bug: 5321184
Change-Id: Iabd668674e60626caafc9b66b29fdbddc3724f58
ibcutils/qtaguid.c
1bd260c726f7f2e583b39baea07b9d4f2e0c1e58 03-May-2012 Nick Kralevich <nnk@google.com> am a6e86165: am f490b56c: (-s ours) am 09a96bef: Merge "init: make chmod/mkdir/chown not follow symlinks"

* commit 'a6e861658b66f64d9925c83587520dd7cb6b348d':
init: make chmod/mkdir/chown not follow symlinks
a6e861658b66f64d9925c83587520dd7cb6b348d 03-May-2012 Nick Kralevich <nnk@google.com> am f490b56c: (-s ours) am 09a96bef: Merge "init: make chmod/mkdir/chown not follow symlinks"

* commit 'f490b56c61df016f6572fc002cbb4f18660e4e01':
init: make chmod/mkdir/chown not follow symlinks
013512b068ab559630bad8d1bbd92db2adddcaf3 03-May-2012 Dima Zavin <dima@android.com> am 37fe6081: am 8be310c2: am 29fea7b1: Merge "Added missing header to window.h"

* commit '37fe6081fb9af06f39248d8b3ddd1962076838d2':
Added missing header to window.h
69b2e7dd127d0fdc8dac6794c323856142792ab3 03-May-2012 Jean-Baptiste Queru <jbq@google.com> am 007b7002: am 2ae9878c: am c5d5a5e8: Merge "Kindle Fire USB ID"

* commit '007b70023b179f846c0ad1f0303da4ce03ac065e':
Kindle Fire USB ID
37fe6081fb9af06f39248d8b3ddd1962076838d2 03-May-2012 Dima Zavin <dima@android.com> am 8be310c2: am 29fea7b1: Merge "Added missing header to window.h"

* commit '8be310c21374013e398705418638509bc0efd32a':
Added missing header to window.h
007b70023b179f846c0ad1f0303da4ce03ac065e 03-May-2012 Jean-Baptiste Queru <jbq@google.com> am 2ae9878c: am c5d5a5e8: Merge "Kindle Fire USB ID"

* commit '2ae9878cd5dc517cc7338aaca81f0eb3127b4a53':
Kindle Fire USB ID
f490b56c61df016f6572fc002cbb4f18660e4e01 02-May-2012 Nick Kralevich <nnk@google.com> am 09a96bef: Merge "init: make chmod/mkdir/chown not follow symlinks"

* commit '09a96bef654d58d5100353a1aa7239aae12d9bf3':
init: make chmod/mkdir/chown not follow symlinks
8be310c21374013e398705418638509bc0efd32a 02-May-2012 Dima Zavin <dima@android.com> am 29fea7b1: Merge "Added missing header to window.h"

* commit '29fea7b17a35390e9a463079936bb8c20bcb1a15':
Added missing header to window.h
2ae9878cd5dc517cc7338aaca81f0eb3127b4a53 02-May-2012 Jean-Baptiste Queru <jbq@google.com> am c5d5a5e8: Merge "Kindle Fire USB ID"

* commit 'c5d5a5e807a99697cff936dcdfe0fbaaf3cb6679':
Kindle Fire USB ID
09a96bef654d58d5100353a1aa7239aae12d9bf3 02-May-2012 Nick Kralevich <nnk@google.com> Merge "init: make chmod/mkdir/chown not follow symlinks"
42a9349dc4e98019d27d7f8d19bc6c431695d7e1 20-Mar-2012 Geremy Condra <gcondra@google.com> init: make chmod/mkdir/chown not follow symlinks

This change brings init's do_chmod, mkdir, and do_chown into line
with open's O_NOFOLLOW semantics, causing them to fail when the
last element of their target path is a symlink.

Change-Id: If00e1a25cfe17ef6f738af4bf0541abd0c1b084b
nit/builtins.c
29fea7b17a35390e9a463079936bb8c20bcb1a15 02-May-2012 Dima Zavin <dima@android.com> Merge "Added missing header to window.h"
c5d5a5e807a99697cff936dcdfe0fbaaf3cb6679 02-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Kindle Fire USB ID"
90392a3aa9d99c03ddec51e23fc2ca074565d090 02-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
76e47e0ec84eaf7faf6f77b853ba74345875a8e3 02-May-2012 Scott Anderson <saa@android.com> am 9526a788: Merge "adb: Add ability to specify device path" into ics-aah

* commit '9526a788a6bd528e14622404e8750bdcc147d15a':
adb: Add ability to specify device path
9526a788a6bd528e14622404e8750bdcc147d15a 02-May-2012 Scott Anderson <saa@android.com> Merge "adb: Add ability to specify device path" into ics-aah
a61bcad58ba1f7359183a333ee58303ed67e4a2f 02-May-2012 Scott Anderson <saa@android.com> resolved conflicts for merge of 13081c69 to master

Change-Id: I631e466fc53e9b0f4a39f24f959b4ae9b626bdda
048f24600f389bb756cf9c6ea93774f31fd588ad 02-May-2012 Glenn Kasten <gkasten@google.com> am eed821e9: am 7e057eb0: Merge "Increase budget" into jb-dev

* commit 'eed821e952e45d680557f71da180dc86c9ea92e1':
Increase budget
eed821e952e45d680557f71da180dc86c9ea92e1 02-May-2012 Glenn Kasten <gkasten@google.com> am 7e057eb0: Merge "Increase budget" into jb-dev

* commit '7e057eb0047819ee4d8af52d2747a7bf29b0cc56':
Increase budget
7e057eb0047819ee4d8af52d2747a7bf29b0cc56 02-May-2012 Glenn Kasten <gkasten@google.com> Merge "Increase budget" into jb-dev
642a601d6301623edc2d97dbfd46ba599c0e4446 02-May-2012 Sundar Raman <sunds@ti.com> am e517c1eb: am e5d32128: sdcard: use FUSE_BIG_WRITES for FUSE writes

* commit 'e517c1eb0ab3e4d692a0d1ec0b5f04e27ab9b127':
sdcard: use FUSE_BIG_WRITES for FUSE writes
e517c1eb0ab3e4d692a0d1ec0b5f04e27ab9b127 02-May-2012 Sundar Raman <sunds@ti.com> am e5d32128: sdcard: use FUSE_BIG_WRITES for FUSE writes

* commit 'e5d32128b0f1373822b02b2a2e69c6b199e0f805':
sdcard: use FUSE_BIG_WRITES for FUSE writes
e5d32128b0f1373822b02b2a2e69c6b199e0f805 09-Feb-2012 Sundar Raman <sunds@ti.com> sdcard: use FUSE_BIG_WRITES for FUSE writes

Slightly optimizes the writes used by sdcard to increase
throughput and decrease cpu load. Update the read
size to 256 x 1024 + 128 from current 8192 bytes since
writes can go as high as that.

Change-Id: I3bad425f31d4aa6f44f546e3d31439fd5bdca9ea
Signed-off-by: Sundar Raman <sunds@ti.com>
dcard/sdcard.c
730768ea3b520d68542d67c749dfbd56b320a4ac 02-May-2012 Jeff Tinker <jtinker@google.com> am 46f9223b: am 94a55df3: Merge "Fix failure to play pinned movies" into jb-dev

* commit '46f9223b994c50e44354566375da2ec95bebc04c':
Fix failure to play pinned movies
46f9223b994c50e44354566375da2ec95bebc04c 02-May-2012 Jeff Tinker <jtinker@google.com> am 94a55df3: Merge "Fix failure to play pinned movies" into jb-dev

* commit '94a55df34d917492cb3613b9445ffb1659459186':
Fix failure to play pinned movies
94a55df34d917492cb3613b9445ffb1659459186 02-May-2012 Jeff Tinker <jtinker@google.com> Merge "Fix failure to play pinned movies" into jb-dev
f3ee64c4b1045ff07f192527f25a88640dd0b7f7 01-May-2012 Ken Sumrall <ksumrall@android.com> am 048cc27c: am 0e9dd90a: Change init to use libfs_mgr to mount filesystems.

* commit '048cc27c8a6796f9b2ce9d58be8c423ab837cf8b':
Change init to use libfs_mgr to mount filesystems.
2b4bda059992ae83f03c17e1f45c27f9b6725537 01-May-2012 Ken Sumrall <ksumrall@android.com> am 4580143b: am c1bf8966: A filesystem manager library to mount filesystems for init.

* commit '4580143b70dc5122a8970d365206ca791a7e6d14':
A filesystem manager library to mount filesystems for init.
048cc27c8a6796f9b2ce9d58be8c423ab837cf8b 01-May-2012 Ken Sumrall <ksumrall@android.com> am 0e9dd90a: Change init to use libfs_mgr to mount filesystems.

* commit '0e9dd90ac336278659477cad0b9e9f1004e2b338':
Change init to use libfs_mgr to mount filesystems.
4580143b70dc5122a8970d365206ca791a7e6d14 01-May-2012 Ken Sumrall <ksumrall@android.com> am c1bf8966: A filesystem manager library to mount filesystems for init.

* commit 'c1bf89663ca71949b508007d4df2b5b06038f96d':
A filesystem manager library to mount filesystems for init.
59e6eb09997125aecc122c7d7d9a6e3ec00be4c4 01-May-2012 Glenn Kasten <gkasten@google.com> Increase budget

Change-Id: I6706a408990abf8d420db73280df2818b8827140
ootdir/init.rc
0e9dd90ac336278659477cad0b9e9f1004e2b338 18-Apr-2012 Ken Sumrall <ksumrall@android.com> Change init to use libfs_mgr to mount filesystems.

The new fs_mgr library moves much of the knowledge of what filesystems
to mount into a new fstab.<device> file, and just calls one function to
mount all the filesystems.

Change-Id: If3db37530a0676000cba3e679db27aca734227e5
nit/Android.mk
nit/builtins.c
nit/init_parser.c
nit/keywords.h
c1bf89663ca71949b508007d4df2b5b06038f96d 07-Jan-2012 Ken Sumrall <ksumrall@android.com> A filesystem manager library to mount filesystems for init.

Instead of specifying in init what to mount, and having various hacks in init
itself to deal with encryption, use a filesystem manager library to do the
work, that can also be invoked by vold when mounting an encrypted volume.
Keep all the magic filesystem info an a device specific fstab file.

Change-Id: Ib988f1e4fb0638ba1d5fd98407fa6d8cf862aaca
s_mgr/Android.mk
s_mgr/fs_mgr.c
s_mgr/fs_mgr_main.c
s_mgr/fs_mgr_priv.h
s_mgr/include/fs_mgr.h
nclude/private/android_filesystem_config.h
437ab3fb401644b77552442c7366639b91c25951 01-May-2012 Jamie Gennis <jgennis@google.com> am e80645d2: am 190b6e26: ANativeWindow: fix up some comments

* commit 'e80645d248c636475929fc6a33ca4eb0ed77d6ba':
ANativeWindow: fix up some comments
e80645d248c636475929fc6a33ca4eb0ed77d6ba 01-May-2012 Jamie Gennis <jgennis@google.com> am 190b6e26: ANativeWindow: fix up some comments

* commit '190b6e2698dc47ddb4888b9c51abb23f69fcf064':
ANativeWindow: fix up some comments
3cc07614f5ce33bac0fbe5e019a9fee6df479daa 01-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
65f1fbcad3247997cf0f0eca54b88f0692781109 01-May-2012 Jeff Tinker <jtinker@google.com> Fix failure to play pinned movies

DRM server process needs to be able to access movies on sdcard
to acquire rights.

related-to-bug: 6414503

Change-Id: If90404e32fd437b8fb7d5a6ec8dfb30a499ef733
ootdir/init.rc
08ec39ecc68674c18cd11bc4d75b30309d6d970f 18-Apr-2012 Ken Sumrall <ksumrall@android.com> Change init to use libfs_mgr to mount filesystems.

The new fs_mgr library moves much of the knowledge of what filesystems
to mount into a new fstab.<device> file, and just calls one function to
mount all the filesystems.

Change-Id: If3db37530a0676000cba3e679db27aca734227e5
nit/Android.mk
nit/builtins.c
nit/init_parser.c
nit/keywords.h
7574c035b2dcf8316c562c648113be6be65cb061 07-Jan-2012 Ken Sumrall <ksumrall@android.com> A filesystem manager library to mount filesystems for init.

Instead of specifying in init what to mount, and having various hacks in init
itself to deal with encryption, use a filesystem manager library to do the
work, that can also be invoked by vold when mounting an encrypted volume.
Keep all the magic filesystem info an a device specific fstab file.

Change-Id: Ib988f1e4fb0638ba1d5fd98407fa6d8cf862aaca
s_mgr/Android.mk
s_mgr/fs_mgr.c
s_mgr/fs_mgr_main.c
s_mgr/fs_mgr_priv.h
s_mgr/include/fs_mgr.h
nclude/private/android_filesystem_config.h
190b6e2698dc47ddb4888b9c51abb23f69fcf064 01-May-2012 Jamie Gennis <jgennis@google.com> ANativeWindow: fix up some comments

This change clarifies in the ANativeWindow perform docs which perform calls are
private to the framework and should not be made by code below the HAL level.

Change-Id: Ibfeba0760d9a3f74996e6358d5ad89a408f80dfe
nclude/system/window.h
802597977c52729a229c8a892c144c71b087d70d 30-Apr-2012 Jamie Gennis <jgennis@google.com> am 5a95bdaa: am 575b2358: Merge "graphics.h: clarify docs about stride for YV12" into jb-dev

* commit '5a95bdaab2939d8f8a2b7657f1b63884781254b6':
graphics.h: clarify docs about stride for YV12
5a95bdaab2939d8f8a2b7657f1b63884781254b6 30-Apr-2012 Jamie Gennis <jgennis@google.com> am 575b2358: Merge "graphics.h: clarify docs about stride for YV12" into jb-dev

* commit '575b23584df48f877f26f62dfb759b4031ba0d3e':
graphics.h: clarify docs about stride for YV12
575b23584df48f877f26f62dfb759b4031ba0d3e 30-Apr-2012 Jamie Gennis <jgennis@google.com> Merge "graphics.h: clarify docs about stride for YV12" into jb-dev
185b300d6a33673daa69fbea6056e91c4390e158 30-Apr-2012 Jamie Gennis <jgennis@google.com> graphics.h: clarify docs about stride for YV12

This change makes it clearer how to derive the stride of the Cr and Cb plane
from the stride of the Y plane for the YV12 pixel format.

Change-Id: I54a9a20f35224bd583e25c615014cc8d830a1dd0
nclude/system/graphics.h
241953cdadcdaaf576a2282a7dd6ea24e7316e2b 30-Apr-2012 Todd Poynor <toddpoynor@google.com> am 8ae80a68: am 249b16d9: Merge "init: Set perms for cpufreq interactive governor input boost sysfs" into jb-dev

* commit '8ae80a68f3ba0587a45e73504498a1cf57f0d5ad':
init: Set perms for cpufreq interactive governor input boost sysfs
8ae80a68f3ba0587a45e73504498a1cf57f0d5ad 30-Apr-2012 Todd Poynor <toddpoynor@google.com> am 249b16d9: Merge "init: Set perms for cpufreq interactive governor input boost sysfs" into jb-dev

* commit '249b16d9b52cd9242306290aa690adfece33b4d5':
init: Set perms for cpufreq interactive governor input boost sysfs
249b16d9b52cd9242306290aa690adfece33b4d5 30-Apr-2012 Todd Poynor <toddpoynor@google.com> Merge "init: Set perms for cpufreq interactive governor input boost sysfs" into jb-dev
4a3c613c4c7fa908edf6db85cfda67bd25de5345 30-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
75e026e3820f831110863afc75d7d76bdf8a0e35 28-Apr-2012 Jeff Brown <jeffbrown@google.com> am d5fc797f: am f1f0d224: am 331667ff: Use #define value of 1 to indicate presence of headers.

* commit 'd5fc797fddcbde6574273c0e33d3a569dc6ef415':
Use #define value of 1 to indicate presence of headers.
d5fc797fddcbde6574273c0e33d3a569dc6ef415 28-Apr-2012 Jeff Brown <jeffbrown@google.com> am f1f0d224: am 331667ff: Use #define value of 1 to indicate presence of headers.

* commit 'f1f0d224c6d4c116eef8ae821e42370ad0fad957':
Use #define value of 1 to indicate presence of headers.
f1f0d224c6d4c116eef8ae821e42370ad0fad957 28-Apr-2012 Jeff Brown <jeffbrown@google.com> am 331667ff: Use #define value of 1 to indicate presence of headers.

* commit '331667ffc86cd907cb80a708db5b7a8a84100217':
Use #define value of 1 to indicate presence of headers.
331667ffc86cd907cb80a708db5b7a8a84100217 03-Mar-2012 Jeff Brown <jeffbrown@google.com> Use #define value of 1 to indicate presence of headers.

strace tests the value of HAVE_TERMIO_H and HAVE_SYS_UIO_H using

Change-Id: If899845503547410cf17d005733d1c0c6741e939
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
afc4e6d95e3e8b9dfc60d36e6523e4cf17910523 28-Apr-2012 Colin Cross <ccross@android.com> am 9a676caa: am ced29ec3: am 87576b5f: Merge "Restrict zygote to system user."

* commit '9a676caaa715cc3d56b884382cf2c49c5f4c1e28':
Restrict zygote to system user.
9a676caaa715cc3d56b884382cf2c49c5f4c1e28 28-Apr-2012 Colin Cross <ccross@android.com> am ced29ec3: am 87576b5f: Merge "Restrict zygote to system user."

* commit 'ced29ec3afda61735b513ede449987c3af3daa63':
Restrict zygote to system user.
ced29ec3afda61735b513ede449987c3af3daa63 28-Apr-2012 Colin Cross <ccross@android.com> am 87576b5f: Merge "Restrict zygote to system user."

* commit '87576b5febf3a46490a8ec355e5e920a5123fac0':
Restrict zygote to system user.
33045a627d4dac8c4c8a910241298ca5da02f87b 28-Apr-2012 Todd Poynor <toddpoynor@google.com> init: Set perms for cpufreq interactive governor input boost sysfs

Change-Id: Ie475c95d81635a068db11e7018895024247878b4
ootdir/init.rc
87576b5febf3a46490a8ec355e5e920a5123fac0 28-Apr-2012 Colin Cross <ccross@android.com> Merge "Restrict zygote to system user."
1541eecdb145142ee8b466213e77b5c706495c01 28-Apr-2012 Romain Guy <romainguy@google.com> am d0ffe384: am ce182cb8: Merge "Let users with SYSTEM permission set debug. properties" into jb-dev

* commit 'd0ffe3840bbcf95e1ee79a4a6926d04c2ea1d56b':
Let users with SYSTEM permission set debug. properties
d0ffe3840bbcf95e1ee79a4a6926d04c2ea1d56b 28-Apr-2012 Romain Guy <romainguy@google.com> am ce182cb8: Merge "Let users with SYSTEM permission set debug. properties" into jb-dev

* commit 'ce182cb8c00d0f5dedadbd4964dbc8cb705b8550':
Let users with SYSTEM permission set debug. properties
ce182cb8c00d0f5dedadbd4964dbc8cb705b8550 28-Apr-2012 Romain Guy <romainguy@google.com> Merge "Let users with SYSTEM permission set debug. properties" into jb-dev
45fa13f370eb5b9215a3467a211f16b3c49f19e9 28-Apr-2012 Romain Guy <romainguy@google.com> Let users with SYSTEM permission set debug. properties

Change-Id: Ieda3f7dd5dca5f6a8fc50b07822e6a875db030ad
nit/property_service.c
40a61cf9903a75dd1919d7e4c753b991bb71652c 27-Apr-2012 Kenny Root <kroot@google.com> am efc70215: am bb2cba56: Merge "Add encryption parameters to adb install" into jb-dev

* commit 'efc702154b5b8256149d1a7a76487244b0d537f8':
Add encryption parameters to adb install
efc702154b5b8256149d1a7a76487244b0d537f8 27-Apr-2012 Kenny Root <kroot@google.com> am bb2cba56: Merge "Add encryption parameters to adb install" into jb-dev

* commit 'bb2cba56b9b64f8bc5ed2bfb68e4836d22862200':
Add encryption parameters to adb install
bb2cba56b9b64f8bc5ed2bfb68e4836d22862200 27-Apr-2012 Kenny Root <kroot@google.com> Merge "Add encryption parameters to adb install" into jb-dev
25dd43a9a5073f0e59102750cb0410b8e9bc9847 27-Jan-2012 Nick Kralevich <nnk@google.com> Restrict zygote to system user.

CVE-2011-3918: Address denial of service attack against Android's
zygote process. This change enforces that only UID=system can
directly connect to zygote to spawn processes.

Change-Id: I89f5f05fa44ba8582920b66854df3e79527ae067
ootdir/init.rc
4474ac408105bb31f945ddab53a24ed148e34227 24-Apr-2012 Anonymous Coward <nobody@android.com> Add encryption parameters to adb install

Change-Id: I92e5f6ace1bc9e711c14cb83533aeb99ab9ab9f7
db/commandline.c
e98cb71db4aa7ddf43b4fa079d48b3767c66c130 27-Apr-2012 JP Abgrall <jpa@google.com> am 03768b36: am b982bce7: Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."

* commit '03768b363cdfbc976ab92a07d70e46b8cd597276':
Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."
03768b363cdfbc976ab92a07d70e46b8cd597276 27-Apr-2012 JP Abgrall <jpa@google.com> am b982bce7: Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."

* commit 'b982bce73b7e2c824ffb50115ea382fe45c751a4':
Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."
58060661008d9492c6eb18c3d6b3688eb0d27d85 27-Apr-2012 Colin Cross <ccross@android.com> am cf417693: am 64753635: am a02ff986: Merge "init: Add noexec mount option"

* commit 'cf41769375f34dbf17de52df02e4881ecfee0c8b':
init: Add noexec mount option
cf41769375f34dbf17de52df02e4881ecfee0c8b 27-Apr-2012 Colin Cross <ccross@android.com> am 64753635: am a02ff986: Merge "init: Add noexec mount option"

* commit '647536359f8ea63330805cb77abbf2f101952daa':
init: Add noexec mount option
647536359f8ea63330805cb77abbf2f101952daa 27-Apr-2012 Colin Cross <ccross@android.com> am a02ff986: Merge "init: Add noexec mount option"

* commit 'a02ff986fc0fe5543bb2168814eee04eac8ef579':
init: Add noexec mount option
b982bce73b7e2c824ffb50115ea382fe45c751a4 27-Apr-2012 JP Abgrall <jpa@google.com> Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."

This reverts commit 731d831e91d5d9f8b15ca95367977abe35967166.

Now that the xt_IDLETIMER uses the KOBJECT_UEVENT netlink, this
change is not needed anymore.
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
a02ff986fc0fe5543bb2168814eee04eac8ef579 27-Apr-2012 Colin Cross <ccross@android.com> Merge "init: Add noexec mount option"
9385e3df6446a17ff896c48d42e4d4b937b046d8 27-Apr-2012 Colin Cross <ccross@android.com> am e860d239: am 9c1c2059: am 5b3eb07e: Merge "Prevent bit shifting if num bits is negative"

* commit 'e860d239529a484021d779d391c823ca93323ae1':
Prevent bit shifting if num bits is negative
e860d239529a484021d779d391c823ca93323ae1 27-Apr-2012 Colin Cross <ccross@android.com> am 9c1c2059: am 5b3eb07e: Merge "Prevent bit shifting if num bits is negative"

* commit '9c1c205931311d576442b5025391d851b22afccb':
Prevent bit shifting if num bits is negative
9c1c205931311d576442b5025391d851b22afccb 27-Apr-2012 Colin Cross <ccross@android.com> am 5b3eb07e: Merge "Prevent bit shifting if num bits is negative"

* commit '5b3eb07ed730f9765c93afcb7f49559c212fe533':
Prevent bit shifting if num bits is negative
5b3eb07ed730f9765c93afcb7f49559c212fe533 26-Apr-2012 Colin Cross <ccross@android.com> Merge "Prevent bit shifting if num bits is negative"
70bec1e1aa159086f988bd41f4fab501ae9734cb 26-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
4b6455c515e1f0171f8703d4d49c21538a9af402 26-Apr-2012 Todd Poynor <toddpoynor@google.com> am 1875930a: (-s ours) am 8d3ea1d1: init: set perms for cpufreq interactive governor boost -- DO NOT MERGE

* commit '1875930a9d24f2b97650bf511c52d197ba0d44d6':
init: set perms for cpufreq interactive governor boost -- DO NOT MERGE
4abdbddec10933748a397f38c46ae11ab04c499e 26-Apr-2012 Kenny Root <kroot@google.com> am d8b46e7f: am f8bbaba5: Add directory for forward locked apps in ASECs

* commit 'd8b46e7fd6769bcae2cdd763a809a265e7a527da':
Add directory for forward locked apps in ASECs
280cbdd49b73a49bc8e3f05805610af8aad9eac1 26-Apr-2012 Jean-Baptiste Queru <jbq@google.com> am 75878ecc: Merge from AOSP

* commit '75878eccc219c02eff6363f1b16a8dab07032322':
Forward compatibility
1875930a9d24f2b97650bf511c52d197ba0d44d6 26-Apr-2012 Todd Poynor <toddpoynor@google.com> am 8d3ea1d1: init: set perms for cpufreq interactive governor boost -- DO NOT MERGE

* commit '8d3ea1d1e198e71ca3f856c6f397faf40922f562':
init: set perms for cpufreq interactive governor boost -- DO NOT MERGE
d8b46e7fd6769bcae2cdd763a809a265e7a527da 26-Apr-2012 Kenny Root <kroot@google.com> am f8bbaba5: Add directory for forward locked apps in ASECs

* commit 'f8bbaba57bf309fec83dc9842176d996831e6db1':
Add directory for forward locked apps in ASECs
8d3ea1d1e198e71ca3f856c6f397faf40922f562 25-Apr-2012 Todd Poynor <toddpoynor@google.com> init: set perms for cpufreq interactive governor boost -- DO NOT MERGE

Change-Id: I6509cda358b4a75706afd01a5b5a36eabe492554
Signed-off-by: Todd Poynor <toddpoynor@google.com>
ootdir/init.rc
f8bbaba57bf309fec83dc9842176d996831e6db1 13-Apr-2012 Kenny Root <kroot@google.com> Add directory for forward locked apps in ASECs

Forward locked apps on internal storage will be stored in ASEC
containers using ext4. This way permissions can be preserved whether on
internal or external storage.

Change-Id: I942f8f0743c210330a11e2b1d0204df7a5ddb2ae
ootdir/init.rc
e945d7ee9e15909c803b4f18e5b72c99ad8b7e60 25-Apr-2012 Todd Poynor <toddpoynor@google.com> init: set perms for cpufreq interactive governor boost

Change-Id: I6509cda358b4a75706afd01a5b5a36eabe492554
Signed-off-by: Todd Poynor <toddpoynor@google.com>
ootdir/init.rc
75878eccc219c02eff6363f1b16a8dab07032322 25-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Merge from AOSP

Change-Id: Iae692bc1c54ffc241fd6853bbbdab19688c4f46b
5e22db914ba1393949019ca132a566bf3ccff1ea 25-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
a9aa02cc4cf7520aa2f4348235e3ff637fe024f3 25-Apr-2012 Jean-Baptiste Queru <jbq@google.com> am 307d9cfc: Merge from AOSP

* commit '307d9cfc1690ec4982152aae1b6bd24ff8e078ed':
b579811b01322593470dd9c9f265860630073f34 25-Apr-2012 Jean-Baptiste Queru <jbq@google.com> am 980a59b4: Forward compatibility

* commit '980a59b45dd210d2c2d0d9e61d48899af2d1099f':
Forward compatibility
307d9cfc1690ec4982152aae1b6bd24ff8e078ed 25-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Merge from AOSP

Change-Id: Iedb6ea4e1cf66edda8d91e3d432cb010e697ed44
c36cc3b59879b0c46aea81b6ee746c40c591abf6 25-Apr-2012 Mathias Agopian <mathias@google.com> Merge "ANativeWindow: add set_active_rect"
aa3f4c3591d83728adec17bf0004f8dd5e46a3bb 18-Apr-2012 Jamie Gennis <jgennis@google.com> add query for finding out if consumer runs behind of producer

Change-Id: I3baae99d4da00d962d3afe6bdfc16e3eb04ede24
nclude/system/window.h
980a59b45dd210d2c2d0d9e61d48899af2d1099f 25-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Forward compatibility

Change-Id: I51a5eb98fb3fa3e09f2eb75de128068572081046
nclude/system/graphics.h
e36df300dcaa156e67b6c3069a737455cde36c9a 24-Apr-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Add ability to quote responses as needed."
d7562ee3d61504ba5d2ff3117cb64216566a40ef 24-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
33ab4ed6fc7cf558ff78635d40654879608685af 24-Apr-2012 Glenn Kasten <gkasten@google.com> Merge "Add more SP_ constants"
af9a0bbbbc45bd1cf0b6a2f1f46af9b91ebd1580 24-Apr-2012 Glenn Kasten <gkasten@google.com> Merge "Update cgroups"
b91bd9f599c43b602eac334244173000a6ce011a 20-Apr-2012 Glenn Kasten <gkasten@google.com> Update cgroups

Change-Id: If4488944e8a1c8af7b13847069d03b7ea4a30785
ootdir/init.rc
10ec3c7645bfdb70518dc1b21df40ad5478589e3 20-Apr-2012 Glenn Kasten <gkasten@google.com> Add more SP_ constants

Change-Id: I52c8ea33b9b915fc08546f2ca0b191391f58506b
nclude/cutils/sched_policy.h
ibcutils/sched_policy.c
b6ee25e3ad4cffa2b0f5bb734df4b503e1e367ba 14-Jul-2011 Lars Svensson <lars1.svensson@sonyericsson.com> init: Add noexec mount option

Change-Id: Ic13d66797a86d38432e79af0c3387ce986d0a19f
nit/builtins.c
77d54cd3d04625831632bd02b553de9377611804 23-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
de930063061d26816bab083f88d7c92c5eba4ef8 22-Apr-2012 Glenn Kasten <gkasten@google.com> Merge "Scheduling group cleanup - add comment, SP_DEFAULT"
594947793c98e8e7f58f0e9b2cb962c9ef23adeb 21-Apr-2012 Robert Greenwalt <rgreenwalt@google.com> Add ability to quote responses as needed.

It's up to the protocol to know when quotes are required. In the future
the response should probably all be binary blobs with lengths.

bug:6353048
Change-Id: I3f9b48ab0f4e6746d75cdc9c0c84d33f38f63661
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
92e6c88265e0126b6d9a205498bb1c62efc05509 20-Apr-2012 Eric Laurent <elaurent@google.com> Merge "audio policy: add deep audio buffering flag."
e109d266c12c5f537d429ca4b892f2719e02c2da 20-Apr-2012 Scott Anderson <saa@android.com> adb: Add ability to specify device path

For manufacturing and testing, there is a need to talk to
whatever device is connected to a given port on the host. This
change modifies adb's "-s" option to take either a serial
number or a device path. The device paths of the connected
devices can be listed using "adb devices -l" whose output
will resemble:

List of devices attached
016B75D60A00600D usb:2-5 device
3031D0B2E71D00EC usb:1-4.3 device

The second column lists the device paths. If the -l option is
not given, the output from "adb devices" will be the same as
it used to be (i.e. the paths will not be printed).

The device path can also be obtained with the get-devpath
command:

$adb -s 3031D0B2E71D00EC get-devpath
usb:1-4.3

Note that the format of the device paths are platform dependent.
The example above is from Linux. On OS-X, the paths will be
"usb:" followed by hex digits. For other platforms, the device
paths will be printed as "????????????" and the -s option will
not be able to select a device until someone implements the
underlying functionality.

Change-Id: I057d5d9f8c5bb72eddf5b8088aae110763f809d7
Signed-off-by: Scott Anderson <saa@android.com>
db/SERVICES.TXT
db/adb.c
db/adb.h
db/commandline.c
db/transport.c
db/usb_libusb.c
db/usb_linux.c
db/usb_linux_client.c
db/usb_osx.c
db/usb_windows.c
69bfb1f099164ae7ba44b5d0f7ba7c47cbbafd4d 16-Mar-2012 Glenn Kasten <gkasten@google.com> Scheduling group cleanup - add comment, SP_DEFAULT

Also tid == 0 maps to gettid() on platforms that support it.
This is needed by mediaserver code that was formerly using
the old C++ API.

Change-Id: I8baaa3e42315c9b924cec26b6da01e7cb69e0078
nclude/cutils/sched_policy.h
ibcutils/sched_policy.c
e17e4e5fad54fe1e47442cd2f15cf073d3460e1f 20-Apr-2012 Homin Lee <suapapa@insignal.co.kr> Added missing header to window.h

Added string.h for memset()

Change-Id: I48ebec4df82bb9ae0b5daac3c653b9c4dc42c502
Signed-off-by: Homin Lee <suapapa@insignal.co.kr>
nclude/system/window.h
9aec362e76a60725df1a444214f222297caf46a2 14-Apr-2012 Eric Laurent <elaurent@google.com> audio policy: add deep audio buffering flag.

Add a value in audio policy flags to indicate an output
stream providing deep audio PCM buffers. Such an output
helps reducing the power consumption at the expense of audio latency.

Stagefright will indicate a preference for such an output when playing music
only (no video) and the audio duration is more than a given threshold.

Change-Id: I0e6a9f5746a22d2bfea2b21dd182489a34a4b528
nclude/system/audio.h
a974e04d3954fde9b7c70189e804a615a0ab5546 20-Apr-2012 Todd Poynor <toddpoynor@google.com> Merge "init.rc: Set perms for cpufreq interactive governor above_hispeed_delay"
29dbf049bc8c9217237422381a8256705d4ce4d5 20-Apr-2012 Eino-Ville Talvala <etalvala@google.com> Merge "Add new raw image sensor HAL pixel format."
f35c203558b0648c351a5262568b383d41639a8b 19-Apr-2012 Todd Poynor <toddpoynor@google.com> init.rc: Set perms for cpufreq interactive governor above_hispeed_delay

Change-Id: Ib9c3fb4e43759af590a6e033b8ba04c0023d5f07
ootdir/init.rc
13081c6915220db03886b177f1a8e0b2c63467c9 06-Apr-2012 Scott Anderson <saa@android.com> fastboot: Add ability to specify device path

For manufacturing and testing, there is a need to talk to
whatever device is connected to a given port on the host. This
change modifies fastboot's "-s" option to take either a serial
number or a device path. The device paths of the connected
devices can be listed using "fastboot -l devices" whose output
will resemble:

016B75D60A00600D usb:2-5 fastboot
AD3C12020173 usb:1-4.3 fastboot

The second column lists the device paths. If the -l option is
not given, the output from "fastboot devices" will be the same as
it used to be (i.e. the paths will not be printed).

Finally, note that the format of the device paths are platform
dependent. The example above is from Linux. On OS-X, the paths
will be "usb:" followed by hex digits. For Windows, the device
paths will be printed as "????????????" and the -s option will
not be able to select a device until someone implements the
underlying functionality in usb_windows.c.

Change-Id: I1f01b8f47acd32edb0ac18db107316a2c923bbde
Signed-off-by: Scott Anderson <saa@android.com>
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
astboot/usb.h
astboot/usb_linux.c
astboot/usb_osx.c
astboot/usb_windows.c
0fb8ec8e9a056cd219216b1f5724d289b50dc993 19-Apr-2012 Jeff Sharkey <jsharkey@android.com> Pipe DHCP vendor info towards framework.

Bug: 6344821
Change-Id: Iebce3e1b36175fc88f44e18db647c43b1245f18f
nclude/netutils/dhcp.h
ibnetutils/dhcp_utils.c
5c39c25c237652098d4d3e5bbb0cdcd3a692836e 19-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
c28cbb2c5abe9e93a75185dc7c9e4925a0f9a87a 19-Apr-2012 Eric Laurent <elaurent@google.com> am d0c3398e: (-s ours) am e4e3f20f: type definition for future compat.

* commit 'd0c3398eb4d3e635a74be63e2bbbb595798b6d1b':
type definition for future compat.
d0c3398eb4d3e635a74be63e2bbbb595798b6d1b 19-Apr-2012 Eric Laurent <elaurent@google.com> am e4e3f20f: type definition for future compat.

* commit 'e4e3f20f5784e719dc221114d7030b241e455f63':
type definition for future compat.
e4e3f20f5784e719dc221114d7030b241e455f63 19-Apr-2012 Eric Laurent <elaurent@google.com> type definition for future compat.

Change-Id: Ifaba69d556ecc2a881293a2217515ea7dc5bb1a9
nclude/system/audio_policy.h
888bac9d4f35cb20875e2bb4062f12726fe62dfc 19-Apr-2012 Eric Laurent <elaurent@google.com> Merge "removed obsolete audio policy flags"
db8be1e6d47da41832cec5f301f2dbda041bd8c4 19-Apr-2012 JP Abgrall <jpa@google.com> Merge "fastboot: Keep borked bootloaders happy by shrinking URB len."
f8ff3a5ae21ce34f22928709cc6f992ff2fdd56e 19-Apr-2012 JP Abgrall <jpa@google.com> fastboot: Keep borked bootloaders happy by shrinking URB len.

Some devices will fail to return the requested data if the final
URB len of the request to > 255.
So shrink the current data buffer from 128 to 127 in the acse of getting
the serial number seems to work just fine.

Change-Id: Ic24e6c86ec93f002dc721d92309b3f880f281f20
astboot/usb_linux.c
577deda5e32ddfa474185f3f5e141d2e029f481c 18-Apr-2012 Eric Laurent <elaurent@google.com> removed obsolete audio policy flags

Removed obsolete AUDIO_POLICY_OUTPUT_FLAG_xxx flags definition.
All project mmust use AUDIO_OUTPUT_FLAG_xxx flags from system/audio.h

Change-Id: Ib374dee96afcf176df35d9a621be02ce0e30caf5
nclude/system/audio_policy.h
196b3a5f6f48649500909c66177967abaf05b898 08-Mar-2012 Erik Gilling <konkers@android.com> sync: Add lib sync helper library

Used to talk to kernel synchronization framework

Change-Id: I66e1f4a90f5d58d384bf1cec09db52101f182c5e
Signed-off-by: Erik Gilling <konkers@android.com>
nclude/sync/sync.h
ibsync/Android.mk
ibsync/sync.c
ibsync/sync_test.c
dc7f45dc58ec2017af28fddd1b1deec003693505 18-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
fb1ee571446c13ad698e91f13fd4e0274a37d4d7 18-Apr-2012 Jamie Gennis <jgennis@google.com> ANativeWindow: add set_active_rect

This change adds the set_active_rect 'method' to the ANativeWindow interface.

Change-Id: Iae910d259ba5c3e94594fa1ffec5fc0662546ad0
nclude/system/window.h
545ab46063f083239b29e59b8b491656d93f2a38 17-Apr-2012 Eric Laurent <elaurent@google.com> audio: added definitions for audio HAL device API.

Added definitions for output flags needed by new audio
HAL device API.

These flags where previously defined in audio_policy.h.
Definition in audio_policy.h remains temporarily until
all projects are changed to use new flags.

Change-Id: I371558c78050daae73942a36f51854372ab71068
nclude/system/audio.h
nclude/system/audio_policy.h
b47cd10acf6eb9449fc12a93f17f720b21e998c8 17-Apr-2012 Mike Lockwood <lockwood@google.com> Merge "init.rc: Add support for new USB accessory configurations"
b7a7223847ec3fe12486767f147cbbc830b5026c 17-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
cc6e34e629ecad281f12f883e035eae6d5c6d861 16-Apr-2012 Andrew Flynn <flynn@google.com> Merge "Don't set ro.carrier in init.c"
d18c683c1b665311c02dc62f4160e3acf008262c 16-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
775ab9c99eb513efecb6390b58bbcec80555eef8 15-Apr-2012 Jon Sawyer <jon@cunninglogic.com> Kindle Fire USB ID

Adds Lab126's USB id to the known USB Devices

Change-Id: I3cd5d90bba68123d5d3d2d67e1ab7d60137eb388
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
db/usb_vendors.c
0a85154c1621b40d384b3fd7d45f3a9c0141e5a6 11-Apr-2012 Eino-Ville Talvala <etalvala@google.com> Add new raw image sensor HAL pixel format.

This format is exposed outside of the HAL to applications.

RAW_SENSOR is a single-channel 16-bit format, typically representing raw
Bayer-pattern images from an image sensor, with minimal processing.

The exact pixel layout of the data in the buffer is sensor-dependent, and
needs to be queried from the camera device.

Generally, not all 16 bits are used; more common values are 10 or 12
bits. All parameters to interpret the raw data (black and white points,
color space, etc) must be queried from the camera device.

This format assumes
- an even width
- an even height
- a horizontal stride multiple of 16 pixels (32 bytes).

Change-Id: I67fc72d1c2c899e258fcd53b3ab91b459e9210f0
nclude/system/graphics.h
34f6d9e910824d6af22c71e6e94a8bea5cde16c8 13-Apr-2012 Andrew Flynn <flynn@google.com> Don't set ro.carrier in init.c

It will instead be set using PRODUCT_PROPERTY_OVERRIDES
in makefiles

Change-Id: Idc8b480af4c15e15c2d97cdd82a20f259e027c52
nit/init.c
aab19bbcb63eb3555291b4efd06282403b9eb002 13-Apr-2012 Mathias Agopian <mathias@google.com> Merge "Added flag for cropped scaling mode"
5fa860dea3618d5397bb580645f057a6e975786e 13-Apr-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Add MDNS service"
f5f9dad0c70c98cc2a500e62830d7be4a2844dbb 12-Apr-2012 Ashish Sharma <ashishsharma@google.com> Merge "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."
29392a4e5bedcff53a1d1f6674c73de00e0e5055 12-Apr-2012 Daniel Lam <dalam@google.com> Added flag for cropped scaling mode

NATIVE_WINDOW_SCALING_MODE_CROP forces the SurfaceTexture
to match the crop rect's aspect ratio to that of the window.

Change-Id: Id126b106eac06fd34d2d650a1bc66ffbac26c501
nclude/system/window.h
8e50627e01ab7f10f3134377eb9becef73e74e96 12-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
ad0d54efbb6f3a12a84d2c76116f5c0703817f12 12-Apr-2012 Jamie Gennis <jgennis@google.com> Merge "window: add API for native_window_set_buffers_user_dimensions"
731d831e91d5d9f8b15ca95367977abe35967166 11-Apr-2012 Ashish Sharma <ashishsharma@google.com> libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events.

xt_IDLETIMER events are used to infer the interface (radio) state
based on a inactivity timeout value.

Change-Id: I755eb54a048ca1c6ce0c646564d61188d8241851
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
6a35bb3529520dd1a47a5d0f58abf91d38eb0222 12-Apr-2012 Todd Poynor <toddpoynor@google.com> Merge "init.rc: Set owner and permissions for cpufreq files"
0653b97b2594d5e3f21c6326fb121741bfbf65f7 11-Apr-2012 Todd Poynor <toddpoynor@google.com> init.rc: Set owner and permissions for cpufreq files

Change-Id: Iaaf8491915567dbe22cab1798081a00fed4fb2e2
ootdir/init.rc
4f5d5176a3d732baebe92ab3748a12166406a198 04-Apr-2012 Mike Lockwood <lockwood@google.com> init.rc: Add support for new USB accessory configurations

Also moved USB scripts to new file init.usb.rc

Change-Id: I98e099fbd8de3eb3e1e18c9ef69312608033a50c
Signed-off-by: Mike Lockwood <lockwood@google.com>
ootdir/Android.mk
ootdir/init.rc
ootdir/init.usb.rc
7ad050855f6ab266fc917917cc9832bbc4d5077b 11-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
afcdef635718985aae26e5f94c21ae4f3248a0b9 10-Apr-2012 Michael I. Gold <gold@nvidia.com> window: add API for native_window_set_buffers_user_dimensions

Add token and wrapper function for a new private function
native_window_set_buffers_user_dimensions which overrides the native window
size as the default buffer size. This is intended for use primarily by
ANativeWindow_SetBuffersGeometry so that application-set buffer dimensions may
co-exist with pre-rotation in e.g. the GLES driver which calls
native_window_set_buffers_dimension.

Change-Id: I6c0fc334c070290cc15b04daae1484d0a28cd8ad
nclude/system/window.h
720d598280e5ebd3fb7c845a2a11520bb646d645 11-Apr-2012 Jamie Gennis <jgennis@google.com> Merge "Add tracing initialization to init.rc."
db49739f390992a3d68303765ac36f14ed09b68a 10-Apr-2012 Jamie Gennis <jgennis@google.com> Add tracing initialization to init.rc.

This change adds init.rc steps to allow kernel tracing to support inserting
messages from any userland process.

Change-Id: I01970728d7132a25408fed09a213a015ac05ccaf
ootdir/init.rc
8fa9b336195cc9be2fe3f7db2fefa35a6346fbaf 10-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
cfa9f650266621fee963fe18084a39602aa8fcc6 10-Apr-2012 Jeff Sharkey <jsharkey@android.com> Migrate emulated SD card to /storage/sdcard.

Bug: 6131916
Change-Id: Iab4d2a36b1dd979f7a9a0583d51dca3c5e38e681
dcard/sdcard.c
03e0cb3a38ec6a2bf65c19466017ce35b13d8cb2 09-Apr-2012 Eric Laurent <elaurent@google.com> Merge "audio: added definitions for usb audio devices"
5ba1861726457da5762f4cf40062ce3313fe77d5 09-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
82fd659667e0919bf804a6a1cb4c9b1b10a76e0f 08-Apr-2012 Kenny Root <kroot@google.com> Tweak makefile to let SELinux build

fastboot now needs SELinux support when not on Windows.

Change-Id: Ib32404ef5c9a1a183d7ae319cc94eaf7f12620d9
astboot/Android.mk
1d91fcf7c0a31d27097b196579a37873ba1c0934 28-Mar-2012 Robert Greenwalt <rgreenwalt@google.com> Add MDNS service

Adds both the new service and another socket for netd.

Change-Id: Ie0271a2c48aa55217ae3fcdcc8e121b86b5a589b
nclude/private/android_filesystem_config.h
ootdir/init.rc
79f90bdc7de561aa31888948c0661568ccc33da1 06-Apr-2012 Eric Laurent <elaurent@google.com> audio: added definitions for usb audio devices

Change-Id: I4a4f5919708a09f87974367961b1d09664ae6c06
nclude/system/audio.h
a64adba539c290624c27a8506ee6c0ba39f44ffc 06-Apr-2012 Kenny Root <kroot@google.com> Add signal names to kill

mksh provides a kill primitive with signal names, but also offer it in
our toolbox binary. This will allow anyone to use "kill -HUP <pid>" or
"kill -l" to look at the name to number signal mapping.

Change-Id: Id683721f4ad3f2b518b4dc54a6073510290cbe04
oolbox/kill.c
835340cff6917eeb60a4ee0596a31526cd8a399a 04-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
98c6a9902599244585a8ed75c7d35634db8cad9e 03-Apr-2012 Nick Kralevich <nnk@google.com> Merge "init: Change umask of forked processes to 077"
d0c5aac3cb084a5dee685b7bbbfa1abd9e5afbea 03-Apr-2012 Nick Kralevich <nnk@google.com> Merge "adb: set umask to 000"
3ad2bb9f759e8c2fc33ea4b804d227b2b2dd3672 03-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
968c234f31aa606a7f3f361ccd8f5b3b4bf3bcea 02-Apr-2012 Ken Sumrall <ksumrall@android.com> Merge "Make sure FAT32 filesystems contain a minimum of 65527 clusters"
6ebf12fe1bc2de7af4522349973e8bfcc71d6126 26-Mar-2012 Nick Kralevich <nnk@google.com> init: Change umask of forked processes to 077

Modify init to set the umask to 077 when forking processes.
This helps protect against inadvertant information disclosure
in init's child processes.

ueventd: Keep umask at 000. uevent needs to be able to
create device nodes with exactly the permissions it
indicates.

Testing:
1) Do an "ls -lR /data /dev" on the device before and after
the umask change and diff the output. Verified by hand
that the permission change wouldn't cause any problems.

2) Verify that package installation works, and the permissions
are as expected, when installing a program from market and
"adb install".

Bug: 3272072
Change-Id: Ie4f7f06c0ee9da8d9b6fce25d71d8991a9bce406
nit/init.c
nit/ueventd.c
eb68fa8153d97f5f8b6d9062fcf91fe393e3bff3 02-Apr-2012 Nick Kralevich <nnk@google.com> adb: set umask to 000

Init is going to be modified to set the umask to 077.
This will impact adb, as "adb install" and "adb sync"
assume that files will be world-readable / writable.

Keep adb's umask at 000 for now.

Bug: 3272072
Change-Id: I75978e8dd7bbdf4dbe7c9a691ef516235f207da2
db/adb.c
f3165455fb9c9b1f7b5f3d880b1262fff170dca2 02-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
1ecb8681c366b1c1e58473d97cd607195a06167f 31-Mar-2012 Kenny Root <kroot@google.com> fastboot: add support for SELinux and fs_config_func

There were some changes to make_ext4fs to add SELinux context. Also, we
changed the "android" argument to an fs_config_func that allows you to
customize the permissions put into a ext4 filesystem.

Change-Id: If23152c40659122a91771fcbd094f713b38e321e
astboot/engine.c
f91259a8f0d75d721761d588a4b811427565c984 30-Mar-2012 JP Abgrall <jpa@google.com> adb: fix non-linux builds. tcpip:, root:, usb: are not for ADB_HOST

The handling of adb root:/tpcip:/usb: is normally only for non-ADB_HOST.
This avoids getuid() being invoked on windows builds.

Change-Id: I365b81d9f70de99b9347d3eac82e690a8ac5e747
db/sockets.c
d7f1feb5c8c76838b822d093983cc8a3f57a9b2d 30-Mar-2012 JP Abgrall <jpa@google.com> adb: fix exit of "adb root" when it is a no-op.

"adb root" creates a socket, then starts the service.
Socket creation should not set the exit_on_close when the service will be
a no-op.

Bug: 6259353
Change-Id: Ie526d2fad64f39a48051ed0ff6fb3405c2802ced
db/sockets.c
ec3b164524fda0beb30354627f3e3f9d0c45126a 15-Dec-2011 Ken Sumrall <ksumrall@android.com> Make sure FAT32 filesystems contain a minimum of 65527 clusters

Some versions of windows cannot handle FAT32 filesystems with less
than 65527 clusters, so make sure we don't create such beasts.

Change-Id: Id00fb02c4f8476f7dcc0ef137bd9e4975d740591
oolbox/newfs_msdos.c
b012679f9730908aa8e7fa6909a401fab47aaefb 30-Mar-2012 Geremy Condra <gcondra@google.com> Merge "cutils: return the remote uid on netlink recv failure"
15621e0970e97eb2fc28f82a07620c9124a4455c 29-Mar-2012 Geremy Condra <gcondra@google.com> cutils: return the remote uid on netlink recv failure

This change adds a layer of indirection to uevent's
uevent_kernel_multicast_recv, allowing dependent code to
get the remote endpoint if desired.

Change-Id: If2f00708a1dd6196c415b1ebc2a7eeb72399a90e
nclude/cutils/uevent.h
ibcutils/uevent.c
0ee4518620f50df88e56d95d3ab5a02eca62aafa 30-Mar-2012 Geremy Condra <gcondra@google.com> Merge "Added netlink failure logging to NetlinkListener.cpp"
d98533a01213ef8d4ef9a644074ada200cdfc926 30-Mar-2012 Geremy Condra <gcondra@google.com> Added netlink failure logging to NetlinkListener.cpp

This depends on If2f00708a1dd6196c415b1ebc2a7eeb72399a90e

Change-Id: If6c63e46f906b94f4778eb5e78123d8efe1710d4
ibsysutils/EventLogTags.logtags
ibsysutils/src/NetlinkListener.cpp
c8583c680a62dcd8f66952a71cd986f477aa1241 29-Mar-2012 Nick Kralevich <nnk@google.com> Merge "change files in /dev/log/ to 666"
3439cc6145d24d2495490dab3e48d91cf36bccc3 29-Mar-2012 Nick Kralevich <nnk@google.com> change files in /dev/log/ to 666

With newer Android kernels, anyone can read from the files in
/dev/log. If you're in the logs group (have the READ_LOGS) permission,
you'll see all entries. If you're not in that group, you'll see
log messages associated with your UID.

Relax the permissions on the files in /dev/log/ to allow an application
to read it's own log messages.

Bug: 5748848
Change-Id: Ie740284e96a69567dc73d738117316f938491777
ootdir/ueventd.rc
29183fdd9be8d852fa051ca2d549866052958b2a 29-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
61745ed7fb1e922afb8b7a105b3e8556c5f83e02 29-Mar-2012 Benoit Goby <benoit@android.com> Merge "init: Fix chown and chmod for write-only files"
58903013084b649fa81e9fd3310517d0e35e7c5d 29-Mar-2012 Benoit Goby <benoit@android.com> init: Fix chown and chmod for write-only files

Change-Id: I570b631ced11ab104aafe7ebfe71bae4e380d8af
nit/builtins.c
9a7611fefae6710ad9903ee61965434d6fb754cc 29-Mar-2012 Kenny Root <kroot@google.com> Merge "Revert "add IP checking for adb over TCP""
9a77f55aada6c5a8da3d330d858bd04c1c0b6c51 29-Mar-2012 Kenny Root <kroot@google.com> Revert "add IP checking for adb over TCP"

This reverts commit dca76e6187c4128a17c8df5bcaca0db6993d91a1
db/transport_local.c
29dc792bcdd466efcdf068404760bcbbbd01017b 29-Mar-2012 Kenny Root <kroot@google.com> Merge "add IP checking for adb over TCP"
29aa88fc766fcafd5c84dea71206e8abf5f06f80 28-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
15892e10a49b5b5f3d612228cd3e125cf3b43025 28-Mar-2012 Marius Renn <renn@google.com> Merge "Multi-Project Commit: Move of filterfw out of system/media (6 of 7)"
b6428c07f2bfb213f85883a17d8814b68d335a5d 27-Mar-2012 Colin Cross <ccross@google.com> Merge "Add handling for DEVNAME for usb devices"
71513567dc0249af1b304e458ceac391ffcbeff5 27-Mar-2012 Marius Renn <renn@google.com> Multi-Project Commit: Move of filterfw out of system/media (6 of 7)

This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I87d034a30bb4b98a85a028cb728e37fb97256039
ootdir/init.rc
76bf7dc51d7b4b920197ab3e64075f7575608330 27-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
60733e9280ebd693293d6e7683af0bd94f8909aa 27-Mar-2012 Kenny Root <kroot@google.com> Make sure "adb install" work is cleaned after error

If an error occurs during the verification of an APK, it could be left
in the temporary installation directory.

Change-Id: I4afa5535fc0b978532b31d5b8fb63776963c39db
db/commandline.c
31af5f7bebf656018482ac1a75a3e1780c0c42d1 26-Mar-2012 Glenn Kasten <gkasten@google.com> Add AUDIO_POLICY_OUTPUT_FLAG_FAST

Change-Id: I513b84de9c08957e22bff1fc2f25e4f4098111ef
nclude/system/audio_policy.h
31fb85865431f98008608b62964cb1c975ca4b71 26-Mar-2012 Nick Kralevich <nnk@google.com> Merge "drmserver: add group drm"
4d668e013b232e080498868b190f2078b244e892 26-Mar-2012 Benoit Goby <benoit@android.com> Merge "adb: Don't synchronize with transport using sleep"
62e5cbaebc29d83148dd1ce30a620a37dcdbe7ed 26-Mar-2012 Benoit Goby <benoit@android.com> Merge "Revert "Reimplement the "adb root" command to more closely match its previous behavior""
3c9eed88c529374c8d80e1daa62ad9bf25c9670e 26-Mar-2012 Nick Kralevich <nnk@google.com> drmserver: add group drm

Make the drm server run as UID=drm, GID=drm. This ensures that
any files created by the drmserver app do not have GID=system.

Bug: 5834297
Change-Id: I3409ad350e9cc82bb0982cdbe470ec1f10b1ca67
ootdir/init.rc
bbfb79a1fc833e4b7f982580ab2b621f1874c546 26-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
f97b887848cc64e7d88d27f198b7721c9f2f8ec8 23-Mar-2012 Wei Zhong <wzhong@google.com> Add handling for DEVNAME for usb devices

When creating device node, user-space handler should honor device
node provided by kernel if present.

Bug: 6105248

Change-Id: I9ab3810563f29f065c239e15149882db28f08893
Signed-off-by: Wei Zhong <wzhong@google.com>
nit/devices.c
8ee361cb01e20b3fb0980f428cf83d0e1181a4bd 23-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Remove duplicated VENDOR_ID_INTEL

VENDOR_ID_INTEL defined and appear in builtInVendorIds[] twice.
Remove the 2nd one.

Change-Id: I62f7bba392012aafb8ea9730959362db4bc6c669
db/usb_vendors.c
6756a0c9fe930cc5ccebf5313f605df0d127a2db 22-Mar-2012 Nick Kralevich <nnk@google.com> logger: Add the update kernel struct to userspace

Android's kernel logger can optionally return UID information
in addition to the previously returned information. This
information is available by telling the kernel to use the
updated structure via the newly introduced LOGGER_SET_VERSION
ioctl.

int fd = open("/dev/log/main", O_RDONLY);
int version = 2;
ioctl(fd, LOGGER_SET_VERSION, &version);

Change-Id: I6bfe7bfb9df45a56124aa8d0d19e7d7a18e06862
nclude/cutils/logger.h
e148601ee2a5cd83a6db80c3c4e24f3dc5a9ab31 22-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> am bd52ff3e: am 4b91e332: am ef3eb5f7: Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a

* commit 'bd52ff3e9362af7747c9442872d23a7d30dc057d':
Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a
bd52ff3e9362af7747c9442872d23a7d30dc057d 22-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> am 4b91e332: am ef3eb5f7: Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a

* commit '4b91e3328c79383bcebed982ce536046ea316456':
Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a
4b91e3328c79383bcebed982ce536046ea316456 22-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> am ef3eb5f7: Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a

* commit 'ef3eb5f74022050666168922d96c79531401a16d':
Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a
10331ed16cb2c28092e381cab70df9824a99515f 22-Mar-2012 Nick Kralevich <nnk@google.com> Revert "logger: Add the update kernel struct to userspace"

This reverts commit 56c3065b7968e2cf00ffc4914d5f2fe86b98ae15.

Breaks win_sdk build.
nclude/cutils/logger.h
3076bfd036cf05c8359f6968525ebbadda0316f1 22-Mar-2012 Nick Kralevich <nnk@google.com> Merge "logger: Add the update kernel struct to userspace"
ef3eb5f74022050666168922d96c79531401a16d 02-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a

Both libraries are needed to build four shared libraries in 64-bit
for 64-bit emulator with "-gpu on"
lib64OpenglRender.so
lib64EGL_translator.so
lib64GLES_CM_translator.so
lib64GLES_V2_translator.so

Change-Id: If57f72d4661a74f1d5e537568881f39132e0b43d
ibcutils/Android.mk
iblog/Android.mk
2affe824ba249b532c5b39941bcdc15800900f6c 22-Mar-2012 Kenny Root <kroot@google.com> Merge "Put keystore into the drmrpc group"
a4d9828aea9dc61129e0fac90ba88101c2de8e58 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge "Merge commit '19155b5'"
2f78d81a1f95cd41d4049ec62c4783a8cecb1e68 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge "Merge commit '5383476727659544875b90d49a5371886a31c1fe'"
2abac4c303658c20f827ee758d4a9e69c1f29617 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge "Merge commit '9dd2eef'"
4aade437d0a084c9d166e760ff9016460aa92c61 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge "Merge commit 'c4fd60b'"
9865be95cf60848d91364b42c2cadd90e63fec66 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge commit '19155b5'

Do not start sshd by default

Change-Id: I22e6dbb6834321709e9b7c5ae49846d7f9f7c67a
ddd48d1c001c29b51fc59cd69f7badee66130eb8 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge commit '5383476727659544875b90d49a5371886a31c1fe'

empty -s ours merge

Change-Id: Ie70e28bcea06dffeebee3887145a30e89626cb62
a9bb7261b4db2372ee0f339d250079c967262758 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge commit '9dd2eef'

sshd to init.rc

Change-Id: I8eedc3b47f1260502034067d9006cac827cb1089
0e5667c18d76594b9d3aaa62be51610d5c962715 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge commit 'c4fd60b'

empty -s ours merge

Change-Id: I148e9138d71a962e463c3252f888c2eccd2bdc4c
054de5cc5b5d0339d761585303cd319b234ec429 22-Mar-2012 Geremy Condra <gcondra@google.com> Merge "init: make chmod/mkdir/chown not follow symlinks"
9ed1fe77322384552d7d9905ffc54c9681d3b73f 20-Mar-2012 Geremy Condra <gcondra@google.com> init: make chmod/mkdir/chown not follow symlinks

This change brings init's do_chmod, mkdir, and do_chown into line
with open's O_NOFOLLOW semantics, causing them to fail when the
last element of their target path is a symlink.

Change-Id: If00e1a25cfe17ef6f738af4bf0541abd0c1b084b
nit/builtins.c
19155b5cd3ee8674a13f7bf111e06b05f0114433 21-Mar-2012 Mike Lockwood <lockwood@google.com> init.rc: Do not start sshd by default

Change-Id: Ieacd4e8fbfcd91ed2342b7a104a9b1f4114fc6d5
Signed-off-by: Mike Lockwood <lockwood@google.com>
ootdir/init.rc
d1fe0d83fafee1854363a6e204379baccfe03531 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> am 17680510: am 7967e4c0: Reconcile with ics-mr1-release

* commit '176805101c10d44f21a65402c9926922b20e1de0':
176805101c10d44f21a65402c9926922b20e1de0 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> am 7967e4c0: Reconcile with ics-mr1-release

* commit '7967e4c021b8790eaac08ab3fb035431ec118cae':
7967e4c021b8790eaac08ab3fb035431ec118cae 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I543778af0009368aa57aba5e0861d981b4351e61
eac5a25f5ff2e5c65181f9c859076e16dda7275d 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> am 049a7882: am 3ebb3dad: Reconcile with ics-mr1-release

* commit '049a78828418c9581b2926a41633dd1b441b2ee8':
049a78828418c9581b2926a41633dd1b441b2ee8 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> am 3ebb3dad: Reconcile with ics-mr1-release

* commit '3ebb3dad6e8da55b2057d064c2c0275f478b4f61':
3ebb3dad6e8da55b2057d064c2c0275f478b4f61 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I5e32c5ab33c5beeab7576a1984dc0add942c590b
14b80583749de8f63037b43e4e85da382536dfd3 21-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
1670f831a56f7232f337407c746e97c5929ee417 21-Mar-2012 Arve Hjønnevåg <arve@android.com> init.rc: Fix permissions on /sys/power/state and /sys/power/wakeup_count

Change-Id: I06a1a2affebdf64f008eaa61a0851f1e832059c5
ootdir/init.rc
56c3065b7968e2cf00ffc4914d5f2fe86b98ae15 22-Feb-2012 Nick Kralevich <nnk@google.com> logger: Add the update kernel struct to userspace

Android's kernel logger can optionally return UID information
in addition to the previously returned information. This
information is available by telling the kernel to use the
updated structure via the newly introduced LOGGER_SET_VERSION
ioctl.

int fd = open("/dev/log/main", O_RDONLY);
int version = 2;
ioctl(fd, LOGGER_SET_VERSION, &version);

Change-Id: I3914be41de55342c2918f8978fcd4d2b96a09288
nclude/cutils/logger.h
3236b7a4d31d5e1f98d4d0348ba7fc7440afa520 21-Mar-2012 Benoit Goby <benoit@android.com> Merge "adb: Remove unused flags"
bdcbfd439930dcd3d55998162feb3aef2ad3ae18 20-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
77a62ceac5f1d3942b85b21d86f6b4d25d686190 20-Mar-2012 Kenny Root <kroot@google.com> MinGW does not have sys/cdefs.h

Change-Id: I5cafafce8488d355ed3865a9fd1173fbebbc5b03
nclude/cutils/list.h
2db11d49aa17b417be4ea8d27a84d15504b5335f 20-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
e8886740744d761d399c426321de3a7bba1c20ae 20-Mar-2012 Colin Cross <ccross@android.com> Merge "init: manually set controlling tty for console services"
418fbe66e0f7d189743ad95c8ba902db1ba6f6da 20-Mar-2012 Kenny Root <kroot@google.com> Merge "Add cdefs decoration to list.h"
5e0621f78a32d48e9a52d78b3f1c6ce2f577a2ea 19-Mar-2012 Jeff Brown <jeffbrown@google.com> qsort_t was only defined in glibc 2.8

Change-Id: I646bac8ed4d94bf75a33b886e700c91c3837bc32
nclude/arch/linux-x86/AndroidConfig.h
4a6b384f607feed3755cfcbcdfded55fc2ccce82 19-Mar-2012 Jeff Brown <jeffbrown@google.com> Provide portable wrapper for qsort_r.

qsort_r() is declared differently on BSD and GNU libc and
may be absent on other platforms.

Provide qsort_r_compat() which should work everywhere.

Change-Id: I17a9026573b1ed971ff7d79895e7eb41ba108807
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
nclude/cutils/qsort_r_compat.h
ibcutils/Android.mk
ibcutils/qsort_r_compat.c
14d0c6c7c0e9abd39e4b4d0a384d12de5ecbdbfc 19-Mar-2012 Jeff Brown <jeffbrown@google.com> Add missing includes.

Caused warnings about implicitly defined malloc() and sprintf().

Change-Id: Ia56309adc11caf5801ffd88e374c512b785cfd93
ibcutils/process_name.c
ibcutils/tzstrftime.c
c4edb9ec907d97175626419ff98302fd5123b943 19-Mar-2012 Dima Zavin <dima@android.com> Merge "cutils: str_parms: when deleting entry, need to also remove key"
b1108c85942f5cff22fbdaa9ed09c7b7d329da81 19-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "audio_channel_in/out_mask_from_count"
61ce6c8dfa64aad9c9dc096e99f03288e26409b6 19-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
50fb5a69333e4eb0b5fc30fdeae54bc73243061d 18-Mar-2012 Colin Cross <ccross@android.com> init: manually set controlling tty for console services

Normally, calling open on a tty will set that tty as the process
group controlling tty if none already exists. However, if the tty
is /dev/console, the kernel will never automatically set it as the
controlling tty. Call the TIOCSCTTY manually on the fd, which will
always attempt to set it as the controlling tty.

Fixes ctrl-c on the console shell when androidboot.console is not
passed on the kernel command line and the default /dev/console is
used.

Change-Id: I449cc41b47e93ac38ad6987413bb54131e1ec0cd
nit/init.c
f366b3698b409405e1ee88476d1186f29fe14b06 16-Mar-2012 Benoit Goby <benoit@android.com> adb: Don't synchronize with transport using sleep

Services that cause adbd to reboot are currently implemented this way:
write(fd, response)
close(fd)
sleep(1)
exit(1)
sleep(1) is necessary to leave time for the transport to transmit
the response before the daemon exits. This is slow and unreliable.
Instead, add a flag to the asocket to make it exit the daemon only
after the socket is closed.

Change-Id: I9df45ea6221f0d9b828703b9b2316a5d4fe59352
db/adb.h
db/services.c
db/sockets.c
7941cf87f624e7747b5bb868a27904c7a3be0ca4 16-Mar-2012 Benoit Goby <benoit@android.com> Revert "Reimplement the "adb root" command to more closely match its previous behavior"

This reverts commit 535164e9d9649a83d4d63829f3389f2bea339fe1.
db/services.c
ootdir/init.rc
9f1af8cde988e8a276753db6019e8c7d94f0e2b4 14-Mar-2012 Benoit Goby <benoit@android.com> adb: Remove unused flags

BUILD_ADBD is always true

ANDROID_GADGET is not used in the code anymore. adbd now checks at
runtime if /dev/android_adb is present

Change-Id: If6c3278606c79cc74d1ef5978e7b8e3a4513aef8
db/Android.mk
0009b73ed88f5c1759c3b2d9df73492d53f79039 16-Mar-2012 Kenny Root <kroot@google.com> Add cdefs decoration to list.h

In case someone includes this from C++ code.

Change-Id: I3b5a8bde5b5b9e8dcee64abaf33383f21eff7046
nclude/cutils/list.h
0ad682cddef396c91707a31d4982dc55206dca1b 15-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Add get_sched_policy_name() and use in ps and top"
86c7cc81891a69ace7044de667b0624c284ee82b 06-Mar-2012 Glenn Kasten <gkasten@google.com> Add get_sched_policy_name() and use in ps and top

This will make it easier to add additional policies (cgroups) if needed.
Also added comments to the sched_policy APIs.

Change-Id: I33ce1cc4deae10983241f7391294b7a512d2c47c
nclude/cutils/sched_policy.h
ibcutils/sched_policy.c
oolbox/ps.c
oolbox/top.c
dca76e6187c4128a17c8df5bcaca0db6993d91a1 13-Mar-2012 Wei Zhong <wzhong@google.com> add IP checking for adb over TCP

whitelist connection for
1) emulator
2) "eng" or "tests" build, or
3) IP matches with "persist.service.adb.client_ip"

Change-Id: I8ac149149873f3bd206bd4d5abc063e5274fb468
Signed-off-by: Wei Zhong <wzhong@google.com>
db/transport_local.c
c4c631a15f04bdcbf8c70737e818c7e4efd5ff7b 15-Mar-2012 Dima Zavin <dima@android.com> Merge "cutils: str_parms: free the key if the value was replaced during create/add"
427d2b43c23c48aedadca008482f495145411e2b 06-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Fix switch indentation in audio_bytes_per_sample

Align "case" keyword with "switch" keyword.

Change-Id: I57ef96253fb1fc925315b557ea27ccc35f63c2f8
nclude/system/audio.h
7c122d06764b39b2f14781f3e0dc746960851d12 15-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
019524a60e979053b8b8ffef61eae162de522257 15-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add camera ping command and release message."
efd7501d535fb165792013763027cf50a5b37e08 15-Mar-2012 Dima Zavin <dima@android.com> cutils: str_parms: when deleting entry, need to also remove key

When removing one entry, we can't just remove it from the map since
key will not be freed. So, instead, search through the map for the key
and free it once it is found.

Change-Id: Id745c166a4acc5ea25f6d6cdbfe4f8fbc21cbbb3
Reported-by: Xin Qian <xqian@marvell.com>
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/str_parms.c
86bfbe3cae1f5e480ba9756ec7404fa4d5a7f2c9 15-Mar-2012 Dima Zavin <dima@android.com> cutils: str_parms: free the key if the value was replaced during create/add

Change-Id: I9f31da62f10f78ed11693a7c04e2be29b0790c93
Reported-by: Xin Qian <xqian@marvell.com>
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/str_parms.c
89f7ba3df8fc359023b494c2e625beed900bc706 14-Mar-2012 Glenn Kasten <gkasten@google.com> audio_channel_in/out_mask_from_count

Change-Id: I879d188cf64ea1dbfa1a0574dee77119c2b08e26
nclude/system/audio.h
820571f4c3f2b95145269d5aa8afe117713a7ce1 15-Mar-2012 Nick Kralevich <nnk@google.com> Merge "init.rc: Add documentation"
f3ef1271f225d9f00bb4ebb0573eb3e03829f9a8 14-Mar-2012 Nick Kralevich <nnk@google.com> init.rc: Add documentation

Android developers should never place files in /data/local/tmp.
Files or directories in /data/local/tmp can be minipulated by the
shell user.

Android developers should never create world-writable files
or directories. This is a common source of security vulnerabilities.

Change-Id: I6d2cd620ab49d8ca3f39282f7d2ed682a9ba91c3
ootdir/init.rc
60feb20d4bddf841dc92be917664970fd88cb611 14-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
2923c0ba526902604ee53e94e07a16bef55742af 06-Mar-2012 Wu-cheng Li <wuchengli@google.com> Add camera ping command and release message.

The problem is both face unlock and camera application try to open
the hardware camera at the same time. A new camera open API is
added to let face unlock take the camera away from the existing
client. The release message is used to notify the existing client,
so it has time to release the hardware camera and clean up.

If existing client tries to use the camera after it is released,
the method will return error. It is still possible that the
camera has been taken and the existing client has not got the
notification. When any method returns error, the existing client
can use ping command to check whether the camera has been released.
If yes, the client can silently finish the app itself or show a
toast if it wants.

bug:5584464

Change-Id: I87f9f7db2f7b2b70ab2405f9b3da0d8946d6a01b
nclude/system/camera.h
9d4dbf4835a073c6a6f970b4e9a87edd6bfb1f5b 14-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Merge "Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a"
ad5b9c7205ac2a9ac500c6d455bf46f8ab3aafe0 24-Feb-2012 Kenny Root <kroot@google.com> Put keystore into the drmrpc group

The keystore service needs to access hardware crypto devices to
fulfill its function on devices with hardware crypto. This role
was assigned to the (now misnamed) drmrpc group.

Change-Id: Ia32f9e96b4372f0974984451680f9a0f6157aa01
ootdir/init.rc
b189b2ce6891efc76326586925a1941f66d4143d 13-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
1a87808b302898f8361664e80096dab0de81dfc0 12-Mar-2012 Dianne Hackborn <hackbod@google.com> Merge "Forget name for AID_SDCARD_R."
eccfb08f383ac3d7e472b9c97a0a43f0090d2ac5 12-Mar-2012 Dima Zavin <dima@android.com> Revert "cutils: str_parms: make test executable build for host instead"

This reverts commit 7d31e6e53392ca6ce7fbe8f17efbeda8b0e91ccf.
ibcutils/Android.mk
cf7d2849cb34c4bb62acfe429477c22e043b2837 12-Mar-2012 Dima Zavin <dima@android.com> Merge "cutils: str_parms: make test executable build for host instead"
21750e794154e22b7538814a32afa38d76a2f76e 12-Mar-2012 Dima Zavin <dima@android.com> Merge "cutils: str_parms: test str_parms_add_str too"
4736a1bb839b9b6deed602a6257fe966d3f1af6d 12-Mar-2012 Dima Zavin <dima@android.com> Merge "cutils: str_parms: need to also dup the key when adding to hash"
5d3aadbeca442b482a132371a46f3356489370b1 12-Mar-2012 Dianne Hackborn <hackbod@google.com> Forget name for AID_SDCARD_R.

Change-Id: Ib65fdf4211bef77057009e31295e610f8ba64b44
nclude/private/android_filesystem_config.h
7d31e6e53392ca6ce7fbe8f17efbeda8b0e91ccf 12-Mar-2012 Dima Zavin <dima@android.com> cutils: str_parms: make test executable build for host instead

Change-Id: I711e03aaf859107c697c6dcb82e0ab83e94570ba
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/Android.mk
a603e40f9efa0239ea18c9e98a0ae0f437c057f1 12-Mar-2012 Dima Zavin <dima@android.com> cutils: str_parms: test str_parms_add_str too

Change-Id: I93f0e577aff6b8ff23a44e29f9942a26545b6dc8
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/str_parms.c
70b93034f3ce06404e9b042c80759da25dac99d8 12-Mar-2012 Dima Zavin <dima@android.com> cutils: str_parms: need to also dup the key when adding to hash

Change-Id: Iabdd2061cbc36c6f4d4eb6e46bd757b5b52e0027
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/str_parms.c
6ac770fc52595b8230c3286d7707c85b003aeac1 12-Mar-2012 Selim Gurun <sgurun@google.com> Do not generate SIGPIPE errors in SocketCLient.

This change is to make sure the users of library does not crash
if they are not handling SIGPIPE properly.

Change-Id: I4ea80d6bfc26a4bca6b901959ae3060b059d46d3
ibsysutils/src/SocketClient.cpp
5f8e27f55e10bd446762c1c778b9c6316464b9c5 12-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
c2db4ffb874783220abf967ca4ccd0e6cf1ba57f 10-Mar-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
4e580885d8886864d0a79bce3658c568f6f3a8cf 10-Mar-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
63d84d049a4673517b389188366ef61f840e9c2d 10-Mar-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix pointer arith."
7599bfcf13cf022333338b7a87aaddae69c48d73 09-Mar-2012 Robert Greenwalt <rgreenwalt@google.com> Fix pointer arith.

Sending 3digit code, null, binary-length and data. Current code sends
3digit code, space, null, binary-length, binary-data.

The space should not be sent.

Change-Id: I1df00a3e70805b39b6105966c7f3c613461a6858
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
de64d60444df579110ec43f6fbbee6e9a1aebd93 09-Mar-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
6ff1bee167234aeb5281ac1a0acc6ce0720bedd1 09-Mar-2012 Dianne Hackborn <hackbod@google.com> Merge "Add AID_SDCARD_R."
fcb4553dbbd0fa01f9381069acb6533d4e7b6434 09-Mar-2012 Andy McFadden <fadden@android.com> Merge "Reduce suicidal tendencies"
b015977acbb7cea0344ca58f15e762fcbb99a7dc 09-Mar-2012 Eric Laurent <elaurent@google.com> Merge "audio policy: added flag for primary output"
424e07fcf655b65306bb846115e22594d6527056 09-Mar-2012 Andy McFadden <fadden@android.com> Reduce suicidal tendencies

Some changes to debuggerd:

(1) Send a SIGSTOP to the target process before doing any of the
PTRACE_ATTACH work. This causes the threads that weren't hit by
the signal to stop moving, which seems to get rid of the "ptrace
detach failed: No such process" problems that result in missed
stack traces and debuggerd self-immolation.

(2) SIGPIPE was in the list of "interesting" signals caught by
debugger_signal_handler(), but debuggerd didn't recognize it, and
you'd get "unexpected signal 13" complaints. It's now in the list.

(3) Fixed a bit-rotted XLOG.

Change-Id: I33297ea6b09ce450671c07dc25846f684afbf480
ebuggerd/debuggerd.c
d890925e2499234de39d2c4508dd25217bccf7d2 08-Mar-2012 Chia-chi Yeh <chiachi@android.com> am 0fc8abe1: am e2e8bd93: am 5ebced39: init.rc: update the permission of /data/local.

* commit '0fc8abe1f661e341ea3c7112d5311f72482e2c16':
89c5926f08fdf551c33ccbfbec5d6bb7d911f067 08-Mar-2012 Chia-chi Yeh <chiachi@android.com> am 0b32a75b: am c8d1a0e1: am 5ebced39: init.rc: update the permission of /data/local.

* commit '0b32a75b7c7f25bd9ab325f44626c402fd9b9b23':
init.rc: update the permission of /data/local.
50458cf76ea7b0b03598c785acb1481ed0ae5b1d 07-Mar-2012 Dianne Hackborn <hackbod@google.com> Add AID_SDCARD_R.

Change-Id: I47f650e415e06c0b69790ffefea7f208c910ebd7
db/adb.c
nclude/private/android_filesystem_config.h
0fc8abe1f661e341ea3c7112d5311f72482e2c16 08-Mar-2012 Chia-chi Yeh <chiachi@android.com> am e2e8bd93: am 5ebced39: init.rc: update the permission of /data/local.

* commit 'e2e8bd93becae10f1cc40bb28a581cb4a36d0154':
0b32a75b7c7f25bd9ab325f44626c402fd9b9b23 08-Mar-2012 Chia-chi Yeh <chiachi@android.com> am c8d1a0e1: am 5ebced39: init.rc: update the permission of /data/local.

* commit 'c8d1a0e18e008009fe75aa2cc7d3deace0479fce':
init.rc: update the permission of /data/local.
c8d1a0e18e008009fe75aa2cc7d3deace0479fce 08-Mar-2012 Chia-chi Yeh <chiachi@android.com> am 5ebced39: init.rc: update the permission of /data/local.

* commit '5ebced39093d1223566166b8cc6abfe6729c487d':
init.rc: update the permission of /data/local.
5383476727659544875b90d49a5371886a31c1fe 08-Mar-2012 Chia-chi Yeh <chiachi@android.com> am 5ebced39: init.rc: update the permission of /data/local.

* commit '5ebced39093d1223566166b8cc6abfe6729c487d':
init.rc: update the permission of /data/local.
e2e8bd93becae10f1cc40bb28a581cb4a36d0154 08-Mar-2012 Chia-chi Yeh <chiachi@android.com> am 5ebced39: init.rc: update the permission of /data/local.

* commit '5ebced39093d1223566166b8cc6abfe6729c487d':
init.rc: update the permission of /data/local.
11fd2beea06dc920acd5139e25de530cde3ea285 02-Mar-2012 Eric Laurent <elaurent@google.com> audio policy: added flag for primary output

Added a flag for output stream attributes indicating a primary
audio output stream.
The primary audio output stream is unique on a platform and receives all volume,
routing and parameters related to telephony use case.

Change-Id: Ic50b3c02cc60805031f26b819da6cf9ad65ad11c
nclude/system/audio_policy.h
44af3c8e47a6051f12e90b57f09c9dd19072d3cd 08-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
7bf4c45f842ded6d6ad6b2d80e052ddf56969723 28-Feb-2012 Selim Gurun <sgurun@google.com> Add a utility function to send a code + binary msg

Add a utility function to SocketClient to send a c-string code
prepended to a binary message. This is necessary to be able to
send a binary message while keeping compatible with underlying
text-based protocol.

Change-Id: Ifc6562003a687577d7deb50260533a5147ae4f97
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
5ebced39093d1223566166b8cc6abfe6729c487d 07-Mar-2012 Chia-chi Yeh <chiachi@android.com> init.rc: update the permission of /data/local.

Bug: 6131945
Change-Id: I3094a471dcfb02b786f47b6778c8fed3726325ec
ootdir/init.rc
e2bbcfba3ab14e77087c3a39565668480d14a00d 07-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
78f6bcf853db3dd9b9b37a0ca4d4ee0374f6835a 06-Mar-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "New NativeDaemonConnector protocol adds a seqnum."
85f978f04d4297cc70cc1f368ee5962d751ce5a6 06-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
397cf1986448cedde2a17093884a0ee8bf0d0b3f 06-Mar-2012 Mathias Agopian <mathias@google.com> remove obsolete code

Change-Id: I65692beb620c35b0d0679939405183626a82bd8c
exus/Android.mk
exus/CommandListener.cpp
exus/CommandListener.h
exus/Controller.cpp
exus/Controller.h
exus/DhcpClient.cpp
exus/DhcpClient.h
exus/DhcpEvent.cpp
exus/DhcpEvent.h
exus/DhcpListener.cpp
exus/DhcpListener.h
exus/DhcpState.cpp
exus/DhcpState.h
exus/IControllerHandler.h
exus/IDhcpEventHandlers.h
exus/ISupplicantEventHandler.h
exus/IWifiStatusPollerHandler.h
exus/InterfaceConfig.cpp
exus/InterfaceConfig.h
exus/LoopController.cpp
exus/LoopController.h
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/NexusCommand.cpp
exus/NexusCommand.h
exus/OpenVpnController.cpp
exus/OpenVpnController.h
exus/Property.cpp
exus/Property.h
exus/PropertyManager.cpp
exus/PropertyManager.h
exus/ResponseCode.h
exus/ScanResult.cpp
exus/ScanResult.h
exus/Supplicant.cpp
exus/Supplicant.h
exus/SupplicantAssociatedEvent.cpp
exus/SupplicantAssociatedEvent.h
exus/SupplicantAssociatingEvent.cpp
exus/SupplicantAssociatingEvent.h
exus/SupplicantConnectedEvent.cpp
exus/SupplicantConnectedEvent.h
exus/SupplicantConnectionTimeoutEvent.cpp
exus/SupplicantConnectionTimeoutEvent.h
exus/SupplicantDisconnectedEvent.cpp
exus/SupplicantDisconnectedEvent.h
exus/SupplicantEvent.cpp
exus/SupplicantEvent.h
exus/SupplicantEventFactory.cpp
exus/SupplicantEventFactory.h
exus/SupplicantListener.cpp
exus/SupplicantListener.h
exus/SupplicantScanResultsEvent.cpp
exus/SupplicantScanResultsEvent.h
exus/SupplicantState.cpp
exus/SupplicantState.h
exus/SupplicantStateChangeEvent.cpp
exus/SupplicantStateChangeEvent.h
exus/SupplicantStatus.cpp
exus/SupplicantStatus.h
exus/TiwlanEventListener.cpp
exus/TiwlanEventListener.h
exus/TiwlanWifiController.cpp
exus/TiwlanWifiController.h
exus/VpnController.cpp
exus/VpnController.h
exus/WifiController.cpp
exus/WifiController.h
exus/WifiNetwork.cpp
exus/WifiNetwork.h
exus/WifiScanner.cpp
exus/WifiScanner.h
exus/WifiStatusPoller.cpp
exus/WifiStatusPoller.h
exus/main.cpp
exus/nexctl.c
b7286aa02e1e554a1ef21a957fabe593f05c1260 06-Mar-2012 Mathias Agopian <mathias@google.com> remove dependency on utils/List.h

Change-Id: I9a1e996be645520d1d5a056337303a6e5ed646e9
nclude/sysutils/FrameworkClient.h
nclude/sysutils/FrameworkCommand.h
nclude/sysutils/List.h
nclude/sysutils/SocketClient.h
f1b244c3fafb9c0b96b10a3aea77bb6690fa9074 05-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add function to derive a channel mask from a channel count"
4ab051ab4613f2622dc3f3f0f57bb34d8a40a6a9 03-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Add function to derive a channel mask from a channel count

Change-Id: I22523ded9cd8e5283a285a9db21d819bbbc1b6c3
nclude/system/audio.h
ab556e27a1c3a93611556705f2669d987435de60 05-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "Use #define value of 1 to indicate presence of headers."
8702bb17f40022e970e8acd40b348d074e39afc7 07-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> New NativeDaemonConnector protocol adds a seqnum.

Allows for one socket to be multiplexed for multiple requests.
Doesn't use command sequence numbers for broadcasts - would make no sense.
Doesn't alter current default behavior so OEM's using these classes
won't notice a difference.
bug:5864209

Change-Id: Ie3b19c4f81eea868569229a365c8cb7de249c2dd
nclude/sysutils/FrameworkListener.h
nclude/sysutils/SocketClient.h
nclude/sysutils/SocketListener.h
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
558ca722a5647cf250dcb44255a52b060a1f261e 05-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
3817a79ded01ee03922fa2f89b2feea9ba65a703 03-Mar-2012 Jeff Brown <jeffbrown@google.com> Use #define value of 1 to indicate presence of headers.

strace tests the value of HAVE_TERMIO_H and HAVE_SYS_UIO_H using

Change-Id: If899845503547410cf17d005733d1c0c6741e939
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
0afee8b668d1ff5bae4294108d5e21abfae28d12 03-Mar-2012 Jeff Sharkey <jsharkey@android.com> Merge "Change "chown" to coreutils syntax."
474cea824fde58a7a2b81b9edc2ffe68d4843177 03-Mar-2012 Jeff Sharkey <jsharkey@android.com> Change "chown" to coreutils syntax.

Change-Id: I7d997b3254354908317feee54b6df9b2419718a6
oolbox/chown.c
99e7f7af84b324034af348cbb7a180848cca2ebb 02-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a

Both libraries are needed to build four shared libraries in 64-bit
for 64-bit emulator with "-gpu on"
lib64OpenglRender.so
lib64EGL_translator.so
lib64GLES_CM_translator.so
lib64GLES_V2_translator.so

Change-Id: If57f72d4661a74f1d5e537568881f39132e0b43d
ibcutils/Android.mk
iblog/Android.mk
9c38e14299bd4cb3693fca2e353a4fa9d8a55c85 02-Mar-2012 Colin Cross <ccross@android.com> am 1a2f32c4: am d39f9d93: am 9cec99ba: Merge "Fix typo in queue_property_triggers ident"

* commit '1a2f32c4828380ca8590cf664725650ef35f1e37':
Fix typo in queue_property_triggers ident
1a2f32c4828380ca8590cf664725650ef35f1e37 02-Mar-2012 Colin Cross <ccross@android.com> am d39f9d93: am 9cec99ba: Merge "Fix typo in queue_property_triggers ident"

* commit 'd39f9d93788ed08f8e90d04bdac798e3f3595889':
Fix typo in queue_property_triggers ident
d39f9d93788ed08f8e90d04bdac798e3f3595889 02-Mar-2012 Colin Cross <ccross@android.com> am 9cec99ba: Merge "Fix typo in queue_property_triggers ident"

* commit '9cec99ba9c64d26e2fa34f310cba13ff119b4c55':
Fix typo in queue_property_triggers ident
9cec99ba9c64d26e2fa34f310cba13ff119b4c55 02-Mar-2012 Colin Cross <ccross@android.com> Merge "Fix typo in queue_property_triggers ident"
469b7b2da84a62652342fd2f6006ca452cb1447d 02-Mar-2012 Chris Dearman <chris@mips.com> Fix typo in queue_property_triggers ident

Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I5f18ccb0912b9bb89c9f5104f9505c610c109af8
nit/init.c
cef6db21fdfa1a1f5af0066be9ac9dae4ce2ca57 01-Mar-2012 Eric Laurent <elaurent@google.com> Merge "renamed audio policy output flag."
2e9d845850841f4bf91ed8bd4a79010c56abf4c2 01-Mar-2012 Eric Laurent <elaurent@google.com> renamed audio policy output flag.

Renamed AUDIO_POLICY_OUTPUT_FLAG_INDIRECT to AUDIO_POLICY_OUTPUT_FLAG_NONE
which is more appropriate.

Change-Id: Ie898ddc2279db55a65ece96e09232163c2e78024
nclude/system/audio_policy.h
1798a88e3f16935a3c9fa1f4f012a3be2b40b106 01-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
977fc4e9153b29e2f5e0b05d20d3c09b81b95e42 01-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Merge "Fixed two 64-bit porting issues; Make pid/tid type consistent"
d2c8f52189f8c2a13b88a107c6495f9d83196d2d 28-Feb-2012 Andrew Hsieh <andrewhsieh@google.com> Fixed two 64-bit porting issues; Make pid/tid type consistent

1. In printf, use "%zu" for variable of type size_t
2. Print tid in %5d
3. Make type of pid/tid in AndroidLogEntry and logger_entry consistent

Change-Id: I3e3d9536ee58823f349a4734ae093d30eabe1bfe
nclude/cutils/logprint.h
iblog/fake_log_device.c
iblog/logprint.c
2c94d240ebcc8034d504f5ec7d0995637f2ffeb6 29-Feb-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
ca3bf25570c197757f75b749cddecfea88cbcdc1 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 25443f80: am 1e28088f: am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"

* commit '25443f80a27c6153c3406b4443fd07442e410a57':
Toolbox implementation of chown has a bad print
cd21d2144fb2fbd4da8e7049a5bea06de0a09ea4 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 72249325: am 428a6e3f: am 13438a93: Merge "logwrapper: reduce verbosity and fix usage"

* commit '72249325df812575d13d44016482a4ac0e7fbe84':
logwrapper: reduce verbosity and fix usage
25443f80a27c6153c3406b4443fd07442e410a57 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 1e28088f: am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"

* commit '1e28088f42f9d04e4ab3abf080f956774b1e78d5':
Toolbox implementation of chown has a bad print
72249325df812575d13d44016482a4ac0e7fbe84 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 428a6e3f: am 13438a93: Merge "logwrapper: reduce verbosity and fix usage"

* commit '428a6e3f562b043f74390806c49686d1f16fe99e':
logwrapper: reduce verbosity and fix usage
1e28088f42f9d04e4ab3abf080f956774b1e78d5 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"

* commit '5cc398ef00b439bcf85b65c894433dd52362dff7':
Toolbox implementation of chown has a bad print
428a6e3f562b043f74390806c49686d1f16fe99e 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 13438a93: Merge "logwrapper: reduce verbosity and fix usage"

* commit '13438a93a8904ae712655533ce63aa0d5b486aba':
logwrapper: reduce verbosity and fix usage
5cc398ef00b439bcf85b65c894433dd52362dff7 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Toolbox implementation of chown has a bad print"
13438a93a8904ae712655533ce63aa0d5b486aba 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "logwrapper: reduce verbosity and fix usage"
1f28b775cfad4cf3d9112a4ad18603b34fb84fac 19-Dec-2011 Tanguy Pruvot <tanguy.pruvot@gmail.com> logwrapper: reduce verbosity and fix usage

- no info on normal process exit (0)
- basename as tag, not the full path
- fix usage, bad "-x" parameter vs "-d" in code

Change-Id: Ife72729eaee2a366bd4226f3fbe3ba074219c974
ogwrapper/logwrapper.c
5ae3f93f3bafbeb1fc9a3324475c58c725749c5e 28-Feb-2012 Anatol Pomazau <anatol@google.com> Remove trailing whitespaces

Change-Id: I6f83333a6ee0fbc562a12bb9555c43a44c98768e
astboot/bootimg.c
astboot/engine.c
astboot/fastboot.h
astboot/protocol.c
astboot/usb.h
astboot/usb_linux.c
astboot/usb_osx.c
astboot/usb_windows.c
astboot/usbtest.c
astboot/util_linux.c
astboot/util_osx.c
astboot/util_windows.c
0ef1824c9a6370d3cf9ba062813f13bad6053d59 28-Feb-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
9427df10e9858ca0c86441d918c262baa9902f2c 28-Feb-2012 Vladimir Chtchetkine <vchtchetkine@google.com> Merge "Enables ADBD tracing in the emulator."
830e19731dbfd5d8a2dd061f188f2ddc30443360 28-Feb-2012 Dima Zavin <dima@android.com> ion: fix header for including in C++ code

Change-Id: I8fc10ac397e60d329a6887f0590d4dba6cbc7545
Signed-off-by: Dima Zavin <dima@android.com>
nclude/ion/ion.h
e92b158de79d5bfe035a75ac520ddae42782bc1d 28-Feb-2012 Dima Zavin <dima@android.com> libion: use correct build vars in makefile

Change-Id: I74c8e723e4f15d3806c1834b069bcb1fd56ac4fa
Signed-off-by: Dima Zavin <dima@android.com>
ibion/Android.mk
c4ddca25e0a1b60453c7fe7b4b73a412d4a940eb 27-Feb-2012 Ramanan Rajeswaran <ramanan@google.com> am f1ab88c2: am 73c019b3: Add asus vendor id

* commit 'f1ab88c23460a608cd6d6f6492fb2b039405c0f2':
Add asus vendor id
f1ab88c23460a608cd6d6f6492fb2b039405c0f2 27-Feb-2012 Ramanan Rajeswaran <ramanan@google.com> am 73c019b3: Add asus vendor id

* commit '73c019b30a7c70c50d2a854982143d5eb8c74f8c':
Add asus vendor id
28781b0a52dfb5ad19121afcc6aef56918992b30 27-Feb-2012 Vladimir Chtchetkine <vchtchetkine@google.com> Enables ADBD tracing in the emulator.

When running inside the emulator, guest's adbd can connect to 'adb-debug' qemud
service that can display adb trace messages on condition that emulator has been
started with '-debug adb' option.

This CL enables that functionality in ADB code.

Change-Id: I59b4a76d3c887ad28b8aa8e2a01dfa814e75faa1
db/adb.c
db/adb.h
d55cdd6698dfd52a0d3311e6aeda9e23cb5fdfc1 27-Feb-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
c958a7f4988f3dd98135b23619cdf55ec55bd1f6 26-Feb-2012 Mathias Agopian <mathias@google.com> add missing include

Change-Id: Id93278c59cfdf72a62a4fe26178bd5c3e43b089e
nclude/system/window.h
73c019b30a7c70c50d2a854982143d5eb8c74f8c 24-Feb-2012 Ramanan Rajeswaran <ramanan@google.com> Add asus vendor id

Change-Id: I6d10b1788903aba526af7f654b12c302c3e9fc89
astboot/fastboot.c
1ae8d4eaa3d52e0b61728c7fc709d28e85c7ce21 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 44898072 to master

Change-Id: Ib77a4d9161261306253a174727801526e7149621
448980724da9ec43917e403d482db398e41e44d0 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 7c02a327: am 1ea9fce4: Merge "Extend toolbox with SE Android support."

* commit '7c02a327563bd0be2d5b7c6cb07f0c48ce87771e':
Extend toolbox with SE Android support.
7c02a327563bd0be2d5b7c6cb07f0c48ce87771e 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 1ea9fce4: Merge "Extend toolbox with SE Android support."

* commit '1ea9fce46f9782a21071b683b183226cb3468a0f':
Extend toolbox with SE Android support.
6439693effbec06c6effcbd9b5acd405ccbeccb3 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 3b04bde9: am ee79b455: am 93553073: Merge "Extend init and ueventd for SE Android."

* commit '3b04bde991d57765a830e06c6f5bb094722583bd':
Extend init and ueventd for SE Android.
3b04bde991d57765a830e06c6f5bb094722583bd 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am ee79b455: am 93553073: Merge "Extend init and ueventd for SE Android."

* commit 'ee79b455a904558f74d63a99ade8f3f1197a5de5':
Extend init and ueventd for SE Android.
ee79b455a904558f74d63a99ade8f3f1197a5de5 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 93553073: Merge "Extend init and ueventd for SE Android."

* commit '935530736d6849c37c0e5c5e01b7e02245481f16':
Extend init and ueventd for SE Android.
1ea9fce46f9782a21071b683b183226cb3468a0f 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Extend toolbox with SE Android support."
935530736d6849c37c0e5c5e01b7e02245481f16 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Extend init and ueventd for SE Android."
274c31ab6b646b52dfe0f69a9e30077795065d0a 23-Feb-2012 Nick Kralevich <nnk@google.com> fix "logcat -c ; logcat -d" hang.

Change-Id: I1dc3633fc7228a6ff8ed0da4572f40055a28ceb2
ogcat/logcat.cpp
afd912394690cbf7d40b021c62d80ff0f3d40806 23-Feb-2012 Rebecca Schultz Zavin <rebecca@android.com> Add ion helper library

This library contains helper functions for using ion

Change-Id: I7d7f76d6d3f36cd94d67797a38099a94214392b1
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
nclude/ion/ion.h
ibion/Android.mk
ibion/ion.c
ibion/ion_test.c
52a5e3bce21431d44255a0a12884ca3cae808f7d 20-Feb-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
c8ba5366da7e23ebf1cd76bcf49449b878563102 16-Dec-2011 Anatol Pomazau <anatol@google.com> Implement 'fastboot format' command

Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

- get size of partition
- create an empty filesystem image
- erase the partition
- flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: I8529bc3485739487f0d91312f7c0ab1a6e5d8b44
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
714052ba4d86a2d411a3944f5034c5a5833ffbb6 05-Feb-2012 Mike J. Chen <mjchen@google.com> DO NOT MERGE

fastboot: Change -w to format after the erase of userdata & cache

If the bootloader doesn't support formatting of those partitions
(either because it doesn't support the getvar commands needed or
the partition type is not supported), the errors are printed but
doesn't halt processing of subsequent commands.

Change-Id: I816ac2e5e7593846fcb4fd39c793a8dbdd996f6f
Signed-off-by: Mike J. Chen <mjchen@google.com>
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
2998c47aaf84499d426b6314070a6fe3bfd33bce 14-Feb-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
fc656103dba298dbab1377ab07060068f50a5f83 14-Feb-2012 Anatol Pomazau <anatol@google.com> Fix 'extra tokens at end of #endif directive' warning

Change-Id: I464ede415e64cf7db845bb441754120974bcf855
db/transport_local.c
ca2074b78d44ce5fb60fae64da84e53c2b82cb8a 13-Feb-2012 Mike Lockwood <lockwood@google.com> Revert "Implement 'fastboot format' command"

until Windows support is done

This reverts commit 452e11885afb53d59b2aa38b15e3be41c568d1e6.
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
4d8a999595b9365845d703c216632088928f6383 13-Feb-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
452e11885afb53d59b2aa38b15e3be41c568d1e6 16-Dec-2011 Anatol Pomazau <anatol@google.com> Implement 'fastboot format' command

Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

- get size of partition
- create an empty filesystem image
- erase the partition
- flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: Ifa42deaa66c3cb96ff786a73c3fadad92658f395
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
0b7fc8bb031d2c0a1dc0485459faa8f2ffd6a0e4 10-Feb-2012 Dianne Hackborn <hackbod@google.com> Merge "New user definitions for isolated sandboxes."
4ae77160727f8b92d61028269d1f49ae16873a08 09-Feb-2012 Nick Kralevich <nnk@google.com> do more checks on packages.list

Change-Id: I16d6eab5e674c860be915fde2da7877994bed314
un-as/package.c
ca185abcb58582ab58805f792eb868681ebdb55e 09-Feb-2012 Dianne Hackborn <hackbod@google.com> New user definitions for isolated sandboxes.

Change-Id: I302f89c102bc35dcd70168748e205b41fdbf6576
nclude/private/android_filesystem_config.h
a8185a622e368d1957e18a3ee9d29d45eda12cfc 08-Feb-2012 Guang Zhu <guangzhu@google.com> Revert "New NativeDaemonConnector protocol adds a seqnum."

Reverting because it seems to break `adb reboot`

This reverts commit dc58e73071aa829a5038caf37211f6b3e2d7b275.

Change-Id: Ib8cc4379254694398cbb7f3e7a64c20e1ed8c1ba
nclude/sysutils/FrameworkListener.h
nclude/sysutils/SocketClient.h
nclude/sysutils/SocketListener.h
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
dc58e73071aa829a5038caf37211f6b3e2d7b275 07-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> New NativeDaemonConnector protocol adds a seqnum.

Allows for one socket to be multiplexed for multiple requests.
bug:5864209

Change-Id: I934c88da25d95e093371f455442bdf2f0ed7a4f4
nclude/sysutils/FrameworkListener.h
nclude/sysutils/SocketClient.h
nclude/sysutils/SocketListener.h
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
6f53225ef9f60a18a69b4ad3ba920ada168b719e 04-Feb-2012 Anatol Pomazau <anatol@google.com> Revert "Implement 'fastboot format' command"

This reverts commit 230d160a718333651f7ca1557404f96682795b37
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
230d160a718333651f7ca1557404f96682795b37 16-Dec-2011 Anatol Pomazau <anatol@google.com> Implement 'fastboot format' command

Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

- get size of partition
- create an empty filesystem image
- erase the partition
- flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: I8529bc1dc64237f1f0d91312f7c0ab1a6e5d8b44
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
7806e5648557532fcfb971bd2fd88f4033f32cb8 03-Feb-2012 Anatol Pomazau <anatol@google.com> Merge "Revert "Implement 'fastboot format' command""
21311f87c60bb75588e12227e7c0b9812e751b4a 03-Feb-2012 Anatol Pomazau <anatol@google.com> Revert "Implement 'fastboot format' command"

This reverts commit 049dff53ef368bd84d0bddcb4c91f408774949c1
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
65cf84f3ff959eec0c97229489d58279feaf3bcb 16-Dec-2011 Anatol Pomazau <anatol@google.com> Implement 'fastboot format' command

Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

- get size of partition
- create an empty filesystem image
- erase the partition
- flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: I8529bc1dc64698f1f0d91312f7c0ab1a6e5d8b44
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
e9f6e00c192494c3e808ce4ca1c6af771179ccf6 03-Feb-2012 Anatol Pomazau <anatol@google.com> Merge "Implement 'fastboot format' command"
8290d1083ec7eee3f32265012f5d6be2774c4afc 13-Jan-2012 Stephen Smalley <sds@tycho.nsa.gov> Extend toolbox with SE Android support.

Add -Z option to ls and ps for displaying security contexts.
Modify id to display security context.
Add new SELinux commands: chcon, getenforce, getsebool, load_policy, restorecon, runcon, setenforce, setsebool.

Change-Id: Ia20941be4a6cd706fe392fed6e38a37d880ec5f1
oolbox/Android.mk
oolbox/chcon.c
oolbox/getenforce.c
oolbox/getsebool.c
oolbox/id.c
oolbox/load_policy.c
oolbox/ls.c
oolbox/ps.c
oolbox/restorecon.c
oolbox/runcon.c
oolbox/setenforce.c
oolbox/setsebool.c
776fd990aaf4127085da4dd3d879b37c61943419 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am 4802f781: am 48aca55f: Reconcile with ics-mr1-release

* commit '4802f78191f0056e184f0c62ffa682866e86decb':
4802f78191f0056e184f0c62ffa682866e86decb 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am 48aca55f: Reconcile with ics-mr1-release

* commit '48aca55f665393d3389073d8b4299a6a30f41c6d':
48aca55f665393d3389073d8b4299a6a30f41c6d 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ib960fbb7d51a45d540149e6a21d50c3e1d17dd3b
1904c276ac0da4cca1bb973834881cca6de25614 01-Feb-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
e46f9d510db9351682cf17c49115110870147335 13-Jan-2012 Stephen Smalley <sds@tycho.nsa.gov> Extend init and ueventd for SE Android.

Add SE Android support for init and ueventd.

init:
- Load policy at boot.
- Set the security context for service daemons and their sockets.
- New built-in commands: setcon, setenforce, restorecon, setsebool.
- New option for services: seclabel.

ueventd:
- Set the security context for device directories and nodes.

Change-Id: I98ed752cde503c94d99dfa5b5a47e3c33db16aac
nit/Android.mk
nit/builtins.c
nit/devices.c
nit/init.c
nit/init.h
nit/init_parser.c
nit/keywords.h
nit/util.c
bf3a5b222ec2de0d6a26b8beb54ef7744d2dbd7f 18-Jun-2011 Chris Dearman <chris@mips.com> Decode DHCP netmask option correctly

Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ibc288458baf2f75c5b19a46e4c97ee59521cc9a5
ibnetutils/dhcpclient.c
ibnetutils/ifc_utils.c
91a8efd210e21bf9678786c3af0271242cf6be43 31-Jan-2012 Nick Kralevich <nnk@google.com> Merge "Restrict zygote to system user."
0a1c57151eba7ec17c38a417ba2351996576ce0c 30-Jan-2012 The Android Open Source Project <initial-contribution@android.com> am aee9fc1e: Reconcile with ics-mr1-release

* commit 'aee9fc1e4a44004a2d0b76dcf4f33cb544d29189':
aee9fc1e4a44004a2d0b76dcf4f33cb544d29189 30-Jan-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ieaacd272ef768930f444735139215730b1c218b6
930a7d72ed661ef4f913a3d1ff3c53e7f43a3098 30-Jan-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
0fe24c96be69e0fd03cbaf16f1b0070423d98799 28-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 142e895a: am e83cd37e: am 0458d373: Merge "fastboot: set the language local string"

* commit '142e895a1d5030a4e032f08fa5814ebd42b964b6':
fastboot: set the language local string
142e895a1d5030a4e032f08fa5814ebd42b964b6 27-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am e83cd37e: am 0458d373: Merge "fastboot: set the language local string"

* commit 'e83cd37e58b00fb6b9eb50464067864ca0cb2ff7':
fastboot: set the language local string
e83cd37e58b00fb6b9eb50464067864ca0cb2ff7 27-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 0458d373: Merge "fastboot: set the language local string"

* commit '0458d373261d89979529853fa63cdd998b12e04a':
fastboot: set the language local string
e7fd911fd42b1f8bea6a004e2bcc1d2dda4ec718 27-Jan-2012 Nick Kralevich <nnk@google.com> Restrict zygote to system user.

CVE-2011-3918: Address denial of service attack against Android's
zygote process. This change enforces that only UID=system can
directly connect to zygote to spawn processes.

Change-Id: I89f5f05fa44ba8582920b66854df3e79527ae067
ootdir/init.rc
0458d373261d89979529853fa63cdd998b12e04a 27-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "fastboot: set the language local string"
65026f980a6df01a7d437ce51a47de911820041e 25-Jan-2012 Bhanu Chetlapalli <bhanu@mips.com> Prevent bit shifting if num bits is negative

Causes OpenGL Software Renderer to generate incorrect window
coordinates on MIPS & possibly x86

Change-Id: I3c51b6a5a4e6af75e9b31d9d47e4e4d894825888
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
ibpixelflinger/fixed.cpp
049dff53ef368bd84d0bddcb4c91f408774949c1 16-Dec-2011 Anatol Pomazau <anatol@google.com> Implement 'fastboot format' command

Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

- get size of partition
- create an empty filesystem image
- erase the partition
- flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: I8529bc1dc64698f1f0d91312f7c0ab1a6e5d8b44
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
465d8fd5ccc3542b875d49bde08a49c2fe88d9c3 25-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
0148e603d827464e344eb1c442919f70e8c6f051 24-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
46f86f11d446a650602057f8a07eba1f609d7fe9 24-Jan-2012 Xavier Ducrohet <xav@android.com> am 0c054095: am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.

* commit '0c05409510037fd7372c3fe7ab240ebf33b15831':
Add USB vendor IDs for Quanta, INQ and Sony.
05025357e6aef0d4cf036d350c96ac529f6306c2 24-Jan-2012 Xavier Ducrohet <xav@android.com> am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.

* commit '746f3243f6d30ab51a36dcfea76eac3ba29ac625':
Add USB vendor IDs for Quanta, INQ and Sony.
0c05409510037fd7372c3fe7ab240ebf33b15831 24-Jan-2012 Xavier Ducrohet <xav@android.com> am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.

* commit '746f3243f6d30ab51a36dcfea76eac3ba29ac625':
Add USB vendor IDs for Quanta, INQ and Sony.
746f3243f6d30ab51a36dcfea76eac3ba29ac625 14-Jan-2012 Xavier Ducrohet <xav@android.com> Add USB vendor IDs for Quanta, INQ and Sony.

Change-Id: I224e067d9a64e8e9e7afbad0760a4b07f965bf83
db/usb_vendors.c
astboot/fastboot.c
38412163da933664791cf511056953b9e3bd1454 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 70580b20: am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"

* commit '70580b20bc8485002df0b3e89e42754c8c9796ff':
adb,fastboot: add USB support for Intel Vendor ID
70580b20bc8485002df0b3e89e42754c8c9796ff 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"

* commit '149ae11fb63818b470156e1652abfad0e08d486d':
adb,fastboot: add USB support for Intel Vendor ID
149ae11fb63818b470156e1652abfad0e08d486d 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "adb,fastboot: add USB support for Intel Vendor ID"
f1c33718faa9979eb8c4b732405cf0944d873af7 24-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
c840653efd8d05a33778d3e73c3521977564bde3 08-Jul-2011 mgross <mark.gross@intel.com> fastboot: set the language local string

Set the language local string to 0x409 (English US / en-us) such that
fastboot will successfully read the usb descriptor serial number string.
The usbdevfs ioctl fails when the wIndex is not initialized with the
local for the unicode of the usb descriptor string. usbdevfs is an
obsolete interface and fastboot probably needs a re-write to use libusb
like what is in adb.

Change-Id: I3687f84643f53c736f14b3ae7793185d9b5cccc0
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
astboot/usb_linux.c
astboot/usb_osx.c
b2d8f896b6ef081c1af263dd13d91d2f435de0fa 23-Jan-2012 Nick Kralevich <nnk@google.com> Don't statically compile run-as

Bug: 5904033
Change-Id: Ie815f09a2bf51ad583ded82f652d162a7f70b87e
un-as/Android.mk
un-as/run-as.c
e463c1ca9192fecd883b2f9c6d7d1a9f003c2a67 23-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
69ab6de33319c111a6b9ff4c78474d7605b28175 24-May-2011 Johan Norberg <johan.xx.norberg@stericsson.com> Toolbox implementation of chown has a bad print

When the chown program fails it prints out an error message
and is describing itself as chmod. This has been corrected.

Change-Id: I2c489975f09343bdf66acbf7df6e7183c2daff78
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
oolbox/chown.c
6ca9d204cdfe2a474335451d3068ede4a712dce2 21-Jan-2012 The Android Open Source Project <initial-contribution@android.com> am 546dc10c: Reconcile with ics-mr1-release

* commit '546dc10c1a7c6fb348507899d3629af01b4e4c43':
1eb99caa73fa240bbfb603196be26bb92c699b9e 21-Jan-2012 The Android Open Source Project <initial-contribution@android.com> am 56acfe35: Reconcile with ics-mr1-release

* commit '56acfe3504249002cb46ab2fe06d420884034444':
a8748d3b2afcbe23eb428f7915a45884ad638438 21-Jan-2012 Andrew Hsieh <andrewhsieh@google.com> am daafb531: am 4779e934: Add Intel\'s vendor ID to adb

* commit 'daafb531484a35a63e229e14d8a81b412e506670':
Add Intel's vendor ID to adb
540298e871f16711381310daaf41732453cca992 21-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am abffc7f7: (-s ours) am fa7860a2: Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c

* commit 'abffc7f7a8c61a4e0202e9398e4d1565408a1ada':
Rename LOG_ASSERT to ALOG_ASSERT
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Rename (IF_)LOG() to (IF_)ALOG()
d21b89db1edbfe798d7da477f949f5a8eb3a5578 20-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_format_t consistently"
546dc10c1a7c6fb348507899d3629af01b4e4c43 20-Jan-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ica26c90c34d9665dfd68e404893a306d43aface3
cb256e7f08cf11060c78985b28819ca4766c39ab 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Set HAVE_LOCALTIME_R to 1 when defined."
e66293900bc8e69fc3359e0c75c6c5473861ab49 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Set HAVE_LOCALTIME_R to 1 when defined.

SQLite 3.7.10 tests the value of the HAVE_LOCALTIME_R macro
if it is defined, so we set it to 1.

Change-Id: I8c34ec362813018f86aea57d1b36b7639d0dd96d
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
2eb08e44350e2f49716f9476110497795ff67ff2 20-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
5890fe33141a9efd124c86c40a8c1ff6170ecf20 19-Jan-2012 Nick Kralevich <nnk@google.com> Don't allow adb to run as root in user builds.

Change-Id: I4fbd7beb7f76c68fead1a89b745f0dfb931b4597
db/Android.mk
db/adb.c
bd9206bc7399b22d3917c737bb75f8534fa77e35 19-Jan-2012 Nick Kralevich <nnk@google.com> Move permission checking code to it's own function.

Change-Id: Ibe46ca3043791f3b3815080f9e23ac307b1f5900
db/adb.c
56acfe3504249002cb46ab2fe06d420884034444 19-Jan-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I7d6cd74bf255c517d04c5900a38145571297f66d
daafb531484a35a63e229e14d8a81b412e506670 19-Jan-2012 Andrew Hsieh <andrewhsieh@google.com> am 4779e934: Add Intel\'s vendor ID to adb

* commit '4779e9344bb62208e4772ff6486b6df564f434b8':
Add Intel's vendor ID to adb
80d50a4c99610334498d23f19932ee782756f4e7 19-Jan-2012 Andrew Hsieh <andrewhsieh@google.com> am 4779e934: Add Intel\'s vendor ID to adb

* commit '4779e9344bb62208e4772ff6486b6df564f434b8':
Add Intel's vendor ID to adb
2593c67afb52d27fba28bf705befb30e7e88b4e8 19-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
abffc7f7a8c61a4e0202e9398e4d1565408a1ada 19-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am fa7860a2: Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c

* commit 'fa7860a27ff79b5697ac059c4bedc4f7445500af':
Rename LOG_ASSERT to ALOG_ASSERT
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Rename (IF_)LOG() to (IF_)ALOG()
abc12070d01cba3dbceb4250d180cebec8fc2afc 19-Jan-2012 Nick Kralevich <nnk@google.com> Merge "Don't read /data/local.prop on user builds"
fa7860a27ff79b5697ac059c4bedc4f7445500af 19-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c

* changes:
Rename LOG_ASSERT to ALOG_ASSERT
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Rename (IF_)LOG() to (IF_)ALOG()
4779e9344bb62208e4772ff6486b6df564f434b8 13-Jan-2012 Andrew Hsieh <andrewhsieh@google.com> Add Intel's vendor ID to adb

Change-Id: I81da3ea11bfd44395f6895fe51e477ff1e7fa25b
db/usb_vendors.c
0dbda7e1c5bcebc501b4943cd6483122297e1834 18-Jan-2012 Nick Kralevich <nnk@google.com> Don't read /data/local.prop on user builds

Creating a root owned /data/local.prop is one of the most common
ways to root an Android device. /data/local.prop is only intended
to assist developers on debuggable devices, and is never
intended to be used on production devices.

Change-Id: Ifcfa21c2ee9914b0b54445218b4cf0fea0a98e9c
nit/Android.mk
nit/property_service.c
38f368c1b3bac76d342189b6412691a217421178 18-Jan-2012 Nick Kralevich <nnk@google.com> Don't parse properties from unsafe files.

Don't set properties from files that are unsafe (world-writable
or group-writable)

Change-Id: I8da539c6446b10596be1d7c2014e4b9aea13e3fd
nit/util.c
f60e8638282d66c108f1e1dea030856312f65892 17-Jan-2012 Wu, Hao <hao.wu@intel.com> adb,fastboot: add USB support for Intel Vendor ID

This patch adds Intel USB Vendor ID into the support
list for adb and fastboot.

Signed-off-by: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
db/usb_vendors.c
astboot/fastboot.c
2ac29d02505670ce412a5fb07009f903b300dce5 09-Jan-2012 Steve Block <steveblock@google.com> Rename LOG_ASSERT to ALOG_ASSERT

Change-Id: Iff15ac5e7ab226d437c08d23f18fd54e6793e65c
nclude/cutils/log.h
ibpixelflinger/tinyutils/VectorImpl.cpp
8aeb6e244a484305428ffbbc4be64d51e9bccdaa 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

Change-Id: I52fce957db06c281e2618daa4e2ecba19974f2eb
nclude/cutils/log.h
ibcutils/loghack.h
ibcutils/properties.c
ibcutils/record_stream.c
ibcutils/sockets.c
ibcutils/zygote.c
ibdiskconfig/config_mbr.c
ibdiskconfig/diskconfig.c
ibdiskconfig/diskutils.c
ibdiskconfig/dump_diskconfig.c
ibdiskconfig/write_lst.c
ibnetutils/ifc_utils.c
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/blending.cpp
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/scanline.cpp
exus/CommandListener.cpp
exus/Controller.cpp
exus/DhcpClient.cpp
exus/NetworkManager.cpp
exus/OpenVpnController.cpp
exus/Property.cpp
exus/PropertyManager.cpp
exus/Supplicant.cpp
exus/SupplicantAssociatingEvent.cpp
exus/SupplicantConnectedEvent.cpp
exus/SupplicantListener.cpp
exus/SupplicantStatus.cpp
exus/TiwlanEventListener.cpp
exus/TiwlanWifiController.cpp
exus/WifiController.cpp
exus/WifiNetwork.cpp
exus/WifiScanner.cpp
exus/WifiStatusPoller.cpp
exus/main.cpp
4f07a1f826ddb3669c8da2b2a92983f01df43d54 05-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

Change-Id: I6c2a1d56dadb7e5c69e478f4d8c7d9f2127db2af
nclude/cutils/log.h
ibcutils/loghack.h
ibcutils/mq.c
ibcutils/properties.c
ibnetutils/ifc_utils.c
ibnetutils/packet.c
ibpixelflinger/scanline.cpp
exus/CommandListener.cpp
exus/Controller.cpp
exus/DhcpClient.cpp
exus/DhcpEvent.cpp
exus/DhcpListener.cpp
exus/DhcpState.cpp
exus/NetworkManager.cpp
exus/Property.cpp
exus/PropertyManager.cpp
exus/ScanResult.cpp
exus/Supplicant.cpp
exus/SupplicantEventFactory.cpp
exus/SupplicantListener.cpp
exus/SupplicantStateChangeEvent.cpp
exus/TiwlanEventListener.cpp
exus/TiwlanWifiController.cpp
exus/WifiController.cpp
exus/WifiNetwork.cpp
exus/WifiScanner.cpp
4163b45949c0382f0370bc2a25fcbb6c07c4c5eb 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)

Change-Id: I929ea38bc6fe6efeefa7870c8e7e4c19cd0029b3
nclude/cutils/log.h
ibcutils/loghack.h
ibcutils/mq.c
ibcutils/qtaguid.c
ibcutils/selector.c
ibcutils/str_parms.c
ibdiskconfig/config_mbr.c
ibdiskconfig/diskconfig.c
ibdiskconfig/diskutils.c
ibdiskconfig/write_lst.c
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/scanline.cpp
ibpixelflinger/trap.cpp
exus/WifiController.cpp
exus/main.cpp
9786ec417ffd59e15b1c659862521e8da21d185d 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

Change-Id: Ia0476219b71ece949595515ee07ea072ed349d73
nclude/cutils/log.h
ibcutils/buffer.c
ibcutils/loghack.h
ibcutils/mq.c
ibcutils/selector.c
ibnetutils/dhcpclient.c
ibnetutils/ifc_utils.c
ibnetutils/packet.c
ibpixelflinger/trap.cpp
ibusbhost/usbhost.c
exus/DhcpClient.cpp
exus/NetworkManager.cpp
exus/PropertyManager.cpp
exus/Supplicant.cpp
exus/SupplicantListener.cpp
exus/SupplicantStatus.cpp
exus/TiwlanEventListener.cpp
exus/TiwlanWifiController.cpp
exus/WifiController.cpp
exus/WifiNetwork.cpp
exus/WifiScanner.cpp
exus/WifiStatusPoller.cpp
66b68757f680ac9262e46f3c7b8cb748c7d99f05 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

Change-Id: Ia9a357dec5ad12eea93fd03401a3b02b38e4e94f
nclude/cutils/log.h
ibcutils/loghack.h
ibcutils/properties.c
ibcutils/qtaguid.c
ibcutils/str_parms.c
ibdiskconfig/diskconfig.c
ibpixelflinger/tinyutils/VectorImpl.cpp
61fbcbe9761bbfdebb0b1f8147faf00cbb1c6e6a 12-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOG() to (IF_)ALOG()

Change-Id: Ifb82ae2c242becaffa3cf19e548b526e6616c2c7
nclude/cutils/log.h
ogwrapper/logwrapper.c
b7b59700cc49991d2442e4c61be4f0e40778e972 17-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
ee508560cc991485c8adf5826e4bf5cf67f183e1 14-Jan-2012 David 'Digit' Turner <digit@google.com> Merge "libcutils: Use proper private header to access C library's <time.h> extension"
7abfff55a3436ea97d15c76719d95ea6721a38c2 14-Jan-2012 Scott Anderson <saa@google.com> Merge "Add md5 command to toolbox." into ics-aah
b8625abd9c1d465944213b9b1028d4415e3c44c7 14-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
7681059436324609c84c0ca2208827e8ba098373 13-Jan-2012 Benoit Goby <benoit@android.com> resolved conflicts for merge of f134ee36 to ics-aah

Change-Id: I9e5a7d9dbbdf6c3959f8c8c905e5dde7bd1f2605
efa5c400e9a1020ced9d03e7d53e09600cff78d8 13-Jan-2012 Benoit Goby <benoit@android.com> am 37a5ecfb: resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp

* commit '37a5ecfb84673673ba19893a7dfdb51d8c6406bd':
HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE
37a5ecfb84673673ba19893a7dfdb51d8c6406bd 13-Jan-2012 Benoit Goby <benoit@android.com> resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp

Change-Id: I7fee3ba108c72450a7f19dee036068cf3783e2fd
f134ee366f4dbea3b508176f8165fe7c54a398c0 13-Jan-2012 Benoit Goby <benoit@android.com> Merge "HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE" into ics-mr1
f124435c4604ad5746135acca5cbc682bedba847 13-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 82dd6af8: am e7b1f132: Merge "rmmod: fix full path syntax"

* commit '82dd6af84676f1ea6f67ce6fbd2c5cea7a8aa601':
rmmod: fix full path syntax
82dd6af84676f1ea6f67ce6fbd2c5cea7a8aa601 13-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am e7b1f132: Merge "rmmod: fix full path syntax"

* commit 'e7b1f132c2a324af89080bc43968b7222b40ddfa':
rmmod: fix full path syntax
a9d6a534ca0d6eef631833ff891e015ad29ee9ce 12-Jan-2012 Scott Anderson <saa@google.com> Add md5 command to toolbox.

This command outputs the MD5 for specified files. The output is
in the same form as the md5sum command on Linux.

Signed-off-by: Scott Anderson <saa@google.com>

(cherry picked from commit d0455c952d61d36e662f4a95d5e03689ecedca8f)

Change-Id: I3be7751b6e301eb2d12844f88f1f5b9ed1225f6b
oolbox/Android.mk
oolbox/md5.c
e7b1f132c2a324af89080bc43968b7222b40ddfa 13-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "rmmod: fix full path syntax"
7913bc05bec230799aa70188b40ec7b231f5400f 13-Jan-2012 David 'Digit' Turner <digit@google.com> libcutils: Use proper private header to access C library's <time.h> extension

The strftime_tz() function is not a standard C library function and should not
appear in <time.h>. Instead, it is being moved to <bionic_time.h>, a private
header only available to platform libraries.

Change-Id: I4dc18939b9380725dfaa20c9e417296363bc52f4
nclude/cutils/tztime.h
ibcutils/Android.mk
7e4c303fe0f490be04400f3f3a08f0c4f5553a96 12-Jan-2012 Scott Anderson <saa@google.com> Fix hd command so it doesn't error out on EOF

hd would error out on files that were not a multiple of its read
buffer size (4096). For example:
Read error on init.rc, offset 17040 len 4096, No such file or directory

The fix is to stop reading on EOF instead of treating it as an
error.

Signed-off-by: Scott Anderson <saa@google.com>

(cherry picked from commit a9fac4155f645b59d92028d56af573999051ab70)

Change-Id: Ib2af725fc39e96c2f81559f61979d451604d4817
oolbox/hd.c
13c5bb504db54d6f01668cc446eb166909ac51d0 12-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
4a404c113e5dc44f89d6e22a281452e8137fa0f9 12-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
a9fac4155f645b59d92028d56af573999051ab70 12-Jan-2012 Scott Anderson <saa@google.com> Fix hd command so it doesn't error out on EOF

hd would error out on files that were not a multiple of its read
buffer size (4096). For example:
Read error on init.rc, offset 17040 len 4096, No such file or directory

The fix is to stop reading on EOF instead of treating it as an
error.

Change-Id: Ie7f4216e08835150f2f5784e77bb9e2190b0def4
Signed-off-by: Scott Anderson <saa@google.com>
oolbox/hd.c
01c76f540054b3f5849da1d557fd2c477b876356 12-Jan-2012 Benoit Goby <benoit@android.com> HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE

Export androidboot.modelno command line parameter as ro.boot.modelno
property, so that we can set the USB iProduct string to the correct
value on Stingray.

Bug: 5853250
Change-Id: Idc413f15dc4d9d02027589d1b11bdf50e0a79ccc
nit/init.c
828bf0cdf4e869fa7bb007331670328c834f8277 12-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_format_t consistently

Change-Id: I7eb489b1c1cbe9bfadd43cd7645da86b90fab652
nclude/system/audio.h
e437f552d2e6a2e6874340754fc59c310d52e91b 12-Jan-2012 Scott Anderson <saa@google.com> Merge "Add md5 command to toolbox."
ec4db51f88401ecf09769511e3c9deb58d721184 01-Sep-2011 Tanguy Pruvot <tanguy.pruvot@gmail.com> rmmod: fix full path syntax

rmmod /system/modules/multitouch.ko
rmmod: delete_module '/multitouch' failed (errno 2)

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
oolbox/rmmod.c
877e39608d8e21279c9b4f70634e5e46a5a4241d 12-Jan-2012 The Android Open Source Project <initial-contribution@android.com> am 863c9311: Reconcile with ics-mr1-release

* commit '863c9311d3f3912f02931265906b08ac780f2a1d':
863c9311d3f3912f02931265906b08ac780f2a1d 12-Jan-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I490a0a05c5e5e7696f8ebd402992047099a4877f
d0455c952d61d36e662f4a95d5e03689ecedca8f 12-Jan-2012 Scott Anderson <saa@google.com> Add md5 command to toolbox.

This command outputs the MD5 for specified files. The output is
in the same form as the md5sum command on Linux.

Change-Id: Ie0e6faf678469ac886bba8b46d98c0e54976a1ed
Signed-off-by: Scott Anderson <saa@google.com>
oolbox/Android.mk
oolbox/md5.c
cffb062cebbc4ae40e5d5467820022f49a534f01 12-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
dae26c6ac44e9c47cc60fcaa3d04c54d68d66760 12-Jan-2012 James Dong <jdong@google.com> am 3e9c9ac5: am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1

* commit '3e9c9ac5ee7a36653b90cb86eb6445496b536c16':
Close a security hole - do not give world readable/writable access to /data/drm
d95c6152197cf3976797267ad40e61b7344933de 12-Jan-2012 James Dong <jdong@google.com> am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1

* commit '032afc1d52289f486538c9ed53f17b9889ea94df':
Close a security hole - do not give world readable/writable access to /data/drm
3e9c9ac5ee7a36653b90cb86eb6445496b536c16 12-Jan-2012 James Dong <jdong@google.com> am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1

* commit '032afc1d52289f486538c9ed53f17b9889ea94df':
Close a security hole - do not give world readable/writable access to /data/drm
032afc1d52289f486538c9ed53f17b9889ea94df 12-Jan-2012 James Dong <jdong@google.com> Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1
a33c6ee92b25f6f89ca2044832344d0a6b2ccd11 11-Jan-2012 Xavier Ducrohet <xav@android.com> am e0b55791: am 07ad9f2a: Add USB Vendor ID for Fujitsu and Lumigon.

* commit 'e0b557915123b7ad022ff5d0a7a3d4dd2ee7c2fe':
Add USB Vendor ID for Fujitsu and Lumigon.
95ec1ca90361c6e3509637565b98ea8c8dca14de 11-Jan-2012 Xavier Ducrohet <xav@android.com> am 07ad9f2a: Add USB Vendor ID for Fujitsu and Lumigon.

* commit '07ad9f2a127b2836c7d45a503a5f3ef7517218f3':
Add USB Vendor ID for Fujitsu and Lumigon.
e0b557915123b7ad022ff5d0a7a3d4dd2ee7c2fe 11-Jan-2012 Xavier Ducrohet <xav@android.com> am 07ad9f2a: Add USB Vendor ID for Fujitsu and Lumigon.

* commit '07ad9f2a127b2836c7d45a503a5f3ef7517218f3':
Add USB Vendor ID for Fujitsu and Lumigon.
07ad9f2a127b2836c7d45a503a5f3ef7517218f3 11-Jan-2012 Xavier Ducrohet <xav@android.com> Add USB Vendor ID for Fujitsu and Lumigon.

Change-Id: Icd013b362366815527834cbf54aa4ecac2b7750d
db/usb_vendors.c
62517fa19b2e23217c7c3d2d58fe5fd69809e80d 11-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
ed8d4a9c5955720a244b8b958faa9e2ff1b15836 11-Jan-2012 Dima Zavin <dima@android.com> am f4d9bc4f: am f90b0e04: rootdir: convert all usages of to

* commit 'f4d9bc4ffec8e878429a1341dfff33bc02a59a0e':
rootdir: convert all usages of $prop to ${prop}
7574a68414ca53277ab2f27dbf393409f4a0dc01 11-Jan-2012 Dima Zavin <dima@android.com> am 37080d00: am 84bf9af7: init: use init\'s property expansion code for setprop/write

* commit '37080d0045009c6161ea0fb52272b6c920fa0da7':
init: use init's property expansion code for setprop/write
1a9878a04955681c691bd3c69eaf8723a1b8181c 11-Jan-2012 Dima Zavin <dima@android.com> am 920d6d8a: am 78a1b1fe: init: delay importing files until after parsing the current file

* commit '920d6d8ab23fc4c8043294f005ecab47b705d7b7':
init: delay importing files until after parsing the current file
b97caf85432ef1b4124ffeb4a8abda44b015f0f7 11-Jan-2012 Dima Zavin <dima@android.com> am 96e9a260: am 5511c84a: init: export all androidboot cmd line values as ro.boot.xx props

* commit '96e9a2602adadf79cf2b319c71562d450fc6c544':
init: export all androidboot cmd line values as ro.boot.xx props
faa19e45fca29dbace01edb31e7184225c63e3ab 11-Jan-2012 Dima Zavin <dima@android.com> am d7abdb21: am 3e7b7739: init: import the hardware specific init file in init.rc

* commit 'd7abdb21b3201de10bde3347e6de443f44f362ca':
init: import the hardware specific init file in init.rc
d81200a86eb72d9a3211ee0667ea5da123c80156 11-Jan-2012 Dima Zavin <dima@android.com> am 079d56d0: (-s ours) am a6235eac: init: allow init file imports to use properties in names

* commit '079d56d0bdcbc04672e83557d06d716eaef44d4f':
init: allow init file imports to use properties in names
f15671c505de47b6bf88b793d2563787a4bb32d3 11-Jan-2012 Dima Zavin <dima@android.com> am 82d5f40d: (-s ours) am d7634c9c: init: initialize property area early at boot

* commit '82d5f40d32d8188ba6963034636a9f2353f12ffa':
init: initialize property area early at boot
f4d9bc4ffec8e878429a1341dfff33bc02a59a0e 11-Jan-2012 Dima Zavin <dima@android.com> am f90b0e04: rootdir: convert all usages of to

* commit 'f90b0e04a61ab3bf5239afb2f7157aabe5fbca8f':
rootdir: convert all usages of $prop to ${prop}
37080d0045009c6161ea0fb52272b6c920fa0da7 11-Jan-2012 Dima Zavin <dima@android.com> am 84bf9af7: init: use init\'s property expansion code for setprop/write

* commit '84bf9af758c84da7d9ff2929bce06bf2b2f239b8':
init: use init's property expansion code for setprop/write
920d6d8ab23fc4c8043294f005ecab47b705d7b7 11-Jan-2012 Dima Zavin <dima@android.com> am 78a1b1fe: init: delay importing files until after parsing the current file

* commit '78a1b1fe1ab76964e35b4a4788238b197bfd613d':
init: delay importing files until after parsing the current file
96e9a2602adadf79cf2b319c71562d450fc6c544 11-Jan-2012 Dima Zavin <dima@android.com> am 5511c84a: init: export all androidboot cmd line values as ro.boot.xx props

* commit '5511c84a50617d1b3c280beb49de38ed1aae21c6':
init: export all androidboot cmd line values as ro.boot.xx props
d7abdb21b3201de10bde3347e6de443f44f362ca 11-Jan-2012 Dima Zavin <dima@android.com> am 3e7b7739: init: import the hardware specific init file in init.rc

* commit '3e7b7739e3d4d7aaaa363645501036dafcc30ed3':
init: import the hardware specific init file in init.rc
079d56d0bdcbc04672e83557d06d716eaef44d4f 11-Jan-2012 Dima Zavin <dima@android.com> am a6235eac: init: allow init file imports to use properties in names

* commit 'a6235eacf4b06b14b19125618d7aca570dbc02b0':
init: allow init file imports to use properties in names
82d5f40d32d8188ba6963034636a9f2353f12ffa 11-Jan-2012 Dima Zavin <dima@android.com> am d7634c9c: init: initialize property area early at boot

* commit 'd7634c9cdad7bec39294a993b0bc898eaf709829':
init: initialize property area early at boot
f90b0e04a61ab3bf5239afb2f7157aabe5fbca8f 10-Jan-2012 Dima Zavin <dima@android.com> rootdir: convert all usages of $prop to ${prop}

Change-Id: Ic2472606e869d23c0f499a192cd7bb21ca3cf5b5
Signed-off-by: Dima Zavin <dima@android.com>
ootdir/init.rc
84bf9af758c84da7d9ff2929bce06bf2b2f239b8 20-Dec-2011 Dima Zavin <dima@android.com> init: use init's property expansion code for setprop/write

Change-Id: I3c284860cc8d5106ac2b086e62baeb6263873935
Signed-off-by: Dima Zavin <dima@android.com>
nit/builtins.c
nit/init_parser.c
nit/init_parser.h
78a1b1fe1ab76964e35b4a4788238b197bfd613d 20-Dec-2011 Dima Zavin <dima@android.com> init: delay importing files until after parsing the current file

If we process the import directive inline, then the ordering of the
commands for the "on xxx" sections would be a little unexpected. The
init.rc files do not really have an implied order as to which section
appears and gets processed first. The init code itself provides that
ordering explicitly. For the user, the expectation is that if both the
current file and the imported file define a section (e.g. "on init"),
then the commands in the current file will be executed first, and then
the ones from the imported file(s).

The current implementation did not do that. It processed the import
directive inline, and thus the imported (i.e. dependent) files would
appear first in the command lists for the sections. This created
unintended side effects and the solution would have been to try and
put the import lines somewhere in the middle of the init file. This
would be difficult to notice and hard to extract the dependencies.

To solve this, we add the imports to a list for each file being parsed
and process the list after finishing parsing the file. This provides
predictable order for imports and provides a logical flow from the
user perspective: the currently parsed file gets to run its commands
before the files being imported.

Change-Id: I06dc35ff286314060e16b18923683cd2787269de
Signed-off-by: Dima Zavin <dima@android.com>
nit/init_parser.c
nit/parser.h
5511c84a50617d1b3c280beb49de38ed1aae21c6 19-Dec-2011 Dima Zavin <dima@android.com> init: export all androidboot cmd line values as ro.boot.xx props

Also, clean up how we initialize the ro.xx properties and process
the kernel command line.

Change-Id: Iedda6c90e31340a189171a44b2767480403354f7
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
nit/property_service.c
nit/property_service.h
3e7b7739e3d4d7aaaa363645501036dafcc30ed3 16-Dec-2011 Dima Zavin <dima@android.com> init: import the hardware specific init file in init.rc

This removes the hardcoding of the file import in init and instead
allows the init.rc file to fully control what is loaded.

Change-Id: I933e5bbab57f1e8705a370d660f92c6508da94d2
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
ootdir/init.rc
a6235eacf4b06b14b19125618d7aca570dbc02b0 16-Dec-2011 Dima Zavin <dima@android.com> init: allow init file imports to use properties in names

Adds new property syntax in init files during init file filename
expansion during the import command:
${prop.name}

So, one can do: import /init.${ro.hardware}.usb.rc

Should convert other usages of property names to use the new function.

Change-Id: I9205d7d7a2da620bc8e6b89ac0eb554fad53ded3
Signed-off-by: Dima Zavin <dima@android.com>
nit/init_parser.c
d7634c9cdad7bec39294a993b0bc898eaf709829 16-Dec-2011 Dima Zavin <dima@android.com> init: initialize property area early at boot

The property service is still started later, but the property area
and the initial boot properties are initialized before the init.rc
file is processed. This allows init.rc files to have access to boot
properties during parsing.

Change-Id: Iae9ed1093c821831a864b39ae6bc697e62b94757
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
729eb83d68268c391e3b1c9e2257bde3c98820e3 11-Jan-2012 Vladimir Chtchetkine <vchtchetkine@google.com> am 88ffed14: (-s ours) am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.

* commit '88ffed14ce314a8e1feb17b701dce8074516f92c':
Cherry-picked from c4f37eed7 in master. Do not merge.
b125671921df885515c87de18aa9fe022bc7d094 11-Jan-2012 Vladimir Chtchetkine <vchtchetkine@google.com> am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.

* commit 'ae4298286896cbef22b2af285a3f651e8f498185':
Cherry-picked from c4f37eed7 in master. Do not merge.
88ffed14ce314a8e1feb17b701dce8074516f92c 11-Jan-2012 Vladimir Chtchetkine <vchtchetkine@google.com> am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.

* commit 'ae4298286896cbef22b2af285a3f651e8f498185':
Cherry-picked from c4f37eed7 in master. Do not merge.
1feff62f3660396442b88bb23865d2f37e50d8ab 11-Jan-2012 Vladimir Chtchetkine <vchtchetkine@google.com> am 8642b9b0: (-s ours) am 74159657: Cherry-picked from c13daef7b on master. Do not merge.

* commit '8642b9b0c757f9e1fcd091aad6ce1b97e16724e2':
Cherry-picked from c13daef7b on master. Do not merge.
8642b9b0c757f9e1fcd091aad6ce1b97e16724e2 11-Jan-2012 Vladimir Chtchetkine <vchtchetkine@google.com> am 74159657: Cherry-picked from c13daef7b on master. Do not merge.

* commit '74159657687aadab4c82e4fd7e7a54d16c045d95':
Cherry-picked from c13daef7b on master. Do not merge.
9f5598834309c61dc7cc8fa964c7e1cc33049929 11-Jan-2012 Vladimir Chtchetkine <vchtchetkine@google.com> am 74159657: Cherry-picked from c13daef7b on master. Do not merge.

* commit '74159657687aadab4c82e4fd7e7a54d16c045d95':
Cherry-picked from c13daef7b on master. Do not merge.
ae4298286896cbef22b2af285a3f651e8f498185 13-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Cherry-picked from c4f37eed7 in master. Do not merge.

Fix the build.

Conditionally compile code that is intended to run inside the emulator only.

Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55
db/transport_local.c
74159657687aadab4c82e4fd7e7a54d16c045d95 10-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Cherry-picked from c13daef7b on master. Do not merge.

Use QEMU pipe for ADB communication when running in emulator.

Change-Id: I7934b6272c2a9825d244ce76ff65dbce6e54ebff
db/transport_local.c
ceabb17306f4de9850516dae96bb0d2d5853f028 09-Jan-2012 Steve Block <steveblock@google.com> Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE

Bug: 5449033
Change-Id: I991dc84c366d8f33e5439894c23df561bbc50b83
nclude/cutils/log.h
ibpixelflinger/tinyutils/VectorImpl.cpp
8f2e8b0a45fca6db949a631e508ec279dbe34047 10-Jan-2012 Steve Block <steveblock@google.com> am a9b84a7e: Add ALOG version of LOG_ASSERT

* commit 'a9b84a7e0b3ecb389a62bc6abb8c2fea3a4a30a6':
Add ALOG version of LOG_ASSERT
9c568c74ae307c4f1a1edf082001f321384e102d 10-Jan-2012 Doug Zongker <dougz@android.com> Merge "add "adb sideload" and sideload connection state"
447f061da19fe46bae35f1cdd93eeb16bc225463 09-Jan-2012 Doug Zongker <dougz@android.com> add "adb sideload" and sideload connection state

Recovery will soon support a minimal implementation of adbd which will
do nothing but accept downloads from the "adb sideload" command and
install them. This is the client side command (mostly resurrected out
of the old circa-2007 "adb recover" command) and the new connection
state.

Change-Id: I4f67b63f1b3b38d28c285d1278d46782679762a2
db/adb.c
db/adb.h
db/commandline.c
db/transport.c
683a09352a0adf8924d67c9aa80bce244592aa25 10-Jan-2012 Dima Zavin <dima@android.com> rootdir: convert all usages of $prop to ${prop}

Change-Id: Ic2472606e869d23c0f499a192cd7bb21ca3cf5b5
Signed-off-by: Dima Zavin <dima@android.com>
ootdir/init.rc
a63c3f6735fd22237291d07b4d4d38aa1a55eae6 10-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
a9b84a7e0b3ecb389a62bc6abb8c2fea3a4a30a6 09-Jan-2012 Steve Block <steveblock@google.com> Add ALOG version of LOG_ASSERT

This is now required by some projects.

Change-Id: If4015c6a9f2391b205d2886bcf7f6e51f371ce08
nclude/cutils/log.h
f5fc75bb3cd3fbcdf3da0620139ba11208094a37 09-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
01dda204cd28fe181691b4a44a51be7e5666d0c8 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

Bug: 5449033
Change-Id: Ibcffdcf620ebae1c389446ce8e9d908f11ac039c
nclude/cutils/log.h
ibcutils/loghack.h
ibcutils/properties.c
ibcutils/record_stream.c
ibcutils/sockets.c
ibcutils/zygote.c
ibdiskconfig/config_mbr.c
ibdiskconfig/diskconfig.c
ibdiskconfig/diskutils.c
ibdiskconfig/dump_diskconfig.c
ibdiskconfig/write_lst.c
ibnetutils/ifc_utils.c
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/blending.cpp
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/scanline.cpp
exus/CommandListener.cpp
exus/Controller.cpp
exus/DhcpClient.cpp
exus/NetworkManager.cpp
exus/OpenVpnController.cpp
exus/Property.cpp
exus/PropertyManager.cpp
exus/Supplicant.cpp
exus/SupplicantAssociatingEvent.cpp
exus/SupplicantConnectedEvent.cpp
exus/SupplicantListener.cpp
exus/SupplicantStatus.cpp
exus/TiwlanEventListener.cpp
exus/TiwlanWifiController.cpp
exus/WifiController.cpp
exus/WifiNetwork.cpp
exus/WifiScanner.cpp
exus/WifiStatusPoller.cpp
exus/main.cpp
36afde3387fff9eac0e6d54854b8d43fe1ebb0cc 07-Jan-2012 Christopher Tate <ctate@google.com> Merge "Tell the user to unlock/confirm backup & restore operations"
bffa4ca9ad2702d51f5b391b7a05be0c7c691e4e 07-Jan-2012 Christopher Tate <ctate@google.com> Tell the user to unlock/confirm backup & restore operations

People are being confused about the silent failure of backup/restore
when they didn't know they had to unlock the device & confirm the
backup/restore operation, so now adb prints a brief reminder.

Change-Id: I1b32913f0ad0cf6e30bf235dc975b9e983b533fd
db/commandline.c
829c0b8d9e7ac32141349117ba4364a2f63b22d8 07-Jan-2012 Dima Zavin <dima@android.com> Merge changes I3c284860,I06dc35ff,Iedda6c90,I933e5bba,I9205d7d7,Iae9ed109

* changes:
init: use init's property expansion code for setprop/write
init: delay importing files until after parsing the current file
init: export all androidboot cmd line values as ro.boot.xx props
init: import the hardware specific init file in init.rc
init: allow init file imports to use properties in names
init: initialize property area early at boot
09cdc0ea12598651d1c074974c9b593fd1c0e4ba 07-Jan-2012 James Dong <jdong@google.com> Close a security hole - do not give world readable/writable access to /data/drm

o related-to-bug: 5834297

Change-Id: I8e459610b4f69999be37364c2359b2bac82d4a2a
ootdir/init.rc
ebe2cb312d36788fa9956ef6829c6aada495606f 20-Dec-2011 Dima Zavin <dima@android.com> init: use init's property expansion code for setprop/write

Change-Id: I3c284860cc8d5106ac2b086e62baeb6263873935
Signed-off-by: Dima Zavin <dima@android.com>
nit/builtins.c
nit/init_parser.c
nit/init_parser.h
304f12270dc0be564eb1b64624770aa72f25e59e 20-Dec-2011 Dima Zavin <dima@android.com> init: delay importing files until after parsing the current file

If we process the import directive inline, then the ordering of the
commands for the "on xxx" sections would be a little unexpected. The
init.rc files do not really have an implied order as to which section
appears and gets processed first. The init code itself provides that
ordering explicitly. For the user, the expectation is that if both the
current file and the imported file define a section (e.g. "on init"),
then the commands in the current file will be executed first, and then
the ones from the imported file(s).

The current implementation did not do that. It processed the import
directive inline, and thus the imported (i.e. dependent) files would
appear first in the command lists for the sections. This created
unintended side effects and the solution would have been to try and
put the import lines somewhere in the middle of the init file. This
would be difficult to notice and hard to extract the dependencies.

To solve this, we add the imports to a list for each file being parsed
and process the list after finishing parsing the file. This provides
predictable order for imports and provides a logical flow from the
user perspective: the currently parsed file gets to run its commands
before the files being imported.

Change-Id: I06dc35ff286314060e16b18923683cd2787269de
Signed-off-by: Dima Zavin <dima@android.com>
nit/init_parser.c
nit/parser.h
8886112d87bcc501e89e4763656a3ebfeb58edf2 19-Dec-2011 Dima Zavin <dima@android.com> init: export all androidboot cmd line values as ro.boot.xx props

Also, clean up how we initialize the ro.xx properties and process
the kernel command line.

Change-Id: Iedda6c90e31340a189171a44b2767480403354f7
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
nit/property_service.c
nit/property_service.h
7634bf87cf6490e5544f040fb403eb164cf0ee5f 16-Dec-2011 Dima Zavin <dima@android.com> init: import the hardware specific init file in init.rc

This removes the hardcoding of the file import in init and instead
allows the init.rc file to fully control what is loaded.

Change-Id: I933e5bbab57f1e8705a370d660f92c6508da94d2
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
ootdir/init.rc
976b878a0a257676cde09556d3e08375b8d2f81a 16-Dec-2011 Dima Zavin <dima@android.com> init: allow init file imports to use properties in names

Adds new property syntax in init files during init file filename
expansion during the import command:
${prop.name}

So, one can do: import /init.${ro.hardware}.usb.rc

Should convert other usages of property names to use the new function.

Change-Id: I9205d7d7a2da620bc8e6b89ac0eb554fad53ded3
Signed-off-by: Dima Zavin <dima@android.com>
nit/init_parser.c
ae8b56c0d17a97aff0b98e6405c7cc9811bbbc3d 05-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

Bug: 5449033
Change-Id: I1e070511b6a538e9f1c94657356437a457d58882
nclude/cutils/log.h
ibcutils/loghack.h
ibcutils/mq.c
ibcutils/properties.c
ibnetutils/ifc_utils.c
ibnetutils/packet.c
ibpixelflinger/scanline.cpp
exus/CommandListener.cpp
exus/Controller.cpp
exus/DhcpClient.cpp
exus/DhcpEvent.cpp
exus/DhcpListener.cpp
exus/DhcpState.cpp
exus/NetworkManager.cpp
exus/Property.cpp
exus/PropertyManager.cpp
exus/ScanResult.cpp
exus/Supplicant.cpp
exus/SupplicantEventFactory.cpp
exus/SupplicantListener.cpp
exus/SupplicantStateChangeEvent.cpp
exus/TiwlanEventListener.cpp
exus/TiwlanWifiController.cpp
exus/WifiController.cpp
exus/WifiNetwork.cpp
exus/WifiScanner.cpp
29b4fecc26d7a7eb79fe72d48056394974cd9c98 05-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
fe71a61e5b0cb666675900d206251a7c18ed944b 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE

Bug: 5449033
Change-Id: I4951baa981f09a84ce483e3d1bd0f9ebe009035f
nclude/cutils/log.h
ibcutils/loghack.h
ibcutils/mq.c
ibcutils/qtaguid.c
ibcutils/selector.c
ibcutils/str_parms.c
ibdiskconfig/config_mbr.c
ibdiskconfig/diskconfig.c
ibdiskconfig/diskutils.c
ibdiskconfig/write_lst.c
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/scanline.cpp
ibpixelflinger/trap.cpp
exus/WifiController.cpp
exus/main.cpp
8d66c49258ac4f59bd67c23c9c914cca81f85b01 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

Bug: 5449033
Change-Id: I9244d927f14c750cd359ebffb1fc1c355a755d5a
nclude/cutils/log.h
ibcutils/buffer.c
ibcutils/loghack.h
ibcutils/mq.c
ibcutils/selector.c
ibnetutils/dhcpclient.c
ibnetutils/ifc_utils.c
ibnetutils/packet.c
ibpixelflinger/trap.cpp
ibusbhost/usbhost.c
exus/DhcpClient.cpp
exus/NetworkManager.cpp
exus/PropertyManager.cpp
exus/Supplicant.cpp
exus/SupplicantListener.cpp
exus/SupplicantStatus.cpp
exus/TiwlanEventListener.cpp
exus/TiwlanWifiController.cpp
exus/WifiController.cpp
exus/WifiNetwork.cpp
exus/WifiScanner.cpp
exus/WifiStatusPoller.cpp
0fdccb561d37022d4ccc82982de81c2b32617803 30-Dec-2011 Steve Block <steveblock@google.com> am e7e7fac9: (-s ours) Add ALOG versions of LOGD, LOGI, LOGW and LOGE

* commit 'e7e7fac974617a5376f05d7a638d2a53094d3ac5':
Add ALOG versions of LOGD, LOGI, LOGW and LOGE
9dd2eef07bbee6ff5b1d1a9ccda6e3499391ecb6 12-Dec-2011 Mike Lockwood <lockwood@google.com> add sshd to init.rc

Change-Id: Ide6e8cca58f090e84d85d0298058c523863d1c43
Signed-off-by: Mike Lockwood <lockwood@google.com>
ootdir/init.rc
e7e7fac974617a5376f05d7a638d2a53094d3ac5 22-Dec-2011 Steve Block <steveblock@google.com> Add ALOG versions of LOGD, LOGI, LOGW and LOGE

These are now required by some projects.

Change-Id: I0d51c950178504474d803620a6cd1c9f084804b5
nclude/cutils/log.h
65a8360795ef9dcdd9a3e6fdacf5a16eacf6f4e1 16-Dec-2011 Dima Zavin <dima@android.com> init: initialize property area early at boot

The property service is still started later, but the property area
and the initial boot properties are initialized before the init.rc
file is processed. This allows init.rc files to have access to boot
properties during parsing.

Change-Id: Iae9ed1093c821831a864b39ae6bc697e62b94757
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
ca2c7b58ea0c7b07345bcf510f482cc698cbb374 14-Dec-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
9f39cde52784e0dd6438b51c9117fe533d464f9b 14-Dec-2011 The Android Open Source Project <initial-contribution@android.com> am 1b251bde: Reconcile with ics-mr1-release

* commit '1b251bde764bcf3b689ee1942e005a821bd06d17':
1b251bde764bcf3b689ee1942e005a821bd06d17 14-Dec-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Iaea0ecf6fc4429640a1d8811ec2034ea0f9eb48e
31b2f4414b291d87adddf13ad62d317d3ba382fa 14-Dec-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
d7f2dfdfeaad42f708d87d96e387ead492d0941d 13-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Merge "Fix the build."
e565492c6c2807f5952bc51a309e98b204350616 13-Dec-2011 Jesse Hall <jessehall@google.com> am 3bc5e452: am 7cd3e0a3: Document ANativeWindow\'s buffer refcounting

* commit '3bc5e452808514c48cdb5d2c3ca14c022aeecf6f':
Document ANativeWindow's buffer refcounting
3bc5e452808514c48cdb5d2c3ca14c022aeecf6f 13-Dec-2011 Jesse Hall <jessehall@google.com> am 7cd3e0a3: Document ANativeWindow\'s buffer refcounting

* commit '7cd3e0a3a2f9b104cd6c04f699ae62c4577787e2':
Document ANativeWindow's buffer refcounting
c4fd60b512952f4d872352fda43b0877488d279c 13-Dec-2011 Jesse Hall <jessehall@google.com> am 7cd3e0a3: Document ANativeWindow\'s buffer refcounting

* commit '7cd3e0a3a2f9b104cd6c04f699ae62c4577787e2':
Document ANativeWindow's buffer refcounting
c4f37eed734ecd3310bbe241df1b940329e91d74 13-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Fix the build.

Conditionally compile code that is intended to run inside the emulator only.

Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55
db/transport_local.c
ea36579f77c2ae3553e6208cc49758c180c7e98b 13-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Merge "Use QEMU pipe for ADB communication when running in emulator."
c13daef7bdc09886ffbd573d7836a66b01c02084 10-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Use QEMU pipe for ADB communication when running in emulator.

Change-Id: I7934b6272c2a9825d244ce76ff65dbce6e54ebff
db/transport_local.c
01fc7b248553eea6dfee8c56819c4855a69504c1 13-Dec-2011 Jean-Baptiste Queru <jbq@google.com> Merge "run-as: use mmap to read package list file"
fc94369b24e3f2d462c1152f964ae74285f9d92d 13-Dec-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
7330ec21c1ce30fb67681236e8cd1a84f00ca0b7 13-Dec-2011 The Android Open Source Project <initial-contribution@android.com> am 00eac093: Reconcile with ics-mr1-release

* commit '00eac09334b10af78e6b9ef9390f492cc74ad5e3':
00eac09334b10af78e6b9ef9390f492cc74ad5e3 13-Dec-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I3f3a977f341cca1f9e0b4a0567fe5fb9f6dd7e0d
fb71a12ec76542917991fee866981364c34ed307 13-Dec-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
7cd3e0a3a2f9b104cd6c04f699ae62c4577787e2 12-Dec-2011 Jesse Hall <jessehall@google.com> Document ANativeWindow's buffer refcounting

Change-Id: I5454e90afd1a1b7d4a75c503f8dca712dba33790
nclude/system/window.h
1f4bada6674e052eb44e174c6abbb0a9948f498a 13-Dec-2011 Christopher Tate <ctate@google.com> am 650307df: am b1dfffe6: Fix \'adb backup\' on Windows

* commit '650307df33fc834c251df71c78b00cc0ae6529b7':
Fix 'adb backup' on Windows
62f75674ad80dd2ec1d6d8f2b87a16dc3fbf5949 12-Dec-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
650307df33fc834c251df71c78b00cc0ae6529b7 10-Dec-2011 Christopher Tate <ctate@google.com> am b1dfffe6: Fix \'adb backup\' on Windows

* commit 'b1dfffe6bb506313a3bc9146d2f6f8c533213193':
Fix 'adb backup' on Windows
1131c1644fe170bc1e1c614ed7cc19c10974b4d2 10-Dec-2011 Christopher Tate <ctate@google.com> am b1dfffe6: Fix \'adb backup\' on Windows

* commit 'b1dfffe6bb506313a3bc9146d2f6f8c533213193':
Fix 'adb backup' on Windows
b1dfffe6bb506313a3bc9146d2f6f8c533213193 09-Dec-2011 Christopher Tate <ctate@google.com> Fix 'adb backup' on Windows

Use the same call sequence that 'adb pull' uses for creating the
output file. adb_open_mode() apparently does not work on Windows
hosts.

Bug 5733007

Change-Id: I48d719c4657c93e19f6790cf1c6da610d49f5806
db/commandline.c
13805ae9595e0e85a98632439abfaf2893630338 09-Dec-2011 The Android Open Source Project <initial-contribution@android.com> am 336658c3: Reconcile with ics-mr1-release

* commit '336658c321a6f15f121514342b0a508d84b4b415':
4367b4ad61be4c20174678a7ed481e480142710b 08-Dec-2011 Nick Kralevich <nnk@google.com> Merge "set mmap_min_addr to 32768"
336658c321a6f15f121514342b0a508d84b4b415 08-Dec-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I90f80bed70319b9973996b74f78b421b87eef8e7
3cf31804b44ed26bd2457836a0a3f8bf3c218f21 08-Dec-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
ae868a40459a6bcb89d8a4426503fea0c8002b25 08-Dec-2011 Joe Onorato <joeo@google.com> Allow adb to listen both on usb and tcp.

Change-Id: I98db594241631fa17e39686727392afc8b3124bc
db/adb.c
c6b07d94fa062886e0908540f3ce760256b37065 08-Dec-2011 Christopher Tate <ctate@google.com> Merge "Tweak logcat parameters"
db0a880c4682a90ddf078f03a0e709ddda07a2fd 30-Nov-2011 Christopher Tate <ctate@google.com> Tweak logcat parameters

Change-Id: If97ee1eb682d95fa05b5e2003a204a628bd6ae4d
db/commandline.c
5792ce79cc79cd0eef9fadd6351521b128b4e85c 27-Aug-2011 David 'Digit' Turner <digit@android.com> run-as: use mmap to read package list file

This patch uses mmap() to read /data/system/packages.list

This avoids depending on the size of a fixed static buffer
which may happen to be too short for systems with a lot of
packages installed.

Also avoids calling malloc() which we don't want to trust here
since run-as is a setuid program.

Change-Id: I1d640a08b5d73af2fc80546b01c8d970c7f6b514
un-as/package.c
de90da4d8ac11c6794d0a7751633224c3ec11d90 06-Dec-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I47a9f56fb1e66b1a488e8510aca941ffd26e2ebe
27cca21a5d0a6beff31d2f9ff1441afc1271a346 05-Dec-2011 Nick Kralevich <nnk@google.com> set mmap_min_addr to 32768

Bug: 5712789
Change-Id: I586a99cd63d8fba06bc2562b1cfce531ee4f554c
ootdir/init.rc
0d0c0ce6ba9e9288c64bdd5c3054662a05b24e90 06-Dec-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
15ec947b659742e681035376fe2f6407d8306193 06-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> am e64ad60a: (-s ours) am ce48083f: Fixes ADB crash on Windows due to large number of connections. do not merge.

* commit 'e64ad60aaf66dd8bce6c6413decfc308bc7c0151':
Fixes ADB crash on Windows due to large number of connections. do not merge.
e64ad60aaf66dd8bce6c6413decfc308bc7c0151 05-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> am ce48083f: Fixes ADB crash on Windows due to large number of connections. do not merge.

* commit 'ce48083fc90cee807dd66608e2c3e496145af9ff':
Fixes ADB crash on Windows due to large number of connections. do not merge.
7ca9e279ca67f1054310787dfc912339ef3eb284 05-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> am ce48083f: Fixes ADB crash on Windows due to large number of connections. do not merge.

* commit 'ce48083fc90cee807dd66608e2c3e496145af9ff':
Fixes ADB crash on Windows due to large number of connections. do not merge.
ce48083fc90cee807dd66608e2c3e496145af9ff 30-Nov-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Fixes ADB crash on Windows due to large number of connections. do not merge.

The reason for the crash is that ADB on Windows uses WaitForMultipleObjects to
wait on connection events. When number of connections exceeds 64, ADB crashes,
because WaitForMultipleObjects API doesn't support more than 64 handles. This
CL contains a fixer routine that allows waiting on an arbitrary number of
handles.

(cherry picked from commit ac52833e48f46dfd9f7c8f86236ee8b437850c0a)

Change-Id: I8ad264765e5b38d01a31e42b445f97ea86e49948
db/sysdeps_win32.c
71b9f3c8280d28d311197d0c7672629ea4aa44e8 05-Dec-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
de0b321880a95c6be7909ac0f698894294a35788 03-Dec-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Merge "Fixes ADB crash on Windows due to large number of connections."
a1d3ef0b251b4b3436c70f22656676b4cf78e6a5 01-Dec-2011 Kenny Root <kroot@google.com> Merge "Use strlcpy instead of strncpy"
b953fc284983ac8eac9174bcfffedd18cb48ac7e 01-Dec-2011 Kenny Root <kroot@google.com> Use strlcpy instead of strncpy

Also make sure the read cmdline is terminated with a null byte.

Change-Id: I6b4aa197ce9bc072a912b7163e8616a03b39c3fe
oolbox/lsof.c
b539f0acabe7a314afe3d704c7574030246f3674 01-Dec-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Flash cache partition with cache.img by default."
ac52833e48f46dfd9f7c8f86236ee8b437850c0a 30-Nov-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Fixes ADB crash on Windows due to large number of connections.

The reason for the crash is that ADB on Windows uses WaitForMultipleObjects to
wait on connection events. When number of connections exceeds 64, ADB crashes,
because WaitForMultipleObjects API doesn't support more than 64 handles. This
CL contains a fixer routine that allows waiting on an arbitrary number of
handles.

Change-Id: I83f712e552018df308318154c27df184015a16ee
db/sysdeps_win32.c
6940ec41d1ed10157b61ba4967b1ab2e79fcb808 30-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I3451784a6887c3d4f82e6c124d28232b3b688d38
b6ea6b469aec2750b23d32fc4725cfaeebde46d0 30-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
601b5f416e8932509fe4524c42273a6472b1d289 30-Nov-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add camera focus move message."
3dc54060c139f5ebbcf3494b346785ea85d4afa8 14-Nov-2011 Wu-cheng Li <wuchengli@google.com> Add camera focus move message.

bug:5534973
Change-Id: I45213b1a4db3dbcfc0ab124689f27a88335fb26b
nclude/system/camera.h
151cd8a0440869c8c272483f922c42701da6610a 28-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
999a1931816495863c5749805e98fd15925c605a 28-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
e4e21796f72e09d4fab153992b31cb1c6f65d0b0 24-Nov-2011 Jeff Brown <jeffbrown@google.com> Make timestamps friendlier.

Change-Id: I378c3028630a7f805c3f730da02bbbfe07ec3654
oolbox/getevent.c
5c9263d819171a2080f175e3582e1e6041130722 22-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I218c334a9e76e161bda994ced6b5ba41f0c79ddd
b75a9a833bca5aea836a021b3db4d70ef5d475d9 22-Nov-2011 Jeff Brown <jeffbrown@google.com> Merge "Improve backtrace formatting."
19b39f371be5250e7b9e88016be1e5e665367b3f 22-Nov-2011 Jeff Brown <jeffbrown@google.com> Improve backtrace formatting.

Show the symbol offset, when available.

Centralized formatting of native stack traces in libcorkscrew.
It's handy for automated tools if all stacks look the same.
Since we already made them all look them same, we might as well
do the formatting in just one place.

Do not strip the Thumb bit on ARM. This fixes an off-by-one
issue that could happen when resolving a PC that was at the
very beginning of a Thumb function, since the symbol table would
have the Thumb bit set but since we stripped the bit from our
PC, we would be looking for an address one byte before the
one listed in the symbol table. It's also quite useful to see
whether a given function is executing in Thumb mode just by glancing
at the PC.

Change-Id: Icaa29add85ce0bcafe24d5ce2098e138d809e2ab
ebuggerd/utility.c
nclude/corkscrew/backtrace.h
ibcorkscrew/arch-arm/backtrace-arm.c
ibcorkscrew/backtrace.c
ibcorkscrew/symbol_table.c
a9856519679790acd7b4ae9aac57a01e07c77bac 22-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
3544e33247fb66de561f8007f553f99c6e087f54 22-Nov-2011 Nick Pelly <npelly@google.com> am 3d547e0d: am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1

* commit '3d547e0dda7ad58108a219c7ef20bab426d5ea38':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
54652f0bfb1861c65fec7d73cc68d6c84216333a 22-Nov-2011 Nick Pelly <npelly@google.com> am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1

* commit 'f9c1fcc505d59fd87392e6af7341b1737f186081':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
3d547e0dda7ad58108a219c7ef20bab426d5ea38 22-Nov-2011 Nick Pelly <npelly@google.com> am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1

* commit 'f9c1fcc505d59fd87392e6af7341b1737f186081':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
f9c1fcc505d59fd87392e6af7341b1737f186081 22-Nov-2011 Nick Pelly <npelly@google.com> Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
097b4ed4100369862793cf4f0fbbb969b50c154e 21-Nov-2011 Nick Pelly <npelly@google.com> Replace vendor specific NfcGoogle.apk with generic Nfc.apk

The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I5e178b469e5210cd231ba5f4ea57aa666b3d8893
nclude/private/android_filesystem_config.h
de8b136d5a1bcb5decf0dd00edcd6c9e70b4f882 21-Nov-2011 Jeff Brown <jeffbrown@google.com> Merge "Minor robustness tweaks."
585d578a21ecf4dc7a4b4cf7c00b1f93641adbaf 21-Nov-2011 Jeff Brown <jeffbrown@google.com> Merge "Delete dead code."
677545639cbc3d3018146534f27c8f5bdcd1bb46 19-Nov-2011 Jeff Brown <jeffbrown@google.com> Minor robustness tweaks.

Use the alternate stack specified by sigaltstack (if there is one).

Use tgkill instead of kill to ensure that we send the signal to
precisely the right thread.

Added timeout logic.

Change-Id: I72922137d1bc0c8becff98244926bde09fe3990e
ibcorkscrew/backtrace.c
33901e602484d0b5f6a07746e4660ec3e9ac62f7 19-Nov-2011 Jeff Brown <jeffbrown@google.com> Delete dead code.

Change-Id: Icfb9bcee2c524026ecbeb7e30e943d8ca299a33a
nit/property_service.c
6bbaaa630195a1bcfa90c168a354f76b90125ed6 18-Nov-2011 Nick Kralevich <nnk@google.com> libsysutils: log dispatchCommand overflow.

Change-Id: Iefd3f7cc170c1fe65209c6ffe10debc21aed0c7f
ibsysutils/Android.mk
ibsysutils/EventLogTags.logtags
ibsysutils/src/FrameworkListener.cpp
90284b1299a9cdf4411429fa7926de7ba59b245c 17-Nov-2011 Andy McFadden <fadden@android.com> am c96d2aee: (-s ours) am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1

* commit 'c96d2aeed70f930d26236a20f6d32f0a24d83bd8':
DO NOT MERGE - disable memory dumps
c96d2aeed70f930d26236a20f6d32f0a24d83bd8 17-Nov-2011 Andy McFadden <fadden@android.com> am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1

* commit '2a38657dfcb5655e3e900a3d25695864f3d023a3':
DO NOT MERGE - disable memory dumps
35a9270a5ed1d70ece5f8ef17b618cc18590869f 17-Nov-2011 Andy McFadden <fadden@android.com> am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1

* commit '2a38657dfcb5655e3e900a3d25695864f3d023a3':
DO NOT MERGE - disable memory dumps
2a38657dfcb5655e3e900a3d25695864f3d023a3 17-Nov-2011 Andy McFadden <fadden@android.com> Merge "DO NOT MERGE - disable memory dumps" into ics-mr1
cf4d03590ac1d105c37655f0f2fc890b78dab587 17-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am e363d387: am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release

* commit 'e363d387a401ccd3a0635b449f3aa966a65607de':
ecf0e9e53abd02cfb4dc56c409ff5a49516c775c 17-Nov-2011 Andy McFadden <fadden@android.com> DO NOT MERGE - disable memory dumps

This disables the hex dumps of memory for registers other than PC
and LR.

Bug 5484924

Change-Id: I26cff857e5d01ed30548ca3e55bdddd63b592c0c
ebuggerd/arm/machine.c
e363d387a401ccd3a0635b449f3aa966a65607de 16-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release

* commit 'b90cb1d20c7d5701e073bf5293a64bfa57861782':
20ba9dd8f15ef09224072b49beb493ccc7681fd7 16-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release

* commit 'b90cb1d20c7d5701e073bf5293a64bfa57861782':
b90cb1d20c7d5701e073bf5293a64bfa57861782 16-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am c6023243: Reconcile with ics-factoryrom-2-release

* commit 'c60232434c941b5175a9ebb542b1c872866d3409':
c60232434c941b5175a9ebb542b1c872866d3409 16-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-factoryrom-2-release

Change-Id: I9671d18aeee882196d56644533c962942c4fbb70
17aad1469ade27a5b728632197c8b6f22af737e2 15-Nov-2011 Jean-Baptiste Queru <jbq@google.com> Revert "Fix build"

This reverts commit 25a89e771aae292193244852166564e83e36232b.
nclude/cutils/log.h
98520ab9a656e44df364bf5eec60518e6cee54f9 15-Nov-2011 Steve Block <steveblock@google.com> am 67b11cba: am 25a89e77: Fix build

* commit '67b11cba5bccd0cdc3ce6117a19c5f036f95d35f':
Fix build
67b11cba5bccd0cdc3ce6117a19c5f036f95d35f 15-Nov-2011 Steve Block <steveblock@google.com> am 25a89e77: Fix build

* commit '25a89e771aae292193244852166564e83e36232b':
Fix build
25a89e771aae292193244852166564e83e36232b 28-Oct-2011 Steve Block <steveblock@google.com> Fix build

Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
nclude/cutils/log.h
c06301db1dbd8e0e7806134a894f01c0fb9fb570 13-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
2992f1813a13bdcfa89c2de68887aefc66496942 10-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Iefafbf68db366745b51f0d62473baa62e84c01ce
600984238961a258ada835b1a2118d2400599c9b 10-Nov-2011 Jing Yu <jingyu@google.com> Merge "Link with libgccdemangle.so for name demangling."
07db70030541c7953a3b3b6340992f1dda2936c7 10-Nov-2011 JP Abgrall <jpa@google.com> am 1351edeb: am 61b90bd2: adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats

* commit '1351edeb56095fb49ceacd927a15b450d8e8dd62':
adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
c6c3d29c47d0d728e1e49437a216a43bb8d4e274 10-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
0026371fcf7eed053e34a489b5a310fa74cfa798 10-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
1a5a497795d3d9a3d9278ca9c23668ab9dc11587 09-Nov-2011 Jing Yu <jingyu@google.com> Link with libgccdemangle.so for name demangling.

1. X86 target will also have name demangling feature.
2. Remove dependency on libiberty.so, since it will not come
with prebuilt toolchain in gcc-4.6 and after.

Change-Id: Iefbb021c5c3171b9467954eafa54046ad6805753
ibcorkscrew/Android.mk
ibcorkscrew/demangle.c
da96a66b88520d8414f30d0eab9eaf1630d374f7 09-Nov-2011 Irfan Sheriff <isheriff@google.com> Merge "Fix dhcp comments"
9323c853ea2b1336d66909240de5aa87fc3ca6b7 09-Nov-2011 Jeff Brown <jeffbrown@google.com> Merge "Print the tombstone path."
35c28608bf3dc31bab8cd6c2579739643e0145d8 09-Nov-2011 Irfan Sheriff <isheriff@google.com> Fix dhcp comments

Change-Id: Ia99b2c10ff6cf8c75c23db49f1e9cf7a043141cc
ibnetutils/dhcp_utils.c
cc77ff73c64c945705158b374209d7d69c433d16 09-Nov-2011 JP Abgrall <jpa@google.com> am 61b90bd2: adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats

* commit '61b90bd211021886049f72cb666a5b49b83b3c64':
adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
1351edeb56095fb49ceacd927a15b450d8e8dd62 09-Nov-2011 JP Abgrall <jpa@google.com> am 61b90bd2: adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats

* commit '61b90bd211021886049f72cb666a5b49b83b3c64':
adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
61b90bd211021886049f72cb666a5b49b83b3c64 09-Nov-2011 JP Abgrall <jpa@google.com> adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats

Normally only bandwidth stats for the uid reading .../stats is returned.
With the extra group, adb shell will be able to read stats from
all UIDs.
This is to be used to offer data usage profiling to developers.

Change-Id: If3d2941ce5aa4dbb1a23947b97b893149ba224f7
db/adb.c
c5a63217db7f7fb62468cd890006d0d626fb6978 09-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
989b2a3a5506e78543ab7cb37f11ec042cbac50c 09-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
06cd7bdc7b09ba071d48836d32457440f7b15c0a 09-Nov-2011 Robert Greenwalt <robdroid@android.com> am 39b6df11: am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1

* commit '39b6df11dc1875f24b65202f96433fe333fc7bc5':
Wimax: wimax related changes for libnetutils
fb9804bfc2111aace2d56b15dbbe32e4d26767bc 09-Nov-2011 Jeff Brown <jeffbrown@google.com> Print the tombstone path.

When explicitly requesting a dump, show the user the path of
the tombstone file that was generated.

Change-Id: I7fff7dea606872a61687ca087e99f604107b70c4
ebuggerd/debuggerd.c
f9557fba347bcb837892458fabd7454e1a1a4d6a 08-Nov-2011 Nick Kralevich <nnk@google.com> Set /proc/sys/kernel/dmesg_restrict to 1

Set dmesg_restrict to 1 to help limit inadvertent information leaks
from the kernel to non-privileged programs. Root and programs with
CAP_SYSLOG will continue to have access to dmesg output.

See "dmesg_restrict" in Documentation/sysctl/kernel.txt from the
Linux kernel source code.

Bug: 5585365
Change-Id: Iffcf060ea4bd446ab9acf62b8b61d315d4ec4633
ootdir/init.rc
1e339a710e0993c18c8b96f9224ebd3aa29cf8cd 08-Nov-2011 Nick Kralevich <nnk@google.com> Merge "Set kptr_restrict to 2."
61fb22cdce63a37111d045d7d47638ceb0383991 08-Nov-2011 Robert Greenwalt <robdroid@android.com> am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1

* commit 'c761b54ead5ec3f22fafb7ce50dd5c5a1939b03f':
Wimax: wimax related changes for libnetutils
39b6df11dc1875f24b65202f96433fe333fc7bc5 08-Nov-2011 Robert Greenwalt <robdroid@android.com> am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1

* commit 'c761b54ead5ec3f22fafb7ce50dd5c5a1939b03f':
Wimax: wimax related changes for libnetutils
c761b54ead5ec3f22fafb7ce50dd5c5a1939b03f 08-Nov-2011 Robert Greenwalt <robdroid@android.com> Merge "Wimax: wimax related changes for libnetutils" into ics-mr1
eeecd4783e4e872616590b16c6e2d24950842dfb 08-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
7938d6d79fd0e31f81adfb1b314d0c507cf4516f 08-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
67d53e21f57b542d8f4a6b304789faab55c252d6 08-Nov-2011 Ying Wang <wangying@google.com> Merge "Remove unnecessary libraries."
fcc0580a7ead3db8eebde97e4733fe0c6b777ebd 08-Nov-2011 Ying Wang <wangying@google.com> Remove unnecessary libraries.

There is no host library named libcutils.

Change-Id: I3b346b9e1a5556cd0cfc932560d9ce54ae6d38f2
ibdiskconfig/Android.mk
ed21633a5e81f7bb9688da98bc9ea9b08b6bce20 13-Oct-2011 tk.mun <tk.mun@samsung.com> Wimax: wimax related changes for libnetutils

- Modified dhcp renew code for the new conenctivity changes in ICS

Change-Id: I614dfc62a875b79dbd8b7c46f4d87f366a3c3661
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
ibnetutils/dhcp_utils.c
e2e35243a3bc4b8bc4136f7948c955332147ecaf 07-Nov-2011 Dima Zavin <dima@android.com> am 3c58933a: am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd

* commit '3c58933aa785ab26f77284f6a1a4e93d2ebfcf04':
rootdir: init.rc: write default oom_adj before starting ueventd
cd11325af9b89021696810e0de92ef1c2c9212ae 07-Nov-2011 Dima Zavin <dima@android.com> am 75e48884: am 3c58933a: am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd

* commit '75e488841d38b67123e5ef0f29186754a52ca5cc':
rootdir: init.rc: write default oom_adj before starting ueventd
75e488841d38b67123e5ef0f29186754a52ca5cc 07-Nov-2011 Dima Zavin <dima@android.com> am 3c58933a: am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd

* commit '3c58933aa785ab26f77284f6a1a4e93d2ebfcf04':
rootdir: init.rc: write default oom_adj before starting ueventd
3c58933aa785ab26f77284f6a1a4e93d2ebfcf04 07-Nov-2011 Dima Zavin <dima@android.com> am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd

* commit '4a2539085062a715b0d345eb50ea48738423c909':
rootdir: init.rc: write default oom_adj before starting ueventd
f8d1c4d39d2602c6d3af3e770316512d9158ce75 06-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
8e4e894acf0ba40df2221c14d91b3a3088adef07 05-Nov-2011 Jeff Brown <jeffbrown@google.com> Merge "Improve stack unwinder robustness."
4a2539085062a715b0d345eb50ea48738423c909 04-Nov-2011 Dima Zavin <dima@android.com> rootdir: init.rc: write default oom_adj before starting ueventd

Otherwise, ueventd's oom_adj value would have been 0 and it could
easily get killed early during low memory events

Change-Id: I1adbd18c37215b26ae77e70f7b8dbd1e143fc2d4
Signed-off-by: Dima Zavin <dima@android.com>
ootdir/init.rc
fe7e9d77c4bc1ce97709c61fc5308893c7950b33 04-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I27a75e893fe4a1e17c7e0b7dd0e96116f3437762
0f80eb24e5ef0a3e1a4128afab17bc20b334c2fe 04-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am 99436ca8: am 6182d031: Reconcile with ics-factoryrom-2-release

* commit '99436ca879c7ec32fda845559fcb038001619dae':
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
Revert "Merge "Remove log spam" into ics-mr0"
02ab0f6715f85072fd69e856a26a1f345f954b37 04-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am 6182d031: Reconcile with ics-factoryrom-2-release

* commit '6182d031d7a1968c2edc8862bb5a9bc5bc8922e9':
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
Revert "Merge "Remove log spam" into ics-mr0"
99436ca879c7ec32fda845559fcb038001619dae 04-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am 6182d031: Reconcile with ics-factoryrom-2-release

* commit '6182d031d7a1968c2edc8862bb5a9bc5bc8922e9':
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
Revert "Merge "Remove log spam" into ics-mr0"
6182d031d7a1968c2edc8862bb5a9bc5bc8922e9 04-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-factoryrom-2-release

Change-Id: If9c35eae1d56a9fc9017c0ae6626466579a4ac96
f0c5872637a63e28e3cd314cfc915c07f76df9c6 04-Nov-2011 Jeff Brown <jeffbrown@google.com> Improve stack unwinder robustness.

Keep track of whether memory maps are readable. Use the information
in try_get_word to try to avoid accidentally dereferencing an invalid
pointer within the current process. (Note that I haven't ever
seen that happen during normal unwinding, but it pays to be
a little more careful.)

Refactored try_get_word a little to make it easier to pass it the
needed state for validation checks by way of a little memory_t struct.

Improved how the memory map for the current process is cached. This is
important because we need up to date information about readable maps.
Use a 5 second cache expiration.

Improved the PC -> LR fallback logic in the unwinder so we can
eke out an extra frame sometimes.

Fixed a bug reading ELF program headers. The phnum & phentsize
fields are half-words. We were incorrectly interpreting
phnum as a whole word.

Used android_atomic_* operations carefully in the unwinder
to prevent possible memory races between the dumper and the dumpee.
This was highly unlikely (or even impossible due to the presence
of other barriers along the way) but the code is clearer now about
its invariants.

Fixed a bug in debuggerd where the pid was being passed to have
its stack dump taken instead of the tid, resulting in short
stacks because ptrace couldn't read the data if pid != tid.
Did a full sweep to ensure that we use pid / tid correctly everywhere.

Ported old code from debuggerd to rewind the program counter back
one instruction so that it points to the branch instruction itself
instead of the return address.

Change-Id: Icc4eb08320052975a4ae7f0f5f0ac9308a2d33d7
ebuggerd/arm/machine.c
ebuggerd/debuggerd.c
ebuggerd/machine.h
ebuggerd/utility.c
ebuggerd/utility.h
ebuggerd/x86/machine.c
nclude/corkscrew/backtrace.h
nclude/corkscrew/map_info.h
nclude/corkscrew/ptrace.h
ibcorkscrew/arch-arm/backtrace-arm.c
ibcorkscrew/arch-arm/ptrace-arm.c
ibcorkscrew/arch-x86/backtrace-x86.c
ibcorkscrew/backtrace-arch.h
ibcorkscrew/backtrace.c
ibcorkscrew/map_info.c
ibcorkscrew/ptrace.c
4dbc0f3f6d27f223868422e40862ed7338d7d215 03-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
b1966c5e76eb0090822ab02aec056f032b70e2ff 03-Nov-2011 The Android Automerger <android-build@android.com> Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"

This reverts commit 4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing
changes made to 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
ibnl_2/handlers.c
ibnl_2/netlink.c
ibnl_2/socket.c
08ffd07a8867e13ea24989409a9e8aed9268c548 03-Nov-2011 The Android Automerger <android-build@android.com> Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"

This reverts commit 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4, reversing
changes made to d4f29767c8cd5a0d8b52b77bed117ca3746af8f3.
harger/charger.c
86eeea5ce88cd551918810e007e33f434bec28f6 03-Nov-2011 The Android Automerger <android-build@android.com> Revert "Merge "Remove log spam" into ics-mr0"

This reverts commit d4f29767c8cd5a0d8b52b77bed117ca3746af8f3, reversing
changes made to 604f52e31357a774ad49290e323976b1db5b9f38.
ibsysutils/src/NetlinkEvent.cpp
23420745e2bd5f6f3445fc9757fd0a3cb4196f50 03-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-factoryrom-2-release history after reset to ics-mr0
fe6c59489cbac15ddd3b68115cd872c06365096c 02-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am 03d7ffc1: am 0e4d9eb8: Reconcile with ics-factoryrom-2-release

* commit '03d7ffc1c8f84773af94abc6fbeb1f631e993c17':
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
Revert "Merge "Remove log spam" into ics-mr0"
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
fdb8247ee99e081f8f6f95cf5b2c6e094968a83c 02-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am 0e4d9eb8: Reconcile with ics-factoryrom-2-release

* commit '0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce':
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
Revert "Merge "Remove log spam" into ics-mr0"
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
03d7ffc1c8f84773af94abc6fbeb1f631e993c17 02-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am 0e4d9eb8: Reconcile with ics-factoryrom-2-release

* commit '0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce':
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
Revert "Merge "Remove log spam" into ics-mr0"
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce 02-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-factoryrom-2-release

Change-Id: Ibfe7c2c1d309f7caae0be71ae631b69830f4e624
06f3a51d8ba647bdf9f2db145d0e2d931bb4fb84 02-Nov-2011 Dmitry Shmidt <dimitrysh@google.com> am 03829345: am e7184667: am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0

* commit '0382934575ad1b915a8edba83292d2e9eccb8049':
libnl_2: Fix memory leaks
57489d40373bf999398c7e4614e29d14dec95001 02-Nov-2011 Dima Zavin <dima@android.com> am 1d6a0a2e: am 3e3d0780: am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0

* commit '1d6a0a2ee637eeea1d8fde63a77299ac891cd3a8':
charger: make the almost-full frame only show when it's current level
60eec53f3a2f40cae4fddf77e7bf24b29d8bd4e6 02-Nov-2011 Irfan Sheriff <isheriff@google.com> am 08db16ac: am a7997f4a: am d4f29767: Merge "Remove log spam" into ics-mr0

* commit '08db16ac10dcbe064810c7dcff67f100ac787160':
Remove log spam
6641b39923ccedab884cad336c0f758d0e7be8fe 02-Nov-2011 The Android Automerger <android-build@android.com> Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"

This reverts commit 4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing
changes made to 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
ibnl_2/handlers.c
ibnl_2/netlink.c
ibnl_2/socket.c
fa792b19cc50d5b6a214a96e25ccf1c8f952c06a 02-Nov-2011 The Android Automerger <android-build@android.com> Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"

This reverts commit 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4, reversing
changes made to d4f29767c8cd5a0d8b52b77bed117ca3746af8f3.
harger/charger.c
77aa2952722bea6a3351c760147eac8b8864ecc5 02-Nov-2011 The Android Automerger <android-build@android.com> Revert "Merge "Remove log spam" into ics-mr0"

This reverts commit d4f29767c8cd5a0d8b52b77bed117ca3746af8f3, reversing
changes made to 604f52e31357a774ad49290e323976b1db5b9f38.
ibsysutils/src/NetlinkEvent.cpp
df241e54aee0458b0d2ef4bf290c9cb00156fba7 02-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-factoryrom-2-release history after reset to ics-mr0
2e7c833279349a694af15f2447cc214dc30bcc01 02-Nov-2011 Nick Kralevich <nnk@google.com> Set kptr_restrict to 2.

To make writing kernel exploits harder, set /proc/sys/kernel/kptr_restrict
to "2". This prohibits users from accessing kernel symbols via /proc/kallsyms

Bug: 5555668
Change-Id: Ib31cb6fcb4d212a0b570ce9e73ae31f721ed801b
ootdir/init.rc
bddff703234f15f236d9f83c5897dbe4e4f21b09 02-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
3d695243b22b3a3c8f534c3baf7ba8ffb8be982f 02-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
6d9f02302ddb1e78f6f9eb34c4e20ce4f26c45e2 02-Nov-2011 The Android Automerger <android-build@android.com> Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"

This reverts commit 4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing
changes made to 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
ibnl_2/handlers.c
ibnl_2/netlink.c
ibnl_2/socket.c
0382934575ad1b915a8edba83292d2e9eccb8049 02-Nov-2011 Dmitry Shmidt <dimitrysh@google.com> am e7184667: am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0

* commit 'e71846671e6dbb2ece3142be92b33ff85f713997':
libnl_2: Fix memory leaks
af0a8b2a90e11edb0c9697323e4cac94b0f30209 02-Nov-2011 Dmitry Shmidt <dimitrysh@google.com> am e7184667: am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0

* commit 'e71846671e6dbb2ece3142be92b33ff85f713997':
libnl_2: Fix memory leaks
e71846671e6dbb2ece3142be92b33ff85f713997 02-Nov-2011 Dmitry Shmidt <dimitrysh@google.com> am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0

* commit '4f7c0843bbaa9cb4ec3a7890461cebbee689530a':
libnl_2: Fix memory leaks
4f7c0843bbaa9cb4ec3a7890461cebbee689530a 02-Nov-2011 Dmitry Shmidt <dimitrysh@google.com> Merge "libnl_2: Fix memory leaks" into ics-mr0
d99fe5ec960b5eae96585d5ceb59fe287fe0c5e7 01-Nov-2011 Dmitry Shmidt <dimitrysh@google.com> libnl_2: Fix memory leaks

BUG: b/5532633

Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/handlers.c
ibnl_2/netlink.c
ibnl_2/socket.c
1d6a0a2ee637eeea1d8fde63a77299ac891cd3a8 01-Nov-2011 Dima Zavin <dima@android.com> am 3e3d0780: am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0

* commit '3e3d0780fcc8da7f9917b3f9d05e16ffc08d4b6f':
charger: make the almost-full frame only show when it's current level
d103041a02773870c4a190cd7a73395053a9cae3 01-Nov-2011 Dima Zavin <dima@android.com> am 3e3d0780: am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0

* commit '3e3d0780fcc8da7f9917b3f9d05e16ffc08d4b6f':
charger: make the almost-full frame only show when it's current level
3e3d0780fcc8da7f9917b3f9d05e16ffc08d4b6f 01-Nov-2011 Dima Zavin <dima@android.com> am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0

* commit '6fb3df8d468a105b49c1cdbbdcb061dc8de022a4':
charger: make the almost-full frame only show when it's current level
6fb3df8d468a105b49c1cdbbdcb061dc8de022a4 01-Nov-2011 Dima Zavin <dima@android.com> Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0
f4360c133e5f54db72364c9104836e06c9fba274 01-Nov-2011 Mathias Agopian <mathias@google.com> am 640cad52: am 04a87590: restart surfaceflinger and drmserver when servicemanager dies

* commit '640cad52ca94dce70b4c9c3424dee18fbe87c84d':
restart surfaceflinger and drmserver when servicemanager dies
08db16ac10dcbe064810c7dcff67f100ac787160 01-Nov-2011 Irfan Sheriff <isheriff@google.com> am a7997f4a: am d4f29767: Merge "Remove log spam" into ics-mr0

* commit 'a7997f4ae27b5c07eb7dbfd2ac0e99472a950855':
Remove log spam
bd6e92c016703e8a25363ce2714ec22f1571da9e 01-Nov-2011 Irfan Sheriff <isheriff@google.com> am a7997f4a: am d4f29767: Merge "Remove log spam" into ics-mr0

* commit 'a7997f4ae27b5c07eb7dbfd2ac0e99472a950855':
Remove log spam
a7997f4ae27b5c07eb7dbfd2ac0e99472a950855 01-Nov-2011 Irfan Sheriff <isheriff@google.com> am d4f29767: Merge "Remove log spam" into ics-mr0

* commit 'd4f29767c8cd5a0d8b52b77bed117ca3746af8f3':
Remove log spam
d4f29767c8cd5a0d8b52b77bed117ca3746af8f3 01-Nov-2011 Irfan Sheriff <isheriff@google.com> Merge "Remove log spam" into ics-mr0
332baee86818c7f79b49fa8a4ed7683ea93eafb7 01-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
9ec3f3e2e4ccb18ed85fa47015b0fa71985710c4 01-Nov-2011 Dima Zavin <dima@android.com> charger: make the almost-full frame only show when it's current level

Change-Id: Id53de101dd3c211d376abfd748e7646e28291749
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
7fb8b6137b54536d8470dc9c0715c5e5da8952dc 31-Oct-2011 Mathias Agopian <mathias@google.com> am 04a87590: restart surfaceflinger and drmserver when servicemanager dies

* commit '04a875902ece07769101a5202e3af554af31a911':
restart surfaceflinger and drmserver when servicemanager dies
640cad52ca94dce70b4c9c3424dee18fbe87c84d 31-Oct-2011 Mathias Agopian <mathias@google.com> am 04a87590: restart surfaceflinger and drmserver when servicemanager dies

* commit '04a875902ece07769101a5202e3af554af31a911':
restart surfaceflinger and drmserver when servicemanager dies
04a875902ece07769101a5202e3af554af31a911 31-Oct-2011 Mathias Agopian <mathias@google.com> restart surfaceflinger and drmserver when servicemanager dies

Bug: 5450389

Change-Id: Ib4e73836721e25e2a88185167b030ea75e0d74e3
ootdir/init.rc
06286288ef40837a5ab69fc09871f7d5f45c8bbd 31-Oct-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ibdbd1329aaad7a60ae68c43dacade214fd7e1181
9004a14b3de40715f92b1697b5c64c6210dc919e 31-Oct-2011 Ed Heyl <ed@google.com> Merge remote branch 'goog/ics-mr1' into ics-aah
b2bcd1b4fd9da66c7c0b241b2c9fb03e09aaa3a0 30-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
17233eea85b2833bfa23a24b99c9f7034a71ac67 30-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
477df68854ff0b92f1ca8f7f18d53b6a0c30102a 29-Oct-2011 Irfan Sheriff <isheriff@google.com> Remove log spam

Bug: 5533986
Change-Id: I3d8108e2f65ce6513ac8b2d14541eaa5e4fc5da1
ibsysutils/src/NetlinkEvent.cpp
42b54d83dfe12e37d7763e53e6234bbf92f2e7cd 29-Oct-2011 Jeff Sharkey <jsharkey@android.com> am 1b3c4299: am 70212a40: Merge "Gracefully handle truncated log messages." into ics-mr1

* commit '1b3c42992abbd97afb51af4bd8754646b8ebf689':
Gracefully handle truncated log messages.
b3897008a31752690180fc3242bd858cb986cbbd 28-Oct-2011 Ed Heyl <ed@google.com> keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
1b3c42992abbd97afb51af4bd8754646b8ebf689 28-Oct-2011 Jeff Sharkey <jsharkey@android.com> am 70212a40: Merge "Gracefully handle truncated log messages." into ics-mr1

* commit '70212a404a46c6a2d4830e721156c3fafbfb1a3a':
Gracefully handle truncated log messages.
70212a404a46c6a2d4830e721156c3fafbfb1a3a 28-Oct-2011 Jeff Sharkey <jsharkey@android.com> Merge "Gracefully handle truncated log messages." into ics-mr1
1941c91389e8b9ba09ea6029b9d1f79abb42fe07 28-Oct-2011 Jean-Baptiste Queru <jbq@google.com> am 4ef824e9: am 71619f13: am 604f52e3: Reconcile with AOSP master

* commit '4ef824e9481625270aa065cc4d0625e8c8d9e0df':
4ef824e9481625270aa065cc4d0625e8c8d9e0df 28-Oct-2011 Jean-Baptiste Queru <jbq@google.com> am 71619f13: am 604f52e3: Reconcile with AOSP master

* commit '71619f13956e44c1b8cb18ddb29bd2522020a7f8':
71619f13956e44c1b8cb18ddb29bd2522020a7f8 28-Oct-2011 Jean-Baptiste Queru <jbq@google.com> am 604f52e3: Reconcile with AOSP master

* commit '604f52e31357a774ad49290e323976b1db5b9f38':
Fix build
4ddc88e73e43b98589bc14739acfb2428c5f9cc3 28-Oct-2011 Steve Block <steveblock@google.com> am 16210c12: am 31a02dba: Fix build

* commit '16210c12bc0a8dab5523289de1e51b6fe8d38053':
Fix build
604f52e31357a774ad49290e323976b1db5b9f38 28-Oct-2011 Jean-Baptiste Queru <jbq@google.com> Reconcile with AOSP master

Change-Id: I12bbc98729a54df0e3d355f3bb2b943964202235
16210c12bc0a8dab5523289de1e51b6fe8d38053 28-Oct-2011 Steve Block <steveblock@google.com> am 31a02dba: Fix build

* commit '31a02dba709166df30b7c3352222c550146d7c81':
Fix build
31a02dba709166df30b7c3352222c550146d7c81 28-Oct-2011 Steve Block <steveblock@google.com> Fix build

Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
nclude/cutils/log.h
ff0aaa3caba10d3e36f2430c0dacda358466424c 08-Sep-2011 Mike Lockwood <lockwood@android.com> init: Increase buffer size for serialno and other properties set from kernel command line

Fixes problem with last character truncated for 32 byte serial numbers.

Change-Id: Ia8c7cde680cd4aefbaea7ff1969eb0d95d4ebd86
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/init.c
f48311073d62068c3978650d3e3d1e367543e6c2 27-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
1c50ba1d8b512d7601b5baa0db5d95cd6129df96 27-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
46d21ef292157bc3ab9df4e2a47e9b2c053db4da 27-Oct-2011 Ken Sumrall <ksumrall@android.com> am 72410ccf: am a286480f: Fix the class_reset command

* commit '72410ccfaa1c47e4a6e0af0c71f138dca05664f6':
Fix the class_reset command
72410ccfaa1c47e4a6e0af0c71f138dca05664f6 27-Oct-2011 Ken Sumrall <ksumrall@android.com> am a286480f: Fix the class_reset command

* commit 'a286480f56012abdb4ef4ddab1c19a5c2316b7b8':
Fix the class_reset command
a820a0e587b1f6be7283588b744cd33ba5723bdf 27-Oct-2011 Jeff Sharkey <jsharkey@android.com> Gracefully handle truncated log messages.

Bug: 5522726
Change-Id: I8637c7da854ec1ecb321632c45ee9bc2edc94a67
iblog/logprint.c
a286480f56012abdb4ef4ddab1c19a5c2316b7b8 27-Oct-2011 Ken Sumrall <ksumrall@android.com> Fix the class_reset command

The class_reset command used to reset services that had been set to
"disabled" in the init.rc file to a non-disabled state. Now, if the
service was originally set to "disabled", have the reset command set
it back to disabled. Otherwise, set it to the "reset" state as it
currently does.

Change-Id: I0c10582e46a8e443d4748d9d893ae762b19b653a
nit/init.c
nit/init.h
nit/init_parser.c
c57ff9be6d97422c02c8105efc83d7613565a5bd 26-Oct-2011 Ed Heyl <ed@google.com> undo reset to ics-mr1 until we have a better method
a41ae39331ee770da6933a61683a9894b0702f45 26-Oct-2011 Ed Heyl <ed@google.com> reset to ics-mr1, but keep history
a8b63e0fb19aed718bc46fcc0c62c50efe9ef5ab 26-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
578854c31e46e8e7269c3428f3c9a20cd02e3697 26-Oct-2011 Steve Block <steveblock@google.com> am 69f4cd7f: (-s ours) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

* commit '69f4cd7f5add7a7c7f5915e5292aab7eb2a42e9f':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
87b42a2e1e853fc1d710a812c9661e59c29ac0df 26-Oct-2011 Jeff Brown <jeffbrown@google.com> am 55bcd2dd: Merge "A wee little division by 8 makes all the difference."

* commit '55bcd2dd8b6f0a705cea1bddaf4cf92fcaeaef0d':
A wee little division by 8 makes all the difference.
3f83ae16673269dbc856bab46f3c548695668f70 26-Oct-2011 Jeff Brown <jeffbrown@google.com> am bbb4f346: Merge "Add support for explicitly dumping native stacks."

* commit 'bbb4f34640a21d0031ead8ed00845597a89bfcd8':
Add support for explicitly dumping native stacks.
69f4cd7f5add7a7c7f5915e5292aab7eb2a42e9f 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

Bug: 5449033
Change-Id: Ib453f869977a6e909095a578bbf0420851f887d2
nclude/cutils/log.h
ibcorkscrew/arch-arm/backtrace-arm.c
ibcorkscrew/ptrace.c
ibcutils/loghack.h
ibcutils/properties.c
ibcutils/qtaguid.c
ibcutils/str_parms.c
ibdiskconfig/diskconfig.c
ibpixelflinger/tinyutils/VectorImpl.cpp
55bcd2dd8b6f0a705cea1bddaf4cf92fcaeaef0d 26-Oct-2011 Jeff Brown <jeffbrown@google.com> Merge "A wee little division by 8 makes all the difference."
bbb4f34640a21d0031ead8ed00845597a89bfcd8 26-Oct-2011 Jeff Brown <jeffbrown@google.com> Merge "Add support for explicitly dumping native stacks."
bd57bd00b2172af9f315f2d3d62d68ca369e3666 26-Oct-2011 Jeff Brown <jeffbrown@google.com> A wee little division by 8 makes all the difference.

Change-Id: Idff879a8461e1abc97dfa624c1441c16df1c7a69
ibcorkscrew/arch-arm/backtrace-arm.c
9524e4158fbb988b6a5e4f5be68ee10b7e4dd6d8 24-Oct-2011 Jeff Brown <jeffbrown@google.com> Add support for explicitly dumping native stacks.

This change modifies debuggerd so that it can be used to grab
the native stacks of a process that has hung and not just crashed.
Note that only the root user can do this (for now).

adb shell debuggerd <tid>

Then use logcat to find the tombstone file that was generated
which will have the native stacks of all threads in the
requested process. The specified thread will be shown first
and will also appear in the main log.

Also made some minor tweaks to libcorkscrew so that we
could handle statically compiled executables in the future
if we compiled the library statically.

Improved the "wait_for_user_action" function to support
volume down as an alternative for devices that do not
have home keys.

Removed a mess of gotos.

Change-Id: Ic149653986b0c2f503c7f0e8b7cb1f3be7c84d1e
ebuggerd/arm/machine.c
ebuggerd/debuggerd.c
ibcorkscrew/arch-arm/backtrace-arm.c
39509a26ee1f4b7faa3f504b78a9e1f736887a67 25-Oct-2011 Steve Block <steveblock@google.com> am 5fb44952: (-s ours) Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE

* commit '5fb44952f6584e7cdeeafb82beb878c3e7546cfd':
Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE
5fb44952f6584e7cdeeafb82beb878c3e7546cfd 12-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE

Bug: 5449033
Change-Id: Id318736a9caa58c6da2683f8663699ce998e79d8
nclude/cutils/log.h
ogwrapper/logwrapper.c
1336a61c695bcd42a16175535465056a44e756f3 25-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
ea609ddd971724545ec5ba69173de298c31ccec8 25-Oct-2011 Jeff Brown <jeffbrown@google.com> am 13e715b4: Use libcorkscrew in debuggerd.

* commit '13e715b491e876865e752a3a69dd6f347049a488':
Use libcorkscrew in debuggerd.
554261dce96c726def062ab50e48093a5937c093 25-Oct-2011 Jeff Brown <jeffbrown@google.com> am 10484a06: Add x86 stack unwinding support to libcorkscrew.

* commit '10484a068412613aaf3924f63a0b2f61400c7d1e':
Add x86 stack unwinding support to libcorkscrew.
4171919990d7f4c0442735fc9c8944edd39d828a 25-Oct-2011 Jeff Brown <jeffbrown@google.com> am 501edd29: Add a new library for collecting stack traces.

* commit '501edd29b823ce1301d2effdd3a9e4b6e2b20b76':
Add a new library for collecting stack traces.
13e715b491e876865e752a3a69dd6f347049a488 21-Oct-2011 Jeff Brown <jeffbrown@google.com> Use libcorkscrew in debuggerd.

Change-Id: I5e3645a39d96c808f87075b49111d0262a19a0c8
ebuggerd/Android.mk
ebuggerd/arm/machine.c
ebuggerd/arm/pr-support.c
ebuggerd/arm/unwind.c
ebuggerd/debuggerd.c
ebuggerd/debuggerd.h
ebuggerd/getevent.h
ebuggerd/machine.h
ebuggerd/symbol_table.c
ebuggerd/symbol_table.h
ebuggerd/utility.c
ebuggerd/utility.h
ebuggerd/x86/machine.c
ebuggerd/x86/unwind.c
ebuggerd/x86/x86_utility.h
10484a068412613aaf3924f63a0b2f61400c7d1e 21-Oct-2011 Jeff Brown <jeffbrown@google.com> Add x86 stack unwinding support to libcorkscrew.

Change-Id: I1d4f4b11b4c8bf517b1dd07afccbedc41a84fd1b
ibcorkscrew/Android.mk
ibcorkscrew/arch-x86/backtrace-x86.c
ibcorkscrew/arch-x86/ptrace-x86.c
501edd29b823ce1301d2effdd3a9e4b6e2b20b76 20-Oct-2011 Jeff Brown <jeffbrown@google.com> Add a new library for collecting stack traces.

Supports collecting the stack trace of the current thread,
another thread in the same process, or a thread in a
different process (using ptrace).

Change-Id: Ica2594e4436edde4ceb7bcc3d78e6c31a7902cbf
nclude/corkscrew/backtrace.h
nclude/corkscrew/demangle.h
nclude/corkscrew/map_info.h
nclude/corkscrew/ptrace.h
nclude/corkscrew/symbol_table.h
ibcorkscrew/Android.mk
ibcorkscrew/MODULE_LICENSE_APACHE2
ibcorkscrew/NOTICE
ibcorkscrew/arch-arm/backtrace-arm.c
ibcorkscrew/arch-arm/ptrace-arm.c
ibcorkscrew/backtrace-arch.h
ibcorkscrew/backtrace-helper.c
ibcorkscrew/backtrace-helper.h
ibcorkscrew/backtrace.c
ibcorkscrew/demangle.c
ibcorkscrew/map_info.c
ibcorkscrew/ptrace-arch.h
ibcorkscrew/ptrace.c
ibcorkscrew/symbol_table.c
899ebdca0b669d6b416505781402fabcdb85dab7 20-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
acfe3789480343d70d8033515a99119dce7de6af 19-Oct-2011 Andy McFadden <fadden@android.com> am 08dedcfd: Enable verbose register memory dumps

* commit '08dedcfd5cfeab526bb02382e4292f3150ed986f':
Enable verbose register memory dumps
08dedcfd5cfeab526bb02382e4292f3150ed986f 19-Oct-2011 Andy McFadden <fadden@android.com> Enable verbose register memory dumps

Dump some memory at addresses for all registers that look like they
might have valid addresses. Previously this was only done for PC
and LR.

(This is expected to be disabled before ship.)

Bug 5484924

Change-Id: I9802eaa396783e1286ae0c53eaf2473892c38a02
ebuggerd/arm/machine.c
5e63c8309a4552bf1a0d99b9377d33a04e7fa82f 19-Oct-2011 Andy McFadden <fadden@android.com> am c69b6b70: Merge "Add log summary to tombstones"

* commit 'c69b6b70e3510c0b1fbf2f31d07eef5f0028a45e':
Add log summary to tombstones
c69b6b70e3510c0b1fbf2f31d07eef5f0028a45e 19-Oct-2011 Andy McFadden <fadden@android.com> Merge "Add log summary to tombstones"
c74c894d87c8189afd1c4e97f9352f9c97ee2a07 19-Oct-2011 Nick Kralevich <nnk@google.com> am b62ace91: Merge "liblog: do better checks of log messages."

* commit 'b62ace913287fb4c43017cc039e23903926c1c1f':
liblog: do better checks of log messages.
b62ace913287fb4c43017cc039e23903926c1c1f 19-Oct-2011 Nick Kralevich <nnk@google.com> Merge "liblog: do better checks of log messages."
9ccc4aaa3cae5c77f5f3104aed2161f232a2e809 19-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
e5cc5396e83d12b7ca02ff6096a9950807aa010d 19-Oct-2011 Andy McFadden <fadden@android.com> Add log summary to tombstones

When the tombstones are uploaded to APR, they're truncated at 64KB.
This causes the log data, which is at the end, to be lost if the
process has more than about 12 threads (which many do).

This change adds the last few lines of the log right below the
report for the crashing thread, where we should be guaranteed to
keep it.

Also, clean up trailing newlines on log messages (which end up in
the tombstone), and don't print a "------- log" banner if there
aren't any messages in that log file (e.g. slog).

Also also, don't try to show_nearby_maps unless this is the crashing
thread.

Bug 5471955

Change-Id: Iaa4fd2fafbaeda2f20bb95f202177d7744a91f9d
ebuggerd/arm/machine.c
ebuggerd/debuggerd.c
85e06657051329866710ad74a977ad0540aa19e6 19-Oct-2011 Andy McFadden <fadden@android.com> am 05a28e1c: Merge "Enhance debuggerd memory dumps"

* commit '05a28e1cd4b9540e855f7f0ed37da9066c177e4d':
Enhance debuggerd memory dumps
05a28e1cd4b9540e855f7f0ed37da9066c177e4d 19-Oct-2011 Andy McFadden <fadden@android.com> Merge "Enhance debuggerd memory dumps"
f2eae5a860ebdf0dd47669c9bf58b8824b57728c 19-Oct-2011 Andy McFadden <fadden@android.com> Enhance debuggerd memory dumps

This makes two changes:

(1) Display ASCII values next to the memory dumps. For example:

I DEBUG: 00008ac4 706f6f4c 20676e69 74206425 73656d69 Looping %d times
I DEBUG: 00008ad4 7453000a 6e69726f 6f742067 0a702520 ..Storing to %p.
I DEBUG: 00008ae4 65642f00 657a2f76 55006f72 6c62616e ./dev/zero.Unabl

(The hex values are still displayed as little-endian word values, while
the ASCII part is byte oriented.)

(2) Optionally display memory dumps for all registers, not just LR
and PC, for the crashing thread. This is meant for situations where
we crash dereferencing foo->bar and want to see what the memory near
"foo" looks like -- could be handy if it got stomped by MUTF-16 text
or something recognizable.

Change #2 is currently disabled, via a compile-time setting.

Bug 5471955

Change-Id: Iacfd01c314055bad81db2f43b7d239f10086fcfb
ebuggerd/arm/machine.c
e1ede1530ff21d3b8920c0cbbebb42ccff4fa22d 19-Oct-2011 Nick Kralevich <nnk@google.com> liblog: do better checks of log messages.

Testing:

The following test cases all passed and generated log entries:

# echo -n '\03foo\0bar\0' > /dev/log/main
# echo -n '\03\0bar\0' > /dev/log/main
# echo -n '\03\0a\0' > /dev/log/main

The following entries were successfully processed by
logcat but produced no log entries:

# echo -n '\03\0\0' > /dev/log/main
# echo -n '\03a\0\0' > /dev/log/main
# echo -n '\03b\0\0' > /dev/log/main

Also tested the pathological error condition:

cat /dev/urandom > /dev/log/main

which produced many "+++ LOG: malformed log entry" errors.

Bug: 5478600
Change-Id: I53bc79507242dcfc14445746c29edf47be0a90b4
iblog/logprint.c
942cfefc6133493a2affa0d80719dbc5e07b0f7c 18-Oct-2011 Nick Kralevich <nnk@google.com> am 4423df76: Merge "logcat: add sanity check"

* commit '4423df76f589e9fbd566f368c453758451c82f78':
logcat: add sanity check
4423df76f589e9fbd566f368c453758451c82f78 18-Oct-2011 Nick Kralevich <nnk@google.com> Merge "logcat: add sanity check"
543cdd2cacf5dc8cf848e00f7ae35e756d816230 18-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
8476bb93cee3298f686eff317916cadbec68c3a5 18-Oct-2011 sinikang <sinikang@samsung.com> am 8cdd4c33: am aa75df74: [maguro] : add setprop net.tcp.buffersize.hspa

* commit '8cdd4c335f0d6e35e6def5ea73dcefb9687071b0':
[maguro] : add setprop net.tcp.buffersize.hspa
8cdd4c335f0d6e35e6def5ea73dcefb9687071b0 18-Oct-2011 sinikang <sinikang@samsung.com> am aa75df74: [maguro] : add setprop net.tcp.buffersize.hspa

* commit 'aa75df74db5beffd25821ed6c360c36197d7bac1':
[maguro] : add setprop net.tcp.buffersize.hspa
aa75df74db5beffd25821ed6c360c36197d7bac1 16-Oct-2011 sinikang <sinikang@samsung.com> [maguro] : add setprop net.tcp.buffersize.hspa

-window size optimized for hspa
-Patchset2 : space removed

Change-Id: Ia4d1043d1a93c929721a4d7cca60ce9ff8bbf67a
Signed-off-by: sinikang <sinikang@samsung.com>
ootdir/init.rc
15c6ad379b4694c899a0522407938529796333e2 17-Oct-2011 David 'Digit' Turner <digit@google.com> am 50f128a3: (-s ours) am 0f9581ab: (-s ours) am b064ed88: (-s ours) am 6306d419: DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener

* commit '50f128a3924f4166ef3886b30659d81dfc8d5bb8':
DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
50f128a3924f4166ef3886b30659d81dfc8d5bb8 17-Oct-2011 David 'Digit' Turner <digit@google.com> am 0f9581ab: (-s ours) am b064ed88: (-s ours) am 6306d419: DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener

* commit '0f9581abf24738c03f572d12f8ef343b66145c61':
DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
0f9581abf24738c03f572d12f8ef343b66145c61 17-Oct-2011 David 'Digit' Turner <digit@google.com> am b064ed88: (-s ours) am 6306d419: DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener

* commit 'b064ed888aaf6c3abbb839dfc60b9b8bfd17fa88':
DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
b064ed888aaf6c3abbb839dfc60b9b8bfd17fa88 17-Oct-2011 David 'Digit' Turner <digit@google.com> am 6306d419: DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener

* commit '6306d4192558c56ac130fe6d66fbca227fd137d6':
DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
46070505e771fb539748936dd6ac68aa77b9f422 17-Oct-2011 Nick Kralevich <nnk@google.com> logcat: add sanity check

Sanity check that the length we get back from the kernel matches
how much data we actually received.

Change-Id: I5cfd80321ab41459bb514dfde2da57413a7bd9e6
ogcat/logcat.cpp
2a736093f78463d83b63cd10393a979acd68bcb1 17-Oct-2011 Nick Kralevich <nnk@google.com> am 63f4a841: liblog: ensure that the message length is consistent

* commit '63f4a84104c228c74cdf132f5cef4f5184ae04bb':
liblog: ensure that the message length is consistent
63f4a84104c228c74cdf132f5cef4f5184ae04bb 17-Oct-2011 Nick Kralevich <nnk@google.com> liblog: ensure that the message length is consistent

When parsing log entries which may have embedded \0s, it's
possible for entry->messageLen to not be the actual
length of the string in entry->message. Detect this condition.

Bug: 5417417
Change-Id: I712cac7696af7831e24765b5a1b345d6ff5fb407
iblog/logprint.c
ec14bcec3359226383d03d03ce65cbd5fad89b85 16-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
f26c6567d6270d55f0bfc79bb7c497cfd669cf91 14-Oct-2011 Andy McFadden <fadden@android.com> am 76feaf37: Merge "Append log data to tombstones"

* commit '76feaf37218b7fec02ade30c143884df8299697c':
Append log data to tombstones
76feaf37218b7fec02ade30c143884df8299697c 14-Oct-2011 Andy McFadden <fadden@android.com> Merge "Append log data to tombstones"
41e0cef301637cd1f2daf72953d1230b7fb174b8 14-Oct-2011 Andy McFadden <fadden@android.com> Append log data to tombstones

The Android Problem Report site shows tombstones uploaded from
devices. We can see the native stack traces for every thread,
but sometimes there's a very important bit of information sitting
in the log, and without it we can't analyze the failure.

This change modifies debuggerd so that the log contents for the
crashing process are appended to the tombstone. The format matches
the output of "logcat -v threadtime". Both "system" and "main" logs
are included (but not interleaved -- we're not that fancy).

This feature is only enabled when the "ro.debuggable" system property
is set to 1 (indicating a development device).

Bug 5456676

Change-Id: I3be1df59813ccf1058cec496a906f6d31fbc7b04
ebuggerd/debuggerd.c
08df672aac5644730662437119df9dc50d6c7af2 14-Oct-2011 Andy McFadden <fadden@android.com> am 90e6f931: Merge "Show maps near native fault address"

* commit '90e6f931f25de36bf7d6e1b9c41ba8ba499631a8':
Show maps near native fault address
90e6f931f25de36bf7d6e1b9c41ba8ba499631a8 14-Oct-2011 Andy McFadden <fadden@android.com> Merge "Show maps near native fault address"
42382429821c1c700accbad56a4a819f3a72377e 13-Oct-2011 Dima Zavin <dima@android.com> am 6606dc95: am 471157a3: charger: key state being the same is not an error

* commit '6606dc9532b20f55d18e0d9cc925358aa1ceb119':
charger: key state being the same is not an error
489ddab36eaf834653f0cd5f2452f87b9591e8be 13-Oct-2011 Dima Zavin <dima@android.com> am d6da4d4f: am 47cca063: Merge changes Idcb48155,Iecb8c3db,I4924134b into ics-mr0

* commit 'd6da4d4fa58b40f66a4bb5b7b0d15bfe7ab7d8c9':
charger: ignore key event if value didn't change
charger: sync with the current key state on boot
charger: print last_kmsg directly using klog_write
6606dc9532b20f55d18e0d9cc925358aa1ceb119 13-Oct-2011 Dima Zavin <dima@android.com> am 471157a3: charger: key state being the same is not an error

* commit '471157a393d052aece013d1f8b7701aaadca3b6c':
charger: key state being the same is not an error
471157a393d052aece013d1f8b7701aaadca3b6c 13-Oct-2011 Dima Zavin <dima@android.com> charger: key state being the same is not an error

Change-Id: I58d53899dbcca8329b65b189c1a6c5eea413c289
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
d6da4d4fa58b40f66a4bb5b7b0d15bfe7ab7d8c9 13-Oct-2011 Dima Zavin <dima@android.com> am 47cca063: Merge changes Idcb48155,Iecb8c3db,I4924134b into ics-mr0

* commit '47cca063939a9d5a3ea0b287d64aac0f53f4c45c':
charger: ignore key event if value didn't change
charger: sync with the current key state on boot
charger: print last_kmsg directly using klog_write
47cca063939a9d5a3ea0b287d64aac0f53f4c45c 13-Oct-2011 Dima Zavin <dima@android.com> Merge changes Idcb48155,Iecb8c3db,I4924134b into ics-mr0

* changes:
charger: ignore key event if value didn't change
charger: sync with the current key state on boot
charger: print last_kmsg directly using klog_write
136dcc5ce628a1ba600a6818e5cb24d5f15eb016 23-Sep-2011 Andy McFadden <fadden@android.com> Show maps near native fault address

This adds some additional output to native crashes. For example, if
something tried to access a bit of mmap(/dev/zero) memory that had
been mprotect()ed, you might see output like this:

I DEBUG : memory map around addr 4015a00c:
I DEBUG : 40159000-4015a000 /system/lib/libstdc++.so
I DEBUG : 4015a000-40162000 /dev/zero
I DEBUG : b0001000-b0009000 /system/bin/linker

The idea is to see what's in and around the fault address to make it
easier to identify bus errors due to file truncation and segmentation
faults caused by buffer over/underruns.

No output is generated for accesses below 0x1000 (which are likely
NULL pointer dereferences) or for signals that don't set si_addr.

Also, suppress the fault address for signals that don't set si_addr:
I DEBUG : signal 6 (SIGABRT), code 0 (?), fault addr --------

We still print "fault addr" followed by 8 characters for anything
that is parsing the contents. The "address" shown for signals like
SIGABRT was meaningless and possibly confusing.

Bug 5358516

Change-Id: Icae8ef309ea2d89b129f68d30f96b2ca8a69cc6c
ebuggerd/arm/machine.c
ebuggerd/debuggerd.c
ebuggerd/utility.c
ebuggerd/utility.h
50888f76660b4387c2b8cbcd76986df7cd2dbf3c 13-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
077b42cd4b36bf582bca8d03c6c2c900a80ece1d 13-Oct-2011 Wu-cheng Li <wuchengli@google.com> am 5babfad4: am baad2843: Update camera documentation about face detection.

* commit '5babfad44584641316b4a2ff62c1a7c9392740e6':
Update camera documentation about face detection.
5babfad44584641316b4a2ff62c1a7c9392740e6 13-Oct-2011 Wu-cheng Li <wuchengli@google.com> am baad2843: Update camera documentation about face detection.

* commit 'baad2843a1af443aa251be510c4476159d064d20':
Update camera documentation about face detection.
baad2843a1af443aa251be510c4476159d064d20 12-Oct-2011 Wu-cheng Li <wuchengli@google.com> Update camera documentation about face detection.

bug:5169599
Change-Id: I5280137cee5401fadec36cae732ecb78a2d44dc3
nclude/system/camera.h
b6472bd1a979de4201c7541d4daeedc47a54f1fb 13-Oct-2011 Romain Guy <romainguy@google.com> am 6bcd4d3e: Add ANDROID_API macro to export symbols

* commit '6bcd4d3e7310240d9424f13444542572e9ae3632':
Add ANDROID_API macro to export symbols
2d978c01ee71002b3c5999126c009ec07a773c30 13-Oct-2011 Dima Zavin <dima@android.com> charger: ignore key event if value didn't change

Change-Id: Idcb481550eca53209be217361cac38e48368a04f
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
2471a6a3956c591b3979b9b73a0d68f3b214da57 13-Oct-2011 Dima Zavin <dima@android.com> charger: sync with the current key state on boot

If the power key was down when we booted, we would not have
gotten the down event and thus the device would not have rebooted until
the user released and pressed it again.

Change-Id: Iecb8c3dba773bce4647748715d056e8e1d77f7e0
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
d11e1a0278c602c761ac37d843926e1eba5a63f1 13-Oct-2011 Dima Zavin <dima@android.com> charger: print last_kmsg directly using klog_write

using the macros introduced extra characters that made things align
poorly.

Change-Id: I4924134be159723b4e4ed905c4293a42358d0ff5
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
6bcd4d3e7310240d9424f13444542572e9ae3632 12-Oct-2011 Romain Guy <romainguy@google.com> Add ANDROID_API macro to export symbols

Change-Id: I55294713c8dd1ac32d6013d084f1bb502fc3572f
nclude/cutils/compiler.h
f620912651338d511a4c5214ec214ca39305ec98 12-Oct-2011 Nick Kralevich <nnk@google.com> am d707fb3f: enable heap randomization.

* commit 'd707fb3fb6448be04d6e14f7e478df7e298ebf35':
enable heap randomization.
984351be159a130f5e89b62ed0bc62e1a2aa5c96 12-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
d707fb3fb6448be04d6e14f7e478df7e298ebf35 06-Oct-2011 Nick Kralevich <nnk@google.com> enable heap randomization.

Bug: 5250555

Change-Id: I7acb0645402611875c481aec33ece85fced7a336
ootdir/init.rc
6d74b0d534184d5bee0b5cc53254521a78f561b8 11-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
6306d4192558c56ac130fe6d66fbca227fd137d6 17-Jan-2011 David 'Digit' Turner <digit@google.com> DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener

+ Handle EINTR in read()
Bug: 5438357
Backport from master.

Change-Id: If7d486dd4fb5666ce16ef36dca5f417da23e0b73
ibsysutils/src/FrameworkListener.cpp
6fcfb8e26067a64aa4a73971901dcbe3d7aab2fe 10-Oct-2011 Wink Saville <wink@google.com> am 4e803c3c: Merge "Add log group to rild to improve log collection on modem issue"

* commit '4e803c3c18ad6a0cebbb16e2cf623a174f5201e1':
Add log group to rild to improve log collection on modem issue
4e803c3c18ad6a0cebbb16e2cf623a174f5201e1 10-Oct-2011 Wink Saville <wink@google.com> Merge "Add log group to rild to improve log collection on modem issue"
0b446a4c3b524f5574cc75c423d0ae5b8f3ddd4a 09-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
ccc79022e13d185bec0b21577f0dd0e2af711e2f 08-Oct-2011 Jeffrey Tinker <jtinker@google.com> am f791e17b: Merge "Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls"

* commit 'f791e17bc94e1308245bf8bf16d1d98e7fd9dcda':
Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls
f791e17bc94e1308245bf8bf16d1d98e7fd9dcda 08-Oct-2011 Jeffrey Tinker <jtinker@google.com> Merge "Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls"
da950f772b718722d74a3707c1987e5712779d49 07-Oct-2011 Wu-cheng Li <wuchengli@google.com> am bc76bb45: Merge "Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview."

* commit 'bc76bb458220f39ed290e2d13180c31bb35ecb90':
Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview.
bc76bb458220f39ed290e2d13180c31bb35ecb90 07-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview."
8d43cb6edb5c0d9ebb1fa0586b738d7832a288b4 07-Oct-2011 Wu-cheng Li <wuchengli@google.com> Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview.

bug:5422679
Change-Id: Ia4a09328bd9e1d36af680be4d065bc08cf0dec0f
nclude/system/camera.h
65c4df51f895b79fc599d3bfa796ddfc660d47e4 07-Oct-2011 Jeffrey Tinker <jtinker@google.com> Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls

Bug 4598045 Implementing secure video path on TI OMAP4 chip for ICS

Change-Id: Iacfe3e79f067172085b96bb4cd4484101aa5be1e
ootdir/init.rc
2e6cff8a283df37b95d3c26ffc789cfbd350602c 06-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
2f1e0f450b982de63cf66d66ff32ee188aeae46e 05-Oct-2011 Kenny Root <kroot@google.com> am ce020a72: Merge "Add checking for log entry format"

* commit 'ce020a72e78408bc66bbd06993d6a24122846610':
Add checking for log entry format
ce020a72e78408bc66bbd06993d6a24122846610 05-Oct-2011 Kenny Root <kroot@google.com> Merge "Add checking for log entry format"
a6d44f0603e90c6fdb5fcc3334f4d7e78df1571a 05-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
a3cb8ec1234b9b65907fa21a63f8fc43b08c8116 05-Oct-2011 Christopher Tate <ctate@google.com> am 114f2421: Merge "Add command line help for the new \'adb backup -all -nosystem\'"

* commit '114f2421fef49d5312763c3c0d6804e096df77e9':
Add command line help for the new 'adb backup -all -nosystem'
114f2421fef49d5312763c3c0d6804e096df77e9 05-Oct-2011 Christopher Tate <ctate@google.com> Merge "Add command line help for the new 'adb backup -all -nosystem'"
5900eaf04cb19ec1ea7d85d648089194851e22d3 04-Oct-2011 Jeffrey Tinker <jtinker@google.com> am 134959a6: Merge "Create drmrpc group for security services"

* commit '134959a621ab03232f08d8ce6198e6a578311022':
Create drmrpc group for security services
libnl_2: Fix nested attribute setting
134959a621ab03232f08d8ce6198e6a578311022 04-Oct-2011 Jeffrey Tinker <jtinker@google.com> Merge "Create drmrpc group for security services"
56885094b63af1b0077dec16bc695aa09d8043fc 04-Oct-2011 Christopher Tate <ctate@google.com> Add command line help for the new 'adb backup -all -nosystem'

Documentation-only change that supports the new framework-side
feature to omit system packages when you're using adb backup -all.
Bug 5361503.

Change-Id: I86bca8883a7fb8c713ca352ad5980e92fd640d18
db/commandline.c
4bf3c02e026077d14a4512c7c2f71937da3c2d50 01-Oct-2011 Kenny Root <kroot@google.com> Add checking for log entry format

The log tag may be zero length if corrupted, so check for this
condition.

Change-Id: I7616226dabe78a85859b0ab53aca08f734dbdd84
iblog/logprint.c
ogcat/logcat.cpp
e701e8ef92c170c41705c0b21421e18c8438f1c2 03-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
d7608a40d6bed0d8ca686414a5a4f44b6d4d0435 30-Sep-2011 Jean-Baptiste Queru <jbq@google.com> Flash cache partition with cache.img by default.

Bug: 5153694
Change-Id: If322d13286e9b0f14877d1a4f03f6bd288ee71f3
astboot/fastboot.c
2a51ec8dd7e128899b8b7ecf8d8d4c38e6077bdd 30-Sep-2011 Dmitry Shmidt <dimitrysh@google.com> am e5de9ee4: libnl_2: Fix getting family_id

* commit 'e5de9ee4915bafd7f31a96260613d8b93aba8351':
libnl_2: Fix getting family_id
7005c0375416abb595721fe9c1324ed7356beb02 30-Sep-2011 Jeffrey Tinker <jtinker@google.com> Create drmrpc group for security services

Bug 4598045

Change-Id: I5550203927146fd6864408b3ac2f5e6f5d2b1d77
nclude/private/android_filesystem_config.h
e5de9ee4915bafd7f31a96260613d8b93aba8351 30-Sep-2011 Dmitry Shmidt <dimitrysh@google.com> libnl_2: Fix getting family_id

Change-Id: I27b2495fb96852e960f647f032a5fcd446ec742b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/genl/genl.c
e65e946382033a94f99f0f05678bb1e6329e3182 29-Sep-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Add log group to rild to improve log collection on modem issue

Add log group to ril-daemon service. rild is the best place to
know the issue on the modem in many time. It would be helpful
if rild alone can capture the snapshot of logcat buffers at
the moment of problem.

Change-Id: Ie0dcda126fb748a00e650427de35541672359287
ootdir/init.rc
334ea78110a8329703119726c7031aa33e7aa87d 30-Sep-2011 Dima Zavin <dima@android.com> am db982b06: am 73531557: Revert "charger: show animation when the device is unplugged"

* commit 'db982b06606e885186efc1ee32c9dd96216c12dc':
Revert "charger: show animation when the device is unplugged"
700500a88174736785cb6759791c576fb278fd8e 30-Sep-2011 Dima Zavin <dima@android.com> am 01851eac: am 823ebc4d: charger: dump the last_kmsg when going into charger mode

* commit '01851eac692286bcd842abf5c4f50654e3a4100c':
charger: dump the last_kmsg when going into charger mode
db982b06606e885186efc1ee32c9dd96216c12dc 30-Sep-2011 Dima Zavin <dima@android.com> am 73531557: Revert "charger: show animation when the device is unplugged"

* commit '7353155717ec56e119a125cd6492c19df755b6ea':
Revert "charger: show animation when the device is unplugged"
01851eac692286bcd842abf5c4f50654e3a4100c 30-Sep-2011 Dima Zavin <dima@android.com> am 823ebc4d: charger: dump the last_kmsg when going into charger mode

* commit '823ebc4d824ea70e5ec7d376adf2fbce50eb9cb2':
charger: dump the last_kmsg when going into charger mode
d43bd5707b8aa5eb358676b82e6ec2d68896f230 30-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
1b3e16ad9838a4627f0f47bb09953779f574a683 30-Sep-2011 David Turner <digit@google.com> am 9892aa5d: Merge "Fix SocketListener socket leak issue."

* commit '9892aa5d041132f1048f6707e09a434c25f06862':
Fix SocketListener socket leak issue.
9892aa5d041132f1048f6707e09a434c25f06862 30-Sep-2011 David Turner <digit@google.com> Merge "Fix SocketListener socket leak issue."
7353155717ec56e119a125cd6492c19df755b6ea 30-Sep-2011 Dima Zavin <dima@android.com> Revert "charger: show animation when the device is unplugged"

This reverts commit e0c70dad4b4d417182e4c0ba8adae199f2622582.
harger/charger.c
823ebc4d824ea70e5ec7d376adf2fbce50eb9cb2 30-Sep-2011 Dima Zavin <dima@android.com> charger: dump the last_kmsg when going into charger mode

Change-Id: I3b76bb5071d8a44adfb221774bb304bf296c8c1b
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
aa51962f6fd7d64c6fb3e5ffbcd0da6bbc3c3dbd 29-Sep-2011 Lorenzo Colitti <lorenzo@google.com> am 15c8c3eb: Merge "Support adding, deleting, and clearing IPv6 addrs."

* commit '15c8c3ebf060c57cb165322cd498958cf9112d8b':
Support adding, deleting, and clearing IPv6 addrs.
15c8c3ebf060c57cb165322cd498958cf9112d8b 29-Sep-2011 Lorenzo Colitti <lorenzo@google.com> Merge "Support adding, deleting, and clearing IPv6 addrs."
4520246d3534c087f3e9253c34f99dd1e45b7bd7 28-Sep-2011 Xianzhu Wang <wangxianzhu@google.com> Fix SocketListener socket leak issue.

The problem was: if a socket is shared between SocketListener and another
thread, only if the last reference is removed by SocketListener can the socket
be closed, otherwise the socket will leak. This sometimes happens in netd's
dnsproxyd.

This change let the SocketClient own the socket and close the socket when
the SocketClient is destructed.

Change-Id: I2865fbfe9ee4d8b3e43d7e02919dbb2d261f70de
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
f32189ab9bbbe74913077382674a3e5ab0ccd66b 29-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
47ddb515b7d59b29d83628c1b4e48642dc0e49ba 26-Sep-2011 Lorenzo Colitti <lorenzo@google.com> Support adding, deleting, and clearing IPv6 addrs.

- Provide a function to add and delete IPv4/IPv6 addresses
using netlink.
- Provide a function that clears all IP addresses on an
interface that can be used by netd.

Also, a couple of cleanups:

- Update the header file to match reality, and include the
header file in the implementation. Also fix a caller that
has an incorrect method signature.
- Fix whitespace in Android.mk.

Change-Id: Ifba9d60cdfffb0b7e5c3b9c6ab328f5f77d259c4
nclude/netutils/ifc.h
ibnetutils/Android.mk
ibnetutils/ifc_utils.c
etcfg/netcfg.c
8d86b7d76b96df105824a766ee2579153b3b5d1e 29-Sep-2011 Mathias Agopian <mathias@google.com> am 2a32df25: Merge "enable HAVE_DLADDR, since... we have it"

* commit '2a32df25b8bb307693173911041458aaca84c84c':
enable HAVE_DLADDR, since... we have it
2a32df25b8bb307693173911041458aaca84c84c 29-Sep-2011 Mathias Agopian <mathias@google.com> Merge "enable HAVE_DLADDR, since... we have it"
4496d12c0dc45cf6141d7127cd074b60de2efe1c 28-Sep-2011 Vladimir Chtchetkine <vchtchetkine@google.com> am b14bbf02: Merge "Pick up on androidboot.hardware kernel cmd option"

* commit 'b14bbf02980fdb87437c1054037fda09286be6a4':
Pick up on androidboot.hardware kernel cmd option
b14bbf02980fdb87437c1054037fda09286be6a4 28-Sep-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Merge "Pick up on androidboot.hardware kernel cmd option"
918638c775ebd115084a42deb68bf518918f6640 28-Sep-2011 Mathias Agopian <mathias@google.com> enable HAVE_DLADDR, since... we have it

Change-Id: I02baa1f7d3383e93a43fa04de1d39f7398e971bc
nclude/arch/linux-arm/AndroidConfig.h
2b99543cef1b8b0aa8cca39544939910035117b0 28-Sep-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Pick up on androidboot.hardware kernel cmd option

x86 emulator passes hardware name through the androidboot.hardware kernel cmd option, and
ueventd must pick up on it to locate proper ueventd.rc file for that hardware.

Change-Id: Id61c5b67fe6275a15c7aa62556e0b89eda7968f8
nit/init.c
nit/ueventd.c
nit/util.c
nit/util.h
80cb60d31576c0f5de4890212b84f8ca3da6696e 28-Sep-2011 Jean-Baptiste Queru <jbq@google.com> am ba8ea700: am c59c6c31: am 52262788: Ignore beec0066 from gingerbread (already here)

* commit 'ba8ea7002497ef7e8555a0fd58bbd7912f9a6c51':
emulator: allow /dev/qemu_pipe access
ba8ea7002497ef7e8555a0fd58bbd7912f9a6c51 28-Sep-2011 Jean-Baptiste Queru <jbq@google.com> am c59c6c31: am 52262788: Ignore beec0066 from gingerbread (already here)

* commit 'c59c6c31a7bb6c70dc8b4f2b2879db98cd617626':
emulator: allow /dev/qemu_pipe access
c59c6c31a7bb6c70dc8b4f2b2879db98cd617626 28-Sep-2011 Jean-Baptiste Queru <jbq@google.com> am 52262788: Ignore beec0066 from gingerbread (already here)

* commit '52262788834da375b88cb97b995b42c4ffde0f60':
emulator: allow /dev/qemu_pipe access
52262788834da375b88cb97b995b42c4ffde0f60 28-Sep-2011 Jean-Baptiste Queru <jbq@google.com> Ignore beec0066 from gingerbread (already here)

Change-Id: Id124f8c7288e464f76bdb531dd97e10d5a22244a
1a1d11e9e444421bbb1f6c7ebb247e02eb8c021f 27-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
15278d1d336e52bb6a5085d2ff2c70cd4913b6f2 27-Sep-2011 Dima Zavin <dima@android.com> am a5bfd4e3: am 1a5ca61b: charger: use the new asset for almost full, and show full @ 95%

* commit 'a5bfd4e3835b44296896da933ca9484441148ae3':
charger: use the new asset for almost full, and show full @ 95%
19496b833a6ec9336a14d0fccd60447a09f232f8 27-Sep-2011 Dima Zavin <dima@android.com> am df3429de: am fc44f5f4: charger: update assets

* commit 'df3429de1294de4b3cadfbfcca06e8c9dc4e090d':
charger: update assets
a5bfd4e3835b44296896da933ca9484441148ae3 27-Sep-2011 Dima Zavin <dima@android.com> am 1a5ca61b: charger: use the new asset for almost full, and show full @ 95%

* commit '1a5ca61b28b3269b625b7a7162b4f50734f7fea9':
charger: use the new asset for almost full, and show full @ 95%
df3429de1294de4b3cadfbfcca06e8c9dc4e090d 27-Sep-2011 Dima Zavin <dima@android.com> am fc44f5f4: charger: update assets

* commit 'fc44f5f4d4b3b05d9eba1ee787b70e1dfe0f18c5':
charger: update assets
1a5ca61b28b3269b625b7a7162b4f50734f7fea9 26-Sep-2011 Dima Zavin <dima@android.com> charger: use the new asset for almost full, and show full @ 95%

Change-Id: I5f8729260ae068d35d981ff2c16d576c3d4dd82f
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
fc44f5f4d4b3b05d9eba1ee787b70e1dfe0f18c5 26-Sep-2011 Dima Zavin <dima@android.com> charger: update assets

Change-Id: I0c0d1206fdc3aa30382a9ee86edb88bba1e21e63
Signed-off-by: Dima Zavin <dima@android.com>
harger/images/battery_0.png
harger/images/battery_1.png
harger/images/battery_2.png
harger/images/battery_3.png
harger/images/battery_4.png
harger/images/battery_5.png
harger/images/battery_charge.png
harger/images/battery_fail.png
06d8d6a8a9f2e4201df2cab32c540bd9ae2db320 26-Sep-2011 Dima Zavin <dima@android.com> am d7802a2f: am e0c70dad: charger: show animation when the device is unplugged

* commit 'd7802a2fa4c5ebda3fe0becbd195479d13793a46':
charger: show animation when the device is unplugged
d7802a2fa4c5ebda3fe0becbd195479d13793a46 26-Sep-2011 Dima Zavin <dima@android.com> am e0c70dad: charger: show animation when the device is unplugged

* commit 'e0c70dad4b4d417182e4c0ba8adae199f2622582':
charger: show animation when the device is unplugged
9aba3032c170d83ea3631e3a43aecc567192542a 26-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
97eaf5a60350a8f68f1ad22f49d9f127bdb55de7 26-Sep-2011 Dima Zavin <dima@android.com> am dcecd4cc: resolved conflicts for merge of 0052abda to master

* commit 'dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3':
charger: update charger UI with official graphics and animation
dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3 26-Sep-2011 Dima Zavin <dima@android.com> resolved conflicts for merge of 0052abda to master

Change-Id: Ia33ac80949bebaafd1a012b7b131dc3960eca862
e0c70dad4b4d417182e4c0ba8adae199f2622582 23-Sep-2011 Dima Zavin <dima@android.com> charger: show animation when the device is unplugged

Change-Id: I54af1bc61c73bbc993d1dff37174b16e1de5b7a4
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
0052abdafd7179fc4a7458f09d2f95c74dda0021 23-Sep-2011 Dima Zavin <dima@android.com> charger: update charger UI with official graphics and animation

Change-Id: I1b36fa9e380797fe01812b57ac5d8c2c38857993
Signed-off-by: Dima Zavin <dima@android.com>
harger/Android.mk
harger/charger.c
harger/images/battery_0.png
harger/images/battery_1.png
harger/images/battery_2.png
harger/images/battery_3.png
harger/images/battery_4.png
harger/images/battery_charge.png
harger/images/battery_fail.png
harger/images/charging.png
f60824cb94d9ca49cc781720293c10c722d120de 25-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
5709ac29b37e4d3ccd74bb66b4ad76cac5bec94e 23-Sep-2011 Kenny Root <kroot@google.com> am a031a91b: Skip argument when parsing adb install

* commit 'a031a91b9518af9a38290713b0c2126d9b8f6cde':
Skip argument when parsing adb install
a031a91b9518af9a38290713b0c2126d9b8f6cde 23-Sep-2011 Kenny Root <kroot@google.com> Skip argument when parsing adb install

A command line flag with an argument was checked in the Pm.java code,
but it wasn't being checked by "adb install" so attempts to use it
failed.

Change-Id: I0b84a4203a416f7323fa823c0f1f1750670d0c76
db/commandline.c
db8bd9d7a9f0cc3b4226555ab2963ca8a852d2ca 23-Sep-2011 JP Abgrall <jpa@google.com> am 8898c874: am 29656d34: qtaguid: shhhh. LOGI -> LOGV

* commit '8898c87449fe08b7af8b6c10b01a4313f2aeac6a':
qtaguid: shhhh. LOGI -> LOGV
8898c87449fe08b7af8b6c10b01a4313f2aeac6a 23-Sep-2011 JP Abgrall <jpa@google.com> am 29656d34: qtaguid: shhhh. LOGI -> LOGV

* commit '29656d34a21f4bc3899264027664c9321b0b94e0':
qtaguid: shhhh. LOGI -> LOGV
29656d34a21f4bc3899264027664c9321b0b94e0 22-Sep-2011 JP Abgrall <jpa@google.com> qtaguid: shhhh. LOGI -> LOGV

Less verbose output.

Bug: 5360129
Change-Id: Id32a7c61d51b6a16f50a5c8bcc75a2feaa0e34b1
ibcutils/qtaguid.c
1b96cfc664a59a737c56f7b7fa70de9fbe6b3a71 22-Sep-2011 David 'Digit' Turner <digit@google.com> am 44e96d43: Merge "emulator: Move qemu-props to core service"

* commit '44e96d4302d5878ae7727de43a0c76525a4a68d8':
emulator: Move qemu-props to core service
44e96d4302d5878ae7727de43a0c76525a4a68d8 22-Sep-2011 David 'Digit' Turner <digit@google.com> Merge "emulator: Move qemu-props to core service"
9378409b546e3708f4f48ebc52e944f9ae0bcf7d 21-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
9dca34522e80a28070c98d386beefd0b6ac3172d 21-Sep-2011 Brian Swetland <swetland@google.com> am 303e6ac8: fix TINY_ANDROID build (exclude charger binary)

* commit '303e6ac804c110ae54a51b56a217d70e97313c10':
fix TINY_ANDROID build (exclude charger binary)
303e6ac804c110ae54a51b56a217d70e97313c10 21-Sep-2011 Brian Swetland <swetland@google.com> fix TINY_ANDROID build (exclude charger binary)

Change-Id: I28157cbadcb208df517052336f652f5810048cc1
Signed-off-by: Brian Swetland <swetland@google.com>
harger/Android.mk
d496f3564fc738ac8e328a3759bf512ead922a1c 21-Sep-2011 Wink Saville <wink@google.com> am 6656d921: am 0c613613: Reduce connectivity logging.

* commit '6656d921e80093ec48d97fa4236a3cc5259b663a':
Reduce connectivity logging.
6656d921e80093ec48d97fa4236a3cc5259b663a 21-Sep-2011 Wink Saville <wink@google.com> am 0c613613: Reduce connectivity logging.

* commit '0c613613d757c544d6ec7e5678f49a631a99d72a':
Reduce connectivity logging.
0c613613d757c544d6ec7e5678f49a631a99d72a 21-Sep-2011 Wink Saville <wink@google.com> Reduce connectivity logging.

Change-Id: Ib71f3f17d56ba614436bcb18f9100196fd7e7ee6
ibnetutils/ifc_utils.c
26833f5724dbbdf37fe9c8485c1b3e674d4a9b11 18-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
abfa0102b77c92b7bbdffb157f502cf89e740057 17-Sep-2011 Xavier Ducrohet <xav@android.com> am 1d37ef6e: Merge "Add Positivo\'s vendor ID to adb."

* commit '1d37ef6ecb25b2c2c974b32e14ce963882c7a699':
Add Positivo's vendor ID to adb.
1d37ef6ecb25b2c2c974b32e14ce963882c7a699 17-Sep-2011 Xavier Ducrohet <xav@android.com> Merge "Add Positivo's vendor ID to adb."
dd52e8c57b5026f70a3ec390d2f9a7809ebd2d85 16-Sep-2011 Xavier Ducrohet <xav@android.com> Add Positivo's vendor ID to adb.

Change-Id: Ida6fc323d766249f4f12708bae1c50ae5d937b2c
db/usb_vendors.c
12f5f0d71c2b8efd0f763fa0986e2561afae29a5 16-Sep-2011 Dima Zavin <dima@android.com> am 92312a51: charger: reduce timeout for power-on with power key to 2 secs

* commit '92312a515b0b877deed5dfdbf9d7613e8d66fee5':
charger: reduce timeout for power-on with power key to 2 secs
92312a515b0b877deed5dfdbf9d7613e8d66fee5 16-Sep-2011 Dima Zavin <dima@android.com> charger: reduce timeout for power-on with power key to 2 secs

Change-Id: I8d3a49678a7fc47282d7ab407722e7c1829e9187
Signed-off-by: Dima Zavin <dima@android.com>
harger/charger.c
beec0066fcef96a8db8347bc0e6967eabca1d299 16-Sep-2011 David 'Digit' Turner <digit@google.com> emulator: allow /dev/qemu_pipe access

This patch is necessary to allow normal applications to access the
special /dev/qemu_pipe device file at runtime. This is used to provide
a high-speed communication channel with the emulator.

Needed by OpenGLES emulation.

Change-Id: Ic266bdcc4fd069d2b4355e6ea81723296a1a21d1
ootdir/ueventd.rc
a503456526359767ffb383a06835308f62172dde 16-Sep-2011 David 'Digit' Turner <digit@google.com> emulator: Move qemu-props to core service

The qemu-props program is launched at boot to read a series of
system property assignments from the emulator and apply them.

This is necessary to deal with the dynamic nature of the emulated
platform (e.g. the screen density which depends on the skin and
cannot be hard-coded in the platform image).

This patch ensures that qemu-props is started before any other
service that may read one of these properties (e.g. surface flinger).
This is done by encapsulating the program into a 'core' service.
Core services are all stared before regular ones.

Before the patch, qemu-props was started manually inside a script
that is called from a late emulator-specific boot service
(goldfish-setup).

The problem was that sometimes qemu-props was run too late.
This resulted in random flakiness, especially when running
on a low-end host machine.

Fix for bug 2161189 (and probably a few others)

Change-Id: I2933a25dcb5fecbb1fc238f157264e621b8f295b
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
a390e7fe9efbf1b667a381af5a1f6220107d6c34 15-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
567d83b8726158221552ffc22e8ef70d59e3d436 15-Sep-2011 JP Abgrall <jpa@google.com> am 243123fb: libcutils: qtaguid: Support new functions, add tag resource tracking.

* commit '243123fb41d7d2981116bd5d11ba168b127d68e9':
libcutils: qtaguid: Support new functions, add tag resource tracking.
243123fb41d7d2981116bd5d11ba168b127d68e9 10-Sep-2011 JP Abgrall <jpa@google.com> libcutils: qtaguid: Support new functions, add tag resource tracking.

* Add support for
deleteTagData(tag, uid)
setCounterSet(counterSetNum, uid)
setPacifier(on)

* Add resource tracking
(If only kernel process termination had a hook)
Because the xt_qtaguid netfilter module needs to keep track of
tagged sockets, it needs a way to know when the process owning
the socket has died.
Normally the app will untag the sockets. But not on crash.
So the process opens the qtaguid misc dev, which is closed on crash,
at which point the xt_qtaguid can force-untag the processes sockets,
and thus allowing their refcount to go down and release them.

* Add pacifier support
Add function to enable/disable pacification of the xt_qtaguid
kernel module. (mostly for debugging)

Change-Id: I7f2228e65208046dd37ec1c7407ee307d5ba9b99
nclude/cutils/qtaguid.h
ibcutils/qtaguid.c
f96e800d9339d7cb1a00fcc5df0464f74bc8cd6c 14-Sep-2011 Mike Lockwood <lockwood@android.com> am aa618546: adb: Add USB vendor IDs for K-Touch, Pegatron and Archos

* commit 'aa61854645ffed8595507463820e81aa0aa8f2fd':
adb: Add USB vendor IDs for K-Touch, Pegatron and Archos
aa61854645ffed8595507463820e81aa0aa8f2fd 13-Sep-2011 Mike Lockwood <lockwood@android.com> adb: Add USB vendor IDs for K-Touch, Pegatron and Archos

Change-Id: Idbc212abfb7d4d0a53e6b8ecd55134b81f4e960d
Bug: 5182028
Bug: 5157478

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
8b4bd3319325f9b09fc3af6fe68fb5f9a12a9446 13-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
be2dd58f57a06e8be5b1263b014d0383c9ae287c 12-Sep-2011 JP Abgrall <jpa@google.com> am 8e3ff704: init.rc: allow all users to open the qtaguid misc dev

* commit '8e3ff70444ac919d0b70eaa1fbe97a3ef5bdb9ef':
init.rc: allow all users to open the qtaguid misc dev
8e3ff70444ac919d0b70eaa1fbe97a3ef5bdb9ef 12-Sep-2011 JP Abgrall <jpa@google.com> init.rc: allow all users to open the qtaguid misc dev

The netfilter xt_qtaguid module uses a misc dev so that processes
that use the module can be tracked.
Every process that does socket tagging must open that dev.

Change-Id: I6af3e0f0180637b14455dd9607724523f142c402
ootdir/init.rc
8897508a12a250569b123e91bf04a9dfb3dffa73 11-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
87b9daae2bf69475782cc35d690e4c02bb134ed3 08-Sep-2011 Robert Greenwalt <rgreenwalt@google.com> am 1ac40f4e: Increase the window sizes on wifi and lte.

* commit '1ac40f4ef18799e252115d9c9ad17396ffb68f3d':
Increase the window sizes on wifi and lte.
3c8dc2ffdd42af559a594881e01c41b18de8b9b3 08-Sep-2011 Mike Lockwood <lockwood@android.com> Merge "init: Increase buffer size for serialno and other properties set from kernel command line" into ics-aah
8a7fbf0cf36c134f93cdac06411413eb8b0561b6 08-Sep-2011 Mike Lockwood <lockwood@android.com> init: Increase buffer size for serialno and other properties set from kernel command line

Fixes problem with last character truncated for 32 byte serial numbers.

Change-Id: I9ad92d4e1c574bf3c174501581283a13772f0075
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/init.c
1ac40f4ef18799e252115d9c9ad17396ffb68f3d 08-Sep-2011 Robert Greenwalt <rgreenwalt@google.com> Increase the window sizes on wifi and lte.

Set to 524288,1048576,2097152, 262144,524288,1048576.

bug:5226360
Change-Id: Id9d4257c51a355d78246b4ca59ab462fbe5b72be
ootdir/init.rc
fcb9bf4cc615a3e8577dd8a1d492a103f5076b93 07-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
ebf46586f57e580d0195a06c32103ea393314f01 06-Sep-2011 Dima Zavin <dima@android.com> init: do not load default.prop from ramdisk in charger mode

Change-Id: Ic471b891829d7f857674b925c9948954972d9ecb
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
nit/property_service.c
nit/property_service.h
13ca5158e45b3acab266c782da98c1179efc671a 05-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
7e14e0c9748722ece27a6a65a5a7812b26d8b22e 05-Sep-2011 Dima Zavin <dima@android.com> cutils: only build klog for target

Change-Id: Id524753ca5e7271a498fdf03179bba3fdaed5729
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/Android.mk
f48b23688c1303212c65e470af9f9f3892e98f8e 30-Aug-2011 Dima Zavin <dima@android.com> core: Add a standalone charger UI binary

This can be launched from an 'on charger' section in init, which
is processed if androidboot.mode=charger is supplied on kernel
command line.

This is a standalone binary that has a simple "user interface"
and allows the standard production kernel to run while charging.
This removes the burden from the bootloader to get low-power mode
working.

Currently, the device will "power-on" (i.e. reboot) into normal
mode if the power key is pressed for X seconds, and will also
power down the device if the usb/ac cable is removed for Y seconds.

Change-Id: I780594b99211cb09de7f8519a69c5962eb91348a
Signed-off-by: Dima Zavin <dima@android.com>
harger/Android.mk
harger/charger.c
harger/images/charging.png
nclude/private/android_filesystem_config.h
ca47cef7491caf6072984d9d64c768717baad09a 25-Aug-2011 Dima Zavin <dima@android.com> init: add charge mode handling

Introduces a 'charger' section that is processed when androidboot.mode
supplied on the kernel commandline is "charger".

In this mode, sections such as fs, post-fs, etc are skipped. Only the
'early-init' and 'init' sections of the init rc files are processed before
processing the 'charger' section.

Change-Id: If9eb6334de18f04cbcf2aab784578e2993615242
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
ootdir/init.rc
da04c52ab1036048520fca265cf02b61dca789e0 02-Sep-2011 Dima Zavin <dima@android.com> init/cutils: move list utility code to cutils from init

Change-Id: I357ceee813700297d8343159f22a07659e768d41
Signed-off-by: Dima Zavin <dima@android.com>
nclude/cutils/list.h
nit/devices.c
nit/init.c
nit/init.h
nit/init_parser.c
nit/list.h
nit/parser.c
nit/signal_handler.c
nit/ueventd_parser.c
nit/util.c
ibcutils/Android.mk
ibcutils/list.c
8f91282ebe1963b9d27f8779ad1342302b293bd2 01-Sep-2011 Dima Zavin <dima@android.com> init/cutils: move kernel logging interface to libcutils from init

Change-Id: Ia0f91b1fcd6cae69d76bf3dd841340958db938a8
Signed-off-by: Dima Zavin <dima@android.com>
nclude/cutils/klog.h
nit/builtins.c
nit/init.c
nit/log.h
nit/ueventd.c
nit/util.c
ibcutils/Android.mk
ibcutils/klog.c
2d55e02d0f3c27f0c99ab889ab7b73126280a21c 01-Sep-2011 Dima Zavin <dima@android.com> libcutils/init: move uevent socket opening code to libcutils

Change-Id: I90adf78c0eb6185505f2bf7b62e96e25ab918345
Signed-off-by: Dima Zavin <dima@android.com>
nclude/cutils/uevent.h
nit/devices.c
ibcutils/uevent.c
d4f1c430efd42827c46c862e4c03fe9986f49052 31-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
4285b8f850d2e9aa60481f9316c7b26d12a74916 30-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
1afcc2cfa47e21292a9dfe651e7d6e26b74a7d00 30-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
09e32886e64258c0600e2696e26a2aca559310e2 30-Aug-2011 Dima Zavin <dima@android.com> am 96a5482b: am fd6f3872: am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"

* commit '96a5482b75029129ebeecd543ca6683d2411b9a3':
libdiskconfig: add missing LOCAL_MODULE_TAGS
7fa67f90bf7ab966ed5c21de02f53bc361abeb77 30-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
96a5482b75029129ebeecd543ca6683d2411b9a3 30-Aug-2011 Dima Zavin <dima@android.com> am fd6f3872: am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"

* commit 'fd6f38727e3be7d5d9163698b06d61656b2bbe4d':
libdiskconfig: add missing LOCAL_MODULE_TAGS
fd6f38727e3be7d5d9163698b06d61656b2bbe4d 30-Aug-2011 Dima Zavin <dima@android.com> am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"

* commit '2985f81d0dfa0e3ff790cb7637684b3919a6ca1c':
libdiskconfig: add missing LOCAL_MODULE_TAGS
dccddee972e5fd93409dc874e0a46fd5ae659b16 29-Aug-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Fix DEBUG_NEEDS usage

Change-Id: Ic107c60080e55e1f9092f20fe3bd55e7592ca9fd
ibpixelflinger/scanline.cpp
97eda8953112b8e73f86da33a8dfb866933f77f3 29-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
2985f81d0dfa0e3ff790cb7637684b3919a6ca1c 27-Aug-2011 Dima Zavin <dima@android.com> Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"
3bea0790e23811d9139f5b39e9b126445fee061c 26-Aug-2011 Dima Zavin <dima@android.com> init: check for list empty when getting commands for action

Change-Id: Id42d6a6b6297919b2e6520e074e31b5e01ae17bc
Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
68cc6bb0f1aae30c3e9d00ddb0393bfde4e48971 16-Jan-2011 Chih-Wei Huang <cwhuang@linux.org.tw> libdiskconfig: add missing LOCAL_MODULE_TAGS

Change-Id: Ia4fceb4e4f33df3e37b0e83f042fff09dab2d06c
ibdiskconfig/Android.mk
948ed29134e9793f0005fd56dba31215d0419001 23-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
bb86bc5892374f3a41784135bebc7ada3270c8c1 23-Aug-2011 Christopher Tate <ctate@google.com> Fix 'adb backup' command line validation

The host side wasn't properly checking for argument-list sufficiency
*after* removing any [-f filename] sequence.

Fixes bug 5164135

Change-Id: I7bc49e37ef168182088e0e664b6897dd2a088ebf
db/commandline.c
5da93589f106646203d6633e2e927aba01fbdb9f 22-Aug-2011 Benoit Goby <benoit@android.com> Allow radio to set sys.usb.config

This allows the ril to put the phone into diagnostic mode

Change-Id: Iafc8164991550e7ab0ffda8b8da1d58e34a4225b
nit/property_service.c
d5e231b8329ff57dd0d393d4a69de13bae478863 22-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
7b114883d08416b2adc6926fa2cd8297b48fa53f 18-Aug-2011 JP Abgrall <jpa@google.com> Merge "init: allow mediaserver to tag socket (group net_bw_acct)"
85e37b0a81f2f24f223c8917db69221779f0d2b0 18-Aug-2011 JP Abgrall <jpa@google.com> init: allow mediaserver to tag socket (group net_bw_acct)

The mediaserver needs to do communication on behalf of other apps
(browser, ...).
It needs to be able to tag sockets. The kernel will check for net_bw_acct
group membership.

Change-Id: I7fb063fdb7d9435d7f979df6622ff17f34049cbc
ootdir/init.rc
e935be126cb703089d6c66f91f6efbb00f8dee4e 17-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
9de370e165350010bc9086347cbd142aecef771e 17-Aug-2011 Jeff Brown <jeffbrown@google.com> Show the resolution of each axis.

Change-Id: I81c4b7e6480b98e59fb389060ab2c8d34257ae5f
oolbox/getevent.c
75ae4246295db86089a0d672873bb5121b051b79 16-Aug-2011 Kenny Root <kroot@google.com> Merge "Add install arg for verification"
ada4aa3ced533e0556a652c7190b2dd5d32503a0 16-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
3572e5ecb11be2829b087ecf54d32963cabcb62b 16-Aug-2011 repo sync <isheriff@google.com> Merge "Update dhcp for p2p"
22268c720b53224ed10fa209266418eec964ea7c 15-Aug-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 549bfcda: am 003771d1: am 80d508fd: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"

* commit '549bfcda6df30dd00db254b3717fc8df463ce710':
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
549bfcda6df30dd00db254b3717fc8df463ce710 15-Aug-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 003771d1: am 80d508fd: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"

* commit '003771d1c0ad6c3c6cd0c82f787636111c9e193c':
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
003771d1c0ad6c3c6cd0c82f787636111c9e193c 15-Aug-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 80d508fd: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"

* commit '80d508fd62a2cc22693a9bbb3aca9bd8568ecec5':
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
80d508fd62a2cc22693a9bbb3aca9bd8568ecec5 15-Aug-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"
571a471576adfdc23965231495d86a2c0b9abf5d 15-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
c11f99f40a200f5cdb4bdaedc18fddbc4324189c 15-Aug-2011 zhangclb <zhangclb@lenovo.com> correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)

Change-Id: I3466fdf7b03cf5da189efe4efb563d09f14b467a
db/usb_vendors.c
63470fd0271143f88b92360312fd278a20e5765b 13-Aug-2011 JP Abgrall <jpa@google.com> Merge "resolved conflicts for merge of d18dc005 to master"
a329b4296cab06ea0b6e95065d8eabb82d3fd76d 29-Jul-2011 repo sync <isheriff@google.com> Update dhcp for p2p

Bug: 5002384
Change-Id: I4ee4f80e2bc2966aa30d1344182d90f30117fbae
ibnetutils/dhcp_utils.c
1e144548aa7c86af880264c7b4a4462e6c1a87c6 12-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> Merge "libnl_2: Update README"
806ed3ce4ac59e55c9c326ad9df056672a608e66 12-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> libnl_2: Update README

Change-Id: I8501dc01782fa2cfeabb9d27b9c48caa50b74f37
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/README
be24f0c33114201f466ce8f001550bdc6910cf7f 12-Aug-2011 JP Abgrall <jpa@google.com> resolved conflicts for merge of d18dc005 to master

Change-Id: I91015a835880f3619452107239a4fc8ea0fafbf6
Signed-off-by: JP Abgrall <jpa@google.com>
c9b06951e0349244fdca7401e7bcc54c538dce62 12-Aug-2011 Mathias Agopian <mathias@google.com> another attempt at fixing the SDK build.

Change-Id: I2b96cf7d046b694b232f0699257e4e0608fda660
nclude/system/graphics.h
d18dc0057988df70b375a453bfc7a188e2ed2891 12-Aug-2011 JP Abgrall <jpa@google.com> resolved conflicts for merge of a88c13bf to honeycomb-plus-aosp

The Android.mk's LOCAL_SRC_FILES was different from gingerbread.

Change-Id: Ie1777a5f449e6b135320e92d0dc1c593869aa266
Signed-off-by: JP Abgrall <jpa@google.com>
7934d18aa62af9ab6a7ad6059e03ab24cf5d5e67 12-Aug-2011 Mathias Agopian <mathias@google.com> really fix the SDK build and fix THE build

Change-Id: I994cccf01bcafedc9ea11648eafc20300c58878b
nclude/system/graphics.h
05dc0c6c8d1bbc6f57dbe4c079eeeb7c885595e4 12-Aug-2011 Mathias Agopian <mathias@google.com> Merge "attempt to fix SDK build."
33a1d436366163d396aa21a3d84099c57da4a50f 12-Aug-2011 Mathias Agopian <mathias@google.com> attempt to fix SDK build.

missing cdefs.h include

Change-Id: Ic7dfdfe74976a459f166a7576b077965cd1fda6a
nclude/system/graphics.h
4863fc19e245715930057bcdace3c7dccfa937b7 11-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> libnl_2: Fix nested attribute setting

Change-Id: I9dbf72a25e8a939ab6aa35eaf4adbf86d9ed97a1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/Android.mk
ibnl_2/attr.c
ibnl_2/dbg.c
ibnl_2/msg.c
5fbf404d72729855a831016e90e03c0a352df878 11-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> Merge "libnl_2: Fix nested attribute setting"
a88c13bfa9fa57780b8193e873b48f8fc0143f70 11-Aug-2011 JP Abgrall <jpa@google.com> am f25e55df: Merge changes I8e33c883,I0a2d1615,I401fc0b4,Ie0fb5b59

* commit 'f25e55df1b086161ab28653b583c945df0a16615':
libcutils: qtaguid: support socket untagging, return errors.
Move qtaguid.c from common sources in Android.mk to fix windows build.
Fix header file inclusion for type uid_t.
Add communication support for xt_qtaguid(network traffic accounting) kernel module.
f25e55df1b086161ab28653b583c945df0a16615 11-Aug-2011 JP Abgrall <jpa@google.com> Merge changes I8e33c883,I0a2d1615,I401fc0b4,Ie0fb5b59

* changes:
libcutils: qtaguid: support socket untagging, return errors.
Move qtaguid.c from common sources in Android.mk to fix windows build.
Fix header file inclusion for type uid_t.
Add communication support for xt_qtaguid(network traffic accounting) kernel module.
8968195b197504b290451e136f2a01757ae1430c 11-Aug-2011 Mathias Agopian <mathias@google.com> Merge "Add a priority constant in to the graphics HAL header"
64f17e85b4783b1a34f6d46dd8aed2745ed0c583 11-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> libnl_2: Fix nested attribute setting

Change-Id: I9dbf72a25e8a939ab6aa35eaf4adbf86d9ed97a1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/Android.mk
ibnl_2/attr.c
ibnl_2/dbg.c
ibnl_2/msg.c
fa2f985b295fbf98eb45a9b5eb100f946055c5b4 03-Aug-2011 Ashish Sharma <ashishsharma@google.com> libcutils: qtaguid: support socket untagging, return errors.

- Enable and rename qtaguid_tagSocket()
- Add qtaguid_untagSocket()
- Return kernel errors to caller

Change-Id: I8e33c8832b7f6b24ed9081f36ce1ea9ae6b099c0
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
nclude/cutils/qtaguid.h
ibcutils/qtaguid.c
86993946391ba6603974b61f35fbaf4463893f00 10-Aug-2011 JP Abgrall <jpa@google.com> Move qtaguid.c from common sources in Android.mk to fix windows build.

Change-Id: I0a2d1615108b6c10064b3635d05699748a1341a4
ibcutils/Android.mk
13825eb0a3f4a4914e20a5096e8ff7e73334752e 10-Jul-2011 Ashish Sharma <ashishsharma@google.com> Fix header file inclusion for type uid_t.

Change-Id: I401fc0b41b4b77114fce7240662c9dfe4509e841
nclude/cutils/qtaguid.h
60daf104a1bd54b97c7bf3d71d74b637a0507ee1 08-Jul-2011 Ashish Sharma <ashishsharma@google.com> Add communication support for xt_qtaguid(network traffic accounting) kernel module.

Change-Id: Ie0fb5b593987c53ee6f906fe6e0caab5a581d5a1
nclude/cutils/qtaguid.h
ibcutils/Android.mk
ibcutils/qtaguid.c
e4b10e9f7ff1e0f51479a40b938474928d329dcf 10-Aug-2011 Ashish Sharma <ashishsharma@google.com> Merge "libcutils: qtaguid: support socket untagging, return errors."
5c9be402a4d934b678fe6609b6cc4d488d6ddaa4 10-Aug-2011 Mathias Agopian <mathias@google.com> Add a priority constant in to the graphics HAL header

this is needed if a display/gpu driver needs to create
service threads that can block the main ui thread.
to avoid priority inversions, these must run at
HAL_PRIORITY_URGENT_DISPLAY

Change-Id: I3af592e05a6d1b6f39a2b7885a7c842e54abfce2
nclude/system/graphics.h
5d5816c484f124ca52c53cd434955b9782a486a5 10-Aug-2011 Christopher Tate <ctate@google.com> Merge "Change default backup filename and terminology"
de034ec83e2d76db54d1936e706e80853146dcc7 10-Aug-2011 Christopher Tate <ctate@google.com> Change default backup filename and terminology

We now use "backup.ab" as the default backup archive filename, and no longer
refer to "tar" or "tarfiles" in the help text. The underlying format may
be tar, but we're certainly not interoperable even with ustar/pax thanks
to our compression & encryption layers and our custom header.

Change-Id: I3e74af96cfc102e94848c969eb36af54304bfd9b
db/commandline.c
20b390e9717583d782581399627f881ab9c72a22 09-Aug-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Move libnl headers to their own project"
d09196d00cb5bf3bffb22d3aae45c8797f1ddf4c 08-Aug-2011 Dianne Hackborn <hackbod@google.com> Merge "Activity Manager now takes care of setting OOM values."
c4fcd8a68aa0ff823d208800676a9aa443e177e9 08-Aug-2011 Jean-Baptiste Queru <jbq@google.com> Move libnl headers to their own project

Change-Id: If3f20575507431afa7a79aee6b99823a2d1df324
ibnl_2/Android.mk
ibnl_2/include/netlink-generic.h
ibnl_2/include/netlink-local.h
ibnl_2/include/netlink-types.h
ibnl_2/include/netlink/addr.h
ibnl_2/include/netlink/attr.h
ibnl_2/include/netlink/cache-api.h
ibnl_2/include/netlink/cache.h
ibnl_2/include/netlink/cli/utils.h
ibnl_2/include/netlink/data.h
ibnl_2/include/netlink/errno.h
ibnl_2/include/netlink/fib_lookup/lookup.h
ibnl_2/include/netlink/fib_lookup/request.h
ibnl_2/include/netlink/genl/ctrl.h
ibnl_2/include/netlink/genl/family.h
ibnl_2/include/netlink/genl/genl.h
ibnl_2/include/netlink/genl/mngt.h
ibnl_2/include/netlink/handlers.h
ibnl_2/include/netlink/list.h
ibnl_2/include/netlink/msg.h
ibnl_2/include/netlink/netfilter/ct.h
ibnl_2/include/netlink/netlink-compat.h
ibnl_2/include/netlink/netlink-kernel.h
ibnl_2/include/netlink/netlink.h
ibnl_2/include/netlink/object-api.h
ibnl_2/include/netlink/object.h
ibnl_2/include/netlink/route/addr.h
ibnl_2/include/netlink/route/class.h
ibnl_2/include/netlink/route/classifier.h
ibnl_2/include/netlink/route/cls/ematch.h
ibnl_2/include/netlink/route/link.h
ibnl_2/include/netlink/route/neighbour.h
ibnl_2/include/netlink/route/neightbl.h
ibnl_2/include/netlink/route/nexthop.h
ibnl_2/include/netlink/route/qdisc.h
ibnl_2/include/netlink/route/route.h
ibnl_2/include/netlink/route/rtnl.h
ibnl_2/include/netlink/route/rule.h
ibnl_2/include/netlink/route/tc.h
ibnl_2/include/netlink/socket.h
ibnl_2/include/netlink/types.h
ibnl_2/include/netlink/utils.h
ibnl_2/include/netlink/version.h
a24687197d69ac677d176dbc41d5cfd65d1afc44 08-Aug-2011 Chia-chi Yeh <chiachi@android.com> init.rc: add inet permission to VPN daemons explicitly.

Racoon still needs it after dropping root privilege, or pure IPSec VPN
will fail. Mtpd works without it because net_raw implies inet. However
it would be better to set all of them clearly without the assumption.

Change-Id: I50762af2c25ec9cc559e528c7b14f469494fd553
ootdir/init.rc
9b5c774369fcbd4460751f9b01e692d688c386ba 03-Aug-2011 Ashish Sharma <ashishsharma@google.com> libcutils: qtaguid: support socket untagging, return errors.

- Enable and rename qtaguid_tagSocket()
- Add qtaguid_untagSocket()
- Return kernel errors to caller

Change-Id: I8e33c8832b7f6b24ed9081f36ce1ea9ae6b099c0
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
nclude/cutils/qtaguid.h
ibcutils/qtaguid.c
06787f4089093fed8a01ec3a3d2092e10919b77e 08-Aug-2011 Dianne Hackborn <hackbod@google.com> Activity Manager now takes care of setting OOM values.

All init needs to do is make these files writeable so that the
activity manager can set them.

Change-Id: Ieea43208fadc01504d813be379aecbafcadf0d34
ootdir/init.lowmem.rc
ootdir/init.rc
597ea5b63f764b4403fd0d34400ab37cf944b479 05-Aug-2011 Kenny Root <kroot@google.com> Add install arg for verification

Allow "adb install" to transfer the file for the verification argument
to the package manager "pm install" command.

Change-Id: I4834f45019eb1387a5d2b205b53a67e91d5fa67e
db/commandline.c
0842f08b915bb2041ac50107bb821c87d7f68db6 05-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> Merge "libnl: Added more detailed information to README"
9ff99f653632504b98c17fc76eac3383df5b5d1e 05-Aug-2011 Kenny Root <kroot@google.com> Merge "Default to secure mode"
e0658725037a65850a11947f881033a2a89e8818 05-Aug-2011 Frank Maker <ffrank@google.com> libnl: Added more detailed information to README

Change-Id: I330a215a02535521b6bdd613eae50c34e47a8835
ibnl_2/README
655835be2a0e6d656040f4dd8f7e3e1035734ef7 26-Jul-2011 Andy McFadden <fadden@android.com> Don't stall waiting for target to crash

This modifies debuggerd to sleep-poll while waiting for the target
process to crash, rather than block (potentially forever).

Also, add/fix some error reporting.

Bug 5035703

Change-Id: Id62ab79f53104927f8de684dff1a5734dbdb8390
ebuggerd/debuggerd.c
2a9050a0dc5fea91c0c507fe3a9261a73d4f1456 03-Aug-2011 Frank Maker <ffrank@google.com> Merge "libnl: BUGFIX to support wpa_supplicant p2p_find"
319f4e2793e691a7aeabad09e463ac09df562ed4 03-Aug-2011 Mathias Agopian <mathias@google.com> fix a typo that prevented api_connect/api_disconnect to work

also make the original connect/disconnect inlines be no-ops.

Change-Id: Ic723e21455491c63ccbbcd01d3a47cd7ed788319
nclude/system/window.h
69bc179b203c17380ba0b4fda7cf99af65cc5324 02-Aug-2011 Frank Maker <ffrank@google.com> libnl: BUGFIX to support wpa_supplicant p2p_find

Close socket file descriptor when nl_msg freed
Correct nested attribute container size when closing nest
ibnl_2/attr.c
ibnl_2/socket.c
a43546a874890064606489f2125181a5f65adacd 02-Aug-2011 Wu-cheng Li <wuchengli@google.com> Change CAMERA_MSG_METADATA_FACE to CAMERA_MSG_PREVIEW_METADATA.

bug:4460717

Change-Id: Icb9c54fa35a1af7c4f761d1a25061e6993cfc4af
nclude/system/camera.h
ed7f9aaf76d58ac1a4a34838ab5f4d6899714056 02-Aug-2011 Mathias Agopian <mathias@google.com> Merge "connect/disconnect is now deprecated."
d387e08788f7f7e21c0f27bf18f27800efb78ce2 01-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Change int to int32_t in camera_frame_metadata and camera_face."
ff9d3484e6c8f2f7e7e25581cb4dc86e0884d8a7 31-Jul-2011 Kenny Root <kroot@google.com> Default to secure mode

If ro.secure is not set for some reason, default to secure mode.

Change-Id: Id0ce3ea5507a3f9690332fb5a2daef7d3303481d
db/adb.c
8ad545297cdb180893c4f957682857953c0d3c5f 30-Jul-2011 Mathias Agopian <mathias@google.com> connect/disconnect is now deprecated.

these hooks are replaced by api_connect/api_disconnect
which serve exactly the same purpose than before.
the old hooks are deprecated because they won't be called
from the gl driver anymore, but instead will be called
by our EGL wrapper. to maintain binary compatibility
it was necessary to introduce these new hooks.

Change-Id: I11756a5d99e3ea3d6fb61b943f82037932dfa56a
nclude/system/window.h
514b40bafada989c63f8a3d42a517c6c53e04b02 30-Jul-2011 Nick Kralevich <nnk@google.com> am 189de0c1: am adabe566: am 810cf41b: Merge "Fixed memory leak when using transport:serial."

* commit '189de0c1f4339abd7b938b4905775163d2a94bbe':
Fixed memory leak when using transport:serial.
189de0c1f4339abd7b938b4905775163d2a94bbe 30-Jul-2011 Nick Kralevich <nnk@google.com> am adabe566: am 810cf41b: Merge "Fixed memory leak when using transport:serial."

* commit 'adabe566906aa5e8ce791327559aeb10c139b365':
Fixed memory leak when using transport:serial.
adabe566906aa5e8ce791327559aeb10c139b365 30-Jul-2011 Nick Kralevich <nnk@google.com> am 810cf41b: Merge "Fixed memory leak when using transport:serial."

* commit '810cf41b6d5b772846bbb16700f8c69f03710e60':
Fixed memory leak when using transport:serial.
810cf41b6d5b772846bbb16700f8c69f03710e60 30-Jul-2011 Nick Kralevich <nnk@google.com> Merge "Fixed memory leak when using transport:serial."
3ac91d178bfbc38fbeb4743f9fbe5619e8e744d0 30-Jul-2011 Wu-cheng Li <wuchengli@google.com> Change int to int32_t in camera_frame_metadata and camera_face.

bug:4460717
Change-Id: I5c7e4ed117c2b481fb0f7d9db418f98b7459adde
nclude/system/camera.h
363725a45d70537195af87ed16f905e38cd6ee79 29-Jul-2011 Robert Greenwalt <robdroid@android.com> Merge "Use dhcp netmask value rather than its pointer (patch from Marvell)"
17a5252f0e9fe382bb50e82fab676e9d3d09ac6c 29-Jul-2011 Andy McFadden <fadden@android.com> Merge "debuggerd can't handle debuggerd crashes"
44e12eceecd0be8ba832a003733bfc859b2ccd9d 29-Jul-2011 Andy McFadden <fadden@android.com> debuggerd can't handle debuggerd crashes

When a process receives a fatal signal, it connects to debuggerd
and initiates a conversation over a socket. When the crashing
process is debuggerd, the conversation stalls forever, and you
stop getting native crash details.

This resets the signal handlers to SIG_DFL, so that debuggerd
simply crashes and gets restarted.

Bug 5035703

Change-Id: Ie081d710d046f701bca7e7d8ea3e1d24766d9f61
ebuggerd/debuggerd.c
4509e482ffec2a28819cce31682482fc26e5840d 29-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "Move some common USB configuration logic to init.rc"
3175c8e9bfcb01f181d7300755da15a999e5461c 27-Jul-2011 Tom Marlin <tomm@bsquare.com> Fixed memory leak when using transport:serial.

Fixed memory leak when using transport:serial. Code was previously
using strdup() to make a copy of the serial number which was not
necessary. Instead, just set serial=service.

Change-Id: Ifa8fe7999c6fb88955d2c6bdfcd3cd724ec1f020
Signed-off-by: Tom Marlin <tomm@bsquare.com>
db/adb.c
7804cbf4833cba82bd38f6adaf567bcb8262c3ad 29-Jul-2011 Mike Lockwood <lockwood@android.com> Move some common USB configuration logic to init.rc

Change-Id: Ib75ccfd9c4aa8aace936370c33f33a922ca3c51f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/init.rc
ea839db2894b88ff8e039e589ad251579fd14610 29-Jul-2011 Mike Lockwood <lockwood@android.com> am b1cfa672: am 7d39463e: am d1015de9: Merge "adb: Add USB vendor ID for Vizio"

* commit 'b1cfa672014d197d6d4d12fca0d40cd59de436bc':
adb: Add USB vendor ID for Vizio
b1cfa672014d197d6d4d12fca0d40cd59de436bc 29-Jul-2011 Mike Lockwood <lockwood@android.com> am 7d39463e: am d1015de9: Merge "adb: Add USB vendor ID for Vizio"

* commit '7d39463eff2a9002208f34f1d2ce4d62546f6c3a':
adb: Add USB vendor ID for Vizio
7d39463eff2a9002208f34f1d2ce4d62546f6c3a 29-Jul-2011 Mike Lockwood <lockwood@android.com> am d1015de9: Merge "adb: Add USB vendor ID for Vizio"

* commit 'd1015de919308ec0a99643f5b2837774d7a3dc62':
adb: Add USB vendor ID for Vizio
d1015de919308ec0a99643f5b2837774d7a3dc62 29-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "adb: Add USB vendor ID for Vizio"
fb34e98bdd36717a1df5a2be4de288c5e08c9b78 29-Jul-2011 Mike Lockwood <lockwood@android.com> adb: Add USB vendor ID for Vizio

Change-Id: I280ff83d7f1fda1ed811bd42cb6fd65036525559
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
6d956cc0897f5a0225913e136c40053162be24aa 29-Jul-2011 Jae Seo <jaeseo@google.com> Use dhcp netmask value rather than its pointer (patch from Marvell)

Change-Id: Iffe2ca52333df4ef393c5305a5b66582006e4699
ibnetutils/dhcpclient.c
22bfc4cca03197036c3b49e7c2cf47a0a23fce87 29-Jul-2011 Benoit Goby <benoit@android.com> Allow radio to set net.cdma* properties

Change-Id: I656abde9d06175eb158e84de4d08ede42620b46a
nit/property_service.c
9d5bfd35414f2be2f1ea8a2cabee8f407d3e38c0 27-Jul-2011 Wu-cheng Li <wuchengli@google.com> Add camera frame metadata and face detection structs.

bug:4460717
Change-Id: Ib72abfba080529472cf3fecb712043403bf7295f
nclude/system/camera.h
17e163182d704a11cdb2108c10197e636e9e0256 27-Jul-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 4604090: notification sound interrupted."
c349636c7cec0abe3a92c220a6d828edbd21208b 26-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 4319552 Use commonly defined channel mask values in native"
9e9c18d55b34c97db2c39a9fa0a2190b423b4c0b 26-Jul-2011 Benoit Goby <benoit@android.com> Merge "Allow radio to set net.lte* properties"
4518e6a2996da0fa00ef427a79227b90ccf94ce0 26-Jul-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add camera face detection enums."
3507616870acd71bbd26e045528b0cfe716d37cd 24-Jul-2011 Eric Laurent <elaurent@google.com> Fix issue 4604090: notification sound interrupted.

Removed system from mediaserver groups. Not needed anymore
now that AudioFlinger acquires wake locks via PowerManagerService.

Change-Id: I177b968a0a30557d871188bf3991b96d9b391d3c
ootdir/init.rc
7100f640deabb9e746e41eac54707f1ca531f2db 26-Jul-2011 Benoit Goby <benoit@android.com> Allow radio to set net.lte* properties

Change-Id: I4b7a280ba4c773673b28db8cfbbffcb360ee717f
nit/property_service.c
de19ea26025927fe95ec96818a13dd58bec91cf6 21-Jul-2011 Wu-cheng Li <wuchengli@google.com> Add camera face detection enums.

bug:4460717
Change-Id: Id5cadcd7cdab9a9978569caf27d2ef2747fa6570
nclude/system/camera.h
c21dcef9fecaa224f153af0c5643fca4933bbc7f 26-Jul-2011 Conley Owens <cco3@android.com> am 45e8fc6b: am 8621b5ea: am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"

* commit '45e8fc6bfd9221274f48861287ff7af06ee7a199':
Fix build error in init when building with bootchart
6d4f39754bff9c1dcb8023839ea583b6d0723b14 26-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 4319552 Use commonly defined channel mask values in native

The native channel mask values are equal to the Java values, which
differ from other standards simply for legacy reasons. It is
preferrable to use commonly used values, and translate from the
Java constants to the common values when specifying a Java mask.
The new definitions uses the same values and ordering as in
OpenSL ES and other standards.

Change-Id: I879f64b281714c60684cd8b36fe6ae648a555121
nclude/system/audio.h
2d3205d2a1404e811cb2c29b57b26137668755ab 26-Jul-2011 Jeff Brown <jeffbrown@google.com> Merge "Dump the HID descriptor when available."
45e8fc6bfd9221274f48861287ff7af06ee7a199 25-Jul-2011 Conley Owens <cco3@android.com> am 8621b5ea: am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"

* commit '8621b5ea475822499128e6f138a9dfc224bbb569':
Fix build error in init when building with bootchart
2ca55922181e6702d9b2a4c5ea4cae96a370d8f9 25-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 4211099 channel constants and 7.1 mask"
251977877594c048728efda856a36f2d6e7392a5 25-Jul-2011 JP Abgrall <jpa@google.com> Merge "NetlinkEvents: adding support for iptables' quota2 NFLOG messages."
33fad99acfaffb775ce0792b06ba97bb6cacce1a 25-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 4211099 channel constants and 7.1 mask

Add definitions for the side and elevated channels.

Ccorrect definition of 7.1 mask which uses
the side channels rather than the front half-pan channels.

Change-Id: I5b6f601f6404d782dc46ef47efac9cc8441fef90
nclude/system/audio.h
4ac87154c1e659c474b8d70b4de7a7700c78b4c4 24-Jul-2011 Jeff Brown <jeffbrown@google.com> Dump the HID descriptor when available.

Also, always print the input properties when -p is
specified.

Change-Id: Ibacb6dd26ccab68c85b76928df60fdc2a53c198c
oolbox/getevent.c
a0cba730558b94e6a6ce3216362bd7d969a92a03 22-Jul-2011 Mike Lockwood <lockwood@google.com> Merge "Fix returning errno values which should be negative."
2fc9fc7c8e26a35059ad39fe35ed256bfadb2891 22-Jul-2011 Yuncheol Heo <ycheo@google.com> Fix returning errno values which should be negative.

Change-Id: Id6464b127678ca1d9f4afa7c99fcfce361f4ad4a
dcard/sdcard.c
8621b5ea475822499128e6f138a9dfc224bbb569 22-Jul-2011 Conley Owens <cco3@android.com> am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"

* commit '212282c314265b1d1def070634049c55291576bb':
Fix build error in init when building with bootchart
212282c314265b1d1def070634049c55291576bb 22-Jul-2011 Conley Owens <cco3@android.com> am 80dbd2a7: Merge "Fix build error in init when building with bootchart"

* commit '80dbd2a7f277e2fcf831e2ac1b2da574e1513564':
Fix build error in init when building with bootchart
80dbd2a7f277e2fcf831e2ac1b2da574e1513564 22-Jul-2011 Conley Owens <cco3@android.com> Merge "Fix build error in init when building with bootchart"
5100916182b05971975f8d8fe65a1255e2c5ac96 20-Jul-2011 Mathias Agopian <mathias@google.com> support for "Add an ANativeWindow API for SurfaceFlinger to suggest an optimal buffer orientation"

Bug: 4487161
Change-Id: I36708fd155415adbb666137692252381c19abcf6
nclude/system/window.h
b32904a9eaff02799713363d5f6817ce86eaca54 18-Jul-2011 Mike Lockwood <lockwood@android.com> am 01acea11: am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"

* commit '01acea112501f7d140f100591319781e59b90d0e':
adb: Add USB vendor ID for Lenovo
01acea112501f7d140f100591319781e59b90d0e 18-Jul-2011 Mike Lockwood <lockwood@android.com> am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"

* commit '1f72fe991dc2e48c13518015c523f9e3ea048af2':
adb: Add USB vendor ID for Lenovo
1f72fe991dc2e48c13518015c523f9e3ea048af2 18-Jul-2011 Mike Lockwood <lockwood@android.com> am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"

* commit '7df080b27921827327952628c46dcea6ae6caf34':
adb: Add USB vendor ID for Lenovo
7df080b27921827327952628c46dcea6ae6caf34 18-Jul-2011 Mike Lockwood <lockwood@android.com> am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"

* commit '3ddaa0ad1eea0bd9b8137ccf3f200992f7d98c5a':
adb: Add USB vendor ID for Lenovo
3ddaa0ad1eea0bd9b8137ccf3f200992f7d98c5a 18-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "adb: Add USB vendor ID for Lenovo"
aa63e196b4d5a94f5717acf307ce64168503221b 18-Jul-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with gingerbread-release

Change-Id: Iaef69ddb901f908564167a085c93e91298ce61d4
4a2b0fcd6e166499fe51e920aca5f9640dd05939 15-Jul-2011 Conley Owens <cco3@android.com> am aa4a66a1: am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."

* commit 'aa4a66a16dd9b97fb876bb296366442b8745a10b':
Create world readable, system writeable /data/resource-cache.
81231596c51ed1509bec0a871a834fb05e709b7c 15-Jul-2011 Kenny Root <kroot@google.com> am 070ec8e0: resolved conflicts for merge of 3ea075be to honeycomb-plus-aosp

* commit '070ec8e02e12aafc8a636737bba3d5ead7cecd8e':
Add -F for classify to ls
aa4a66a16dd9b97fb876bb296366442b8745a10b 15-Jul-2011 Conley Owens <cco3@android.com> am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."

* commit '1e5e2d7673a9ea915283f6626fa692cc169b0e67':
Create world readable, system writeable /data/resource-cache.
1e5e2d7673a9ea915283f6626fa692cc169b0e67 15-Jul-2011 Conley Owens <cco3@android.com> am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."

* commit 'af6e3266fd8d4808a3aa2b37e08dce67493ff396':
Create world readable, system writeable /data/resource-cache.
af6e3266fd8d4808a3aa2b37e08dce67493ff396 15-Jul-2011 Conley Owens <cco3@android.com> am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."

* commit 'd0b93f4317c29d434ce22a2643c165317efc5464':
Create world readable, system writeable /data/resource-cache.
070ec8e02e12aafc8a636737bba3d5ead7cecd8e 15-Jul-2011 Kenny Root <kroot@google.com> resolved conflicts for merge of 3ea075be to honeycomb-plus-aosp

Change-Id: Ic668cb99822d4bc44f2f57782afd1a6c1b348e9b
d0b93f4317c29d434ce22a2643c165317efc5464 15-Jul-2011 Conley Owens <cco3@android.com> Merge "Create world readable, system writeable /data/resource-cache."
3ea075bee78d8c82b0209c43d02e2324846fbe3e 15-Jul-2011 Kenny Root <kroot@google.com> am ca0a6f04: am 008cbcd0: Merge "Add -F for classify to ls"

* commit 'ca0a6f0493c2b6a4b6ea20b31a37457accdaf126':
Add -F for classify to ls
ca0a6f0493c2b6a4b6ea20b31a37457accdaf126 15-Jul-2011 Kenny Root <kroot@google.com> am 008cbcd0: Merge "Add -F for classify to ls"

* commit '008cbcd082f21683b3b53d1ca84725b72b2f90b6':
Add -F for classify to ls
008cbcd082f21683b3b53d1ca84725b72b2f90b6 15-Jul-2011 Kenny Root <kroot@google.com> Merge "Add -F for classify to ls"
5fd94e561f28279650487283060953916bace742 15-Jul-2011 Jeff Brown <jeffbrown@google.com> Merge "Show why umount failed."
e6f80149a201e02ddd1e251e0690ad100b688cd6 15-Jul-2011 JP Abgrall <jpa@google.com> NetlinkEvents: adding support for iptables' quota2 NFLOG messages.

It passes the quota2 name and the device at the time the quota was
reached.
ALERT_NAME=...
INTERFACE=...

This needs the new kernel in which xt_quota2 can log.

Change-Id: Icf5045374e1e33bdd1da0d2a2c183e70903a1fea
ibsysutils/src/NetlinkEvent.cpp
baf6b6bdebd6e91c401f64e8013fed49697ed2cc 14-Jul-2011 Jeff Brown <jeffbrown@google.com> Show why umount failed.

Change-Id: Id2b3fbc46b8dfbe2f05637fb35c298915cd5f524
oolbox/umount.c
2210a837561000eb91007edec94a4587158d9d86 14-Jul-2011 Jean-Baptiste Queru <jbq@google.com> am 51ca95dc: am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit '51ca95dc08a411b7973b5d0626e43f8ba0753370':
pixelflinger: back-port AOSP master version.
x86: Add vold.fstab to mount the SD card
Assembly coded android_memset16 and android_memset32
debuggerd: IA version
debuggerd: Reorganize to facilitate IA commit
Set the modes for rc.* files in /system/etc
DBUS is not fully implemented. Disable it for now
debuggerd: Show function names in tombstone backtraces
7076831c7d59d96e9b75bf9aa5664d1d1b312f32 14-Jul-2011 Jean-Baptiste Queru <jbq@google.com> am f75a2ed2: Merge from gingerbread-plus-aosp

* commit 'f75a2ed2138cd8b74597bd57e13d12e1f0b815c2':
adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
Add Gigabyte's USB vendor ID to adb.
Add Funai's USB vendor ID to adb.
7c17d0932c676d75ac0ff42b1917a02127ee554e 14-Jul-2011 Mike Lockwood <lockwood@android.com> adb: Add USB vendor ID for Lenovo

Change-Id: I1c2423f567272493067fae04e64fdcb651b0af62
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
e877ad7ae3ea3c1a631652c86887a627ef9feb3f 14-Jul-2011 Ken Sumrall <ksumrall@android.com> Merge "Add -o loop= option to mount, and fix error detection in mount and umount"
ae3736a3d1418eb1a1e57895ce410256d7106aa3 14-Jul-2011 Mathias Agopian <mathias@google.com> Add lock/unlock perform codes

these will be used to implement lock/unlock on
surfacetexture.

Change-Id: I75f8d8dd136433bd5d61610caeb763d836f8b4e7
nclude/system/window.h
40dac659418f84551a5637a9edee03764c570f3c 13-Jul-2011 Kenny Root <kroot@google.com> Add -F for classify to ls

Adds a field to the non-long version of ls that tells what type of file
it is (i.e., regular, directory, link, fifo, etc).

This is useful for scripts that don't have direct filesystem access.

Change-Id: I54a327390f6ed403acb13c824f62ba9594ba320d
oolbox/ls.c
42cc1edfe7edf613e17bff97f30ff124ada05136 14-Jul-2011 Mathias Agopian <mathias@google.com> Add setScalingMode to ANativeWindow

Also cleanup the header a bit. Give fixed values to enum
because these can never change. And try to make all
comments C (as opposed to C++)

Change-Id: Ie0914ccd81a0231f32e8c21a8ff730985c5c3607
nclude/system/window.h
940c81078e7291096b22f05f6b953658f1e1d730 13-Jul-2011 Ken Sumrall <ksumrall@android.com> Add -o loop= option to mount, and fix error detection in mount and umount

This fixes bug http://b.android.com/18419, which complains about a bogus
error check in the mount command (it also was wrong in the umount command)
and also asks for the mount command to support more than one loopback
device, as mentioned in the FIXME comments in mount.c. This required some
corresponding changes to umount.c

Change-Id: Ib796c70926395e61557e487bad64984d3295d5f3
oolbox/mount.c
oolbox/umount.c
51ca95dc08a411b7973b5d0626e43f8ba0753370 13-Jul-2011 Jean-Baptiste Queru <jbq@google.com> am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit '3415d411073113b44d9fcfd2b7ca7cc0d483d27c':
pixelflinger: back-port AOSP master version.
x86: Add vold.fstab to mount the SD card
Assembly coded android_memset16 and android_memset32
debuggerd: IA version
debuggerd: Reorganize to facilitate IA commit
Set the modes for rc.* files in /system/etc
DBUS is not fully implemented. Disable it for now
debuggerd: Show function names in tombstone backtraces
3415d411073113b44d9fcfd2b7ca7cc0d483d27c 13-Jul-2011 Jean-Baptiste Queru <jbq@google.com> Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp
f75a2ed2138cd8b74597bd57e13d12e1f0b815c2 12-Jul-2011 Jean-Baptiste Queru <jbq@google.com> Merge from gingerbread-plus-aosp

Change-Id: I55b84eda30edf0eade8b43712ab011cd3f65f0d9
2258e08724a4e727323c920f2b894a500ecfccd5 12-Jul-2011 Mathias Agopian <mathias@google.com> Merge "ANativeWindow: add more connectable APIs"
5423e9e4ce52a45ac42419f1467e79ba9e62298f 12-Jul-2011 Jamie Gennis <jgennis@google.com> ANativeWindow: add more connectable APIs

This change adds three new possible values for the 'api' argument to
native_window_connect: CPU, MEDIA and CAMERA.

Change-Id: I9305a5c0c87ab06a2c2bd7c585f54c7c7470408a
Bug: 5020877
nclude/system/window.h
a38ec2b7d4324965d55a020baf4ad8b979d69597 12-Jul-2011 Mike Lockwood <lockwood@android.com> am 4c6b494a: Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones"

* commit '4c6b494a109186791bfc421bc10f35eaae871174':
adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
7da2397583445a263fcad23f548951d13cf3b4bb 12-Jul-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 0dce7d7e: Merge "Add Gigabyte\'s USB vendor ID to adb."

* commit '0dce7d7e7294c3815594f7e561f8df9a858e0fab':
Add Gigabyte's USB vendor ID to adb.
9df11a69e1c7c0a6217f567c6afbc86b4125ed99 12-Jul-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 161fca79: Merge "Add Funai\'s USB vendor ID to adb."

* commit '161fca79a9b79ed15d009fc71a916bf1a3b62621':
Add Funai's USB vendor ID to adb.
4c6b494a109186791bfc421bc10f35eaae871174 12-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones"
0dce7d7e7294c3815594f7e561f8df9a858e0fab 12-Jul-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> Merge "Add Gigabyte's USB vendor ID to adb."
161fca79a9b79ed15d009fc71a916bf1a3b62621 12-Jul-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> Merge "Add Funai's USB vendor ID to adb."
29e1e7393d1742f9dd5663c63026f50981e5bd89 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I2fcf31af681d92880e5d31a46d5f6777f7ca1977
ndroid.mk
db/Android.mk
ibcutils/Android.mk
ibdiskconfig/Android.mk
iblog/Android.mk
ibnetutils/Android.mk
ibsysutils/Android.mk
97814ab2a3355ca94122e692660b61796d5ab7af 12-Jul-2011 David 'Digit' Turner <digit@google.com> resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp

Change-Id: Ie5d26c5a8b31e85aa5137ddbc5eef3616df4fcba
292e86230ee0eabb9c9bed902bc3b3941437341d 11-Jul-2011 Mike Lockwood <lockwood@android.com> adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones

Change-Id: I4dafc43aa76049dd0075e1d70ba05d899e545c8d
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
db/usb_vendors.h
7a5c1463ba386fd14e97c9fb4e058129763b60c1 19-May-2011 Joe Bass <jbass@google.com> Add Gigabyte's USB vendor ID to adb.

Bug #4452872

Change-Id: Ib97548d121d40e96ccc519323a335fc90f3b32b9
db/usb_vendors.c
cbe19cec6192837582906d885dafe1945d6a7f4c 19-May-2011 Xavier Ducrohet <xav@android.com> Add Funai's USB vendor ID to adb.

Change-Id: Idc2974d4437ab1c79cfea5aade98b599a877aad3
db/usb_vendors.c
56286d6fdb07d8b1310c27eeb59bdf05500f166e 11-Jul-2011 Chia-chi Yeh <chiachi@android.com> Merge "init: update permissions for VPN."
1ac6ddeba6873e44b49610ca1f272186f5318f8e 11-Jul-2011 Ashish Sharma <ashishsharma@google.com> Move qtaguid.c from common sources in Android.mk to fix windows build.

Change-Id: I0a2d1615108b6c10064b3635d05699748a1341a4
ibcutils/Android.mk
6dce8322d66361e40d1feb5a6c3de15244de5949 10-Jul-2011 Ashish Sharma <ashishsharma@google.com> Fix header file inclusion for type uid_t.

Change-Id: I401fc0b41b4b77114fce7240662c9dfe4509e841
nclude/cutils/qtaguid.h
dbbfba39a5c81753438ac18bc52a1aa64860ab86 09-Jul-2011 Ashish Sharma <ashishsharma@google.com> Merge "Add communication support for xt_qtaguid(network traffic accounting) kernel module."
9bb4d411e01c8e6330b5c27c489485592360576b 09-Jul-2011 Chia-chi Yeh <chiachi@android.com> init: update permissions for VPN.

VPN no longer uses system properties to keep network parameters.
Besides, profiles are now stored and encrypted by keystore.

Change-Id: I7575f04f350b7d8d5ba7008eb874a72180d057e8
nit/property_service.c
ootdir/init.rc
50d9819ef49c2d557ad0b33a7880a7a3b72e3fb8 09-Jul-2011 Chia-chi Yeh <chiachi@android.com> Merge "init: clean up init.rc as now mkdir handles EEXIST."
8626cce5f381899f47e3a82e2ef4c98f183391b0 08-Jul-2011 Ashish Sharma <ashishsharma@google.com> Add communication support for xt_qtaguid(network traffic accounting) kernel module.

Change-Id: Ie0fb5b593987c53ee6f906fe6e0caab5a581d5a1
nclude/cutils/qtaguid.h
ibcutils/Android.mk
ibcutils/qtaguid.c
ea7441415997faf34f7ae44f462f916f5f7ea0df 09-Jul-2011 Chia-chi Yeh <chiachi@android.com> init: clean up init.rc as now mkdir handles EEXIST.

Change-Id: I3fa2a618ef27197315fc128738a284ac644e86c0
ootdir/init.rc
8a330bc533691a5358168e9ccb24b615f1c8f42a 09-Jul-2011 Chia-chi Yeh <chiachi@android.com> Merge "init: make "mkdir" work even when the directory already exists."
27164dce5f0788476449057c978fa24e62245cb8 08-Jul-2011 Chia-chi Yeh <chiachi@android.com> init: make "mkdir" work even when the directory already exists.

This allows us to change permissions and ownerships of directories
in init scripts without adding additional commands.

Change-Id: I1815d6015953035251b98f28c0f3efd3c7f25f80
nit/builtins.c
6b06f9f48dde2802218cade3fdb12a4fed5f46f6 08-Jul-2011 Jamie Gennis <jgennis@google.com> Merge "ANativeWindow: add setters for dimensions and fmt"
7da24861ea933db3bd27509f91717b5c63fd6dde 08-Jul-2011 Wink Saville <wink@google.com> am 436deea5: am 979203ee: Add reset_mask as parameter to ifc_reset_connections

* commit '436deea5bbd43ae402ca8ee5bbc7fed3daaf3fce':
Add reset_mask as parameter to ifc_reset_connections
39e219e9d6dabbac4c5a46c6a4629c1663e88832 08-Jul-2011 android-merger <android-build@android.com> reset, and keep history
436deea5bbd43ae402ca8ee5bbc7fed3daaf3fce 08-Jul-2011 Wink Saville <wink@google.com> am 979203ee: Add reset_mask as parameter to ifc_reset_connections

* commit '979203ee34084327bf4f20ad1f878450de94826e':
Add reset_mask as parameter to ifc_reset_connections
8f1f5b061f12fd0b155c70b46796f1605e8bf292 08-Jul-2011 David 'Digit' Turner <digit@google.com> merge intel x86 patches into gingerbread branch
1384e50b4d757931ccdbd76b61fd68006eddb531 08-Jul-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with gingerbread-release

Change-Id: I1b4ebc93955e3e929c8984e4e6b505d628061b68
697fb7622b402627e85081d2fbb84a8fc3daafbc 07-Jul-2011 android-merger <android-build@android.com> Revert "Validate sender credentials on netlink msg receive"

This reverts commit b620a0b1c7ae486e979826200e8e441605b0a5d6.
ibsysutils/src/NetlinkListener.cpp
0ac3adb0380f0d2f048d0cef15995656bfdb9169 07-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> Merge "libnl: nl_socket_alloc() Bugfix"
979203ee34084327bf4f20ad1f878450de94826e 07-Jul-2011 Wink Saville <wink@google.com> Add reset_mask as parameter to ifc_reset_connections

The reset_mask allows either IPv4 and or IPv6 connections
of an interface to be reset.

Bug: 4981919
Change-Id: Id2d9ab90e30091d3d0764c66d4b01b73c0edbfcc
nclude/netutils/ifc.h
ibnetutils/ifc_utils.c
208ec5ec564597bdf8b478a424cc9ccc09547bac 07-Jul-2011 Jamie Gennis <jgennis@google.com> ANativeWindow: add setters for dimensions and fmt

This change adds two new 'perform' setters to set the dimensions and
pixel format of the buffers that will be dequeued from the
ANativeWindow. These new setters provide the same functionality as
_SET_BUFFERS_GEOMETRY, but allow the format and dimensions to be set
independently. The _SET_BUFFERS_GEOMETRY setter is still supported to
maintain backwards compatibility.

Change-Id: Ib49b7798ffebe61eff2c8e4202fc3048cfec7bdd
nclude/system/window.h
f48fd5d403d77c4586ad0e715affd601a0934334 07-Jul-2011 Eric Laurent <elaurent@google.com> Temporary workaround for issue 4604090

There was a regression caused by a change in Honeycomb that removed
mediaserver process from system group to improve security: This prevents
the audio HAL (which runs in mediaserver process) from taking wake locks
while audio is playing thus causing the pcm stream to get unexpectedly
suspended.

This temporary workaround is just to allow ICS dogfood in better conditions until
a real fix taking into account the security issue is implemented.

Change-Id: Ic19a23da4b4383559188b6f5c3a82604c3d95d74
ootdir/init.rc
c28b79a6c23226c1c24a2d8b954f7199195bba6f 07-Jul-2011 Frank Maker <ffrank@google.com> libnl: nl_socket_alloc() Bugfix

Clear memory and allow kernel to set local socket pid

Change-Id: I274156fa7bcf8d2fe78f719fb2eb32d963682931
ibnl_2/socket.c
e89675584df1f02dd4642585493a19ac3e691bc5 07-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "init.rc: Allow system process to configure RNDIS USB ethernet address"
64416c816cbe1161a09d6e6a65732399fac4e3ca 06-Jul-2011 Mathias Agopian <mathias@google.com> Merge "don't restart surfaceflinger when the window manager dies"
9350a00ce65a6425ba4566fe943c954373240f6c 06-Jul-2011 Mike Lockwood <lockwood@android.com> init.rc: Allow system process to configure RNDIS USB ethernet address

Change-Id: Id339d8359e592dbc1279e423d9a5adc3a775949d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/init.rc
b4daef45310891d550ea9cfb89ab4bf5b3e15ef5 02-Jul-2011 Mathias Agopian <mathias@google.com> don't restart surfaceflinger when the window manager dies

Change-Id: Ia3c60e6c5471e2b72d53c936de44b730c68095e0
ootdir/init.rc
5744d312c87cde7a5672f56120164078ca9f653a 02-Jul-2011 Frank Maker <ffrank@google.com> Merge "BUGFIX: libnl_2"
1f311f2f160853bebab70d31dabf17aa1a83f2a6 02-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4571308 Timestamps are not always monotonic"
856f63c0df9cd4e8783ca65140fe386e3a98a274 01-Jul-2011 Brian Carlstrom <bdc@google.com> Merge "Revert "Add keychain user""
8648c3797538573091d6ec72303371015909b0be 01-Jul-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Add mobile filter framework library into the bootclasspath."
d18678f882eed5677c28d03a86a8ab43300acd4e 01-Jul-2011 Mike Lockwood <lockwood@android.com> init: Handle EINTR in handle_property_set_fd()

Change-Id: I5a6f1791eaf11e98b1d81697112d78c99822fba5
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/property_service.c
1c9a996c50e096eb9f54dc806aae6d82fa3cc2e8 20-Jun-2011 Eino-Ville Talvala <etalvala@google.com> Add mobile filter framework library into the bootclasspath.

Change-Id: Ia9ae45de5d58ba5e98821fd04add96c6062c1a18
ootdir/init.rc
04918930236981a6d2a096a73854caa96cb94bda 01-Jul-2011 Brian Carlstrom <bdc@google.com> Revert "Add keychain user"

This reverts commit 6541ef1562ccf93e498d653598330a7fc80ad2b2.

Bug:4970237
Change-Id: I23a90eb89c1d19893d2ba7065fc624c0521cb06e
nclude/private/android_filesystem_config.h
ootdir/init.rc
1b53483949c0ff11ef78bcf67196f0ef4db0aeb4 01-Jul-2011 Frank Maker <ffrank@google.com> BUGFIX: libnl_2

Fixed return value for nla_put.

Change-Id: If1ae33bb38c0e88ca7a9220e90ae35dfb0b44b86
ibnl_2/attr.c
fb9134e3d01da0681097d5bf037aae730f09a2c0 30-Jun-2011 Jeff Brown <jeffbrown@google.com> Merge "getevent: Fix a couple of bugs."
2e81f58baa246adbe4dcb479ef40c3f1ffcf8534 30-Jun-2011 Jeff Sharkey <jsharkey@android.com> Merge "Create groups to protect bandwidth statistics."
f6d0f8af1768b3b9b10760bba5583c5e721b64ea 30-Jun-2011 Jeff Brown <jeffbrown@google.com> getevent: Fix a couple of bugs.

Fixed a bug printing the event value when using labels.

Stop trying to print the available codes for EV_SYN because
we cannot actually query them. EVIOCGBIT(0, size) is a special
case that returns the set of events that are supported, and
EV_SYN == 0.

Change-Id: Iea086ba24300ca0815e4814a3bc5ff60756612c2
oolbox/getevent.c
f96993eb4e09d183259fda7eca35a32974345ff8 30-Jun-2011 Jeff Brown <jeffbrown@google.com> lsof: Print process user name.

Change-Id: I6e96faba894ad8c2eeb06e514d332c8ab2ec52f0
oolbox/lsof.c
ed6b39cc7746fabdd0d01c96afcf60b9544913d3 24-May-2011 Frank Maker <ffrank@google.com> Cleanroom libnl_2 library

By overriding the netlink cache pointer, able to pass nl80211 family id.
Scan and connecting open access point work
Added legal stuff to headers

Change-Id: I1c60452f35fdd1f80edebc03fef33067722d0543
ibnl_2/.gitignore
ibnl_2/Android.mk
ibnl_2/README
ibnl_2/attr.c
ibnl_2/cache.c
ibnl_2/genl/family.c
ibnl_2/genl/genl.c
ibnl_2/handlers.c
ibnl_2/include/netlink-generic.h
ibnl_2/include/netlink-local.h
ibnl_2/include/netlink-types.h
ibnl_2/include/netlink/addr.h
ibnl_2/include/netlink/attr.h
ibnl_2/include/netlink/cache-api.h
ibnl_2/include/netlink/cache.h
ibnl_2/include/netlink/cli/utils.h
ibnl_2/include/netlink/data.h
ibnl_2/include/netlink/errno.h
ibnl_2/include/netlink/fib_lookup/lookup.h
ibnl_2/include/netlink/fib_lookup/request.h
ibnl_2/include/netlink/genl/ctrl.h
ibnl_2/include/netlink/genl/family.h
ibnl_2/include/netlink/genl/genl.h
ibnl_2/include/netlink/genl/mngt.h
ibnl_2/include/netlink/handlers.h
ibnl_2/include/netlink/list.h
ibnl_2/include/netlink/msg.h
ibnl_2/include/netlink/netfilter/ct.h
ibnl_2/include/netlink/netlink-compat.h
ibnl_2/include/netlink/netlink-kernel.h
ibnl_2/include/netlink/netlink.h
ibnl_2/include/netlink/object-api.h
ibnl_2/include/netlink/object.h
ibnl_2/include/netlink/route/addr.h
ibnl_2/include/netlink/route/class.h
ibnl_2/include/netlink/route/classifier.h
ibnl_2/include/netlink/route/cls/ematch.h
ibnl_2/include/netlink/route/link.h
ibnl_2/include/netlink/route/neighbour.h
ibnl_2/include/netlink/route/neightbl.h
ibnl_2/include/netlink/route/nexthop.h
ibnl_2/include/netlink/route/qdisc.h
ibnl_2/include/netlink/route/route.h
ibnl_2/include/netlink/route/rtnl.h
ibnl_2/include/netlink/route/rule.h
ibnl_2/include/netlink/route/tc.h
ibnl_2/include/netlink/socket.h
ibnl_2/include/netlink/types.h
ibnl_2/include/netlink/utils.h
ibnl_2/include/netlink/version.h
ibnl_2/msg.c
ibnl_2/netlink.c
ibnl_2/object.c
ibnl_2/socket.c
9d94942bcd6347d6ee8524b23bc94b95ba32d8e0 27-Jun-2011 vidya rao <vidya.rao@motorola.com> am 6a18a077: am 04cf629b: Move RILD to class main

* commit '6a18a07774123c409cefd9a92f1c4c6504f4edfd':
Move RILD to class main
f048363184a63848c30407c680dcea0c0fd0fcfb 27-Jun-2011 Mike J. Chen <mjchen@google.com> Merge changes I255cca69,Ice9ec7f0,I4e97ac98

* changes:
Workaround Motorola ril.so incompatiblity with Netlink changes
Cleanup NetlinkListener and NetlinkEvent
Revert "Revert "Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet""
7b023b293b3252feddab29b0672524a341494b9e 27-Jun-2011 Brett Chabot <brettchabot@android.com> Fix SDK build.

Revert "Fix build warnings"

This reverts commit 590e364868b6466e169f2647e95462ba2558dd00.
iblog/fake_log_device.c
iblog/fake_log_device.h
iblog/logd_write.c
c322f67140d52014c47dff41d03a601b251f56ed 27-Jun-2011 Glenn Kasten <gkasten@google.com> Bug 4571308 Timestamps are not always monotonic

Change-Id: Ia4e89a286a514d91d76268235c716e328cd3d0c2
nclude/system/window.h
6a18a07774123c409cefd9a92f1c4c6504f4edfd 25-Jun-2011 vidya rao <vidya.rao@motorola.com> am 04cf629b: Move RILD to class main

* commit '04cf629be5e99a3a920aecc0b059444bd07e9d84':
Move RILD to class main
04cf629be5e99a3a920aecc0b059444bd07e9d84 24-Jun-2011 vidya rao <vidya.rao@motorola.com> Move RILD to class main

-- This is needed so the modems (LTE & CDMA) are powered on and running
before unlocking encrypted devices

Change-Id: I842f5286499fd76abc554ded550fb837d12b324e
ootdir/init.rc
590e364868b6466e169f2647e95462ba2558dd00 24-Jun-2011 Glenn Kasten <gkasten@google.com> Fix build warnings

Change-Id: Ie24cf8e729813e4527c698fc7c1502a1efbc63e5
iblog/fake_log_device.c
iblog/fake_log_device.h
iblog/logd_write.c
2a56688da92fcf22ea8ce996e2a0e7b453d1543b 24-Jun-2011 Mike J. Chen <mjchen@google.com> Workaround Motorola ril.so incompatiblity with Netlink changes

To workaround a binary incompatiblity with Motorola's ril.so, I had to
temporarily provide the old constructor for NetlinkListener as well as
a new contructor that takes an additional format argument.
There's still a slight chance of a problem because the size of the
NetlinkListener has changed with the addition of the
mFormat member, but so far I've not seen any obvious problem with that
incompatiblity.

Another way we could have worked around the incompatiblity is to have
netd (the main user of the new format argument to NetlinkListener) keep
track of the format itself in it's NetlinkHandler (derived from NetlinkListener)
and supply it's own version of onDataAvailable() that's almost 100% identical
to NetlinkListener's except for the decode() call. That would allow us
not to modify NetlinkListener at all. Worth considering but I think it's
more properly divided right now and we just have to make Motorola fix their
code (and ideally not use our private APIs).

This change should be reverted when Motorola's has fixed their ril to
either not use our private APIs or to use our updated ones.

Change-Id: I255cca6908444e56cbbbed7eef1fa0cf1d8f0918
Signed-off-by: Mike J. Chen <mjchen@google.com>
nclude/sysutils/NetlinkListener.h
ibsysutils/src/NetlinkListener.cpp
17260b14682d4fe59dad3de2de8c9370e6ba9a71 24-Jun-2011 Mike J. Chen <mjchen@google.com> Cleanup NetlinkListener and NetlinkEvent

To make it easier to be compatible with older existing code, use
default parameters instead of separate functions for setting.

Also, reintroduce the const usage that was not in the original
changes by Stan.

Also fix some indent spacing.

Change-Id: Ice9ec7f0d5c4a0673037e2e04a764d88a98f68eb
Signed-off-by: Mike J. Chen <mjchen@google.com>
nclude/sysutils/NetlinkEvent.h
nclude/sysutils/NetlinkListener.h
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
ec16b9d47cacb0d873ee0ff80c919f49215c0005 23-Jun-2011 Mike J. Chen <mjchen@google.com> Revert "Revert "Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet""

This reverts commit 1d504eeb50d980c222572629383bb76315f32ca0.

Conflicts:

libsysutils/src/NetlinkEvent.cpp

Bring back the changes from Stan Chesnutt regarding adding NETLINK_ROUTE
processing. The original commit message description was:

Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet
physical-layer up/down events can be tracked. Upper layers will use these
events to enable/disable Ethernet connectivity.

The original change was reverted due to an incompatiblity with Motorola's
ril.so binary. I'll submit a patch to workaround that incompatiblity
separately.

Change-Id: I4e97ac98833b10543e654c63ecae3b9b8c7db44f
Signed-off-by: Mike J. Chen <mjchen@google.com>
nclude/sysutils/NetlinkEvent.h
nclude/sysutils/NetlinkListener.h
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
9661a3aecd39cca95bd07253c52b99521409c147 23-Jun-2011 Eric Laurent <elaurent@google.com> Merge "Fixed some audio helper functions"
4f1df18766fa13959f347f9c0cbb3dfa67273fa7 03-May-2011 Jeff Sharkey <jsharkey@android.com> Create groups to protect bandwidth statistics.

Introduces new "net_bw_stats" group which will protect reading
detailed bandwidth statistics. Also introduce "net_bw_acct" group
which will enable specific applications to request that their network
traffic be counted against other UIDs.

Change-Id: Ic0ec04e0d2bb9573f3c2a094ebd6d6a8cae0aae6
nclude/private/android_filesystem_config.h
535164e9d9649a83d4d63829f3389f2bea339fe1 22-Jun-2011 Mike Lockwood <lockwood@android.com> Reimplement the "adb root" command to more closely match its previous behavior

The adb gadget driver used to reset the USB bus when the adbd daemon exited,
and the host side adb relied on this behavior to force it to reconnect
with the new adbd instance after init relaunches it. The new gadget
drivers no longer automatically reset the USB bus when adbd is restarted
which caused adb to hang since it was no longer forced to reconnect with the
device. We attempted to work around this on the host side adb, but that
work around has not been reliable.

This change adds a property trigger on the service.adb.root system property
which will reset the USB bus and restart the adbd daemon when adbd sets
the property to 1. This should be much closer to the previous behavior
and will hopefully fix some problems with automated testing.

Change-Id: I177c37400009a3d83f21a5f9431f94fd1cc19b9b
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/services.c
ootdir/init.rc
07edefe4cecbddaf6282e556e04a1e1ef21c404a 22-Jun-2011 Mike Lockwood <lockwood@android.com> Revert "adb: kick the transport after sending the "adb root" command"

This reverts commit d15e6ac95dc898fb78fb5917bb2e4498b40b716f.

Also increment adb version to 1.0.29

Change-Id: I890643f0c18a2fe90f170134df039c54116cecda
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.h
db/sockets.c
693e78b9b61da835b6d2f88348bb99ab0840b37e 22-Jun-2011 Mike Lockwood <lockwood@google.com> Merge "Fix hang after end of backup"
10f129ca8eb266f46393e981484e60521f9011df 22-Jun-2011 Christopher Tate <ctate@google.com> Fix hang after end of backup

The buggy behavior was that the 'adb backup ....' host command line
invocation would hang forever, even after the backup finished and
the forked device-side subprocess had been reaped. The reason for
this is that the device adbd end of the socketpair used to send
the data back from the forked subprocess was still stuck readable
even after the remote end of it had been closed.

With this patch, the thread whose job it is to waitpid() in order
to harvest the forked child process also closes the local (adbd)
end of the socketpair. This makes the fdevent logic notice that
the socket is dead, at which point it cleans up everything including
the communication back to the host.

Change-Id: I90e7e4e5db36c5a6f7363708b29a6d2c56d1250e
db/backup_service.c
4d557db514655e85479a5f0ca1fb6152abb24a40 22-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am e1259d63: am 202729a0: am 14c2823a: Merge "add strutils"

* commit 'e1259d633c084bb7516b76a859c6acae20b06aee':
add strutils
ef8fd9c4a43c7dacbf26397a4e9bd9386c524dfb 22-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am b06dfe14: am 4c78d862: am a08f7ae3: Merge "tweak for forward-compatibility"

* commit 'b06dfe142505df7efc729455f30ae73fa3cf6fae':
tweak for forward-compatibility
b0bd6024e344eb49702e24e78654f55254f42e8f 21-Jun-2011 Mike Lockwood <lockwood@android.com> adb: Update version to 1.0.28

Change-Id: Ib8a98d3840abf24cf062112aca7ce462a0f44bc5
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.h
5b811fa5dd00288954f15209a56aea03d5e4a004 10-Jun-2011 Christopher Tate <ctate@google.com> Tidy up the end-of-data handling in backup

* Increase transfer buffer size to 32K
* Add logging about error conditions and fd teardown
* Pass the fd number as a command line option to the 'bu' subprocess
* Properly harvest the 'bu' subprocess after it's done

Change-Id: Id44dde25778ecf43c5604fd9d01d726ba58861e5
db/backup_service.c
db/commandline.c
db/sockets.c
e1259d633c084bb7516b76a859c6acae20b06aee 20-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 202729a0: am 14c2823a: Merge "add strutils"

* commit '202729a0c1d966345dcbfa21db7d886b5d1e6200':
add strutils
b06dfe142505df7efc729455f30ae73fa3cf6fae 20-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 4c78d862: am a08f7ae3: Merge "tweak for forward-compatibility"

* commit '4c78d8620514fe1a704872cba66bc1b14d4e2a66':
tweak for forward-compatibility
202729a0c1d966345dcbfa21db7d886b5d1e6200 20-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 14c2823a: Merge "add strutils"

* commit '14c2823a631b444687b9d26b7baf4c864091c07b':
add strutils
4c78d8620514fe1a704872cba66bc1b14d4e2a66 20-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am a08f7ae3: Merge "tweak for forward-compatibility"

* commit 'a08f7ae3c10f4874194fb48ff549e846e39217b7':
tweak for forward-compatibility
14c2823a631b444687b9d26b7baf4c864091c07b 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge "add strutils"
89790b892988accff0d1a5c9f191a221369b29ce 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> add strutils

Change-Id: If5938ecd1dfd7f35e326573d10788bacaf3e2383
ibcutils/Android.mk
ibcutils/str_parms.c
a08f7ae3c10f4874194fb48ff549e846e39217b7 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge "tweak for forward-compatibility"
b6c15de82a9bf477aab34763c9a4e9d8612c8af1 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> tweak for forward-compatibility

Change-Id: I1896be16622b452a3652412af3c64f8c550f71d0
nclude/cutils/str_parms.h
352dfdfaea55601f2c36fe7286a158e84028bcf3 09-Jun-2011 Mike Lockwood <lockwood@android.com> init.rc: Changes for new USB gadget drivers

Change-Id: I68fcf167c9fc71bb5f44793648a35d3181fd36d7
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/init.rc
da382248758eacd9f91d6f0a50dff3f021791c24 17-Jun-2011 Eric Laurent <elaurent@google.com> Fixed some audio helper functions

Make sure audio_is_valid_format() is true only
for formats supported by AudioTrack and AudioRecord.
Generalized audio_is_linear_pcm().
Added audio_bytes_per_sample() function.

Change-Id: If588af6c08f09796ab04bccbbd6e720f1e914412
nclude/system/audio.h
9f7ad372b33dc6c69cc5818aaf36e6e51ecefe29 16-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 88fd7a50: am fa3dfff8: Move mksh to external/mksh

* commit '88fd7a5082ebf964e9470a5f856081b27d887a28':
Move mksh to external/mksh
88fd7a5082ebf964e9470a5f856081b27d887a28 16-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am fa3dfff8: Move mksh to external/mksh

* commit 'fa3dfff83b29137d2984c9776a8a64b09a758bde':
Move mksh to external/mksh
fa3dfff83b29137d2984c9776a8a64b09a758bde 16-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Move mksh to external/mksh

Change-Id: I836b8764320bd498c335d97267d8b47acb97514d
ksh/Android.mk
ksh/MODULE_LICENSE_BSD_LIKE
ksh/NOTICE
ksh/mkmf.sh
ksh/mkshrc
ksh/src/00-NOTE.txt
ksh/src/Build.sh
ksh/src/check.pl
ksh/src/check.t
ksh/src/edit.c
ksh/src/emacsfn.h
ksh/src/eval.c
ksh/src/exec.c
ksh/src/expr.c
ksh/src/funcs.c
ksh/src/histrap.c
ksh/src/jobs.c
ksh/src/lalloc.c
ksh/src/lex.c
ksh/src/main.c
ksh/src/misc.c
ksh/src/sh.h
ksh/src/sh_flags.h
ksh/src/shf.c
ksh/src/syn.c
ksh/src/tree.c
ksh/src/var.c
ksh/src/var_spec.h
b0a8aae3eda5e245b93cb6d3af286202dc8c011c 16-Jun-2011 Kenny Root <kroot@google.com> Use adb_sleep_ms for Cygwin compat

Change-Id: Iabb2cddfb6740a35e4b6b1563a81b64972c29453
db/sockets.c
f8754337d82d0a1ba509311bbadd281619c7d96e 16-Jun-2011 Jeff Brown <jeffbrown@google.com> Enhance getevent to print event labels.

Added -l argument to print labels for event types, codes and values.
Added -i argument to print all device info.
Added support for printing input properties.

Change-Id: I3cacb716dbc38f50217b9dfc24ba44d08f352603
oolbox/getevent.c
oolbox/getevent.h
bb5da058067a777d0231ada73e691078817aac15 11-Jun-2011 David 'Digit' Turner <digit@google.com> pixelflinger: back-port AOSP master version.

Pixelflinger doesn't have an x86 JIT, and the generic scanline()
routine is _extremely_ slow. This makes UI performance very slow.
when running full_x86-eng under emulation.

This patch back-ports the AOSP master pixelflinger into the
gingerbread branch. This essentially contains more than a dozen
new "shortcut" scanline functions used to speed-up the pixel
operations that are mostly used with the normal widget UI.

GL applications (e.g. Gallery3D) will still be very slow, but
this makes the home screen, app launcher, settings and many
simple applications work with very usable performance.

Change-Id: Ia64d8dd2e46820f07e98c4c9a4ec831b59fc61e4
ibpixelflinger/Android.mk
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/ARMAssemblerProxy.cpp
ibpixelflinger/codeflinger/ARMAssemblerProxy.h
ibpixelflinger/codeflinger/disassem.c
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/col32cb16blend.S
ibpixelflinger/col32cb16blend_neon.S
ibpixelflinger/raster.cpp
ibpixelflinger/scanline.cpp
ibpixelflinger/tests/codegen/Android.mk
ibpixelflinger/tests/codegen/codegen.cpp
0f1b4f37c1a2528315aa01c77d22cbea8041e8d0 14-Feb-2011 Jun Nakajima <jnakajim@gmail.com> x86: Add vold.fstab to mount the SD card

Orig-Change-Id: Ie1f70a22dd4e27e8ea956d5e627877d1e2379b95
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
ootdir/Android.mk
c8bb0ab714c476e13df01d060561421f647e5bb9 28-Dec-2010 Bruce Beare <bruce.j.beare@intel.com> Assembly coded android_memset16 and android_memset32

Orig-Change-Id: Ifa05006df7ce7364d18eb10d64a818d619664475
Author: Lu, Hongjiu <hongjiu.lu@intel.com>
Signed-off-by: Mark Gross <mark.gross@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ibcutils/Android.mk
ibcutils/arch-arm/memset32.S
ibcutils/arch-x86/android_memset16.S
ibcutils/arch-x86/android_memset32.S
ibcutils/arch-x86/cache_wrapper.S
ibcutils/arch-x86/sse2-memset16-atom.S
ibcutils/arch-x86/sse2-memset32-atom.S
ibcutils/memory.c
ibcutils/memset32.S
7b0bad30bf643ba9ea44bbb8d23c6b6994eb90db 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> debuggerd: IA version

Orig-Change-Id: I0c0d9c2d7e476b8d117aaf505a9480a47c0b5c05
Signed-off-by: Lei Li <lei.l.li@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ebuggerd/Android.mk
ebuggerd/arm/unwind.c
ebuggerd/debuggerd.c
ebuggerd/debuggerd.h
ebuggerd/symbol_table.c
ebuggerd/symbol_table.h
ebuggerd/utility.c
ebuggerd/x86/crashglue.S
ebuggerd/x86/machine.c
ebuggerd/x86/unwind.c
ebuggerd/x86/x86_utility.h
9e3933829690abe6d14b3f6acc30c8fdc64ab571 31-May-2011 Bruce Beare <bruce.j.beare@intel.com> debuggerd: Reorganize to facilitate IA commit

Orig-Change-Id: I22dd02daf617672fc0a8ba7e396017c57f17e26e
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ebuggerd/Android.mk
ebuggerd/arm/crashglue.S
ebuggerd/arm/machine.c
ebuggerd/arm/pr-support.c
ebuggerd/arm/unwind.c
ebuggerd/crasher.c
ebuggerd/crashglue.S
ebuggerd/debuggerd.c
ebuggerd/debuggerd.c.orig
ebuggerd/debuggerd.h
ebuggerd/pr-support.c
ebuggerd/unwind-arm.c
ebuggerd/utility.c
ebuggerd/utility.h
160c0319f6d33b94a130008bc139013e32ce3c4d 24-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> Set the modes for rc.* files in /system/etc

Orig-Change-Id: I0897897cdffa66afa4f818f7ebcf0a9b70c517ea
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
nclude/private/android_filesystem_config.h
54dc50135267575e7dbd34399b440bc035e4d10a 24-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> DBUS is not fully implemented. Disable it for now

Orig-Change-Id: I2286064bffc7e9fa7381aa04d5d20abf11c3aab7
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
nclude/arch/target_linux-x86/AndroidConfig.h
50257cf18bd8dba90f405587994b98ca26f3224b 05-Nov-2009 Meng Hu <meng.hu@garmin.com> debuggerd: Show function names in tombstone backtraces

This change enables debuggerd to provide backtraces with function
names in tombstone files and log messages. It does this by reading
the image file that the address is found in, and parsing the dynamic
symbol table to try to extract the symbol corresponding to the given
address.

This works best when "-Wl,-export-dynamic" is added to the LDFLAGS
of each library and executable, because this will cause all symbols
to be added to the dynamic symbol table. If this flag is not present,
it will still work, but it will only be able to identify functions
which are part of the external API of the library/executable.

Orig-Change-Id: I618baaff9ed9143b7d1a1f302224e9f21d2b0626
ebuggerd/Android.mk
ebuggerd/debuggerd.c
ebuggerd/symbol_table.c
ebuggerd/symbol_table.h
ebuggerd/unwind-arm.c
ebuggerd/utility.h
5f05f83075857c499a83f36e347c1ef49501a0dd 15-Jun-2011 Tom Marlin <tomm@bsquare.com> am 55b8a474: (-s ours) am 0ec54854: am 774abe7b: Cherry-pick 49f1857d from master. do not merge.

* commit '55b8a474c3bbb67bfd8a495409254337f3d1d59c':
Cherry-pick 49f1857d from master. do not merge.
55b8a474c3bbb67bfd8a495409254337f3d1d59c 14-Jun-2011 Tom Marlin <tomm@bsquare.com> am 0ec54854: am 774abe7b: Cherry-pick 49f1857d from master. do not merge.

* commit '0ec5485484e0667fb48bee32197b2c2e0669adf4':
Cherry-pick 49f1857d from master. do not merge.
0ec5485484e0667fb48bee32197b2c2e0669adf4 14-Jun-2011 Tom Marlin <tomm@bsquare.com> am 774abe7b: Cherry-pick 49f1857d from master. do not merge.

* commit '774abe7b7e463436107545250aa573c99e246a86':
Cherry-pick 49f1857d from master. do not merge.
774abe7b7e463436107545250aa573c99e246a86 13-May-2011 Tom Marlin <tomm@bsquare.com> Cherry-pick 49f1857d from master. do not merge.

Fixed adb crash due to accessing freed memory

Reset peers to NULL after closing them down. This prevents
other code from attempting to access that freed memory
(which prevents crashes). Previously, it left pointers to
freed memory and the "if (s->peer)" guards could not block
the attempt to access that memory later. Resolves many
crashes seen while taking repeated screenshots on WinXP.

Change-Id: I2697ba09971f2e0b51ff5c5e89a6fa20ebafb2c4
db/sockets.c
823e96e27e6d621a794bd9c5c9ab8aa798d7c981 14-Jun-2011 Mike Lockwood <lockwood@android.com> Merge "adb: kick the transport after sending the "adb root" command"
28e08dc58148dba98feefbadc9657840fe141084 14-Jun-2011 Dima Zavin <dima@android.com> core: move audio_policy.h here from hardware

Change-Id: I6b8c04c975e01f2502d766ed2b9353d3c83193b3
Signed-off-by: Dima Zavin <dima@android.com>
nclude/system/audio_policy.h
d15e6ac95dc898fb78fb5917bb2e4498b40b716f 12-Jun-2011 Mike Lockwood <lockwood@android.com> adb: kick the transport after sending the "adb root" command

This is needed because the USB driver on the device no longer resets the bus
when exits and restarts.
Since the host side adb no longer detects that adbd has restarted we need
to reset the connection on the host side now.

Change-Id: I1a8eabd292e8b45c34fa07a8a8b8c609cc15648d
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.h
db/sockets.c
1621a6836ee50d99d3199645f883c348da768a23 11-Jun-2011 David 'Digit' Turner <digit@android.com> am 8af9ac15: am 69c2dcbb: am fbcb1883: run-as: Bump the size of the internal packages list buffer.

* commit '8af9ac15bf2b8d063b3c6842769352daec3442cd':
run-as: Bump the size of the internal packages list buffer.
8af9ac15bf2b8d063b3c6842769352daec3442cd 10-Jun-2011 David 'Digit' Turner <digit@android.com> am 69c2dcbb: am fbcb1883: run-as: Bump the size of the internal packages list buffer.

* commit '69c2dcbb0f2672652366e3950dea48ed4483eaa4':
run-as: Bump the size of the internal packages list buffer.
69c2dcbb0f2672652366e3950dea48ed4483eaa4 10-Jun-2011 David 'Digit' Turner <digit@android.com> am fbcb1883: run-as: Bump the size of the internal packages list buffer.

* commit 'fbcb1883df3aa913c6a530e933880095173b4624':
run-as: Bump the size of the internal packages list buffer.
fbcb1883df3aa913c6a530e933880095173b4624 06-Jun-2011 David 'Digit' Turner <digit@android.com> run-as: Bump the size of the internal packages list buffer.

This is a back-port of https://review.source.android.com/#change,23480
into the honeycomb-mr2 internal tree.

This patch increases the size of the internal buffer used by run-as
to store the content of /data/system/packages.list from 8KB to 64KB.

It has been reported that, on some systems, 8KB was too small. This
resulted in a truncated file being loaded, and the inability to debug
native applications properly (either because the application was not
found in the list, or because the tool reported a 'corrupted
installation' due to BAD_FORMAT issues when parsing the truncated
file).

See http://code.google.com/p/android/issues/detail?id=16391

Change-Id: Ie7b171d3deed805a185f14f63ec03b64b2a8e1b3
un-as/package.c
21a6c1c0044966b02532504e06be1564ba31678a 10-Jun-2011 Mike Lockwood <lockwood@android.com> Merge changes I7b4e1ed1,I8a91c3f7,If78d20a5,I55431ac7

* changes:
init: Add support for assigning system properties to system properties in init.rc
init: Fix the init.rc import command
init: Allow wildcards in property triggers by using * for property value
init: Add support for writing system property value to a file in init.rc
1f0bd32f90161940d531040677099f32eef21fc4 09-Jun-2011 Mike Lockwood <lockwood@android.com> init: Add support for assigning system properties to system properties in init.rc

For example:
setprop sys.usb.config $persist.sys.usb.config

Change-Id: I7b4e1ed1335906b32621bd96a341b0f94bbee7f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/builtins.c
f5cb5b24356fae2dfa3477589ee0f3c094479e63 08-Jun-2011 Mike Lockwood <lockwood@android.com> init: Fix the init.rc import command

Change-Id: I8a91c3f7d1ca31e137d9043bb7f56e4a44fb63df
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/builtins.c
nit/init_parser.c
nit/keywords.h
7ba61b15ed11e168457270f20f5a80992756524a 08-Jun-2011 Mike Lockwood <lockwood@android.com> init: Allow wildcards in property triggers by using * for property value

For example, the following trigger will fire when the sys.foo property
is set to any value:

on property:sys.foo=*
write /data/foo hello

It is also possible to refer to the property within the trigger actions:

on property:sys.foo=*
write /data/foo $sys.foo

Change-Id: If78d20a532f77e17aa5703d53be581ad6736cbcf
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/init_parser.c
2c4d5dc41505d28cff369cfbe8b17ac81106d936 08-Jun-2011 Mike Lockwood <lockwood@android.com> init: Add support for writing system property value to a file in init.rc

The write command will write a property value if the value starts with a "$'

For example:
write /sys/class/android_usb/iSerial $ro.serialno

Use double leading '$' if you need to write a string that starts with '$':

write /data/foo $$hello

to write "$hello" to /data/foo

Change-Id: I55431ac7715a5347bb95c3a15aee97c575444dde
nit/builtins.c
d8222d2b86ea01ce2e9007c69b84160520fe964f 10-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Reconcile with gingerbread-release

Change-Id: I01d34fd2c90d381d4095b5217506a4d35034be53
838a24ac661dfb5147dd584e6dc36dc74c61725e 09-Jun-2011 The Android Automerger <android-build@android.com> merge in gingerbread-release history after reset to gingerbread
37b9fc6e7c25e4d7f57e1df6954498c8bc3c5a1b 09-Jun-2011 Nick Kralevich <nnk@google.com> am 4ba5a8ac: am eafcbe10: am 072a0fac: Merge "Fixed adb crash due to accessing freed memory"

* commit '4ba5a8acba033127befd184f2f78cf0580995b07':
Fixed adb crash due to accessing freed memory
953907faa38e8deff2b0a8f3c3cd7db68074950a 09-Jun-2011 Vladimir Chtchetkine <vchtchetkine@google.com> am 716104b4: am 771f5146: am 4c0b9e3d: Merge "Fix crash reporting on x86 platform."

* commit '716104b40df12d367cb5f649b92c6105d5978787':
Fix crash reporting on x86 platform.
9b5be35770aab82c851eb5ec40b4b63175c99198 09-Jun-2011 David 'Digit' Turner <digit@android.com> am fced5e70: am f45cd81b: am 1468cb54: run-as: Bump the size of the internal packages list buffer.

* commit 'fced5e7015aa0cf916dbd6947ad91093332056e3':
run-as: Bump the size of the internal packages list buffer.
b36f136738f6ed35c9686e1d42b57655eba9ce8d 08-Jun-2011 David 'Digit' Turner <digit@android.com> am c324ee6a: am 06fcf938: Merge "run-as: Bump the size of the internal packages list buffer."

* commit 'c324ee6a838e4d87362de6af8d741a85efa8dd39':
run-as: Bump the size of the internal packages list buffer.
4ba5a8acba033127befd184f2f78cf0580995b07 08-Jun-2011 Nick Kralevich <nnk@google.com> am eafcbe10: am 072a0fac: Merge "Fixed adb crash due to accessing freed memory"

* commit 'eafcbe109f97e5a687cc944e65c383fa45d71c8f':
Fixed adb crash due to accessing freed memory
eafcbe109f97e5a687cc944e65c383fa45d71c8f 08-Jun-2011 Nick Kralevich <nnk@google.com> am 072a0fac: Merge "Fixed adb crash due to accessing freed memory"

* commit '072a0fac3cabd50c2089d987b5abceac35c74570':
Fixed adb crash due to accessing freed memory
716104b40df12d367cb5f649b92c6105d5978787 08-Jun-2011 Vladimir Chtchetkine <vchtchetkine@google.com> am 771f5146: am 4c0b9e3d: Merge "Fix crash reporting on x86 platform."

* commit '771f5146893aa9bbc451aed78e61b3b18c1bc3b4':
Fix crash reporting on x86 platform.
fced5e7015aa0cf916dbd6947ad91093332056e3 08-Jun-2011 David 'Digit' Turner <digit@android.com> am f45cd81b: am 1468cb54: run-as: Bump the size of the internal packages list buffer.

* commit 'f45cd81bc81cbe92fc666f56d2b75f911cdca208':
run-as: Bump the size of the internal packages list buffer.
072a0fac3cabd50c2089d987b5abceac35c74570 08-Jun-2011 Nick Kralevich <nnk@google.com> Merge "Fixed adb crash due to accessing freed memory"
771f5146893aa9bbc451aed78e61b3b18c1bc3b4 07-Jun-2011 Vladimir Chtchetkine <vchtchetkine@google.com> am 4c0b9e3d: Merge "Fix crash reporting on x86 platform."

* commit '4c0b9e3dc00640022a0512be909c33f0a51a9816':
Fix crash reporting on x86 platform.
f45cd81bc81cbe92fc666f56d2b75f911cdca208 07-Jun-2011 David 'Digit' Turner <digit@android.com> am 1468cb54: run-as: Bump the size of the internal packages list buffer.

* commit '1468cb540f5c257d32bde182ae8f0f522c582d07':
run-as: Bump the size of the internal packages list buffer.
c324ee6a838e4d87362de6af8d741a85efa8dd39 07-Jun-2011 David 'Digit' Turner <digit@android.com> am 06fcf938: Merge "run-as: Bump the size of the internal packages list buffer."

* commit '06fcf938feaf02aa3cbf99e1ee08fe8e8335cb1c':
run-as: Bump the size of the internal packages list buffer.
4c0b9e3dc00640022a0512be909c33f0a51a9816 07-Jun-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Merge "Fix crash reporting on x86 platform."
714d9de60d6c82d36cfe960af7dc5e4cbea368d2 07-Jun-2011 Vladimir Chtchetkine <vchtchetkine@google.com> Fix crash reporting on x86 platform.

Make sure that crash frame gets printed in one line

Change-Id: If097a5a1655b17165b2a3271f0f5ee8ace57686f
ebuggerd/x86/unwind.c
1468cb540f5c257d32bde182ae8f0f522c582d07 06-Jun-2011 David 'Digit' Turner <digit@android.com> run-as: Bump the size of the internal packages list buffer.

This is a back-port of https://review.source.android.com/#change,23480
to the gingerbread branch. Fix for b/4546601

This patch increases the size of the internal buffer used by run-as
to store the content of /data/system/packages.list from 8KB to 64KB.

It has been reported that, on some systems, 8KB was too small. This
resulted in a truncated file being loaded, and the inability to debug
native applications properly (either because the application was not
found in the list, or because the tool reported a 'corrupted
installation' due to BAD_FORMAT issues when parsing the truncated
file).

See http://code.google.com/p/android/issues/detail?id=16391

Change-Id: Ie0bfb5847f6fb1c2c0a836aee2347911f78049c1
un-as/package.c
06fcf938feaf02aa3cbf99e1ee08fe8e8335cb1c 06-Jun-2011 David 'Digit' Turner <digit@android.com> Merge "run-as: Bump the size of the internal packages list buffer."
93d81ef7a104ae9a229aca3c7c6da0445440213e 06-Jun-2011 David 'Digit' Turner <digit@android.com> run-as: Bump the size of the internal packages list buffer.

This patch increases the size of the internal buffer used by run-as
to store the content of /data/system/packages.list from 8KB to 64KB.

It has been reported that, on some systems, 8KB was too small. This
resulted in a truncated file being loaded, and the inability to debug
native applications properly (either because the application was not
found in the list, or because the tool reported a 'corrupted
installation' due to BAD_FORMAT issues when parsing the truncated
file).

See http://code.google.com/p/android/issues/detail?id=16391

Change-Id: I0c35a61b163c4abc6f1a2681adc0ef0d76493171
un-as/package.c
49f1857dd8b64cdd57f28e965a1ff5fa0c2b0547 13-May-2011 Tom Marlin <tomm@bsquare.com> Fixed adb crash due to accessing freed memory

Reset peers to NULL after closing them down. This prevents
other code from attempting to access that freed memory
(which prevents crashes). Previously, it left pointers to
freed memory and the "if (s->peer)" guards could not block
the attempt to access that memory later. Resolves many
crashes seen while taking repeated screenshots on WinXP.

Change-Id: I32553f4d19f6ddc9b05b6ab4dc1e9efe69e5be4f
db/sockets.c
c9cd3b976111d91ede6cd88bd06eb57b10b2f0e7 02-Jun-2011 Christopher Tate <ctate@google.com> Make 'adb backup' -f handling more bulletproof and more flexible

* "adb backup" as the entire command line no longer crashes

* The "-f filename" option can now appear anywhere in the command line.
A trailing "-f" at EOL prompts an error message and usage summary.

Change-Id: I040ed73c2ca3687e265e35600eb3ab2b3c879695
db/commandline.c
b45280d259c5036dd066782d725c55284c7dae90 30-May-2011 MÃ¥rten Kongstad <marten.kongstad@sonyericsson.com> Create world readable, system writeable /data/resource-cache.

/data/resource-cache is used to store idmap files.

Change-Id: I9b1dbc8d607333b71c05f55a4a402ae92193c36c
ootdir/init.rc
211ce1343267155ce5092f3ad7fd3b27bb106475 28-May-2011 Ken Sumrall <ksumrall@android.com> Merge "Teach the mount command in init to not consider a wiped partition to be encrypted."
3142a203b3c493094f59e5acda0cfa2360dd9038 27-May-2011 Eric Laurent <elaurent@google.com> Merge "Config utils improvement"
38d14f76048e6a14303dc81275303b63c9d7b064 27-May-2011 Eric Laurent <elaurent@google.com> Merge "Added PCM formats to audio.h"
2b8f76cdbb254ac1170087a40dbf30b7627f3516 05-May-2011 jeffhao <jeffhao@google.com> Tracking merge of dalvik-dev to master

Reordered bootclasspath to allow verification of all framework methods.
git cherry-pick --no-commit ec164a0170955fe63106c2576a65bc4ffb1df425

Address CVE-2011-1090.
git cherry-pick --no-commit 3365288d3c00072689cd9d733e055561cadc87b5

Change-Id: I6a89bc600ced06a0cb84ae1670cb7a6ea39de9c8
nclude/cutils/sockets.h
ibcutils/Android.mk
ibcutils/sockets.c
ootdir/init.rc
7bc6e9ebe4783d5fbae17d7249cb80e997531598 27-May-2011 Ken Sumrall <ksumrall@android.com> Teach the mount command in init to not consider a wiped partition to be encrypted.

Change-Id: I3e989f0b81ec35084baddc04e014406f4d90ce04
nit/builtins.c
e555f54965b2955b2977c137bca66ca1be4be5f4 27-May-2011 Ken Sumrall <ksumrall@android.com> Merge "Crypto changes for devices that don't write ext4 fs on wipe"
b05b0b5d3b01441d648782f552d9f7e2d7bfbbc1 19-May-2011 Ken Sumrall <ksumrall@android.com> Crypto changes for devices that don't write ext4 fs on wipe

This adds a new function to libcutils, partition_wiped().
This is used to determine if a partition is wiped.

Change-Id: Ibb388976c6b5bd3923b62d8f79b2b97748abf6c1
nclude/cutils/partition_utils.h
ibcutils/Android.mk
ibcutils/partition_utils.c
c3cf1a827807d11b07bce9d6941342c68808aab1 26-May-2011 Eric Laurent <elaurent@google.com> Config utils improvement

Added a function to free resources allocated by config node tree.

Change-Id: I2ee8ae642899ec4501fa6e490c5be7efaa2d738e
nclude/cutils/config_utils.h
ibcutils/config_utils.c
9714b27bb41d999cb61b22833d3f253552b3c82b 26-May-2011 Eric Laurent <elaurent@google.com> Added PCM formats to audio.h

Added formats for 32 bit PCM audio to allow direct use of
common audio formats defined in audio.h by audio effect
API defined in audio_effect.h

Change-Id: I5d58c2db8325ca625ab6d2b10cc0d422ba119ca5
nclude/system/audio.h
7956d759be249fabef78a933db273709661e4284 26-May-2011 Nick Kralevich <nnk@google.com> Merge "rename uevent_checked_recv to uevent_kernel_multicast_recv"
b6b48ae47a44cb231d0a16ca618ac28b0024c11c 25-May-2011 Robert Greenwalt <rgreenwalt@google.com> Revert some of change 109925 to fix connectivity

bug:4476009
Change-Id: I93c492eebe24d9744b8ef79378c73301d167f5a3
ibnetutils/ifc_utils.c
1ffdb38213d177a83d74e1dc3bf41237dcbe8c9a 24-May-2011 tedbo <tedbo@google.com> Fix broken comment on closing #endif in window.h

The closing #endif comment is missing the comment delimiters. This
change adds them and fixes a compile warning about extra tokens after
endif.

Change-Id: If8295aa6fbb2b21c2b56fe57a467dcde79c65de3
nclude/system/window.h
2bc503e6a9000c1b218f5f059629990341d74c33 22-May-2011 Joe Bass <jbass@google.com> am 0efe2f2f: am b27c682e: am f5144d34: Add Gigabyte\'s USB vendor ID to adb.

* commit '0efe2f2f11d79060962f35a3fb4db525d3f12e9e':
Add Gigabyte's USB vendor ID to adb.
0efe2f2f11d79060962f35a3fb4db525d3f12e9e 21-May-2011 Joe Bass <jbass@google.com> am b27c682e: am f5144d34: Add Gigabyte\'s USB vendor ID to adb.

* commit 'b27c682e28a01b18f7506a9b35222453058107ad':
Add Gigabyte's USB vendor ID to adb.
5526ee0831358d0a79670806e6a7df8b0380e61e 21-May-2011 Christopher Tate <ctate@google.com> Merge "Add 'adb restore' to parallel 'adb backup'"
b27c682e28a01b18f7506a9b35222453058107ad 21-May-2011 Joe Bass <jbass@google.com> am f5144d34: Add Gigabyte\'s USB vendor ID to adb.

* commit 'f5144d34fac074b134722b1fdb6149eb11eff420':
Add Gigabyte's USB vendor ID to adb.
ac54557b76de1480d0045f6d422f21d0b975df6e 20-May-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with gingerbread-release honeycomb-release honeycomb-mr1-release

Change-Id: I673f0a6cc6425eadd0be9ba977be8d499f50ffda
f5144d34fac074b134722b1fdb6149eb11eff420 19-May-2011 Joe Bass <jbass@google.com> Add Gigabyte's USB vendor ID to adb.

Bug #4452872

Change-Id: Ib97548d121d40e96ccc519323a335fc90f3b32b9
db/usb_vendors.c
aff5d7870e2f7db808b47d8ca2fd4a567433dba5 19-May-2011 Xavier Ducrohet <xav@android.com> am 44c336bf: am 830fc9af: am 30d916c3: Add Funai\'s USB vendor ID to adb.

* commit '44c336bfe9bbd400461b9b28a449a67145eaeeb8':
Add Funai's USB vendor ID to adb.
ab86504f5820945f6ac9fcccdbda06efa73d15ca 19-May-2011 Robert Greenwalt <rgreenwalt@google.com> am 61e33b33: am aded02cb: Merge "Add v4/v6 route add/removal support" into honeycomb-LTE

* commit '61e33b338cbb90c34cb3e07fe55edcc08c6ce3b8':
Add v4/v6 route add/removal support
44c336bfe9bbd400461b9b28a449a67145eaeeb8 19-May-2011 Xavier Ducrohet <xav@android.com> am 830fc9af: am 30d916c3: Add Funai\'s USB vendor ID to adb.

* commit '830fc9afbe3e83b3b39278d67a9680bb2068098a':
Add Funai's USB vendor ID to adb.
830fc9afbe3e83b3b39278d67a9680bb2068098a 19-May-2011 Xavier Ducrohet <xav@android.com> am 30d916c3: Add Funai\'s USB vendor ID to adb.

* commit '30d916c360d4d49658b9b305b17568b37fcb1029':
Add Funai's USB vendor ID to adb.
aef403e917ddbf0576d69c1c0b6bb2fb75161afe 19-May-2011 Jamie Gennis <jgennis@google.com> Merge "fix a comment typo in system/graphics.h"
30d916c360d4d49658b9b305b17568b37fcb1029 19-May-2011 Xavier Ducrohet <xav@android.com> Add Funai's USB vendor ID to adb.

Change-Id: Idc2974d4437ab1c79cfea5aade98b599a877aad3
db/usb_vendors.c
61e33b338cbb90c34cb3e07fe55edcc08c6ce3b8 19-May-2011 Robert Greenwalt <rgreenwalt@google.com> am aded02cb: Merge "Add v4/v6 route add/removal support" into honeycomb-LTE

* commit 'aded02cbd04320a200b0dd47f92b467a211a0234':
Add v4/v6 route add/removal support
aded02cbd04320a200b0dd47f92b467a211a0234 19-May-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Add v4/v6 route add/removal support" into honeycomb-LTE
da1a1f629b0f3b3a63d9951de4381a41bc31fb91 18-May-2011 Jamie Gennis <jgennis@google.com> fix a comment typo in system/graphics.h

Change-Id: Ia6471a1c005cdc13833e6b0444e758add5a990e0
nclude/system/graphics.h
702967afb1bebc97c0b8a23c075d4932820ef7a3 18-May-2011 Christopher Tate <ctate@google.com> Add 'adb restore' to parallel 'adb backup'

It won't actually do anything until the 'bu' tool and framework are
updated to respond properly, but this is the adb side of the
necessary infrastructure: we copy the tarfile into the socket pointed
at the device, using the existing mechanisms.

Change-Id: Ic3b5779ade256bd1ad989a94b0685f7b1a7d59d2
db/Android.mk
db/adb.h
db/backup_service.c
db/commandline.c
db/services.c
70080d97cfcb3fe273207b1c739df587f5f93767 17-May-2011 Brian Carlstrom <bdc@google.com> Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (6 of 6)"
a31a3511825375177d26ab27067352c2c8f42038 05-May-2011 Brian Carlstrom <bdc@google.com> Make CertInstaller installed CA certs trusted by applications via default TrustManager (6 of 6)

frameworks/base

Adding IKeyChainService APIs for CertInstaller and Settings use
keystore/java/android/security/IKeyChainService.aidl

libcore

Improve exceptions to include more information
luni/src/main/java/javax/security/auth/x500/X500Principal.java

Move guts of RootKeyStoreSpi to TrustedCertificateStore, leaving only KeyStoreSpi methods.
Added support for adding user CAs in a separate directory for system.
Added support for removing system CAs by placing a copy in a sytem directory
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStore.java

Formerly static methods on RootKeyStoreSpi are now instance methods on TrustedCertificateStore
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java

Added test for NativeCrypto.X509_NAME_hash_old and X509_NAME_hash
to make sure the implementing algorithms doe not change since
TrustedCertificateStore depend on X509_NAME_hash_old (OpenSSL
changed the algorithm from MD5 to SHA1 when moving from 0.9.8 to
1.0.0)

luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

Extensive test of new TrustedCertificateStore behavior
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStoreTest.java

TestKeyStore improvements
- Refactored TestKeyStore to provide simpler createCA method (and
internal createCertificate)
- Cleaned up to remove use of BouncyCastle specific X509Principal
in the TestKeyStore API when the public X500Principal would do.
- Cleaned up TestKeyStore support methods to not throw Exception
to remove need for static blocks for catch clauses in tests.

support/src/test/java/libcore/java/security/TestKeyStore.java
luni/src/test/java/libcore/java/security/KeyStoreTest.java
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

Added private PKIXParameters contructor for use by
IndexedPKIXParameters to avoid wart of having to lookup and pass
a TrustAnchor to satisfy the super-class sanity check.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
luni/src/main/java/java/security/cert/PKIXParameters.java

packages/apps/CertInstaller

Change CertInstaller to call IKeyChainService.installCertificate
for CA certs to pass them to the KeyChainServiceTest which will
make them available to all apps through the
TrustedCertificateStore. Change PKCS12 extraction to use AsyncTask.

src/com/android/certinstaller/CertInstaller.java

Added installCaCertsToKeyChain and hasCaCerts accessor for use by
CertInstaller. Use hasUserCertificate() internally. Cleanup coding
style.

src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

Added MANAGE_ACCOUNTS so that IKeyChainService.reset
implementation can remove KeyChain accounts.

AndroidManifest.xml

Implement new IKeyChainService methods:
- Added IKeyChainService.installCaCertificate to install certs
provided by CertInstaller using the TrustedCertificateStore.
- Added IKeyChainService.reset to allow Settings to remove the
KeyChain accounts so that any app granted access to keystore
credentials are revoked when the keystore is reset.

src/com/android/keychain/KeyChainService.java

packages/apps/Settings

Changed com.android.credentials.RESET credential reset action to
also call IKeyChainService.reset to remove any installed user CAs
and remove KeyChain accounts to have AccountManager revoke
credential granted to private keys removed during the RESET.

src/com/android/settings/CredentialStorage.java

Added toast text value for failure case

res/values/strings.xml

system/core

Have init create world readable /data/misc/keychain to allow apps
to access user added CA certificates installed by the CertInstaller.

rootdir/init.rc

Change-Id: I768ca8e8e990ff333ce0f7069a0935173498c5ed
ootdir/init.rc
024447c3c3dcf63b54cc481f2c6ecbda10823269 17-May-2011 Christopher Tate <ctate@google.com> Use the new 'bu' syntax for backup vs restore operation

Change-Id: Ib007705ee562a41869f8add3408101b3a53aa2d7
db/backup_service.c
35e6a003ca5d59cbaa504d8bb8458e8bdd995906 17-May-2011 Omari Stephens <xsdg@android.com> Merge "Add a 1000msec timeout for adb's USB control packets"
ef1e9bf9db7d238c1bb2c2918ce3edc98293dae5 16-May-2011 Chia-chi Yeh <chiachi@android.com> Merge "Update the device permission of /dev/tun."
021d0a2e7cd7c65036d425b7bef775bbc1733864 10-May-2011 Robert Greenwalt <rgreenwalt@google.com> Add v4/v6 route add/removal support

Change-Id: I259a3be4fe473dff75336139c9584d2c5ab27b2d
ibnetutils/ifc_utils.c
7c0ece0531d43dcf95fc6c0ef4bfb625f0206655 14-May-2011 Jean-Baptiste Queru <jbq@google.com> am 860f98af: am 327b2b70: Merge "move core audio definitions under system/core"

* commit '860f98afe175667d2f72f7a5e8b1bf58bfdf96ea':
move core audio definitions under system/core
76dd7247178cdd97577a9d9691c5e385bd474942 13-May-2011 The Android Automerger <android-build@android.com> merge in gingerbread-release history after reset to gingerbread
860f98afe175667d2f72f7a5e8b1bf58bfdf96ea 13-May-2011 Jean-Baptiste Queru <jbq@google.com> am 327b2b70: Merge "move core audio definitions under system/core"

* commit '327b2b709f1c9ed119b2d87cd95d4a5367fe0338':
move core audio definitions under system/core
327b2b709f1c9ed119b2d87cd95d4a5367fe0338 13-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge "move core audio definitions under system/core"
253b598dc081640d2962bb2de5f876a75a22ec47 12-May-2011 Dima Zavin <dima@android.com> move core audio definitions under system/core

Change-Id: I58b7324edff834b3afa4d9c86452e66f8c29c63b
Signed-off-by: Dima Zavin <dima@android.com>
nclude/system/audio.h
0913936a570736524a1881ce37914c2c3543799e 13-May-2011 Irfan Sheriff <isheriff@google.com> am 37737d83: (-s ours) am d4f87e71: am 91a9b452: DO NOT MERGE DHCP changes from master

* commit '37737d8386a8f4349dd6ce9a06a3ed95fcde8b9e':
DO NOT MERGE DHCP changes from master
37737d8386a8f4349dd6ce9a06a3ed95fcde8b9e 13-May-2011 Irfan Sheriff <isheriff@google.com> am d4f87e71: am 91a9b452: DO NOT MERGE DHCP changes from master

* commit 'd4f87e718d2b72c302bf641c5ed7fa7b7f3ca951':
DO NOT MERGE DHCP changes from master
d4f87e718d2b72c302bf641c5ed7fa7b7f3ca951 13-May-2011 Irfan Sheriff <isheriff@google.com> am 91a9b452: DO NOT MERGE DHCP changes from master

* commit '91a9b452152f3c147f5356f0d2f503a664bd2a46':
DO NOT MERGE DHCP changes from master
69f43c90cbf7e1a0952f7001796b45f22d48c3dc 12-May-2011 Chia-chi Yeh <chiachi@android.com> Update the device permission of /dev/tun.

Change-Id: Ie8ad60047fc7160997100bd28a0abb439406806a
ootdir/ueventd.rc
e8e4be57aa45f621d231a40801a4dea877be09d5 12-May-2011 Dima Zavin <dima@android.com> move core audio definitions under system/core

Change-Id: I58b7324edff834b3afa4d9c86452e66f8c29c63b
Signed-off-by: Dima Zavin <dima@android.com>
nclude/system/audio.h
98c68bd7c7daba97f519400674c607f9cc5fee38 12-May-2011 Jean-Baptiste Queru <jbq@google.com> am 34df17d0: am 7078f776: Merge "cutils: add popcount/popcountl/popcountll static inline definitions"

* commit '34df17d03289cee83cee176807c9390b084d77b9':
cutils: add popcount/popcountl/popcountll static inline definitions
34df17d03289cee83cee176807c9390b084d77b9 12-May-2011 Jean-Baptiste Queru <jbq@google.com> am 7078f776: Merge "cutils: add popcount/popcountl/popcountll static inline definitions"

* commit '7078f776fd658f86ecb249eeffc6e7cb0c4ae66a':
cutils: add popcount/popcountl/popcountll static inline definitions
7078f776fd658f86ecb249eeffc6e7cb0c4ae66a 12-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge "cutils: add popcount/popcountl/popcountll static inline definitions"
4af1cf2bd7b6a2bc519e6ad7ea342963b9118eb8 11-Mar-2011 Dima Zavin <dima@android.com> cutils: add popcount/popcountl/popcountll static inline definitions

Just pass them through to their specific GCC builtins. If we find
that the builtins are not performing well or have other issues, we can
pull in existing public implementations and/or write arch-specific
helpers if necessary.

Change-Id: I278e6b73d75fac88808ed4546070d288c06f79e0
Signed-off-by: Dima Zavin <dima@android.com>
nclude/cutils/bitops.h
57de8b8f27f887ca8084671df777a4ac199ba647 11-May-2011 Nick Kralevich <nnk@google.com> rename uevent_checked_recv to uevent_kernel_multicast_recv

Change-Id: I1839627490080efcbb7269699709064856312f8b
nclude/cutils/uevent.h
nit/devices.c
ibcutils/uevent.c
ibsysutils/src/NetlinkListener.cpp
9b7ee137e097c97c1c324f994eb2f03f900121b8 11-May-2011 Nick Kralevich <nnk@google.com> Merge "NetlinkListener: eliminate duplicate code"
574ebc41f8aaaec25039b91b118d2dd98678c7d6 11-May-2011 Christopher Tate <ctate@google.com> Merge "Add 'adb backup' for pulling a full backup tarfile to the host"
8bbae239156cb51fd36300368588e9bf8d42613d 10-May-2011 Omari Stephens <xsdg@android.com> Add a 1000msec timeout for adb's USB control packets

Includes a version bump to make it possible to determine if a given
binary has this fix or not.

Bug: 4111855
Change-Id: I86d902a7fa0c4b906264141d2467b7bdddb61801
db/adb.h
db/usb_linux.c
d76921e7bebc5ae0d3a6c004c7ba82bb1b5a2876 07-May-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
91a9b452152f3c147f5356f0d2f503a664bd2a46 30-Apr-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE DHCP changes from master

Pick dhcp changes from master for the renewal fixes

Bug: 3344732
Change-Id: I42596513f3ef936ef7160d954e3bd26bc51662c8
ibnetutils/dhcp_utils.c
387f6904d1c80c9dcf8e1e1a23b12040ac26a0d6 06-May-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
5f14f4f52a440c39438a50522346be16fb1e6deb 06-May-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
69e26b8f30f91626d42eb710d90570fe93754703 05-May-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
16293716e38a08df50e426636a2227fd59b3fcb0 03-May-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
0ab886bdabd167b32aad90ce5d4e00ce8392858c 01-May-2011 Iliyan Malchev <malchev@google.com> move ANativeWindow and friends under system/core

This patch moves the definition of ANativeWindow from frameworks/base into
system/core. We move ANativeWindow for two reasons.

Firstly, the native-window interface may need to be used by lower-level code
than the framework. Such code (such as the camera HAL) is not allowed to use
definitions from frameworks/base, since the latter is stacked on top of the
former. Thus moving (the interface definition) ANativeWindow under system/core
lowers the level at which we can work with windows.

Secondly, this enables an implementation of ANativeWindow that lies outside of
frameworks, enabling quick initial bringup of graphics.

Change-Id: I851b9bb2834bcec73255b5af82f66411e54bb1a5
Signed-off-by: Iliyan Malchev <malchev@google.com>
nclude/system/window.h
66ea3574b6383e4107c74a192cadda1427320375 01-May-2011 Iliyan Malchev <malchev@google.com> move non-HAL definitions to syste/core/include

This patch moves camera- and graphics-related definitions out of the hardware
HAL layer and into system/core. These definitions are used both by the HAL and
by higher-level code as well. More functionality (e.g., audio definitions)
will be moved here as well.

Change-Id: I225f12374ce54fa393640dce53738267d0d703e9
Signed-off-by: Iliyan Malchev <malchev@google.com>
nclude/system/camera.h
nclude/system/graphics.h
3ffd793a1d6a134a5fde9eabd936614d1b02dceb 13-Apr-2011 Iliyan Malchev <malchev@google.com> native_handle.h: fix declaration

Change-Id: I452a517ee6982995318802eb4bbb23bd79401c4d
Signed-off-by: Iliyan Malchev <malchev@google.com>
nclude/cutils/native_handle.h
cd28c408410cfcd3f96f8fd97a9ba76bca64c435 02-May-2011 Irfan Sheriff <isheriff@google.com> am c951695e: (-s ours) am 3746be26: DHCP changes from master

* commit 'c951695ede6636955965d358454a23752c554da6':
DHCP changes from master
c951695ede6636955965d358454a23752c554da6 02-May-2011 Irfan Sheriff <isheriff@google.com> am 3746be26: DHCP changes from master

* commit '3746be268c1b70ebbf0dee6ed21b7efb479414c9':
DHCP changes from master
3746be268c1b70ebbf0dee6ed21b7efb479414c9 30-Apr-2011 Irfan Sheriff <isheriff@google.com> DHCP changes from master

Pick dhcp changes from master for the renewal fixes

Bug: 3344732
Change-Id: Ie49cd11f74cf89e9edf2d1c788a699ce0996190d
ibnetutils/dhcp_utils.c
531312e491079b7d62612fa35b64e8398f1b3283 30-Apr-2011 Nick Kralevich <nnk@google.com> NetlinkListener: eliminate duplicate code

The checks in this code duplicate uevent_checked_recv().
Use that instead.

Change-Id: I2c48bcf4372f0975c27a63d929cae73e16422faf
ibsysutils/src/NetlinkListener.cpp
fdbbdc4ecda05e028ec41352b373d8232f600ccc 30-Apr-2011 Nick Kralevich <nnk@google.com> am 943ae2ce: am fe6bfb12: am a8728ee0: (-s ours) Merge "libsysutils: only accept uevents from the kernel."

* commit '943ae2ceb7260236fd3cbcc0877edcee48bed4a1':
libsysutils: only accept uevents from the kernel.
6e90ecf2d3ce627ae30c30e612304578c8005e24 30-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
943ae2ceb7260236fd3cbcc0877edcee48bed4a1 29-Apr-2011 Nick Kralevich <nnk@google.com> am fe6bfb12: am a8728ee0: (-s ours) Merge "libsysutils: only accept uevents from the kernel."

* commit 'fe6bfb1285f8c784e0700d03f0f3657ba126e6c4':
libsysutils: only accept uevents from the kernel.
affee0eb10471d274e6ac7c393706f204945acb4 29-Apr-2011 David 'Digit' Turner <digit@google.com> am 7db617ef: resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp

* commit '7db617efc079ccc1f384ef7939f7e8c444dfff7a':
ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
7db617efc079ccc1f384ef7939f7e8c444dfff7a 29-Apr-2011 David 'Digit' Turner <digit@google.com> resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp

Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c
2d7a35fb78b7f80db4eda08d7ec0f9dd51721e72 29-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
b3d7785217d92b45038b2c8a3704cbbbe3971ab0 29-Apr-2011 Erik Gilling <konkers@android.com> Merge "add r to eng and userdebug builds"
b76f0ff7005bde136c2e2f7d19359abe320ab90b 28-Apr-2011 Erik Gilling <konkers@android.com> add r to eng and userdebug builds

Change-Id: Ia52a4897e300568dad2c8c1c7af1fe228d058eaf
oolbox/Android.mk
fe6bfb1285f8c784e0700d03f0f3657ba126e6c4 28-Apr-2011 Nick Kralevich <nnk@google.com> am a8728ee0: (-s ours) Merge "libsysutils: only accept uevents from the kernel."

* commit 'a8728ee0f2e7927d7300a673946926ff82dd8ef3':
libsysutils: only accept uevents from the kernel.
a8728ee0f2e7927d7300a673946926ff82dd8ef3 28-Apr-2011 Nick Kralevich <nnk@google.com> Merge "libsysutils: only accept uevents from the kernel."
b013bfc17110787f4a735552f7e0c03261a3f2b5 28-Apr-2011 David 'Digit' Turner <digit@android.com> am 52a64057: Merge "ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc"

* commit '52a64057b60b0ad242e95fdc285ec60e0191d5b5':
ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
52a64057b60b0ad242e95fdc285ec60e0191d5b5 28-Apr-2011 David 'Digit' Turner <digit@android.com> Merge "ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc"
14fc0c27659d72601888ee9d95cf50a0465b12e3 28-Apr-2011 Dima Zavin <dima@android.com> libcutils: build str_parms test for target instead of host

Change-Id: Ic1cd1c26b86b051c25db2521bd90b58731e29135
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/Android.mk
0e02fcab11f969024813f636909c572e4a73cc73 28-Apr-2011 Dima Zavin <dima@android.com> Merge "libcutils: add a simple string parameter parsing ("a=b;c=d;") helper utils"
c5ae7dbf4c189b986a7937fd212ea29d0b9bd1a4 28-Apr-2011 Dima Zavin <dima@android.com> Merge "libcutils: hashmap: save next pointer in forEach before calling callback"
d2f5415c603f7d9961f7a0b05579a0768e071410 21-Apr-2011 Christopher Tate <ctate@google.com> Add 'adb backup' for pulling a full backup tarfile to the host

The direct command interfaces with the 'bu' binary in /system/bin
on the device.

Change-Id: I4cd69eedfe5144c47277573c5626c6ad8755d70b
db/Android.mk
db/adb.h
db/backup_service.c
db/commandline.c
db/services.c
b71bbcbabac24920dc3ff9a6f898d8a30ec33a6f 27-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
4682abaaa6f714d7bcfcf861af77b1b3c3c64281 27-Apr-2011 Nick Kralevich <nnk@google.com> am b0d0e260: resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp

* commit 'b0d0e260bd6118959fa0e2d3c84037b3e0178551':
Fold uevent message origin checking from init into libcutils.
b0d0e260bd6118959fa0e2d3c84037b3e0178551 27-Apr-2011 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp

Change-Id: Ib3169b3a36aa13ef413da624355b1737e9b76fd9
2baeb89882259661e17d7f631ae7f8987cf53c46 27-Apr-2011 Nick Kralevich <nnk@google.com> am a2842b68: Merge "Fold uevent message origin checking from init into libcutils."

* commit 'a2842b68548c8cdfbf6b3c14480ab04bab9010ea':
Fold uevent message origin checking from init into libcutils.
a2842b68548c8cdfbf6b3c14480ab04bab9010ea 27-Apr-2011 Nick Kralevich <nnk@google.com> Merge "Fold uevent message origin checking from init into libcutils."
80b0162910f5190b237bb1811ad21f180477bf35 24-Apr-2011 Vernon Tang <vt@foilhead.net> libsysutils: only accept uevents from the kernel.

Addresses CVE-2011-1823.

Change-Id: I393c21da749a6a6491d6719767bc1ff3df647ebe
ibsysutils/src/NetlinkListener.cpp
3f582e92f07d358f3d0941b86407b39e2e7e67cc 25-Apr-2011 Vernon Tang <vt@foilhead.net> Fold uevent message origin checking from init into libcutils.

Change-Id: I7cbc0cb840d1b4962e6c360fdad9a9c0ce20e87b
nclude/cutils/uevent.h
nit/devices.c
ibcutils/Android.mk
ibcutils/uevent.c
ee07501b25e088b24f87b691bf14756a94d2941e 27-Apr-2011 Conley Owens <cco3@android.com> am 66acffad: am c4eaebbe: am ab6e55f7: Merge "Enlarge USB bulk transfer size for faster downloads"

* commit '66acffad765add93c8fc74592725eec901867393':
Enlarge USB bulk transfer size for faster downloads
66acffad765add93c8fc74592725eec901867393 27-Apr-2011 Conley Owens <cco3@android.com> am c4eaebbe: am ab6e55f7: Merge "Enlarge USB bulk transfer size for faster downloads"

* commit 'c4eaebbe7a0c125663f74e3961b62de8d3611a51':
Enlarge USB bulk transfer size for faster downloads
c4eaebbe7a0c125663f74e3961b62de8d3611a51 27-Apr-2011 Conley Owens <cco3@android.com> am ab6e55f7: Merge "Enlarge USB bulk transfer size for faster downloads"

* commit 'ab6e55f72b975b4fc61c436d4540ba7416166262':
Enlarge USB bulk transfer size for faster downloads
ab6e55f72b975b4fc61c436d4540ba7416166262 27-Apr-2011 Conley Owens <cco3@android.com> Merge "Enlarge USB bulk transfer size for faster downloads"
bb738d6727f589240dbd31b59e5747eab62ab59f 27-Apr-2011 Nick Kralevich <nnk@google.com> am de35f274: am 03752be0: am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""

* commit 'de35f2741c4e32e331a92be99f7c04b92b94beb2':
Revert "Fold uevent message origin checking from init into libcutils."
de35f2741c4e32e331a92be99f7c04b92b94beb2 27-Apr-2011 Nick Kralevich <nnk@google.com> am 03752be0: am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""

* commit '03752be0a437d12e19ac73ebe23385fe6f756e2c':
Revert "Fold uevent message origin checking from init into libcutils."
03752be0a437d12e19ac73ebe23385fe6f756e2c 27-Apr-2011 Nick Kralevich <nnk@google.com> am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""

* commit '0c297f5ebb5ae7af2854f7c07d97bcdd13c159fc':
Revert "Fold uevent message origin checking from init into libcutils."
0c297f5ebb5ae7af2854f7c07d97bcdd13c159fc 27-Apr-2011 Nick Kralevich <nnk@google.com> Merge "Revert "Fold uevent message origin checking from init into libcutils.""
de9e65dd6586a1c62fe010f9512e326591a4863d 27-Apr-2011 Nick Kralevich <nnk@google.com> Revert "Fold uevent message origin checking from init into libcutils."

This reverts commit 8405ec0e7562a370174d9973dd94984c47e49c36.

The original change does not compile.
nclude/cutils/uevent.h
nit/devices.c
ibcutils/Android.mk
ibcutils/uevent.c
3268eda4dc028e338728d822e18974ed6e7cd639 27-Apr-2011 Nick Kralevich <nnk@google.com> am e3ab4245: am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."

* commit 'e3ab42457077ec2a66bac553e59a7fee08d4fa9e':
Fold uevent message origin checking from init into libcutils.
e3ab42457077ec2a66bac553e59a7fee08d4fa9e 27-Apr-2011 Nick Kralevich <nnk@google.com> am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."

* commit 'a7cf7ed93486240ca48a407e67c7c3683a3b93aa':
Fold uevent message origin checking from init into libcutils.
2084da4c0fc9cb11d75108d385cb1237114aa757 27-Apr-2011 Nick Kralevich <nnk@google.com> am 02c8a9cf: am 18f6d964: am f819d023: Merge "libsysutils: SocketListener: handle recv errors more gracefully."

* commit '02c8a9cf594d8a074a707e06553a230a690124c4':
libsysutils: SocketListener: handle recv errors more gracefully.
02c8a9cf594d8a074a707e06553a230a690124c4 27-Apr-2011 Nick Kralevich <nnk@google.com> am 18f6d964: am f819d023: Merge "libsysutils: SocketListener: handle recv errors more gracefully."

* commit '18f6d964cbee483106da5c96a8c067a948324da7':
libsysutils: SocketListener: handle recv errors more gracefully.
a7cf7ed93486240ca48a407e67c7c3683a3b93aa 27-Apr-2011 Nick Kralevich <nnk@google.com> am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."

* commit '282c2ab408d487d0995362d1b9aa97fe30d97ebd':
Fold uevent message origin checking from init into libcutils.
282c2ab408d487d0995362d1b9aa97fe30d97ebd 27-Apr-2011 Nick Kralevich <nnk@google.com> Merge "Fold uevent message origin checking from init into libcutils."
18f6d964cbee483106da5c96a8c067a948324da7 27-Apr-2011 Nick Kralevich <nnk@google.com> am f819d023: Merge "libsysutils: SocketListener: handle recv errors more gracefully."

* commit 'f819d0233646668b06de36a787979e3b180d6c48':
libsysutils: SocketListener: handle recv errors more gracefully.
f819d0233646668b06de36a787979e3b180d6c48 27-Apr-2011 Nick Kralevich <nnk@google.com> Merge "libsysutils: SocketListener: handle recv errors more gracefully."
8405ec0e7562a370174d9973dd94984c47e49c36 25-Apr-2011 Vernon Tang <vt@foilhead.net> Fold uevent message origin checking from init into libcutils.

Change-Id: I1a38e611a7ad990f74306ce453740a1eeed2416d
nclude/cutils/uevent.h
nit/devices.c
ibcutils/Android.mk
ibcutils/uevent.c
8795007a4aedb0860f6e7b838984ba8104f2febc 27-Apr-2011 Vernon Tang <vt@foilhead.net> libsysutils: SocketListener: handle recv errors more gracefully.

Don't close the socket when onDataAvailable returns false if the socket
is connectionless.

Change-Id: Ie19497f5928144c463d92aa72ba517e675549ea6
ibsysutils/src/SocketListener.cpp
224f9485f15b0319440153e42532f71e0906abf4 27-Apr-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 81ce51da: am 55537c34: am 2f7995ee: Merge "adb: fix typo in helptext"

* commit '81ce51dae95deb0dc6b07cbd96bd07d08aad5178':
adb: fix typo in helptext
81ce51dae95deb0dc6b07cbd96bd07d08aad5178 27-Apr-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 55537c34: am 2f7995ee: Merge "adb: fix typo in helptext"

* commit '55537c347bb31d0e2b176ca2550d2054877f9d54':
adb: fix typo in helptext
55537c347bb31d0e2b176ca2550d2054877f9d54 27-Apr-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 2f7995ee: Merge "adb: fix typo in helptext"

* commit '2f7995ee0ff480b4ee06e8944e7d4569b59a5bad':
adb: fix typo in helptext
2f7995ee0ff480b4ee06e8944e7d4569b59a5bad 26-Apr-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> Merge "adb: fix typo in helptext"
8c75b8f22b4affba37cf5d5b9a92de2af0d965da 26-Apr-2011 David 'Digit' Turner <digit@android.com> am f315896f: am 09bd79c1: am d068e5ae: Merge "pixelflinger: Provide more scanline shortcut functions."

* commit 'f315896f17475c293af3b2cf485d5f0bae812a88':
pixelflinger: Provide more scanline shortcut functions.
0c5c789d5920ad661786cf77e065c6bd123ada26 26-Apr-2011 Nick Kralevich <nnk@google.com> am 9285dc25: am 4aadb7f6: (-s ours) am b620a0b1: Validate sender credentials on netlink msg receive

* commit '9285dc2511e252eef00c0140b89346fb743960c8':
Validate sender credentials on netlink msg receive
f315896f17475c293af3b2cf485d5f0bae812a88 26-Apr-2011 David 'Digit' Turner <digit@android.com> am 09bd79c1: am d068e5ae: Merge "pixelflinger: Provide more scanline shortcut functions."

* commit '09bd79c1c9f66f4b77969c3ec14bf62b29911ff5':
pixelflinger: Provide more scanline shortcut functions.
9285dc2511e252eef00c0140b89346fb743960c8 26-Apr-2011 Nick Kralevich <nnk@google.com> am 4aadb7f6: (-s ours) am b620a0b1: Validate sender credentials on netlink msg receive

* commit '4aadb7f6df4fd21f66c37b8ac0ea8ebf939b41bf':
Validate sender credentials on netlink msg receive
f431d0499b3521caa38673b1fcd8c36a1072c9e6 26-Apr-2011 David 'Digit' Turner <digit@android.com> ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc

+ Add /dev/qemu_pipe line for QEMU pipes.

Change-Id: If3c5c675bfc1585a1d6ffcd1042aaedbc2e94763
ootdir/etc/ueventd.goldfish.rc
ootdir/ueventd.rc
6715a4390f482815f51577d25d464537f7e7b823 26-Apr-2011 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> adb: fix typo in helptext

s/ocmmand/command

Change-Id: I4ed17e8df9dc71a28e1caef5a21f6351e92628af
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
db/commandline.c
09bd79c1c9f66f4b77969c3ec14bf62b29911ff5 26-Apr-2011 David 'Digit' Turner <digit@android.com> am d068e5ae: Merge "pixelflinger: Provide more scanline shortcut functions."

* commit 'd068e5aeb9992caa46a45275f7ff2ef73d3732a4':
pixelflinger: Provide more scanline shortcut functions.
d068e5aeb9992caa46a45275f7ff2ef73d3732a4 26-Apr-2011 David 'Digit' Turner <digit@android.com> Merge "pixelflinger: Provide more scanline shortcut functions."
8d63e3507c841475f322608037d1186f71e3f801 26-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
dbff9862ad687c419e49f0955918758ffad1e834 22-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
0fad7d023f0229f763a58dd479f78397322baa6d 24-Mar-2011 Dima Zavin <dima@android.com> libcutils: add a simple string parameter parsing ("a=b;c=d;") helper utils

Change-Id: Ifabeb75550fa6e351434e6e6d036b19331daf6c1
Signed-off-by: Dima Zavin <dima@android.com>
nclude/cutils/str_parms.h
ibcutils/Android.mk
ibcutils/str_parms.c
6b54a6832f68a8378cd1e7ca620cf3c8824ac5fc 20-Apr-2011 Nick Kralevich <nnk@google.com> am a265e5a3: am d94bbc32: am 6bc08280: Validate sender credentials on netlink msg receive

* commit 'a265e5a352c2f43d3229702eb215347b3f7e2047':
Validate sender credentials on netlink msg receive
a265e5a352c2f43d3229702eb215347b3f7e2047 20-Apr-2011 Nick Kralevich <nnk@google.com> am d94bbc32: am 6bc08280: Validate sender credentials on netlink msg receive

* commit 'd94bbc326ab0e9ceca6f3f90a2864e40bb584c07':
Validate sender credentials on netlink msg receive
d94bbc326ab0e9ceca6f3f90a2864e40bb584c07 20-Apr-2011 Nick Kralevich <nnk@google.com> am 6bc08280: Validate sender credentials on netlink msg receive

* commit '6bc08280108d020edfceff039f3955eebdc1e45c':
Validate sender credentials on netlink msg receive
4fab9ac04e444f8ad057e67006320ca25381948e 24-Mar-2011 Dima Zavin <dima@android.com> libcutils: hashmap: save next pointer in forEach before calling callback

If the callback passed to forEach tries to remove the element it was passed,
there's a use-after-free of the entry pointer in forEach.

Change-Id: Ia364b4775c9c55780b23f683b30cbff511b7f944
Signed-off-by: Dima Zavin <dima@android.com>
ibcutils/hashmap.c
e2f246e497b368c76c37a39f2f347b697545e6c9 20-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
6bc08280108d020edfceff039f3955eebdc1e45c 19-Apr-2011 Nick Kralevich <nnk@google.com> Validate sender credentials on netlink msg receive

Verify that netlink messages are actually from the kernel,
and not from a userspace program.

This is a manual cherry-pick from b620a0b1c7ae486e979826200e8e441605b0a5d6

Change-Id: I237f0a5cb56393bb3aab64a7ae5898f2bdc95cef
ibsysutils/src/NetlinkListener.cpp
c4956766c064f4f4f439939d2376fcd087b996ce 19-Apr-2011 Nick Kralevich <nnk@google.com> Validate sender credentials on netlink msg receive

Verify that netlink messages are actually from the kernel,
and not from a userspace program.

Change-Id: I709c0efe9ba0258f6d79ebcde531d7f7bbe780b2
ibsysutils/src/NetlinkListener.cpp
4aadb7f6df4fd21f66c37b8ac0ea8ebf939b41bf 19-Apr-2011 Nick Kralevich <nnk@google.com> am b620a0b1: Validate sender credentials on netlink msg receive

* commit 'b620a0b1c7ae486e979826200e8e441605b0a5d6':
Validate sender credentials on netlink msg receive
b620a0b1c7ae486e979826200e8e441605b0a5d6 19-Apr-2011 Nick Kralevich <nnk@google.com> Validate sender credentials on netlink msg receive

Verify that netlink messages are actually from the kernel,
and not from a userspace program.

Change-Id: I709c0efe9ba0258f6d79ebcde531d7f7bbe780b2
ibsysutils/src/NetlinkListener.cpp
39764f41a5a6bff89160d644f509a05061365041 15-Apr-2011 David 'Digit' Turner <digit@android.com> pixelflinger: Provide more scanline shortcut functions.

This patch adds a dozen more "shortcut" scanline-processing functions
to pixel-flingers. All of them avoid using the JIT for the corresponding
operation (on ARM), or using the generic and _extremely_ slow 'scanline'
function (on x86, where there is no JIT).

The shortcuts were selected by running the system under emulation
(build full_x86-eng, then launch emulator-x86), and correspond to
operations that are in use when using the system's typical UI features.

This makes it much more responsive and amenable to testing most
applications, at least those that don't use OpenGL ES heavily.

Note that HW OpenGLES emulation is under completion and should solve this
problem entirely, though is not there yet.

Change-Id: I9c73ba21ad158d6cc5532fabe7ed2419e00ecb3f
ibpixelflinger/scanline.cpp
a0d8f0def711e846928de8a8ad5c3495e2cced2b 16-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
bdaaec1ba0a7cf832ad7fe475a7c541ed9973e52 16-Apr-2011 Irfan Sheriff <isheriff@google.com> Use DHCP server as gateway when it is absent

Some routers can return 0.0.0.0 as gateway address,
use DHCP server as gateway in such instances

Change-Id: I7e8db8e619475efce53ce391f77f2c13c3b7268c
ibnetutils/dhcp_utils.c
596a670c31eb19e0d9c97ee1d92f7d39d2c07085 13-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
112445b8a752ce174f36cf853d5f1c356c3f5286 13-Apr-2011 JP Abgrall <jpa@google.com> adb: Don't allow a forced exit if data is still in the socket


Fixes the http://b/4271011 "adb shell cat /init.rc output gets truncated"


Change-Id: I6df64374b60789595fb18f96d429315dec032443
Signed-off-by: JP Abgrall <jpa@google.com>
db/sockets.c
f098c159e306105aa64977955887e687112c76c6 13-Apr-2011 Carl Shapiro <cshapiro@google.com> Merge "Make atomic-inline.h usable from ordinary C++ code."
b60d9ce1fcedf264f7cd7eb9fb8895b118f72ac3 12-Apr-2011 Carl Shapiro <cshapiro@google.com> Make atomic-inline.h usable from ordinary C++ code.

Change-Id: I18dcba9cb3adc22f26403e94df4b2684f51090ed
nclude/cutils/atomic-inline.h
6f49d5f266dffee103a3af07a7f6266f405d2924 12-Apr-2011 Jake Hamby <jhamby@google.com> Add missing function required to load Crespo RIL library.

ifc_set_mask() function was removed in a previous change. This function
is called by the Crespo RIL, so we can't remove it yet.

Bug: 4268537
Change-Id: I634580ee8d2a1aff069178837cc121c89c5e73f9
ibnetutils/ifc_utils.c
203f9513fd720c091c0bb4289f1c4211aaf1cedc 12-Apr-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 0ffe483a: am e4bcf830: am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."

* commit '0ffe483a6a9191fc6da031bbcdbdc50f6f64bdf0':
In serial, skip over port as well if numbers found after colon.
91758c174647f2dd2a247db42da6f371be1ef69d 12-Apr-2011 Ken Sumrall <ksumrall@android.com> Merge "Add the touch command to toolbox."
0ffe483a6a9191fc6da031bbcdbdc50f6f64bdf0 11-Apr-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am e4bcf830: am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."

* commit 'e4bcf8305748e8799df9047fb0f6881553dd43b5':
In serial, skip over port as well if numbers found after colon.
9ab8190e418c9985ae1b92ad8fa2d20b2ed216e9 14-Jan-2011 Carl-Emil Lagerstedt <carl-emil.lagerstedt@sonyericsson.com> Fix build error in init when building with bootchart

There was a build error in init.c if you enabled bootchart, this
should probably be shipped upstream if not fixed already.

Change-Id: Iea3451c3e15d5cac00c5420d99bfce9a950aaaac
nit/init.c
6541ef1562ccf93e498d653598330a7fc80ad2b2 15-Feb-2011 Brian Carlstrom <bdc@google.com> Add keychain user

Change-Id: Id6738d7c97dd58b2043e2cba018797e3b2b4d77a
nclude/private/android_filesystem_config.h
8b0c302a87a96994be45a894c110d315185c2937 08-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
0abfc5659b21e6f8ac2662937f52a1975c749738 07-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
e4bcf8305748e8799df9047fb0f6881553dd43b5 06-Apr-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."

* commit 'd37e0840d75ef133083181f9f95dff9aa46a1b16':
In serial, skip over port as well if numbers found after colon.
d37e0840d75ef133083181f9f95dff9aa46a1b16 06-Apr-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> Merge "In serial, skip over port as well if numbers found after colon."
e994f18c53673cac42ed45ccb3d427bd40000948 16-Mar-2011 Terence Haddock <thaddock@google.com> In serial, skip over port as well if numbers found after colon.

Change-Id: Icd45f570a9527790eb0cd614a3f77da1a72375b1
db/sockets.c
795165bc1512faa121083c6bf3ce6f6d83ce59e6 06-Apr-2011 Ken Sumrall <ksumrall@android.com> Add the touch command to toolbox.

I wrote this to test my fix to support utime(2) system calls in the
sdcard fuse filesystem for stingray, and decided to finish sprucing
it up and make it part of toolbox. In an effort to keep it small,
it doesn't accept dates a la touch, but just a time_t value.

Change-Id: I5dd011cd2e34d0cc605d6f40e46b96a8c949f194
oolbox/Android.mk
oolbox/touch.c
6f9adeb85eb7b33e3a19b77b87be89d91f879fb3 06-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
18247d74be9d0d4d6f1ae25bdd198e5dbf522af8 05-Apr-2011 Jeff Hamilton <jham@android.com> am ee3420bc: resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp

* commit 'ee3420bc124613827af474684c3015d12742c70d':
Make the NFC UID forward compatible.
ee3420bc124613827af474684c3015d12742c70d 05-Apr-2011 Jeff Hamilton <jham@android.com> resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp

Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3
32e834b63b88f81589b8d70a680bfa15374bf82f 05-Apr-2011 Wink Saville <wink@google.com> am b6623abc: am b98762f7: Teach fastboot to allow required variables per product.

* commit 'b6623abc414ea2a1d1ac3cbfef0c435e3b7e8987':
Teach fastboot to allow required variables per product.
b6623abc414ea2a1d1ac3cbfef0c435e3b7e8987 05-Apr-2011 Wink Saville <wink@google.com> am b98762f7: Teach fastboot to allow required variables per product.

* commit 'b98762f7824c291dc5d9a9b757af434ef31d8c81':
Teach fastboot to allow required variables per product.
e10e16983d5f2fbee949a9f148fb42bd2f5539dd 05-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
b98762f7824c291dc5d9a9b757af434ef31d8c81 05-Apr-2011 Wink Saville <wink@google.com> Teach fastboot to allow required variables per product.

This is needed for products like xoom-cdma and xoom-cdma-lte.
The xoom-cdma-lte product requires an lte baseband binary but
it's not needed for xoom-cdma.

This is implemented by allowing an optional product parameter
to "required" statements. The parameter is separated from
"required" by a colon so the version-baseband-2 requirment in
board-info.txt for stingray becomes:

require-for-product:xoom-cdma-lte version-baseband-2=ltedc_u_03.25.00|ltedc_u_03.19.00

In the above statement, only xoom-cdma-lte requires version-baseband-2
and the baseband can be lte_u_03.25.00 or lte_u_03.19.00. For other
products version-baseband-2 will be ignored.


Change-Id: I786bec5f5661c2243d87925b064fc6124d3cffa1
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
65475f89e14cb0914db336652c345e2847c7cb92 04-Apr-2011 Jeff Hamilton <jham@android.com> am 336bc321: Make the NFC UID forward compatible.

* commit '336bc321a6e978a273098148e13a82c5e7ec3be5':
Make the NFC UID forward compatible.
151fae8e125496db8576f116c18c86ad1195869a 01-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
d6efa4548998174404fe16840d34e24235a4ffaa 01-Apr-2011 Brad Fitzpatrick <bradfitz@android.com> am 80337ffc: am 47e4ee59: am 71ead183: Close the client socket early for ctl.* properties.

* commit '80337ffcf45205750b8b90cbbe28c4c8e7e2baff':
Close the client socket early for ctl.* properties.
80337ffcf45205750b8b90cbbe28c4c8e7e2baff 01-Apr-2011 Brad Fitzpatrick <bradfitz@android.com> am 47e4ee59: am 71ead183: Close the client socket early for ctl.* properties.

* commit '47e4ee5958bfd48c741f17c23b3a4a3f7866416e':
Close the client socket early for ctl.* properties.
47e4ee5958bfd48c741f17c23b3a4a3f7866416e 01-Apr-2011 Brad Fitzpatrick <bradfitz@android.com> am 71ead183: Close the client socket early for ctl.* properties.

* commit '71ead1835317af5305f9ef87ce06ebdf9cff92e6':
Close the client socket early for ctl.* properties.
71ead1835317af5305f9ef87ce06ebdf9cff92e6 01-Apr-2011 Brad Fitzpatrick <bradfitz@android.com> Close the client socket early for ctl.* properties.

Bug: 4199411
Change-Id: I3bf335e16e0df8405c538989a8f4f6db7795fa36
nit/property_service.c
336bc321a6e978a273098148e13a82c5e7ec3be5 01-Apr-2011 Jeff Hamilton <jham@android.com> Make the NFC UID forward compatible.

Change-Id: Icfa302c22151b3d722ad0da7e58806f74730e1a3
nclude/private/android_filesystem_config.h
a084db0890886c6415acedefa990e321619f4a85 01-Apr-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
ab0c4e03565c619a95fd39d3d3ee87c61c0bdb2b 01-Apr-2011 Colin Cross <ccross@android.com> Merge "ueventd: track platform device uevents to parse block device names"
320cbfa719f1205ae1035113f47ef51cb078a3ef 01-Apr-2011 Colin Cross <ccross@android.com> Merge "ueventd: refactor uevent handling"
fadb85e3bd333653014df5fcc931d844dc8c3630 31-Mar-2011 Colin Cross <ccross@android.com> ueventd: track platform device uevents to parse block device names

The mmc block devices on panda boards use a platform device called
omap/omap_hsmmc.0. The number of path entries in the uevent after
the platform device is unknown, and the number of path entries in
the platform device is unknown, so the only way to determine how
many entries make up the platform device is to compare against
a list of platform devices.

Add a list of platform devices that have been registered, and
iterate through it to determine the platform device portion of
a block device uevent.

Change-Id: I1480bc6429172ca6997d548787be3863ce062472
nit/devices.c
eb5ba8306522acdbf3a63ca847e5e6b990d842b9 31-Mar-2011 Colin Cross <ccross@android.com> ueventd: refactor uevent handling

Change-Id: I2002be3580ff87b0a55dc030a9099bf6d795011f
nit/devices.c
7b43eb122414676f4a86d5fd546dc60e51bf322a 31-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am e9fa47ca: am 0dd572a5: Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE

* commit 'e9fa47ca664577e4ca7ed270f1f72a2d43fb3423':
Kill IPv6 sockets as well as IPv4 sockets.
e9fa47ca664577e4ca7ed270f1f72a2d43fb3423 31-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am 0dd572a5: Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE

* commit '0dd572a5196f7887de56912b6f2a22f053f1ca34':
Kill IPv6 sockets as well as IPv4 sockets.
0dd572a5196f7887de56912b6f2a22f053f1ca34 31-Mar-2011 Lorenzo Colitti <lorenzo@google.com> Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE
a8bf8324623e42f388042da58b62ebf653346044 31-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 719e4048: am 9cbac1fc: am 9f1e0e3a: Close the property socket *after* updating properties.

* commit '719e40484fa13ecd0b1645c7a7a5d01d5845731a':
Close the property socket *after* updating properties.
124d1931ba86cb193228fe9f094e74a896733a79 31-Mar-2011 Jeff Hamilton <jham@android.com> am 99f28ca6: am be61f39a: (-s ours) am a6a36c0b: Update the value for the NFC shared UID.

* commit '99f28ca6ddc4c1010ecac7420fb23dd8038c8abc':
Update the value for the NFC shared UID.
719e40484fa13ecd0b1645c7a7a5d01d5845731a 31-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 9cbac1fc: am 9f1e0e3a: Close the property socket *after* updating properties.

* commit '9cbac1fc0bb5e521e3e017542ca8b6477504fce7':
Close the property socket *after* updating properties.
9cbac1fc0bb5e521e3e017542ca8b6477504fce7 31-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 9f1e0e3a: Close the property socket *after* updating properties.

* commit '9f1e0e3ae3108086948b74ce58af32df92ff8331':
Close the property socket *after* updating properties.
9f1e0e3ae3108086948b74ce58af32df92ff8331 30-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Close the property socket *after* updating properties.

Also remove some dead code.

Bionic update is in change I3e80cecf

Bug: 4185486
Change-Id: I28e06197ff7a452c70b89b9fc5e2bcf0d9d54bbe
nit/property_service.c
0b6f5634423e9a6d02af51c0267fd6ac0fb86fb2 30-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Close the property socket *after* updating properties."
8ec49049da42e4a987213ec9b0a19a7f907951f8 30-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Close the property socket *after* updating properties.

Also remove some dead code.

Bionic update is in change I3e80cecf

Bug: 4185486
Change-Id: I8dd685eaea1a927c1659df5a1228cc259227ad1c
nit/property_service.c
99f28ca6ddc4c1010ecac7420fb23dd8038c8abc 30-Mar-2011 Jeff Hamilton <jham@android.com> am be61f39a: (-s ours) am a6a36c0b: Update the value for the NFC shared UID.

* commit 'be61f39a6b3b92fd6f0a9d1e732f59fa08e95da6':
Update the value for the NFC shared UID.
412514ea60a707cefb42f2609a3422223bd86381 30-Mar-2011 Alexandre Elias <aelias@google.com> Add ifndef guards to remaining logging macros.

Change-Id: I5fce9bffdb9e52d50059034fd1cc05ba7f0e3b87
nclude/cutils/log.h
b40367e7bc3f89c3875d50b29fa98c3a541e33a3 29-Mar-2011 JP Abgrall <jpa@google.com> adb: keep mac build happy

Use FIONREAD instead of TIOCINQ

Change-Id: Ic9db0228a51c546a798c70f08f2e644a1a376120
db/fdevent.c
bab2c6a883ed0c42cd2d19be027c4f6dc93202c5 29-Mar-2011 JP Abgrall <jpa@google.com> Merge "adb: fix subprocess exit handling, oom adjust fixes, extra debugging."
97d81766fd33cea0dc9bac9bcc71980f8c4c8726 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 4fecade5: am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03

* commit '4fecade5f21d5d062ebe1c70535367d3407bb68f':
Fix potential race introduced in Icd7f5f03
SocketClient: add optional reference counting
471bfa78ffca4249ec38ac16c0cdbb789be45a72 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 15b15c4b: am a14da5b1: am 499b45a3: Merge "libsysutils: Fix a file descriptor leak."

* commit '15b15c4b4acede0b999e6a7af9ce797c6a58a62a':
libsysutils: Fix a file descriptor leak.
a39cd620f3b453daa6d672e90b7aaec20a8d64fb 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 34859033: am fdb915d2: (-s ours) am 4593e0a7: Merge "libsysutils: Fix race condition in SocketListener thread."

* commit '34859033c1076f23d958349b86cb0a5d42696745':
libsysutils: Fix race condition in SocketListener thread.
4fecade5f21d5d062ebe1c70535367d3407bb68f 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03

* commit 'cb1e616e3c108a9c8b159bb95c3356acf5797ba2':
Fix potential race introduced in Icd7f5f03
SocketClient: add optional reference counting
15b15c4b4acede0b999e6a7af9ce797c6a58a62a 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am a14da5b1: am 499b45a3: Merge "libsysutils: Fix a file descriptor leak."

* commit 'a14da5b1e5c956dc90d8725ab6b68311f66e6b6a':
libsysutils: Fix a file descriptor leak.
34859033c1076f23d958349b86cb0a5d42696745 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am fdb915d2: (-s ours) am 4593e0a7: Merge "libsysutils: Fix race condition in SocketListener thread."

* commit 'fdb915d2569b73312e7ab8cb0c0556a3c3d1310a':
libsysutils: Fix race condition in SocketListener thread.
a6d6a6d8beab1bdeac645784cb61ea76021681e7 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am ff904188: am df424691: am 0e59123a: Merge "libsysutils: Handle EINTR in SocketClient::sendData()"

* commit 'ff90418888631b2d0b195657b00da55b9d7edcd1':
libsysutils: Handle EINTR in SocketClient::sendData()
ff90418888631b2d0b195657b00da55b9d7edcd1 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am df424691: am 0e59123a: Merge "libsysutils: Handle EINTR in SocketClient::sendData()"

* commit 'df42469121211905532c5c6d7aa95ec392a7eb35':
libsysutils: Handle EINTR in SocketClient::sendData()
408fa57864c01113deaa213e5c1848a9c594ae92 16-Mar-2011 JP Abgrall <jpa@google.com> adb: fix subprocess exit handling, oom adjust fixes, extra debugging.

* Add support for correctly handling subprocess termination in shell service (b/3400254 b/3482112 b/2249397)
- have a waitpid() track the subprocess, then notify the fdevent via a socket
- force an eof on the pty master in fdevent's new subproc handler.
- modify fdevent to force-read the pty after an exit.
* Migrate the "shell:blabla" handling to "#if !ADB_HOST" sections, where it
belongs.
* Fix the race around OOM adjusting.
- Do it in the child before exec() instead of the in the parent as the
child could already have started or not (no /proc/pid/... yet).
* Allow for multi-threaded D() invocations to not clobber each other.
- Allow locks across object files.
- Add lock within D()
- Make sure sysdesp init (mutex init also) is called early.
* Add some missing close(fd) calls
- Match similar existing practices near dup2()
* Add extra D() invocations related to FD handling.
* Warn about using debugging as stderr/stdout is used for protocol.
* Fix some errno handling and make D() correctly handle it.
* Add new adb trace_mask: services.
* Make fdevent_loop's handle BADFDs more gracefully (could occur some subproc closed its pts explicitely).
* Remove obsolete commandline args reported in help. (b/3509092)


Change-Id: I928287fdf4f1a86777e22ce105f9581685f46e35
db/adb.c
db/adb.h
db/adb_client.c
db/commandline.c
db/fdevent.c
db/fdevent.h
db/file_sync_client.c
db/file_sync_service.c
db/mutex_list.h
db/services.c
db/sockets.c
db/sysdeps.h
db/transport.c
db/transport.h
db/usb_linux.c
db/usb_linux_client.c
db/usb_vendors.h
db/usb_windows.c
cffabfbef627a452b4057ce9645457044c0b4e9c 28-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
913eb8bf874fcec647667bd7113da65b6e38488a 08-Mar-2011 David Krause <david.krause@motorola.com> Enlarge USB bulk transfer size for faster downloads

The default USB transfer bulk is fixed as 4096 in fastboot util code for
Windows and Linux. Enlarging the bulk size can greatly improve the image
download speed via USB.

For Windows, adjust the max bulk size to 1MB to maximize the USB transfer
speed. With this change, the USB transfer speed can be doubled to 20MB/s.

For Linux, adjust the max bulk size to 16384 to maximize the USB transfer
speed according to MAX_USBFS_BUFFER_SIZE definition in drivers/usb/core/devio.c.

For OSX, the maxLenToSend is already 1MB in code.

Change-Id: If6af8c6301f6f6c2ef345e37241706f16d8f5cda
astboot/usb_linux.c
astboot/usb_windows.c
8bd4445d697867bd31353a56f8d23616dd57fadd 26-Mar-2011 The Android Automerger <android-build@android.com> keep previous history
cdae7a1df8f118404689b656003f4313b62987f2 25-Mar-2011 Brian Swetland <swetland@google.com> Merge "defer firmware load until after filesystems are mounted"
8d48c8e45724c7103f0ace7885d339e49399908b 24-Mar-2011 Brian Swetland <swetland@google.com> defer firmware load until after filesystems are mounted

In some situations a driver could try to request firmware before
/system is mounted. Previously we'd fail the request. Now we
will retry the read-from-filesystem every 100ms until we find the
firmware or we've finished the "fs" and "post-fs" stages of init.

Change-Id: Ie32402f7d41c818bf20f3297286ed5f99705b72c
nit/devices.c
nit/init.c
nit/ueventd.c
ea52ff0e560799a5081d2dd03dc3040389fecd05 25-Mar-2011 The Android Automerger <android-build@android.com> keep previous history
ca1030ae42edfbeaedef5ea02a2c279bbb3b10cf 25-Mar-2011 Ken Sumrall <ksumrall@android.com> am b26662c0: am c3e69903: am 97919656: Add support for the utime(2) family of system calls to the sdcard fuse filesystem.

* commit 'b26662c0a2876767b2c06cb740f07b1010f91548':
Add support for the utime(2) family of system calls to the sdcard fuse filesystem.
b26662c0a2876767b2c06cb740f07b1010f91548 25-Mar-2011 Ken Sumrall <ksumrall@android.com> am c3e69903: am 97919656: Add support for the utime(2) family of system calls to the sdcard fuse filesystem.

* commit 'c3e69903ed5f9e406fe51093fc41917512aa4036':
Add support for the utime(2) family of system calls to the sdcard fuse filesystem.
c3e69903ed5f9e406fe51093fc41917512aa4036 25-Mar-2011 Ken Sumrall <ksumrall@android.com> am 97919656: Add support for the utime(2) family of system calls to the sdcard fuse filesystem.

* commit '97919656803126c6b28ea6070fc86d124ac4ef4b':
Add support for the utime(2) family of system calls to the sdcard fuse filesystem.
be61f39a6b3b92fd6f0a9d1e732f59fa08e95da6 25-Mar-2011 Jeff Hamilton <jham@android.com> am a6a36c0b: Update the value for the NFC shared UID.

* commit 'a6a36c0b799b84d06b695027d205f21d13a3275b':
Update the value for the NFC shared UID.
a6a36c0b799b84d06b695027d205f21d13a3275b 25-Mar-2011 Jeff Hamilton <jham@android.com> Update the value for the NFC shared UID.

Change-Id: I47edf39dbdf2ebd41f44ca69aac250d8991dec4c
nclude/private/android_filesystem_config.h
97919656803126c6b28ea6070fc86d124ac4ef4b 18-Mar-2011 Ken Sumrall <ksumrall@android.com> Add support for the utime(2) family of system calls to the sdcard fuse filesystem.

Add support for the utime(2) family of system calls to change the modify
and access time of files. Requires an updated bionic with support for
the utimensat(2) system call.

Change-Id: I8cc0c0e6671c5708849752f47e4c3d4be2858b61
dcard/sdcard.c
c5b3b3d298f0780ef9e675d3b29394666907e008 24-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
9d157870345fa18ee7e639a85f6bcc4afb50c648 23-Feb-2011 TK MUN <tk.mun@samsung.com> Add per interface dhcp client support

Added when using dhcp on both wimax and wifi. But should be useful across multiple
services running dhcp now. Also adds a renewal api

Change-Id: Ic850a612dd429cd675b5b0224ff58895f9d8e4d9
Signed-off-by: TK MUN <tk.mun@samsung.com>
ibnetutils/dhcp_utils.c
e31f2cdde626a0ef6c731c98b92b5b2dc5a533f4 23-Mar-2011 TK MUN <tk.mun@samsung.com> am 5c8cc803: (-s ours) am 4ae741bb: (-s ours) am 7238072a: DO NOT MERGE Change IP renew service name

* commit '5c8cc8036cd2565ccf541f87b192a7c7a74f42e4':
DO NOT MERGE Change IP renew service name
5c8cc8036cd2565ccf541f87b192a7c7a74f42e4 23-Mar-2011 TK MUN <tk.mun@samsung.com> am 4ae741bb: (-s ours) am 7238072a: DO NOT MERGE Change IP renew service name

* commit '4ae741bb34b9fe397986663e108a5091ea9ee29e':
DO NOT MERGE Change IP renew service name
cb1e616e3c108a9c8b159bb95c3356acf5797ba2 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 7c556549: Merge changes Icdefb5ff,Icd7f5f03

* commit '7c556549079dbcc3f6f7ef4376978cd8c598aa62':
Fix potential race introduced in Icd7f5f03
SocketClient: add optional reference counting
a14da5b1e5c956dc90d8725ab6b68311f66e6b6a 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 499b45a3: Merge "libsysutils: Fix a file descriptor leak."

* commit '499b45a3597bc2434bcc0974660470192ab4ff06':
libsysutils: Fix a file descriptor leak.
fdb915d2569b73312e7ab8cb0c0556a3c3d1310a 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 4593e0a7: Merge "libsysutils: Fix race condition in SocketListener thread."

* commit '4593e0a7645ba5d848c0bf19d30f57b52fd305b1':
libsysutils: Fix race condition in SocketListener thread.
df42469121211905532c5c6d7aa95ec392a7eb35 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 0e59123a: Merge "libsysutils: Handle EINTR in SocketClient::sendData()"

* commit '0e59123adad22e1dac03e972ea37361056bb382c':
libsysutils: Handle EINTR in SocketClient::sendData()
7c556549079dbcc3f6f7ef4376978cd8c598aa62 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge changes Icdefb5ff,Icd7f5f03

* changes:
Fix potential race introduced in Icd7f5f03
SocketClient: add optional reference counting
499b45a3597bc2434bcc0974660470192ab4ff06 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "libsysutils: Fix a file descriptor leak."
4593e0a7645ba5d848c0bf19d30f57b52fd305b1 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "libsysutils: Fix race condition in SocketListener thread."
0e59123adad22e1dac03e972ea37361056bb382c 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "libsysutils: Handle EINTR in SocketClient::sendData()"
c747264892cb62cdfa2068cd7035a1d86a401e60 23-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
3549b0dc2829184f9911d27a6ab0cf39b19764f1 18-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Fix potential race introduced in Icd7f5f03

Digit wrote:

"You probably don't want to close the socket here without updating
c->socket as well. Otherwise, another thread holding a handle to the
client after the c->decRef() could end up sending a message to a
different socket, if the file descriptor index is reused by another
client in the meantime."

Change-Id: Icdefb5ffc0c7607325d7db761e1f04e5d868bfb7
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
13aa8ad44570bceef73115cea749b11f30888530 17-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> SocketClient: add optional reference counting

Needed to fix a race in netd.

Bug: 3438459
Change-Id: Icd7f5f035510235f733a25c0621479d3e644b152
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
15d09854a8b2a1adf2fa5123ff77b9882afd6c22 21-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Fix a file descriptor leak.

The recent refactoring of the select() loop in SocketListener
missed a close() of the file descriptor when the onDataAvailable()
callback returns false.

Change-Id: I767caefab4b98ab350f2db2497ee2bd630f20850
ibsysutils/src/SocketListener.cpp
100c0e2dab243da3a5351f1acbcdc560af10a405 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Fix race condition in SocketListener thread.

+ Handle EINTR in accept(), write() and select()
+ Fix a memory leak when deleting the mClients list
+ Fix typo in SocketListener.h

Change-Id: Ie68bb3e2dbefe0dfdaa22a5cd06a42dbc4c0f8aa
nclude/sysutils/SocketListener.h
ibsysutils/src/SocketListener.cpp
01feae2d7cbd607970c8008055094a6259658939 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Handle EINTR in SocketClient::sendData()

+ Improve allocation code in sendMsg(code,msg,addErrno)

Change-Id: Ib5fe84bec1a167c369e7ba759acea395e832f6b5
ibsysutils/src/SocketClient.cpp
529bfd9126a2acad96b9bd29696125c0abac263d 22-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
4ae741bb34b9fe397986663e108a5091ea9ee29e 22-Mar-2011 TK MUN <tk.mun@samsung.com> am 7238072a: DO NOT MERGE Change IP renew service name

* commit '7238072a7da527147c21cc939160d975eb28b1ac':
DO NOT MERGE Change IP renew service name
7238072a7da527147c21cc939160d975eb28b1ac 20-Mar-2011 TK MUN <tk.mun@samsung.com> DO NOT MERGE Change IP renew service name

- Change invalid service name (dhcpcd_renew -> iprenew)
- Remove condition which checks status of renew service.
- Remove unused variable.

Change-Id: Ic4ae7fb950baf4bd7286088a945a48ab5fe64e91
ibnetutils/dhcp_utils.c
fcbc38b172f23b52526ccca853f3ad4a82a173ac 21-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
613bcd30408c40ddcda00316db6608385f3fb7e9 18-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
4be4e69f0128b7d9b0a29651ef4b79d806ae3ce7 18-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Fix potential race introduced in Icd7f5f03

Digit wrote:

"You probably don't want to close the socket here without updating
c->socket as well. Otherwise, another thread holding a handle to the
client after the c->decRef() could end up sending a message to a
different socket, if the file descriptor index is reused by another
client in the meantime."

Change-Id: Icdefb5ffc0c7607325d7db761e1f04e5d868bfb7
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
51101e86dce3c512a915308274406968aa5d0760 18-Mar-2011 Brian Carlstrom <bdc@google.com> Merge "Revert "Debuggerd now outputs the offset of libc.so on the device as a separate item.""
3eb0897df7b37614ac656ee0d8f96de2b2a2b9d6 18-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "SocketClient: add optional reference counting"
e2f712303279039310ddb8e59cf7884338c0e40d 18-Mar-2011 Brian Carlstrom <bdc@google.com> Revert "Debuggerd now outputs the offset of libc.so on the device as a separate item."

This reverts commit c031a3b006129ca408eaade325a53a334daee3b2.

Conflicts:

debuggerd/debuggerd.c

Change-Id: Ib37ae793bbffdb4a81837bc51171cc62b12abe7d
ebuggerd/debuggerd.c
9b53946d91f5da5889de2b5224e99a07069f4bbe 18-Mar-2011 Jeffrey Tinker <jtinker@google.com> am cdfde07e: am f642c3d1: Make drmserver\'s primary group be system, so setgid is not required in ueventd.stingray.rc

* commit 'cdfde07eb7bd02bf8b3f6c46784309d33ff1df1e':
Make drmserver's primary group be system, so setgid is not required in ueventd.stingray.rc
cdfde07eb7bd02bf8b3f6c46784309d33ff1df1e 18-Mar-2011 Jeffrey Tinker <jtinker@google.com> am f642c3d1: Make drmserver\'s primary group be system, so setgid is not required in ueventd.stingray.rc

* commit 'f642c3d12f4cffdc349b9ebfc4107de254ad8db9':
Make drmserver's primary group be system, so setgid is not required in ueventd.stingray.rc
648ebad883e7825353c841950dd7d78664c238e6 17-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> SocketClient: add optional reference counting

Needed to fix a race in netd.

Bug: 3438459
Change-Id: Icd7f5f035510235f733a25c0621479d3e644b152
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
6cf73eadc752b619bc7c38d0d1277891eccbf81d 17-Mar-2011 Lorenzo Colitti <lorenzo@google.com> Kill IPv6 sockets as well as IPv4 sockets.

Change-Id: Ib9e070e510d1a762295faf4dc673c9a6e8207a8d
ibnetutils/ifc_utils.c
f642c3d12f4cffdc349b9ebfc4107de254ad8db9 17-Mar-2011 Jeffrey Tinker <jtinker@google.com> Make drmserver's primary group be system, so setgid is not required in ueventd.stingray.rc

Change-Id: Ie8a287620d22b5c1bdc459fb288b7403589ab474
ootdir/init.rc
29639392d86ebfa7936a7872c82b7dbe44253fda 17-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
9a7522735d1715e88f045c2cced69fff9d97f5ec 17-Mar-2011 Mike Lockwood <lockwood@google.com> Merge "Fix uninitialized variable bug in sdcard emulator - Following members were not initialized in fuse_init(). fuse->root.actual_name fuse->root.gen - Initialize fuse->root with memset()."
b51326351a28f70e4c003df8f89d0b450bcd6041 16-Mar-2011 Mike Lockwood <lockwood@google.com> Merge "In serial, skip over port as well if numbers found after colon."
23dc601c8543fc9734e53d2dde59c09aca917730 16-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
28e1390e688f721e13a9877d3c41884bf151db60 16-Mar-2011 Terence Haddock <thaddock@google.com> In serial, skip over port as well if numbers found after colon.

Change-Id: Icd45f570a9527790eb0cd614a3f77da1a72375b1
db/sockets.c
d4e57a8a4026b2ebabdc5f03170c6ff69d94b0cd 16-Mar-2011 satok <satok@google.com> am f0a670eb: (-s ours) do not merge. Fix a race in system properties.

* commit 'f0a670eb12a0e5854dfd2a9284973d0711392653':
do not merge. Fix a race in system properties.
f0a670eb12a0e5854dfd2a9284973d0711392653 15-Mar-2011 satok <satok@google.com> do not merge. Fix a race in system properties.

Backport Iee1ca9b7defd6

This now passes:

$ adb shell am instrument -w -e class android.os.SystemPropertiesTest \
com.android.frameworks.coretests.systemproperties/android.test.InstrumentationTestRunner

(which tests setting and re-reading back system properties in a loop)

This patch depends on I110b653a which moves property setting
from libcutils into bionic.

Bug: 3511230

Change-Id: I145e642bd13079677017bb64e361e176fc73b810
ibcutils/properties.c
8349cce829388503fae67d454aff6a544ccd36aa 16-Mar-2011 Terry Heo (Woncheol) <terryheo@google.com> Fix uninitialized variable bug in sdcard emulator
- Following members were not initialized in fuse_init().
fuse->root.actual_name
fuse->root.gen
- Initialize fuse->root with memset().

Change-Id: I4bce754ace608b526961f59049b2d780fd99756f
dcard/sdcard.c
700d68477e2d4c0ee7089dd2891b67e16eba5330 15-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
d6851475e0bc104e18a8d7cbcb1abd081f7f94a0 15-Mar-2011 satok <satok@google.com> am 49ad2447: (-s ours) am c1b97e05: (-s ours) do not merge. Fix a race in system properties.

* commit '49ad2447286b7b3af73f52d6f000f1452c7ece0a':
do not merge. Fix a race in system properties.
49ad2447286b7b3af73f52d6f000f1452c7ece0a 15-Mar-2011 satok <satok@google.com> am c1b97e05: (-s ours) do not merge. Fix a race in system properties.

* commit 'c1b97e05b0aee92b249a93e53b3f8151fcb74287':
do not merge. Fix a race in system properties.
c1b97e05b0aee92b249a93e53b3f8151fcb74287 15-Mar-2011 satok <satok@google.com> do not merge. Fix a race in system properties.

Backport Iee1ca9b7defd6

This now passes:

$ adb shell am instrument -w -e class android.os.SystemPropertiesTest \
com.android.frameworks.coretests.systemproperties/android.test.InstrumentationTestRunner

(which tests setting and re-reading back system properties in a loop)

This patch depends on I110b653a which moves property setting
from libcutils into bionic.

Bug: 3511230

Change-Id: I145e642bd13079677017bb64e361e176fc73b810
ibcutils/properties.c
efd1fc2fa60e12a370ba2ea37860ff989e64deb8 15-Mar-2011 Glenn Kasten <gkasten@google.com> am 187fb7e6: am cfce2826: Bug 4089635 mediaserver fewer supplementary groups

* commit '187fb7e6cab0701b9c4fec0b6074c15b3ef5703f':
Bug 4089635 mediaserver fewer supplementary groups
187fb7e6cab0701b9c4fec0b6074c15b3ef5703f 15-Mar-2011 Glenn Kasten <gkasten@google.com> am cfce2826: Bug 4089635 mediaserver fewer supplementary groups

* commit 'cfce2826780dc1c4811619b89ba8d358e3f30f11':
Bug 4089635 mediaserver fewer supplementary groups
7cf20f925d65a8e1575ae48c5b5da7508cbdd477 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Fix a race in system properties."
29d1f53a56fc2eb5a52a80ceb6cfbde778e4bc12 14-Mar-2011 Dima Zavin <dima@android.com> Merge "cutils: add popcount/popcountl/popcountll static inline definitions"
cfce2826780dc1c4811619b89ba8d358e3f30f11 14-Mar-2011 Glenn Kasten <gkasten@google.com> Bug 4089635 mediaserver fewer supplementary groups

Change-Id: I90111567564397ca08e87dcfcbdf23337bf79ae6
ootdir/init.rc
a0768663c5798986c3ccfb3fdab380c5a4cf7d67 14-Mar-2011 Glenn Kasten <gkasten@google.com> am 34f62a36: am fcad9d8d: Merge "Bug 4086255 drmserver process needs system group" into honeycomb-mr1

* commit '34f62a36a32919e6ba6ec5bb5210c3000bbec473':
Bug 4086255 drmserver process needs system group
34f62a36a32919e6ba6ec5bb5210c3000bbec473 14-Mar-2011 Glenn Kasten <gkasten@google.com> am fcad9d8d: Merge "Bug 4086255 drmserver process needs system group" into honeycomb-mr1

* commit 'fcad9d8d6bd3cd1e750f4d965968878be44a65d8':
Bug 4086255 drmserver process needs system group
fcad9d8d6bd3cd1e750f4d965968878be44a65d8 14-Mar-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4086255 drmserver process needs system group" into honeycomb-mr1
7793471397043942a3931e21d866afc043cc8bdd 14-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
4297a049e685157da049140217025f0455a913d8 14-Mar-2011 Mike Lockwood <lockwood@android.com> am 3e5223a9: am c4c00d8e: libusbhost: Limit bulk transfer requests to 16384 bytes

* commit '3e5223a925bef52eb24ff449d235dccbb8207954':
libusbhost: Limit bulk transfer requests to 16384 bytes
3e5223a925bef52eb24ff449d235dccbb8207954 14-Mar-2011 Mike Lockwood <lockwood@android.com> am c4c00d8e: libusbhost: Limit bulk transfer requests to 16384 bytes

* commit 'c4c00d8e6a215020be87f6702844267e105e1f0e':
libusbhost: Limit bulk transfer requests to 16384 bytes
c4c00d8e6a215020be87f6702844267e105e1f0e 12-Mar-2011 Mike Lockwood <lockwood@android.com> libusbhost: Limit bulk transfer requests to 16384 bytes

Otherwise the kernel will return an EINVAL error

Change-Id: I906472a4128eb26c5be7865142bc4a52464cf5f8
Bug: 4065217

Signed-off-by: Mike Lockwood <lockwood@android.com>
ibusbhost/usbhost.c
b7b770dd76d664b1e44adb2f98b8caf594f6d3c8 11-Mar-2011 Glenn Kasten <gkasten@google.com> Bug 4086255 drmserver process needs system group

Change-Id: If9a325b9e716abe00f3ad6f20b012861308abd2d
ootdir/init.rc
b490d3faaef2c867e3d091837d01c5e1155047a5 11-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
a2519531e1bfcd49f54f772d74ce3adbcc791597 11-Mar-2011 Ken Sumrall <ksumrall@android.com> am bdf7b815: am 5db0897c: Merge "Load the persistent properties after decrypting the /data partition" into honeycomb-mr1

* commit 'bdf7b815063b5abb633a73450feb50d2edc67377':
Load the persistent properties after decrypting the /data partition
bdf7b815063b5abb633a73450feb50d2edc67377 11-Mar-2011 Ken Sumrall <ksumrall@android.com> am 5db0897c: Merge "Load the persistent properties after decrypting the /data partition" into honeycomb-mr1

* commit '5db0897c6530502e1343a75b258868122030e4a5':
Load the persistent properties after decrypting the /data partition
5db0897c6530502e1343a75b258868122030e4a5 11-Mar-2011 Ken Sumrall <ksumrall@android.com> Merge "Load the persistent properties after decrypting the /data partition" into honeycomb-mr1
bb889dde13c7d47b69a52159604cf5b2763ce2d2 11-Mar-2011 Ken Sumrall <ksumrall@android.com> am 276df093: am 70987108: Merge "Try to unmount writable filesystems when rebooting" into honeycomb-mr1

* commit '276df0936dbf438b32ab099b04f69f01d7f1eed7':
Try to unmount writable filesystems when rebooting
276df0936dbf438b32ab099b04f69f01d7f1eed7 11-Mar-2011 Ken Sumrall <ksumrall@android.com> am 70987108: Merge "Try to unmount writable filesystems when rebooting" into honeycomb-mr1

* commit '7098710805bbf771d7b76c798951f4648539dadb':
Try to unmount writable filesystems when rebooting
7098710805bbf771d7b76c798951f4648539dadb 11-Mar-2011 Ken Sumrall <ksumrall@android.com> Merge "Try to unmount writable filesystems when rebooting" into honeycomb-mr1
c5c51033c86353d1a448c72e0e9388906eed7114 09-Mar-2011 Ken Sumrall <ksumrall@android.com> Load the persistent properties after decrypting the /data partition

Fix for bug 3415286. The persistent properties are normally read early
in the boot process after /data is mounted. However, for an encrypted
system, at that point /data is a tmpfs ramdisk. This change adds a new
command to init (load_persist_props) to read the persistent properties,
and adds an action to init.rc to load the persistent properties. This
action is triggered by setting a property in vold, but that's in a
different CL.

Change-Id: I74b3057974ee6029c29d956b76fef5566700d471
nit/builtins.c
nit/init_parser.c
nit/keywords.h
nit/property_service.c
nit/property_service.h
ootdir/init.rc
e3aeeb4de34dbb93e832e6554f494122ba633f3b 08-Mar-2011 Ken Sumrall <ksumrall@android.com> Try to unmount writable filesystems when rebooting

Ext4 filesystems like to be unmounted before rebooting. The Android system
doesn't have a traditional Linux init setup, and shutting down the system
was not much more than calling sync(2) and reboot(2). This adds a new
function to libcutils called android_reboot(). By default, it calls sync()
and then remounts all writable filesystems as read-only and marks them clean.
There is a flag parameter in which the caller can ask for sync() not to be
called, or to not remount the filesystems as read-only. Then it will call
reboot(2) as directed by the other parameters. This change also updates
adb, init and toolbox to call the new android_reboot() function.
Fixes bugs 3350709 and 3495575.

Change-Id: I16d71ffce3134310d7a260f61ec6f4dd204124a7
db/services.c
nclude/cutils/android_reboot.h
nit/signal_handler.c
ibcutils/Android.mk
ibcutils/android_reboot.c
oolbox/reboot.c
oolbox/wipe.c
dfa9f55700789100c1f8ee2230c33a8ba9768fd7 11-Mar-2011 Mathias Agopian <mathias@google.com> am e7ee3b1d: (-s ours) am a40481b2: Run surfaceflinger in its own process. [DO NOT MERGE]

* commit 'e7ee3b1d9078c227378a06d88d848b6066bfec3f':
Run surfaceflinger in its own process. [DO NOT MERGE]
e7ee3b1d9078c227378a06d88d848b6066bfec3f 11-Mar-2011 Mathias Agopian <mathias@google.com> am a40481b2: Run surfaceflinger in its own process. [DO NOT MERGE]

* commit 'a40481b2cc604b8b278d509f120cf496c4c318f2':
Run surfaceflinger in its own process. [DO NOT MERGE]
a40481b2cc604b8b278d509f120cf496c4c318f2 04-Mar-2011 Mathias Agopian <mathias@google.com> Run surfaceflinger in its own process. [DO NOT MERGE]

This is to allow OpenGL ES rendering from the system process,
and help with debugging.

Bug: 4086003
Change-Id: I732e95f4fcaa358f430cc195d8e63a69263bffdc
ootdir/init.rc
eb1f0c6fd162fe34d91e8766e53e440349130a36 07-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Fix a race in system properties.

This now passes:

$ adb shell am instrument -w -e class android.os.SystemPropertiesTest \
com.android.frameworks.coretests.systemproperties/android.test.InstrumentationTestRunner

(which tests setting and re-reading back system properties in a loop)

This patch depends on I110b653a which moves property setting
from libcutils into bionic.

Bug: 3511230
Change-Id: Iee1ca9b7defd6060510a01f40fbe63ba4c96eb8d
ibcutils/properties.c
5a809b90e91d2ccf4c84181d10d175eb2c1c6bc7 11-Mar-2011 Dima Zavin <dima@android.com> cutils: add popcount/popcountl/popcountll static inline definitions

Just pass them through to their specific GCC builtins. If we find
that the builtins are not performing well or have other issues, we can
pull in existing public implementations and/or write arch-specific
helpers if necessary.

Change-Id: I278e6b73d75fac88808ed4546070d288c06f79e0
Signed-off-by: Dima Zavin <dima@android.com>
nclude/cutils/bitops.h
c117f577c373b61bcb2bb12b9f50a89cce2c255c 10-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
91826623eef7eaeb0ba268f52bc2abc0dbf42229 10-Mar-2011 TK MUN <tk.mun@samsung.com> am 5ef46801: am 9badcf70: (-s ours) am 5b63884e: wimax : Fix for multiple dhcpcd service.

* commit '5ef4680140aa3eee148c86ef764b6f9d270c4997':
wimax : Fix for multiple dhcpcd service.
5ef4680140aa3eee148c86ef764b6f9d270c4997 10-Mar-2011 TK MUN <tk.mun@samsung.com> am 9badcf70: (-s ours) am 5b63884e: wimax : Fix for multiple dhcpcd service.

* commit '9badcf70addfbf28ee99da358f23dcbb8248812b':
wimax : Fix for multiple dhcpcd service.
9badcf70addfbf28ee99da358f23dcbb8248812b 10-Mar-2011 TK MUN <tk.mun@samsung.com> am 5b63884e: wimax : Fix for multiple dhcpcd service.

* commit '5b63884e4ebf356fd6812f1253456e8447d3e3de':
wimax : Fix for multiple dhcpcd service.
5b63884e4ebf356fd6812f1253456e8447d3e3de 23-Feb-2011 TK MUN <tk.mun@samsung.com> wimax : Fix for multiple dhcpcd service.

- Seperate dhcp service for each interface(wifi and wimax).

Change-Id: Ib88436b0e468e93ce3199f3b6c00799fd168b666
Signed-off-by: TK MUN <tk.mun@samsung.com>
ibnetutils/dhcp_utils.c
8ee41e31d7c8286dcd29afd9feb60d0e994e1b84 09-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
5d1c9c703e1336f77a9f8f8145837670c65a62df 08-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
48a7c2f9b1cc7fe5c4df253959a13b473f827c61 07-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Restart surfaceflinger with stop/start too."
d8ed091c6eaa5f44b84407af5d8e902f9358dc60 05-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Restart surfaceflinger with stop/start too.

Change-Id: Ide045fc3baced9e1bde95cb26d0b835511c21780
oolbox/start.c
oolbox/stop.c
5489648cd55c4fe6ff7be3edc1cc653bd1fe3a1e 07-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
4fc3706015b80cc9b02305062467458215f38f33 05-Mar-2011 Raphael <raphael@google.com> Merge "Revert "Define O_BINARY for non-Windows platforms.""
d0e29533d3937a9cfdfa3cc56ffdcc1141021d9b 04-Mar-2011 Mathias Agopian <mathias@google.com> Run surfaceflinger in its own process.

This is to allow OpenGL ES rendering from the system process,
and help with debugging.

Change-Id: I2dccc015c5ce3f6730c8d559b51422fe571f83b6
ootdir/init.rc
de983c56d6c990479df4c9a5efd6f88ada942e5a 04-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2da6c56051b741d5181a94a228b30bf0f8589102 03-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to master
1e47832909606ae3cbd0169ec48956b5c8fdea4f 03-Mar-2011 Raphael <raphael@google.com> Revert "Define O_BINARY for non-Windows platforms."

This reverts commit bd70e4aca5680acb7d5da5500b7e8c618fb499f2.
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
cf01597121c1c08780966f22e2a62386d0e1a08f 19-Feb-2011 Amol Bhatkar <amolbhatkar@motorola.com> property_service: Give radio permission to set net.qmi*

Change-Id: I771ef22859799b863ab79de9d3248ef610af4dd8
nit/property_service.c
f0900adeb2b260068e7dae5509b821c8f5aa45eb 03-Mar-2011 David Turner <digit@android.com> am 663268ca: am fe111c83: am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"

* commit '663268caac636e32b19173743594899e52df0830':
x86: Add vold.fstab to mount the SD card
879dd27b2b39064df902941a6d84c4ac6c7519dc 03-Mar-2011 Raphael Moll <ralf@android.com> am e24624da: am 733e4701: am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."

* commit 'e24624da7d29374ad59d20312ca0e0ea2ea5596b':
Define O_BINARY for non-Windows platforms.
663268caac636e32b19173743594899e52df0830 02-Mar-2011 David Turner <digit@android.com> am fe111c83: am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"

* commit 'fe111c83708dd3c8746b3a05d4b2f53c7a9f4477':
x86: Add vold.fstab to mount the SD card
e24624da7d29374ad59d20312ca0e0ea2ea5596b 02-Mar-2011 Raphael Moll <ralf@android.com> am 733e4701: am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."

* commit '733e47011023787cf996b1b4f232453b2324e303':
Define O_BINARY for non-Windows platforms.
51c17a96b196fdad440a4bb014ba8b3c93218d72 02-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Make optional valgrind binaries +x."
09dacc8d0acaf6634abd50f35e73fd854f6ee684 02-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to master
fe111c83708dd3c8746b3a05d4b2f53c7a9f4477 02-Mar-2011 David Turner <digit@android.com> am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"

* commit 'e6b638be199a5f16f3eaff69710d92ea248d60a3':
x86: Add vold.fstab to mount the SD card
e6b638be199a5f16f3eaff69710d92ea248d60a3 02-Mar-2011 David Turner <digit@android.com> Merge "x86: Add vold.fstab to mount the SD card"
2d13d1408bef9e26cc418e6fc2579dfd12378a3c 02-Mar-2011 JP Abgrall <jpa@google.com> fastboot: fix arg handling causing no-op.

Change-Id: I89d4a6d14e542d8f2d7832d94b0a7cee6eb88305
astboot/fastboot.c
733e47011023787cf996b1b4f232453b2324e303 02-Mar-2011 Raphael Moll <ralf@android.com> am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."

* commit 'fa5f2ad48b0a22d963b11b87cb94d5d1960c42ff':
Define O_BINARY for non-Windows platforms.
8d1c6e76859e1dd51644f5f0f7f21f3950430157 02-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Make optional valgrind binaries +x.

Change-Id: If3417e0c8728c7c74badb12de734cf06e794619d
nclude/private/android_filesystem_config.h
e05b9c75c2fd446284a7b35ae6be5bae1bfe3cba 01-Mar-2011 Tsu Chiang Chuang <tsu@google.com> Merge "Add explicit 'help' command to fastboot."
fa5f2ad48b0a22d963b11b87cb94d5d1960c42ff 01-Mar-2011 Raphael Moll <ralf@android.com> am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."

* commit 'bd8f4a85ce45649dc75fbef139f0deae12f834a7':
Define O_BINARY for non-Windows platforms.
87da5483083051d629c29afbe75b98c32c903b5c 01-Mar-2011 Mike Lockwood <lockwood@android.com> am e09c3fc7: (-s ours) am 0c8b18b9: (-s ours) am 126d4bc1: Give system server permission to enable and disable USB functions DO NOT MERGE

* commit 'e09c3fc7bdbbb05ff535852d6af3975ba5f23aee':
Give system server permission to enable and disable USB functions DO NOT MERGE
373e6276e3dc4eaaa552a559a9d45d3d631d158d 01-Mar-2011 Mike Lockwood <lockwood@android.com> am 9c6fe252: (-s ours) am 5ebe6fe6: (-s ours) am 642075b6: Set USB group for /dev/usb_accessory DO NOT MERGE

* commit '9c6fe252df8b148ddb2ca382b2d527189252d0b9':
Set USB group for /dev/usb_accessory DO NOT MERGE
e09c3fc7bdbbb05ff535852d6af3975ba5f23aee 01-Mar-2011 Mike Lockwood <lockwood@android.com> am 0c8b18b9: (-s ours) am 126d4bc1: Give system server permission to enable and disable USB functions DO NOT MERGE

* commit '0c8b18b96038c1634735cdae2bd5f8cf25c7dbef':
Give system server permission to enable and disable USB functions DO NOT MERGE
9c6fe252df8b148ddb2ca382b2d527189252d0b9 01-Mar-2011 Mike Lockwood <lockwood@android.com> am 5ebe6fe6: (-s ours) am 642075b6: Set USB group for /dev/usb_accessory DO NOT MERGE

* commit '5ebe6fe6779fcbd4961de22301a5ec5d83f5cdea':
Set USB group for /dev/usb_accessory DO NOT MERGE
4f4977f0bcfb56c3cc6e18cc8e94559837b109f4 01-Mar-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to master
0c8b18b96038c1634735cdae2bd5f8cf25c7dbef 28-Feb-2011 Mike Lockwood <lockwood@android.com> am 126d4bc1: Give system server permission to enable and disable USB functions DO NOT MERGE

* commit '126d4bc18c93f06016998cf6d014c6055c2d3a40':
Give system server permission to enable and disable USB functions DO NOT MERGE
5ebe6fe6779fcbd4961de22301a5ec5d83f5cdea 28-Feb-2011 Mike Lockwood <lockwood@android.com> am 642075b6: Set USB group for /dev/usb_accessory DO NOT MERGE

* commit '642075b6f74faeca53d9449ec9b74d7c66fe7cdd':
Set USB group for /dev/usb_accessory DO NOT MERGE
be99a97e1991730dc523921db9e9f3de26057bf8 28-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to master
126d4bc18c93f06016998cf6d014c6055c2d3a40 02-Feb-2011 Mike Lockwood <lockwood@android.com> Give system server permission to enable and disable USB functions DO NOT MERGE

Change-Id: Ie43b6679838436ac004d0b5fa59d3d98cb5b0c76
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/ueventd.rc
642075b6f74faeca53d9449ec9b74d7c66fe7cdd 30-Jan-2011 Mike Lockwood <lockwood@android.com> Set USB group for /dev/usb_accessory DO NOT MERGE

Change-Id: I41264272ff6ce245cb2b8989ddee4a82059444a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/ueventd.rc
ee52055ae5eeb951bb4805bd8aa57d63718e1ce7 26-Feb-2011 Tsu Chiang Chuang <tsu@google.com> Add explicit 'help' command to fastboot.

Change-Id: I350feab372e105755509c81604d57b2de1a69163
astboot/fastboot.c
810baba2d8f3f972c6ad237143c52ccfc92bd0f3 25-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to master
dce4d06b5c92f375bcf2efcb5b2d87d7566d04f2 25-Feb-2011 Ben Cheng <bccheng@android.com> Fix overflow prevention code in memory dump.

The delta between start and end pointers in memory dump has to be
multiples of 4 or 16.

Bug: 3486787
Change-Id: Ie34aa79ffb704ca647805dbc6a16f2c35adf849c
ebuggerd/arm/machine.c
88a5eeb08b4dbdc6d404de1ff9b0c3a681c206f5 24-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-mr1-release history after reset to master
865f6f9869281ff04cf890bfe74f3598d9363a08 24-Feb-2011 JP Abgrall <jpa@google.com> Revert "Fix adb hang when subprocess dies early."

This is for http://b/3482112 "adb interactions with device causing test harness failures".

This reverts commit 69c5c4c45bd4f1575ae8bdba13795297be7deb8c.

Change-Id: I630bf2e04d2ecf0223bd2af4e87136754ff880d3
db/adb.c
db/adb.h
db/adb_client.c
db/commandline.c
db/fdevent.c
db/mutex_list.h
db/services.c
db/sockets.c
db/sysdeps.h
db/transport.c
db/usb_linux.c
db/usb_linux_client.c
0e7c4274c687446dbe30a814278d7a6b99da8c4e 24-Feb-2011 JP Abgrall <jpa@google.com> Revert "Fix adb hang when subprocess dies early."

This is for http://b/3482112 "adb interactions with device causing test harness failures".

This reverts commit 69c5c4c45bd4f1575ae8bdba13795297be7deb8c.

Change-Id: I630bf2e04d2ecf0223bd2af4e87136754ff880d3
db/adb.c
db/adb.h
db/adb_client.c
db/commandline.c
db/fdevent.c
db/mutex_list.h
db/services.c
db/sockets.c
db/sysdeps.h
db/transport.c
db/usb_linux.c
db/usb_linux_client.c
1e0582eba6cb07aa9311602dbed7d13bbab84588 23-Feb-2011 JP Abgrall <jpa@google.com> Merge "Fix adb hang when subprocess dies early."
bd8f4a85ce45649dc75fbef139f0deae12f834a7 22-Feb-2011 Raphael Moll <ralf@android.com> Merge "Define O_BINARY for non-Windows platforms."
012cf8f2de3cf48645e05209123d11bdb0ed8de7 22-Feb-2011 Ken Sumrall <ksumrall@android.com> Merge "Fix for bug 3379244, non-eMMC devices don't start all services."
69c5c4c45bd4f1575ae8bdba13795297be7deb8c 18-Feb-2011 JP Abgrall <jpa@google.com> Fix adb hang when subprocess dies early.

* Handling of the subprocess and its FD.
This fixes http://b/3400254 "Many bugreports getting hung at the end in monkey"
- Start up a service thread that waits on the subprocess to terminate,
then closes the FD associated with it.
- Have the event handler select() with a timeout so that it can
detect the closed FD. Select() with no timeout does not return when an FD is closed.
- Have the event handler force a read on the closed FD to trigger the close sequence.
- Migrate the "shell:blabla" handling to "#if !ADB_HOST" sections.
* Fix the race around OOM adjusting.
- Do it in the child before exec() instead of the in the parent as the
child could already have started or not (no /proc/pid/... yet).
* Allow for multi-threaded D() invocations to not clobber each other.
- Allow locks across object files.
- Add lock within D()
* Add some missing close(fd) calls
- Match similar existing practices near dup2()
* Add extra D() invocations related to FD handling.
* Warn about using debugging as stderr/stdout is used for protocol.

Change-Id: Ie5c4a5e6bfbe3f22201adf5f9a205d32e069bf9d
Signed-off-by: JP Abgrall <jpa@google.com>
db/adb.c
db/adb.h
db/adb_client.c
db/commandline.c
db/fdevent.c
db/mutex_list.h
db/services.c
db/sockets.c
db/sysdeps.h
db/transport.c
db/usb_linux.c
db/usb_linux_client.c
dd4d786cbf993a024fcd0f926fd40b90c8a08d51 18-Feb-2011 Ken Sumrall <ksumrall@android.com> Fix for bug 3379244, non-eMMC devices don't start all services.

Fix for non-eMMC based devices to properly start the "on nonencrypted"
action.

Change-Id: I5d2966db352b02f1a1724fb105e1cefc46037e42
nit/builtins.c
ootdir/etc/init.goldfish.rc
53df0b6393979e7f35ab271683429aa1ea1230cd 17-Feb-2011 Mike Lockwood <lockwood@android.com> Merge "lsof: Add support for printing open files for a single process"
bd70e4aca5680acb7d5da5500b7e8c618fb499f2 16-Feb-2011 Raphael Moll <ralf@android.com> Define O_BINARY for non-Windows platforms.

All tools (aapt, aidl, dexdump, etc.) need this flag to open()
binary files, or they risk reading corrupted data on Windows.

A bunch of these tools just conditionaly define O_BINARY in
their C files. Seems it would just make sense to define it globally.

Change-Id: Ia5c0a59e9e77bbdcbce235233555f611207abed8
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
0569692b730734e73b2f2a13b224c8fb72d3f7c5 15-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "update netcfg to use prefixLength not netmask"
177ca7cd76a9245818b99f1dd6700c276511fcc0 15-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> update netcfg to use prefixLength not netmask

Change-Id: I353906d220382a1f5d9aad689e3927fd3dbc91d2
etcfg/netcfg.c
a95abdd8ed69bff64f272f21cfad9c3d4b006c4c 15-Feb-2011 Brian Muramatsu <btmura@google.com> Fix getprop Format

getprop used to output a colon after the property name like:
[property.name]: [property.value]

Add back the colon that was missing, because
com.android.ddmlib.GetPropReceiver's regex expects it. Without
the colon, the GetPropReceiver doesn't parse the device's
properties causing CTS to not recognize the device.

Change-Id: I9bef5ab2b310c831c49c8c51cae7f129167c2dc5
oolbox/getprop.c
b5d68a3c28d0b7a947373344cbda2a2369d0b67d 14-Feb-2011 Mike Lockwood <lockwood@android.com> libusbhost: Save endpoint ID in usb_request struct

Change-Id: I2cf189cee67c2efbcf919c8bae1447a6cb112f02
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
0db0921b59cd02186b5aa588d69213cc9d5d3e1d 14-Feb-2011 Jun Nakajima <jnakajim@gmail.com> x86: Add vold.fstab to mount the SD card

Change-Id: Ie1f70a22dd4e27e8ea956d5e627877d1e2379b95
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
ootdir/Android.mk
99038f96fd458848c18d63db8cc7668cc8f1a1c7 10-Feb-2011 Mike Lockwood <lockwood@android.com> Merge changes I4af1f3fe,I17db8d9b

* changes:
ueventd.rc: Give system process permission to enable and disable USB functions
Set USB group for /dev/usb_accessory
2847d395536aa94b06cdc6b64ca1a250d5b207bc 09-Feb-2011 Mathias Agopian <mathias@google.com> am 0909af57: am c1fbf7c1: fix [3374821] Cannot take screenshot of HC preview

* commit '0909af57d59422be672ad02e72837e773e1ddd4b':
fix [3374821] Cannot take screenshot of HC preview
0909af57d59422be672ad02e72837e773e1ddd4b 09-Feb-2011 Mathias Agopian <mathias@google.com> am c1fbf7c1: fix [3374821] Cannot take screenshot of HC preview

* commit 'c1fbf7c1638cb4f1f139edf74562fcfbaa6f3435':
fix [3374821] Cannot take screenshot of HC preview
c1fbf7c1638cb4f1f139edf74562fcfbaa6f3435 09-Feb-2011 Mathias Agopian <mathias@google.com> fix [3374821] Cannot take screenshot of HC preview

don't hardcode the pixelformat to RGBA_8888 when taking
screenshots.

Change-Id: I3a76b49275acfce9a2994436f521b76310cd8fb2
db/framebuffer_service.c
ddc4cfd8b2dd556b30898c6d7b02883b57ce96b0 02-Feb-2011 Mike Lockwood <lockwood@android.com> ueventd.rc: Give system process permission to enable and disable USB functions

Change-Id: I4af1f3fed857df2be96a640f65cd612577c957c7
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/ueventd.rc
45e96d0e49a02c710520d9a023b699a578352c5b 30-Jan-2011 Mike Lockwood <lockwood@android.com> Set USB group for /dev/usb_accessory

Change-Id: I17db8d9bb1bf6336979e9b7bce62306d0d7a79d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/ueventd.rc
9ac8484e0b677802474e2fd73edb9cbac02d98a6 08-Feb-2011 Ying Wang <wangying@google.com> Merge "Reorder BOOTCLASSPATH to match change 7eff81df2a"
04e5232ac2b3fc87596c6d82c07c667e52e2d7c2 08-Feb-2011 Ying Wang <wangying@google.com> Reorder BOOTCLASSPATH to match change 7eff81df2a

Bug: 3385161
Change-Id: I8bb91753c02c031c32ab0070dd424a6ac859311a
ootdir/init.rc
4fe0bc5cf618e53d29941cd4a36b635621f743ce 07-Feb-2011 Paul Eastham <eastham@google.com> am 57cd87d9: am 1ace223f: Set default permissions for preloaded /data/media aka /sdcard content.

* commit '57cd87d9ccf57a2c874fafd1a0b8cab7ebea646f':
Set default permissions for preloaded /data/media aka /sdcard content.
15b9c9c9802d63264714b7e56779d78d8b0e6d52 05-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
8394dcbf81e28cb47e524c00b0fe1d1e23fb4d55 05-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
16f1a453de4f50dd5af48ef774416304ec5b32b6 05-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
224e8e747004ad3a2fb236f1ada4f91f4b1fb30a 04-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
a39a6242e70f21d9c71c1dd24f2b132e3b164997 04-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
93541f2f625a5f50d879a347fe0745c261204e04 04-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
651acecfeb95883df708cfa35318855e0cd54c34 04-Feb-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 67afaad5: am d4894f4b: am 034117e4: Merge changes I8df51128,Ie922b3e7,I31f78419,I7e8df44d,I6067857b,Ifd35587c,Ie8d66740

* commit '67afaad585f327b1306ea840aacd19f16f19d7da':
Fix adb leaking file descriptors to forked processes
adb: Fix command-line parser.
adb: Increase device descriptor buffer size in Linux host USB support
adb: improve debug traces readability.
adb: Don't report negative number of bytes after pushing file > 2 gigabytes
Adding Texas Instruments to the VID list.
Support an additional alias for 'adb shell.'
57cd87d9ccf57a2c874fafd1a0b8cab7ebea646f 04-Feb-2011 Paul Eastham <eastham@google.com> am 1ace223f: Set default permissions for preloaded /data/media aka /sdcard content.

* commit '1ace223fcbf8da9e0d22e31c1b3129a7a8276cb1':
Set default permissions for preloaded /data/media aka /sdcard content.
1ace223fcbf8da9e0d22e31c1b3129a7a8276cb1 04-Feb-2011 Paul Eastham <eastham@google.com> Set default permissions for preloaded /data/media aka /sdcard content.

Change-Id: Ia67cbdbfbcd423cf163f0fce5c6edc215564e782
nclude/private/android_filesystem_config.h
fac94c3305b1c45bd7ce8324f918d567ac908f4e 04-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
c786d4cdc73cde6b7241a8845b87d9f4a3d5d976 03-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Stop using netmask in the framework"
67afaad585f327b1306ea840aacd19f16f19d7da 03-Feb-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am d4894f4b: am 034117e4: Merge changes I8df51128,Ie922b3e7,I31f78419,I7e8df44d,I6067857b,Ifd35587c,Ie8d66740

* commit 'd4894f4be608c28ef0f39c7794ba865ac812dff9':
Fix adb leaking file descriptors to forked processes
adb: Fix command-line parser.
adb: Increase device descriptor buffer size in Linux host USB support
adb: improve debug traces readability.
adb: Don't report negative number of bytes after pushing file > 2 gigabytes
Adding Texas Instruments to the VID list.
Support an additional alias for 'adb shell.'
d4894f4be608c28ef0f39c7794ba865ac812dff9 03-Feb-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> am 034117e4: Merge changes I8df51128,Ie922b3e7,I31f78419,I7e8df44d,I6067857b,Ifd35587c,Ie8d66740

* commit '034117e47f2601d46563461a0bfe3cc22f89a0f0':
Fix adb leaking file descriptors to forked processes
adb: Fix command-line parser.
adb: Increase device descriptor buffer size in Linux host USB support
adb: improve debug traces readability.
adb: Don't report negative number of bytes after pushing file > 2 gigabytes
Adding Texas Instruments to the VID list.
Support an additional alias for 'adb shell.'
034117e47f2601d46563461a0bfe3cc22f89a0f0 03-Feb-2011 Mike Lockwood <lockwood%android.com@gtempaccount.com> Merge changes I8df51128,Ie922b3e7,I31f78419,I7e8df44d,I6067857b,Ifd35587c,Ie8d66740

* changes:
Fix adb leaking file descriptors to forked processes
adb: Fix command-line parser.
adb: Increase device descriptor buffer size in Linux host USB support
adb: improve debug traces readability.
adb: Don't report negative number of bytes after pushing file > 2 gigabytes
Adding Texas Instruments to the VID list.
Support an additional alias for 'adb shell.'
3b4a0c81c4f2af46e6075f1150dcde55d436c7a6 02-Feb-2011 Benoit Goby <benoit@android.com> Fix adb leaking file descriptors to forked processes

accept() creates a new file descriptor that should be closed on exec so
that forked processes don't keep a fd opened on the socket.

This also fixes b/3297070 where adb hangs after running adb on the
target.

Change-Id: I8df511289e5549ae49b4824c9dfb71a3bf85eae8
db/adb.c
db/jdwp_service.c
db/services.c
db/sysdeps.h
eb5df470e6e0402006030b76315f06bcb4f17882 31-Jan-2011 David 'Digit' Turner <digit@google.com> adb: Fix command-line parser.

This fixes the command-line parser to accept both "daemon server"
and "server nodaemon". Before the patch, the second string would
ignore the "nodaemon" flag.

Fixes b/2191598

Change-Id: Ie922b3e7bf57a6e334fc448cec33fb340ca6abc4
db/commandline.c
a5d469484660513e47b074b9d7fff17475a68efc 08-Jan-2011 Mike Lockwood <lockwood@android.com> adb: Increase device descriptor buffer size in Linux host USB support

256 bytes wasn't big enough for some complicated USB configurations

Change-Id: I31f7841953d73b06958f44040f58166b159faff4
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
3e42db23fbbfdc2866f5ca035641444c5ab2ff78 06-Jan-2011 David 'Digit' Turner <digit@google.com> adb: improve debug traces readability.

This patch makes the traces easier to read. For example transports are
displayed by name/serial instead of their hex address.

Change-Id: I7e8df44ddbec19754d63d989bd56485998b4627b
db/adb.c
db/transport.c
487009ef5e723729d51b937d6844b8d12fb974a3 15-Dec-2010 Mike Lockwood <lockwood@android.com> adb: Don't report negative number of bytes after pushing file > 2 gigabytes

BUG: 3198322

Change-Id: I6067857b9490984a21b597f6ee338446a9decaf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/file_sync_client.c
1d3fbed34897e36ed0b55c68fe6b0a7f2dd2ec8e 13-Dec-2010 Alex Sakhartchouk <alexst@google.com> Adding Texas Instruments to the VID list.

Change-Id: Ifd35587c93ae7d5c8253f477a92cca2345dc8bb5
db/usb_vendors.c
9c73d17e870e448ea1f036bda70736ae0ae6bf2e 19-Aug-2010 Daniel Sandler <dsandler@google.com> Support an additional alias for 'adb shell.'

Change-Id: Ie8d667407fef8ee5a6c7ab86b30307fb61869170
db/commandline.c
4371726fc8ff5290b0b5941f001d075669fef379 03-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
61bb9cf37d7d0adccffa272903f70d3c7668c6bf 03-Feb-2011 David 'Digit' Turner <digit@google.com> Merge "debuggerd: Fix missing include."
7e0d7833a2bed469edcaee7a0fc35a7a37f98880 03-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
ab1ee96c20a9fbf9ac5143c030f56d7a024abd71 03-Feb-2011 Benoit Goby <benoit@android.com> Merge "Fix adb leaking file descriptors to forked processes"
8ed7ace16c9b91adca7b9bbdf9b09f7f708001f5 03-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
b03afaafb542e84a6ae9b09d89f7eb3a9d1ccf7a 03-Feb-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3381298 Remove old /data/drm/plugins/native"
09dd819d2794caf1a17cd03592c100755fb25577 02-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Stop using netmask in the framework

This pushes prefixLength down as far as we can.

bug:2542681
Change-Id: I94b7cde9d10e97ee2c071d92f25555cff5934f0b
nclude/netutils/ifc.h
ibnetutils/dhcpclient.c
ibnetutils/ifc_utils.c
95ef82866c7a922bf588027aa38c58a45eb84d9c 02-Feb-2011 Benoit Goby <benoit@android.com> Fix adb leaking file descriptors to forked processes

accept() creates a new file descriptor that should be closed on exec so
that forked processes don't keep a fd opened on the socket.

This also fixes b/3297070 where adb hangs after running adb on the
target.

Change-Id: I8df511289e5549ae49b4824c9dfb71a3bf85eae8
db/adb.c
db/jdwp_service.c
db/services.c
db/sysdeps.h
d5f27159b67e47afe623f50a267147b7e79776cf 02-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
e2782e811a7f9deeb325eb65867a19bae44be93c 01-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
2c259914a0c5d49a3fcb525a75f4817a3a99a6c8 26-Jan-2011 David 'Digit' Turner <digit@google.com> debuggerd: Fix missing include.

The structure user_vfp is incorrectly defined in bionic/libc/kernel/arch-arm/asm/ptrace.h
at the moment, while it should be under bionic/libc/kernel/arch-arm/asm/user.h instead.

Before moving its definition in the corresponding source files, we need to fix its users.
It happens that debuggerd is the only one for now, so fix this by including <linux/user.h>
instead (which will include <asm/user.h> and <asm/ptrace.h>).

Also, make the debug output less chatty by specifying all symbols to be listed
through XLOG2 instead of XLOG.

Change-Id: I16e0fa700945d86efd44ee885a84ad609c0a9b58
ebuggerd/arm/machine.c
ebuggerd/symbol_table.c
ebuggerd/utility.h
daab7ac5b588fd6ecf6d17cc074067a60bd4acbe 01-Feb-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
305b4b0f6069d733d3023a57fdc8a6d9cf7de2a6 31-Jan-2011 David 'Digit' Turner <digit@google.com> adb: Fix command-line parser.

This fixes the command-line parser to accept both "daemon server"
and "server nodaemon". Before the patch, the second string would
ignore the "nodaemon" flag.

Fixes b/2191598

Change-Id: Ie922b3e7bf57a6e334fc448cec33fb340ca6abc4
db/commandline.c
7cb05f63f60d8f140e83ce26eb673c593d5430e3 30-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
63e99f447fed821b57f3f13e33abd740b3b04c03 30-Jan-2011 Rebecca Schultz Zavin <rebecca@android.com> am e442cff0: am 58fb8220: Raise the viking killer min free values to match the system properties

* commit 'e442cff05ff9f083c91caa3bed74e37318a69fda':
Raise the viking killer min free values to match the system properties
e442cff05ff9f083c91caa3bed74e37318a69fda 30-Jan-2011 Rebecca Schultz Zavin <rebecca@android.com> am 58fb8220: Raise the viking killer min free values to match the system properties

* commit '58fb822024a04641d5ca1d0341456a2706aee853':
Raise the viking killer min free values to match the system properties
ef0bf1d8be4f615c3a1db27aad5bd6d44876d589 30-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
58fb822024a04641d5ca1d0341456a2706aee853 29-Jan-2011 Rebecca Schultz Zavin <rebecca@android.com> Raise the viking killer min free values to match the system properties

Change-Id: Idcbdb106d704ef63c9a44e635b6e995e0e5f6479
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
leanSpec.mk
ootdir/init.rc
24823cfa84d1a4dcb719c1949092facf8c92804a 29-Jan-2011 Dianne Hackborn <hackbod@google.com> am fee2cfb0: am 9efdcd96: Fix issue #3401380: Raise OOM killer limits

* commit 'fee2cfb01165f6797d783c6a8c0b1fba4f591355':
Fix issue #3401380: Raise OOM killer limits
fee2cfb01165f6797d783c6a8c0b1fba4f591355 29-Jan-2011 Dianne Hackborn <hackbod@google.com> am 9efdcd96: Fix issue #3401380: Raise OOM killer limits

* commit '9efdcd969ed03cfbe8cfa692b8adcc46d954914a':
Fix issue #3401380: Raise OOM killer limits
391b7ded6de0ccf587383e6166014dc5a5c69265 29-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
9efdcd969ed03cfbe8cfa692b8adcc46d954914a 29-Jan-2011 Dianne Hackborn <hackbod@google.com> Fix issue #3401380: Raise OOM killer limits

Change-Id: Ia9c82e7d31b7f1b89bf9650ebea697d9b3a64506
leanSpec.mk
ootdir/init.rc
cf6de26941bdfd0cea9cc95a40b97483fb9c9898 28-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
120b57a3d9703bccba534af335aa94dd3a41be2f 27-Jan-2011 Mike Lockwood <lockwood@android.com> libusbhost: Add call for synchronous bulk transfers

Also clean up and add timeout to control request transfer

Change-Id: Ibc2d8ac64d0fa90e0a23e6225ce2c49b23bb0d97
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
b42db825e103b1c37107bf8cd9a35fe4b8a07a13 28-Jan-2011 Dmitry Shmidt <dimitrysh@google.com> Merge "libnetutils: Clean all IPs assigned to the interface on cleaning"
9092b91ccaa4c6069036f72163e6473a5ca408c4 27-Jan-2011 Dmitry Shmidt <dimitrysh@google.com> libnetutils: Clean all IPs assigned to the interface on cleaning

Change-Id: Ic285bbb4b224fc4e62e88e76b8b448edbe814a17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
nclude/netutils/ifc.h
ibnetutils/ifc_utils.c
e16c8fec4046ba15fbd54ab3378b75cc02d6ca9d 27-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
56fc4c98531beac24114fa4daf52d776d4314532 26-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Change our dhcp interface to be IPv6 compat."
b238d0693a2cef14490d42272a467ce7c9f3a69d 26-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
19de1bfc11bc44efeb54571726deef2b078ca295 26-Jan-2011 Mike Lockwood <lockwood@android.com> am 99f13909: am 75e17a89: sdcard: Fix readdir implementation so rewinddir will work correctly

* commit '99f13909578d2dbebedc32f62884a486096e6fa8':
sdcard: Fix readdir implementation so rewinddir will work correctly
99f13909578d2dbebedc32f62884a486096e6fa8 26-Jan-2011 Mike Lockwood <lockwood@android.com> am 75e17a89: sdcard: Fix readdir implementation so rewinddir will work correctly

* commit '75e17a8908d52e32f5de85b90b74e156265c60c6':
sdcard: Fix readdir implementation so rewinddir will work correctly
75e17a8908d52e32f5de85b90b74e156265c60c6 26-Jan-2011 Mike Lockwood <lockwood@android.com> sdcard: Fix readdir implementation so rewinddir will work correctly

Fixes problem with "ls -R" in /mnt/sdcard

BUG: 3309556

Change-Id: Ie2246585439116de3cb40f4005f3b44a0439f54c
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
9409bc2677582ab00ef7dce5c86c2b57c149a2fe 26-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> am ceddc751: resolved conflicts for merge of 63e70b24 to honeycomb-plus-aosp

* commit 'ceddc751d7a2764da56a573de83202f30843c45b':
Permit 0 length writes.
Let SocketClient users write binary data to clients.
ceddc751d7a2764da56a573de83202f30843c45b 26-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> resolved conflicts for merge of 63e70b24 to honeycomb-plus-aosp

Change-Id: I9a26acdc029da9b886171b1f2084003ef97f61ef
63e70b24282bf3be89e5311a50d0a05915063b22 26-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> am 4585e0e9: Merge changes I087d0074,I8a51924e

* commit '4585e0e9f76e2c51a7f4a9679ec8b8d25f9b5e63':
Permit 0 length writes.
Let SocketClient users write binary data to clients.
4585e0e9f76e2c51a7f4a9679ec8b8d25f9b5e63 26-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> Merge changes I087d0074,I8a51924e

* changes:
Permit 0 length writes.
Let SocketClient users write binary data to clients.
faab26d542740f03cbe12e44f6af1f97e8e7c12e 14-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Change our dhcp interface to be IPv6 compat.

Doesn't do IPv6, but removes v4-specific structures from the framework
(netmask, ints for addrs)
bug:2542681

Change-Id: I1110e6f32d42a472b104835a4298e18b391db0a7
nclude/netutils/dhcp.h
ibnetutils/dhcp_utils.c
1aef06283286df8658b427885a6fffe9bdfeedbe 25-Jan-2011 rich cannings <richc@google.com> Add missing header to gpttool

Fixes a broken build from: https://android-git.corp.google.com/g/92563

Change-Id: I4d9a2eecde2a17aef0a35952c32483ec4af2b483
pttool/gpttool.c
3efa197e903d7bac01adc10373777ed9f1b673cc 25-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
a360a77294600cd679d4ea69b0b24e217bd02a9e 25-Jan-2011 Brian Swetland <swetland@google.com> gpttool: useful for partitioning sdcards

Where @partitions.txt contains:

:128k

xloader:128k
bootloader:256k
environment:128k
:384k
boot:8m
recovery:8m
system:256m
cache:256m
userdata:1g

Change-Id: I1221677e5b3dc4d5b19420c4a64d21b587fb7d47
media:
pttool/Android.mk
pttool/gpttool.c
7bfca89cec9898587dcb3e00dd0bc3d90c63a9b9 25-Jan-2011 Dmitry Shmidt <dimitrysh@google.com> Merge "libnetutils: Fix warning"
a5d6520be81a87a57f3569e0eac97f9554b0a196 25-Jan-2011 Dmitry Shmidt <dimitrysh@google.com> Merge "netcfg: Add MAC address to interface dump"
7d05a80da8c210d11df657bcec8b19a6bf1e8a16 25-Jan-2011 Dmitry Shmidt <dimitrysh@google.com> libnetutils: Fix warning

Change-Id: I2a914314a027e0e542d45dff0c2e6029e9f40615
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnetutils/ifc_utils.c
97186a9c3d1874ac79f94676dc9f0df1f0815e1f 25-Jan-2011 Dmitry Shmidt <dimitrysh@google.com> netcfg: Add MAC address to interface dump

Change-Id: I52b3336a66224c9ae19a4c80cc706890742d4130
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
etcfg/netcfg.c
f59ed65c47576435a0438263b3832bb19e2eb8d2 25-Jan-2011 Carl Shapiro <cshapiro@google.com> am 3b093369: am 1147407b: Merge "Remove unconditional swap from the android atomic operations suite." into honeycomb

* commit '3b093369d85f2d248799073152ece79987d4b30b':
Remove unconditional swap from the android atomic operations suite.
3b093369d85f2d248799073152ece79987d4b30b 25-Jan-2011 Carl Shapiro <cshapiro@google.com> am 1147407b: Merge "Remove unconditional swap from the android atomic operations suite." into honeycomb

* commit '1147407becd8569ad1ddcf620a10076675ef92da':
Remove unconditional swap from the android atomic operations suite.
1147407becd8569ad1ddcf620a10076675ef92da 25-Jan-2011 Carl Shapiro <cshapiro@google.com> Merge "Remove unconditional swap from the android atomic operations suite." into honeycomb
b6e5e1469d56646c8872097a24a8fa999901bfcb 24-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
1aa59a83b57154d7b28f92e28d41ba497d639895 24-Jan-2011 Brian Swetland <swetland@google.com> libsysutils: do not build for TINY_ANDROID

This depends on frameworks/... :-(

Technically it doesn't belong in system/core at all, but of course there are
things in system/core that depend on it, so for now we'll hack around this.

Change-Id: I6aa437f18e1c09bd10fbd3333cf6998a0b6140c6
ibsysutils/Android.mk
cecec9d027b05c20ed79e8d55a025619f66252b3 24-Jan-2011 Brian Swetland <swetland@google.com> remove crasher and vfp-crasher from standard builds

These are only for debuggerd testing.

Change-Id: If2d2ff85e8c182d366cc251e9446ae7fdd094e55
ebuggerd/Android.mk
163f7057c0a7bea27c820a8c9b49f096a4338512 24-Jan-2011 Mike Lockwood <lockwood@android.com> am e12e5f37: am 575a2bbe: sdcard: Remove lower case squashing of file names

* commit 'e12e5f376bc9b4cf6a846e850a20d237fc81d503':
sdcard: Remove lower case squashing of file names
e12e5f376bc9b4cf6a846e850a20d237fc81d503 24-Jan-2011 Mike Lockwood <lockwood@android.com> am 575a2bbe: sdcard: Remove lower case squashing of file names

* commit '575a2bbee30d70a1940077a5b699aaf93cb4e2cd':
sdcard: Remove lower case squashing of file names
575a2bbee30d70a1940077a5b699aaf93cb4e2cd 23-Jan-2011 Mike Lockwood <lockwood@android.com> sdcard: Remove lower case squashing of file names

sdcard daemon will now create new files and directories using
the actual name passed in by the client.
For existing files, sdcard will do case insensitive matching
when case sensitive lookup fails.

Change-Id: I89f995ea01beb2c63a9b36943dbcfaa16e7cd972
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
0a16d839698e46e87268707e79e66f51a42b932e 23-Jan-2011 Carl Shapiro <cshapiro@google.com> Remove unconditional swap from the android atomic operations suite.

Bug: 3381237
Change-Id: I7bdc7c8eb4c1cc6303d96e40ca2f196a007c4dd2
nclude/cutils/atomic-arm.h
nclude/cutils/atomic-x86.h
nclude/cutils/atomic.h
ibcutils/atomic-android-sh.c
b81dfcb4f6275bf675e7afe64ccecc29c1b8c3ae 23-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 3381298 Remove old /data/drm/plugins/native

Change-Id: Ic299d328f2e04a65a9dce68909c7b83f3ac03b20
ootdir/init.rc
328c0d4a89d7c04c829c587657b95b3241f64f60 23-Jan-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3361124 Remove drmioserver"
ab845e0fc02fc053d8de1a19d30c096c2cb22495 23-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
ec9e7b1c1844e66c39a4f63ded8208c1717380f8 22-Jan-2011 Mike Lockwood <lockwood@android.com> libusbhost: Add usb_device_connect_kernel_driver()

This can be used to ask the kernel to disconnect its driver for a device
so usb_device_claim_interface() can claim it instead.

Also increased size of descriptor buffer and added some debugging logs

Change-Id: I4945196d957fb8493716eb9b7e5463c06b168ef1
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
f2a1878f644cb3b4def60aee2203c22474923837 22-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
a1db6620f63612589cecadb923cf2f421b71a7e5 22-Jan-2011 David 'Digit' Turner <digit@google.com> goldfish: Work-around to start the RIL daemon.

This change forces the start of the RIL daemon used to provide
3G connectivity to the system. It should normally be started
automatically by init.rc but there is a bug within
system/core/init/builtins.c that prevents this to happen.

Fixes the "No network connectivity" bug while the network
interface and route were properly setup.

Change-Id: Ieec0f513aabf92b8a59f0a86f64a16e97057c3c3
ootdir/etc/init.goldfish.rc
0897a4353ec74e05d4be23eb422080d4ad9c7c30 22-Jan-2011 David 'Digit' Turner <digit@google.com> am 100511ff: am 88af5ff4: Merge "goldfish: Work-around to start the RIL daemon." into honeycomb

* commit '100511ffaa11b33a6856a434c62ad326a899f252':
goldfish: Work-around to start the RIL daemon.
100511ffaa11b33a6856a434c62ad326a899f252 22-Jan-2011 David 'Digit' Turner <digit@google.com> am 88af5ff4: Merge "goldfish: Work-around to start the RIL daemon." into honeycomb

* commit '88af5ff47dc6eb371c3ee597b5a646fa0e5a8578':
goldfish: Work-around to start the RIL daemon.
88af5ff47dc6eb371c3ee597b5a646fa0e5a8578 22-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "goldfish: Work-around to start the RIL daemon." into honeycomb
dc743112ca561242052d7fd5e4b11f6db38f99aa 22-Jan-2011 David 'Digit' Turner <digit@google.com> goldfish: Work-around to start the RIL daemon.

This change forces the start of the RIL daemon used to provide
3G connectivity to the system. It should normally be started
automatically by init.rc but there is a bug within
system/core/init/builtins.c that prevents this to happen.

Fixes the "No network connectivity" bug while the network
interface and route were properly setup.

Change-Id: Ieec0f513aabf92b8a59f0a86f64a16e97057c3c3
ootdir/etc/init.goldfish.rc
a31af76bc91f52b0b5853790a14457ef688cf0e3 21-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Fix a file descriptor leak.

The recent refactoring of the select() loop in SocketListener
missed a close() of the file descriptor when the onDataAvailable()
callback returns false.

Change-Id: I767caefab4b98ab350f2db2497ee2bd630f20850
ibsysutils/src/SocketListener.cpp
dce50654b90aae849ff3e045b4a34e3299a1c7c6 22-Jan-2011 David 'Digit' Turner <digit@google.com> am 38f81ccf: am fc67acc3: Merge "libsysutils: Fix a file descriptor leak." into honeycomb

* commit '38f81ccf62201863ab3f9468659abb1aee1de7c0':
libsysutils: Fix a file descriptor leak.
38f81ccf62201863ab3f9468659abb1aee1de7c0 22-Jan-2011 David 'Digit' Turner <digit@google.com> am fc67acc3: Merge "libsysutils: Fix a file descriptor leak." into honeycomb

* commit 'fc67acc381ca684caffab957c6113d7285d46e3d':
libsysutils: Fix a file descriptor leak.
fc67acc381ca684caffab957c6113d7285d46e3d 22-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "libsysutils: Fix a file descriptor leak." into honeycomb
69416dadc9a3bd1ef44ddbfd716c752066db4c82 21-Jan-2011 David 'Digit' Turner <digit@google.com> am 54175579: am 02526d48: debuggerd: properly unblock signal handler.

* commit '54175579333b4b95606bbdb7840bcfbea5b854ee':
debuggerd: properly unblock signal handler.
b913b5170f3b957d7d1ced425e891a4208ce88bc 21-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Fix a file descriptor leak.

The recent refactoring of the select() loop in SocketListener
missed a close() of the file descriptor when the onDataAvailable()
callback returns false.

Change-Id: I767caefab4b98ab350f2db2497ee2bd630f20850
ibsysutils/src/SocketListener.cpp
a937a721a36620943ca9908e925d23b111542ac4 21-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
54175579333b4b95606bbdb7840bcfbea5b854ee 21-Jan-2011 David 'Digit' Turner <digit@google.com> am 02526d48: debuggerd: properly unblock signal handler.

* commit '02526d486803de153d03851f4d5f9be7c555e46c':
debuggerd: properly unblock signal handler.
02526d486803de153d03851f4d5f9be7c555e46c 21-Jan-2011 David 'Digit' Turner <digit@google.com> debuggerd: properly unblock signal handler.

This change ensures that debuggered properly releases
the signal handler that invoked it after the PTRACE_ATTACH.

The previous code simply did a close() of the file descriptor,
but for some reason, this didn't always make the read() blocking
the signal handler exit. Instead, the thread would stay blocked
and never fault, preventing the generation of a useful stack
trace.

Change-Id: I6b0579041165a710d74ec1bece113ff7b828aed4
ebuggerd/debuggerd.c
b92c54172b80f59688834fdeceb3ec3e228c7834 20-Jan-2011 Carl Shapiro <cshapiro@google.com> am c7de5e33: am c1b546b2: Merge "Remove two unused event log tags." into honeycomb

* commit 'c7de5e33e36143e900be4db4030e4c0ef6a51258':
Remove two unused event log tags.
c7de5e33e36143e900be4db4030e4c0ef6a51258 20-Jan-2011 Carl Shapiro <cshapiro@google.com> am c1b546b2: Merge "Remove two unused event log tags." into honeycomb

* commit 'c1b546b22dc229fdbef9105f010e3ac0172cfc8f':
Remove two unused event log tags.
c1b546b22dc229fdbef9105f010e3ac0172cfc8f 20-Jan-2011 Carl Shapiro <cshapiro@google.com> Merge "Remove two unused event log tags." into honeycomb
b29b33841bd2f5143e2705525bfc4f8a2d2b6316 20-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 3361124 Remove drmioserver

Change-Id: Ie3b20b487c1466737921567ab2d043e230356bf4
Note: safe to re-use the drmio uid/gid as no files were ever created.
nclude/private/android_filesystem_config.h
ootdir/init.rc
f47ba12b6c3acd821c5d55846b115bd04fbf9d3d 20-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
852c13d1b2404e5a360375ae75291ac1a9dae026 20-Jan-2011 Ken Sumrall <ksumrall@android.com> am afa099a1: am 3a159d62: Move rild to the late_start class

* commit 'afa099a1909c02196574d125d735adb0c8918392':
Move rild to the late_start class
afa099a1909c02196574d125d735adb0c8918392 20-Jan-2011 Ken Sumrall <ksumrall@android.com> am 3a159d62: Move rild to the late_start class

* commit '3a159d62a9d771f2a2d38129f1db56d873598696':
Move rild to the late_start class
3a159d62a9d771f2a2d38129f1db56d873598696 20-Jan-2011 Ken Sumrall <ksumrall@android.com> Move rild to the late_start class

Now that rild can be killed in a reasonable amount of time, move it
from the core class to late_start. I was going to move it to main,
but it would get killed and restarted right after the disk crypto
password was entered, which is when the late_start class is started,
and I was seeing issues with rild not re-connecting to the network
when it was killed and restarted.

Change-Id: I60479ddb853953029890fc816538d615ef5a96ab
ootdir/init.rc
0f951a4fb85c29c4aebef123e8e247316ee13c5b 20-Jan-2011 Colin Cross <ccross@android.com> am 618eca4e: am 6fa54fa2: Merge "Accept address ranges in r" into honeycomb

* commit '618eca4ed91af2d2a2c618168327ca4a6a496669':
Accept address ranges in r
618eca4ed91af2d2a2c618168327ca4a6a496669 20-Jan-2011 Colin Cross <ccross@android.com> am 6fa54fa2: Merge "Accept address ranges in r" into honeycomb

* commit '6fa54fa2234920e36b0563082af3a0bc6c8da640':
Accept address ranges in r
6fa54fa2234920e36b0563082af3a0bc6c8da640 20-Jan-2011 Colin Cross <ccross@android.com> Merge "Accept address ranges in r" into honeycomb
dfe3b602587043b75855db5a1a2475e627e209df 20-Jan-2011 Carl Shapiro <cshapiro@google.com> Remove two unused event log tags.

Change-Id: I4be6e142ecdb3caebde21bef9898fc9e25fe181a
ogcat/event.logtags
2ad280f07a97e9ed0dfd86202abe659ad0ca9ccd 20-Jan-2011 Colin Cross <ccross@android.com> Accept address ranges in r

Change-Id: Ifece1b37d018216462844cc89e0f2f6a2b7d287d
oolbox/r.c
4036d44c0352bf9d3449ccc1f26478fc857bd4fb 19-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
a6f502683bb75e3864e8445291e559502a9edddd 19-Jan-2011 Ken Sumrall <ksumrall@android.com> am 849bf4e0: am 203bad59: Add the commands rm and rmdir to init.

* commit '849bf4e088aa7d9e3ac43441aa5aeaa248ecf03e':
Add the commands rm and rmdir to init.
3a16f753a694c9a0f86ea92aeeeb3ac713349f5e 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 75b9f6dc: am 108d3d74: Merge "libsysutils: Handle EINTR in FrameworkClient.cpp" into honeycomb

* commit '75b9f6dc975758d95ee4e0499b0c8d2e4a19a08e':
libsysutils: Handle EINTR in FrameworkClient.cpp
ac28dff42a70e91a2cab3bb8e8b2add5addd89cc 19-Jan-2011 David 'Digit' Turner <digit@google.com> am ebdbe206: am c7166971: Merge "libsysutils: Fix potential overwrites in FrameworkListener" into honeycomb

* commit 'ebdbe206e8cf716e76cce4871e45a32a4f4224f5':
libsysutils: Fix potential overwrites in FrameworkListener
b4770e83b4e0fa44124fe008b2974adaa922e775 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 8667348a: am 9aae7b51: Merge "libsysutils: Fix race condition in SocketListener thread." into honeycomb

* commit '8667348ad8c59afa9523f2550b4fc439a52c325c':
libsysutils: Fix race condition in SocketListener thread.
9d2732edbc1b0c788f3380e31b402f4b2671620d 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 8252a7b3: am 292bb77c: Merge "libsysutils: Handle EINTR in SocketClient::sendData()" into honeycomb

* commit '8252a7b3c244b95b71a29cc776916623b9c06255':
libsysutils: Handle EINTR in SocketClient::sendData()
faaa63c01a5244b5359d2e44fb55231595f05ca2 19-Jan-2011 David 'Digit' Turner <digit@google.com> am bc8facc9: am 706747e5: Merge "libsysutils: Fix wait loop in ServiceManager::start and ::stop" into honeycomb

* commit 'bc8facc9bb5cc15686d126d6d3ea5736813bbe24':
libsysutils: Fix wait loop in ServiceManager::start and ::stop
468c41642b822cced63f59ff2407177f384e546e 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 0e2177d5: am f605b2a1: Merge "libsysutils: Handle EINTR in NetlinkListener" into honeycomb

* commit '0e2177d53035f1c67c44cff0d963715dbd1465b5':
libsysutils: Handle EINTR in NetlinkListener
b1e921d8ed533a5bc891953fde2b0395335495a5 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 5e4d60fb: am 68649564: Merge "libsysutils: Fix NetLinkEvent security issues." into honeycomb

* commit '5e4d60fbf5de28f05d635f2d62733c29a8797883':
libsysutils: Fix NetLinkEvent security issues.
ba3bcef0244321916799442f9c028229733a1767 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 794fb914: am eeeca4dd: rootdir: goldfish: Fix network route during emulation.

* commit '794fb914bef34c1c5f32764947801c95575ecd41':
rootdir: goldfish: Fix network route during emulation.
849bf4e088aa7d9e3ac43441aa5aeaa248ecf03e 19-Jan-2011 Ken Sumrall <ksumrall@android.com> am 203bad59: Add the commands rm and rmdir to init.

* commit '203bad597fb4e46ddda051add28400070b5c3a5a':
Add the commands rm and rmdir to init.
75b9f6dc975758d95ee4e0499b0c8d2e4a19a08e 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 108d3d74: Merge "libsysutils: Handle EINTR in FrameworkClient.cpp" into honeycomb

* commit '108d3d74a805ad15d2cd2db47dad86f1082a59ba':
libsysutils: Handle EINTR in FrameworkClient.cpp
ebdbe206e8cf716e76cce4871e45a32a4f4224f5 19-Jan-2011 David 'Digit' Turner <digit@google.com> am c7166971: Merge "libsysutils: Fix potential overwrites in FrameworkListener" into honeycomb

* commit 'c71669715320b90aafcc84d86068944149375cfa':
libsysutils: Fix potential overwrites in FrameworkListener
8667348ad8c59afa9523f2550b4fc439a52c325c 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 9aae7b51: Merge "libsysutils: Fix race condition in SocketListener thread." into honeycomb

* commit '9aae7b5182c4cf46d629fa061e3c58d8730314da':
libsysutils: Fix race condition in SocketListener thread.
8252a7b3c244b95b71a29cc776916623b9c06255 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 292bb77c: Merge "libsysutils: Handle EINTR in SocketClient::sendData()" into honeycomb

* commit '292bb77cc3b145bca0f5cb31e1d3ce906455b0f3':
libsysutils: Handle EINTR in SocketClient::sendData()
bc8facc9bb5cc15686d126d6d3ea5736813bbe24 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 706747e5: Merge "libsysutils: Fix wait loop in ServiceManager::start and ::stop" into honeycomb

* commit '706747e57b640da414cef542517241279d508c01':
libsysutils: Fix wait loop in ServiceManager::start and ::stop
0e2177d53035f1c67c44cff0d963715dbd1465b5 19-Jan-2011 David 'Digit' Turner <digit@google.com> am f605b2a1: Merge "libsysutils: Handle EINTR in NetlinkListener" into honeycomb

* commit 'f605b2a1903241ceebecb22ae80f87ff8007c6e3':
libsysutils: Handle EINTR in NetlinkListener
5e4d60fbf5de28f05d635f2d62733c29a8797883 19-Jan-2011 David 'Digit' Turner <digit@google.com> am 68649564: Merge "libsysutils: Fix NetLinkEvent security issues." into honeycomb

* commit '6864956495c9dd5d07b10a8795cd23c0db20acbc':
libsysutils: Fix NetLinkEvent security issues.
794fb914bef34c1c5f32764947801c95575ecd41 19-Jan-2011 David 'Digit' Turner <digit@google.com> am eeeca4dd: rootdir: goldfish: Fix network route during emulation.

* commit 'eeeca4dd45899c20d4fc187c59bda58af43352f2':
rootdir: goldfish: Fix network route during emulation.
203bad597fb4e46ddda051add28400070b5c3a5a 19-Jan-2011 Ken Sumrall <ksumrall@android.com> Add the commands rm and rmdir to init.

rm only removes a single non-directory directory entry (no -r support)
rmdir removes a single empty directory

Change-Id: I49702b02ba98a177027b126268c2c2846f968195
nit/builtins.c
nit/init_parser.c
nit/keywords.h
108d3d74a805ad15d2cd2db47dad86f1082a59ba 19-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "libsysutils: Handle EINTR in FrameworkClient.cpp" into honeycomb
c71669715320b90aafcc84d86068944149375cfa 19-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "libsysutils: Fix potential overwrites in FrameworkListener" into honeycomb
9aae7b5182c4cf46d629fa061e3c58d8730314da 19-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "libsysutils: Fix race condition in SocketListener thread." into honeycomb
292bb77cc3b145bca0f5cb31e1d3ce906455b0f3 19-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "libsysutils: Handle EINTR in SocketClient::sendData()" into honeycomb
706747e57b640da414cef542517241279d508c01 19-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "libsysutils: Fix wait loop in ServiceManager::start and ::stop" into honeycomb
f605b2a1903241ceebecb22ae80f87ff8007c6e3 19-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "libsysutils: Handle EINTR in NetlinkListener" into honeycomb
6864956495c9dd5d07b10a8795cd23c0db20acbc 19-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "libsysutils: Fix NetLinkEvent security issues." into honeycomb
af91e4ef095d2c770f1aeceafc1c2e66b645a3c4 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Handle EINTR in FrameworkClient.cpp

+ get rid of strcpy + strcat calls.

Change-Id: I47778f3d14aa961474648cddf6510b761f124e74
ibsysutils/src/FrameworkClient.cpp
c6b0def5f039dc3bbe1d4b7dc1666c24316eb020 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Fix potential overwrites in FrameworkListener

+ Handle EINTR in read()

Change-Id: If7d486dd4fb5666ce16ef36dca5f417da23e0b73
ibsysutils/src/FrameworkListener.cpp
cf9e1003ce69a2aea2c64cd82d54a0d3e8917dbb 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Fix race condition in SocketListener thread.

+ Handle EINTR in accept(), write() and select()
+ Fix a memory leak when deleting the mClients list
+ Fix typo in SocketListener.h

Change-Id: Ie68bb3e2dbefe0dfdaa22a5cd06a42dbc4c0f8aa
nclude/sysutils/SocketListener.h
ibsysutils/src/SocketListener.cpp
af61509b50bc110b0c7c4691e37873cc0987ab5c 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Handle EINTR in SocketClient::sendData()

+ Improve allocation code in sendMsg(code,msg,addErrno)

Change-Id: Ib5fe84bec1a167c369e7ba759acea395e832f6b5
ibsysutils/src/SocketClient.cpp
af174f0039bf462c36b89fd1439a44c60c4b89c9 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Fix wait loop in ServiceManager::start and ::stop

Also check the service name length.

Change-Id: Iffb82aa9e71dd96c85c05c4e2016930f4847c1e8
ibsysutils/src/ServiceManager.cpp
b59539d395218299f4b4288a26403fedb3d8124c 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Handle EINTR in NetlinkListener

Change-Id: Id881a9ca0f0e54f7c78b3609120bedec00d6671c
ibsysutils/src/NetlinkListener.cpp
3311eea1d3881e6f3d6806988b7db3de0a5f68d5 17-Jan-2011 David 'Digit' Turner <digit@google.com> libsysutils: Fix NetLinkEvent security issues.

The issues were the following:
- The code in decode() didn't handle the degenerate case where the input buffer is full of '@'
- The code in decode() assumed the input buffer is properly zero-terminated.
- The code in decode() would not check that it doesn't overwrite the mParams[] array.
- The code in findParam() would check mParams[i] before checking the value of 'i'

Also remove un-necessary calls to strlen() at runtime.

Change-Id: I8acead959bd10d97c5380b08958fcb796248a010
ibsysutils/src/NetlinkEvent.cpp
6be830903aac70439e07f7a51856bc429b9b711e 06-Jan-2011 David 'Digit' Turner <digit@google.com> rootdir: Fix system emulation startup.

This fixes the goldfish-specific config scripts used by init and ueventd
to properly setup the system under emulation. This fixes a lot of broken-ess
introduced by recent permission changes in the system.

Note that there are still several problems after this patch is applied, but
at least it becomes possible to get an adb connection to the emulated system,

Change-Id: Iff47bbf0fe5cb759fa93089284bb0f71e32405a2
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
ootdir/etc/ueventd.goldfish.rc
ootdir/ueventd.rc
eeeca4dd45899c20d4fc187c59bda58af43352f2 18-Jan-2011 David 'Digit' Turner <digit@google.com> rootdir: goldfish: Fix network route during emulation.

The net.eth0.gw system property is used by the ConnectivityService
to set the default route when it detects that 3G connectivity is
established. Because the property was undefined, the route was
unset which broke networking.

+ Format / document init.goldfish.sh

Change-Id: I1133cf6c093609300315cd0ea363c9e139b42521
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
bb6e3e939ba5aa33e9d00e3bc16b797d7b6a2b2e 18-Jan-2011 David 'Digit' Turner <digit@google.com> am 620a5401: am a42f152b: Merge "rootdir: Fix system emulation startup." into honeycomb

* commit '620a540128ace4514a5695bdfa94b9f409c7a605':
rootdir: Fix system emulation startup.
620a540128ace4514a5695bdfa94b9f409c7a605 18-Jan-2011 David 'Digit' Turner <digit@google.com> am a42f152b: Merge "rootdir: Fix system emulation startup." into honeycomb

* commit 'a42f152b4ae365e2f8d232237a8aa0168061feb4':
rootdir: Fix system emulation startup.
a42f152b4ae365e2f8d232237a8aa0168061feb4 18-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "rootdir: Fix system emulation startup." into honeycomb
ce132be609f5941b4258ca8bda22946b71f587df 18-Jan-2011 Mike Lockwood <lockwood@android.com> am 5885ec1c: am 96e32dfe: Merge "sdcard: Fix lower case squashing for case insensitivity support." into honeycomb

* commit '5885ec1c2d8471b5d97bee50b20015e2791f2699':
sdcard: Fix lower case squashing for case insensitivity support.
5885ec1c2d8471b5d97bee50b20015e2791f2699 18-Jan-2011 Mike Lockwood <lockwood@android.com> am 96e32dfe: Merge "sdcard: Fix lower case squashing for case insensitivity support." into honeycomb

* commit '96e32dfe6c5cefa57d1b4ae19982fa1e50926e09':
sdcard: Fix lower case squashing for case insensitivity support.
96e32dfe6c5cefa57d1b4ae19982fa1e50926e09 18-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "sdcard: Fix lower case squashing for case insensitivity support." into honeycomb
b9dbf9443c5d53abe52b1598cd7b8fc25f262c06 18-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
b94d320b1e7e2a3493147f6763cd2825b111a4d8 18-Jan-2011 Mike Lockwood <lockwood@android.com> sdcard: Fix lower case squashing for case insensitivity support.

The fuse layer in the kernel does not support case insensitive file systems.
But the sdcard daemon's fuse_lookup was returning the same file object for
different file names, which caused problems in the kernel fuse layer's dcache,
resulting in EBUSY errors if the same directory was opened twice under different
names differing only by case.

To fix this, the sdcard daemon will return different file objects for files or directories
that differ only by case. Now the squashing occurs only in the interaction between
the sdcard daemon and the underlying file system in /data/media, and sdcard maintains
the illusion for the kernel fuse layer that there are two separate files.

Example: Suppose both /mnt/sdcard/foo.txt and /mnt/sdcard/FOO.TXT are opened.
Previously, the sdcard would squash this to a single node, and return the same
node to the kernel fuse implementation twice, and would open the underlying file
/data/media/foo.txt only once. Now sdcard will create two separate nodes will open
/data/media/foo.txt twice, once for mnt/sdcard/foo.txt and again for /mnt/sdcard/FOO.TXT.

Change-Id: I70e36b7822142750d3eeeb75edd6464ec7c79f2a
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
701d40f721573c5c9e0b45b59a383e04c582f6d0 18-Jan-2011 Ken Sumrall <ksumrall@android.com> am 383b76f8: am e4349157: Add a new trigger to support a progress bar UI for encrypt in place.

* commit '383b76f86af48d4a1a502d7767ab79f024483864':
Add a new trigger to support a progress bar UI for encrypt in place.
383b76f86af48d4a1a502d7767ab79f024483864 17-Jan-2011 Ken Sumrall <ksumrall@android.com> am e4349157: Add a new trigger to support a progress bar UI for encrypt in place.

* commit 'e434915787c38a6d84e1058044fed3be2ed02235':
Add a new trigger to support a progress bar UI for encrypt in place.
e434915787c38a6d84e1058044fed3be2ed02235 17-Jan-2011 Ken Sumrall <ksumrall@android.com> Add a new trigger to support a progress bar UI for encrypt in place.

Change-Id: I6a14eb43462505cb7fecfee9fd1ecdea50065963
ootdir/init.rc
f3b6c659e0fdaa23150ad100204e92869feb0da5 17-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
4e1c143fe02daf6accfc0a791af26b3aa5678dbd 16-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
95df887ac0cd2fab3f5d3148feb7839b5f65223f 06-Jan-2011 David 'Digit' Turner <digit@google.com> rootdir: Fix system emulation startup.

This fixes the goldfish-specific config scripts used by init and ueventd
to properly setup the system under emulation. This fixes a lot of broken-ess
introduced by recent permission changes in the system.

Note that there are still several problems after this patch is applied, but
at least it becomes possible to get an adb connection to the emulated system,

Change-Id: Iff47bbf0fe5cb759fa93089284bb0f71e32405a2
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
ootdir/etc/ueventd.goldfish.rc
ootdir/ueventd.rc
c633356e85543fc4904e3c853f6433ecbd532d22 15-Jan-2011 Jesse Wilson <jessewilson@google.com> Merge "Move apache-xml to external. (project 4 of 4)"
08cdb756be0c8848424e8a113e694f35711e43a0 14-Jan-2011 Ken Sumrall <ksumrall@android.com> am 69e40574: am 4e84d3bc: Set a read-only property to indicate if the device is running encrypted.

* commit '69e4057440b298a65c7d21bacc466087c7f81d7e':
Set a read-only property to indicate if the device is running encrypted.
69e4057440b298a65c7d21bacc466087c7f81d7e 14-Jan-2011 Ken Sumrall <ksumrall@android.com> am 4e84d3bc: Set a read-only property to indicate if the device is running encrypted.

* commit '4e84d3bcf9af3452128fe2e8dc7607dff9016fac':
Set a read-only property to indicate if the device is running encrypted.
4e84d3bcf9af3452128fe2e8dc7607dff9016fac 14-Jan-2011 Ken Sumrall <ksumrall@android.com> Set a read-only property to indicate if the device is running encrypted.

The UI needs to know if the device is running with an encrypted
filesystem or now. So set a read-only property at boot to let it know.

Change-Id: I753de2d606c975bcbe9946d10fd47558cf357dac
nit/builtins.c
493547118158f0f61129b705dc8249f1c38d0ab9 14-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
30d5d038a94b09bd906d8a07a9c4b79640d36c2e 14-Jan-2011 Jesse Wilson <jessewilson@google.com> Move apache-xml to external. (project 4 of 4)

Change-Id: I8e1ea723481ae6d8e609563331c187576f306bce
http://b/3351604
ootdir/init.rc
3a34d5a28621c265f18df25d6f9d30624758afd0 13-Jan-2011 Mike Lockwood <lockwood@android.com> sdcard: Have the -f option fix user/group permissions as well as file name case

Change-Id: I280ded6ce79fb11752c89ebafa663d7ee29edebc
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
aad1a5d2bad222480c2c6f778f775cdae5b18c53 13-Jan-2011 Ken Sumrall <ksumrall@android.com> am c1ab5b92: am 63990cf5: Merge "Move rild to the core class." into honeycomb

* commit 'c1ab5b92c8ba639d4b60f84d44f1ea0df17dc100':
Move rild to the core class.
c1ab5b92c8ba639d4b60f84d44f1ea0df17dc100 13-Jan-2011 Ken Sumrall <ksumrall@android.com> am 63990cf5: Merge "Move rild to the core class." into honeycomb

* commit '63990cf56fc64033c0382ac19a3ffba7f525fb30':
Move rild to the core class.
63990cf56fc64033c0382ac19a3ffba7f525fb30 13-Jan-2011 Ken Sumrall <ksumrall@android.com> Merge "Move rild to the core class." into honeycomb
a02714bd3e8e75298c6e684ef375407fe02dd9b0 11-Jan-2011 Ken Sumrall <ksumrall@android.com> Move rild to the core class.

Changes in init.stingray.rc now prevent rild from making sockets
or named pipes on /data. Now that rild no longer prevents /data
from being unmounted, we can put it in the core class, which doesn't
restart when we enable encryption. This speeds up the boot by 20+
seconds.

Change-Id: I737baf804e089f4ddbd664eaa1e675a7bd62e699
ootdir/init.rc
ceb0ab0fb89f79ca20ed8a40e1268b8802aa7f20 13-Jan-2011 Mike Lockwood <lockwood@android.com> am 73a223d0: am 1bedb73f: sdcard: Have the -f option fix user/group permissions as well as file name case

* commit '73a223d09f3e5643d70f6604f9bf7110c52445c7':
sdcard: Have the -f option fix user/group permissions as well as file name case
73a223d09f3e5643d70f6604f9bf7110c52445c7 13-Jan-2011 Mike Lockwood <lockwood@android.com> am 1bedb73f: sdcard: Have the -f option fix user/group permissions as well as file name case

* commit '1bedb73f9fc239b69d958cbabc50c7ba382bacbc':
sdcard: Have the -f option fix user/group permissions as well as file name case
1bedb73f9fc239b69d958cbabc50c7ba382bacbc 13-Jan-2011 Mike Lockwood <lockwood@android.com> sdcard: Have the -f option fix user/group permissions as well as file name case

Change-Id: I280ded6ce79fb11752c89ebafa663d7ee29edebc
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
627a0c748b4809a4798656b4281a6c0b26456ee0 13-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
216516f00ccac1d80ac0d8ebd764a9d35fe69c85 12-Jan-2011 Mike Lockwood <lockwood@android.com> am cfee7769: am 4f35e623: sdcard: Add command line options for lowercase file name squashing:

* commit 'cfee7769daebfc812a5eea367f4a97f0c89b5670':
sdcard: Add command line options for lowercase file name squashing:
cfee7769daebfc812a5eea367f4a97f0c89b5670 12-Jan-2011 Mike Lockwood <lockwood@android.com> am 4f35e623: sdcard: Add command line options for lowercase file name squashing:

* commit '4f35e623a2359789406772009078d1a6ca7af6b3':
sdcard: Add command line options for lowercase file name squashing:
daeaf0eec0fbf7744e91803600e38a809ef82e65 12-Jan-2011 Mike Lockwood <lockwood@android.com> am 326d6f9d: am 51b3a2d7: sdcard: Force file names to lower case in order to provide case insensitivity

* commit '326d6f9daa3893e90f5dcf574b475c951020990a':
sdcard: Force file names to lower case in order to provide case insensitivity
4f35e623a2359789406772009078d1a6ca7af6b3 12-Jan-2011 Mike Lockwood <lockwood@android.com> sdcard: Add command line options for lowercase file name squashing:

-l squash all file names to lower case when creating new files
-f rename existing files to make them lower case

Change-Id: I3245deb690228cf577bdc9bd4b0fcf0306ea3e16
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
326d6f9daa3893e90f5dcf574b475c951020990a 12-Jan-2011 Mike Lockwood <lockwood@android.com> am 51b3a2d7: sdcard: Force file names to lower case in order to provide case insensitivity

* commit '51b3a2d77a3361f6088172a4a68a0111058d3aab':
sdcard: Force file names to lower case in order to provide case insensitivity
51b3a2d77a3361f6088172a4a68a0111058d3aab 12-Jan-2011 Mike Lockwood <lockwood@android.com> sdcard: Force file names to lower case in order to provide case insensitivity

Change-Id: I2cdb12c7e296e1c28b66e32c7037dce060eecd67
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
d336ab3161c93853e882af44b6c90c2449a309b2 12-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
d3172e8791fe2511e8366787ff7001c90e0de245 12-Jan-2011 Kenny Root <kroot@google.com> am 04a62c8c: am 98af303d: Merge "Use pread64/pwrite64 instead of pread/pwrite" into honeycomb

* commit '04a62c8cd4537eed84ec0ffb4c2bc23da590345d':
Use pread64/pwrite64 instead of pread/pwrite
04a62c8cd4537eed84ec0ffb4c2bc23da590345d 12-Jan-2011 Kenny Root <kroot@google.com> am 98af303d: Merge "Use pread64/pwrite64 instead of pread/pwrite" into honeycomb

* commit '98af303d44f88d32e14566ec25acd06eab3bed24':
Use pread64/pwrite64 instead of pread/pwrite
98af303d44f88d32e14566ec25acd06eab3bed24 12-Jan-2011 Kenny Root <kroot@google.com> Merge "Use pread64/pwrite64 instead of pread/pwrite" into honeycomb
90749774edd0c0cab327b62ce43cb4dfd33e897d 12-Jan-2011 Kenny Root <kroot@google.com> Use pread64/pwrite64 instead of pread/pwrite

>2GB files were failing strangely when pread was used instead of
pread64. Also writing to files should use pwrite64 in case they grow
over 2GB.

Bug: 3205336
Change-Id: I0c9619de35680093d7777ca132ce488eae502216
dcard/sdcard.c
f217995c2f37040838d42af123b852f45076e44a 12-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am 2dfe3970: am 55dc9744: am cdeba125: Merge "Assembly coded android_memset16 and android_memset32"

* commit '2dfe3970797ed772e5ad09cb2023bc62fbeb293d':
Assembly coded android_memset16 and android_memset32
67b73f8af89efee637ddeedf94884728a0c51d23 12-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am d3049ec8: am f5cb0a13: am fc0b4ff1: Merge "init: Fix parser line numbering"

* commit 'd3049ec8b871cf6dcaa326653feddeb665123a49':
init: Fix parser line numbering
2dfe3970797ed772e5ad09cb2023bc62fbeb293d 11-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am 55dc9744: am cdeba125: Merge "Assembly coded android_memset16 and android_memset32"

* commit '55dc9744c9a4e6805a27da5dd8619f27736dd8e6':
Assembly coded android_memset16 and android_memset32
d3049ec8b871cf6dcaa326653feddeb665123a49 11-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am f5cb0a13: am fc0b4ff1: Merge "init: Fix parser line numbering"

* commit 'f5cb0a138528144f3bb1cf6bbcb3c4e4ad5e9dc9':
init: Fix parser line numbering
62a063225823866f89b05ac5a88b81424f667df7 11-Jan-2011 Gloria Wang <gwang@google.com> am a44aca65: (-s ours) Temporarily disable the drm service. do not merge

* commit 'a44aca6580b6f39459195275f4631682410aae4b':
Temporarily disable the drm service. do not merge
83f42a0da1d099600d25c8ae8f697643494c0d97 11-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
34360a4c0702eb2b1a4b86fc0c1141037342a70d 11-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
f3c42b6ee4f0bb042cf93e1ac6c9c4d72e1558fa 11-Jan-2011 Ken Sumrall <ksumrall@android.com> Move rild to the core class.

Changes in init.stingray.rc now prevent rild from making sockets
or named pipes on /data. Now that rild no longer prevents /data
from being unmounted, we can put it in the core class, which doesn't
restart when we enable encryption. This speeds up the boot by 20+
seconds.

Change-Id: I71c426dab1b725e401116234167d41c7ccd958c1
ootdir/init.rc
a44aca6580b6f39459195275f4631682410aae4b 11-Jan-2011 Gloria Wang <gwang@google.com> Temporarily disable the drm service. do not merge

Change-Id: I5cb04a9c2cc5b95443c6c0ea77132a4102ca47fc
ootdir/init.rc
1cdd11c528ee24a678fb980d9e1b146255faeee7 10-Jan-2011 Iliyan Malchev <malchev@google.com> Merge "system/core: delete an old patch file"
e30dd2e1d111e4ded694f2cc40d9d52eb6945def 17-Dec-2010 Iliyan Malchev <malchev@google.com> system/core: delete an old patch file

Change-Id: Icb47b08fcca2c85ac4b92a6cd12429f3f0e0526a
Signed-off-by: Iliyan Malchev <malchev@google.com>
atch.txt
c9ba230ae82a0776a3595afed153000d2384acc3 10-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am d66aa916: Merge changes Ife2dd406,I1ac481a2 into honeycomb

* commit 'd66aa9162324ba263049d983e104756629c7af21':
Assembly coded android_memset16 and android_memset32
init: Fix parser line numbering
d66aa9162324ba263049d983e104756629c7af21 10-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge changes Ife2dd406,I1ac481a2 into honeycomb

* changes:
Assembly coded android_memset16 and android_memset32
init: Fix parser line numbering
48b911c573c92742aa80270b734811f722c67c37 10-Jan-2011 Mike Lockwood <lockwood@android.com> am af7bdc64: Add separate permission and group for access to MTP USB driver

* commit 'af7bdc646088e3112052f4fd35061bb720393287':
Add separate permission and group for access to MTP USB driver
5494cefd5e0eaae65c4297014385990a90224d28 10-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
af7bdc646088e3112052f4fd35061bb720393287 10-Jan-2011 Mike Lockwood <lockwood@android.com> Add separate permission and group for access to MTP USB driver

Since the "usb" group and ACCESS_USB permission will be used by regular apps
to access USB devices in host mode, we need a separate permission for the
device side MTP driver.

Change-Id: Ibb546b8726d61e041fc7c273f71929624ad1575b
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/private/android_filesystem_config.h
ootdir/ueventd.rc
73334cfab136d405f389f2174c2f86bea3ddb683 10-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "adb: improve debug traces readability."
318f00c043f231bf40c1a7e6460ee36c6450b95a 10-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "toolbox: make getprop print a sorted list of properties"
1d504eeb50d980c222572629383bb76315f32ca0 09-Jan-2011 Wink Saville <wink@google.com> Revert "Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet"

This reverts commit 8418ac8ba59bd140b5a2432c99501cc79debdefc.
nclude/sysutils/NetlinkEvent.h
nclude/sysutils/NetlinkListener.h
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
9315c4bed6783869463e580a19c5b82faf9c3964 08-Jan-2011 Mike Lockwood <lockwood@android.com> am b596608f: adb: Increase device descriptor buffer size in Linux host USB support

* commit 'b596608f098937049fd98c5896cf72ebbf3584ae':
adb: Increase device descriptor buffer size in Linux host USB support
a8d1afb3e91b043fcd303a40ca4ac9293bbd2781 06-Jan-2011 David 'Digit' Turner <digit@google.com> toolbox: make getprop print a sorted list of properties

This patch also factors out the dynarray_t/strlist_t code
from ls.c and moves it to dynarray.[hc].

Change-Id: Ifae2b364d7c2733aad5551ad3c78ae72f8ac31f4
oolbox/Android.mk
oolbox/dynarray.c
oolbox/dynarray.h
oolbox/getprop.c
oolbox/ls.c
b596608f098937049fd98c5896cf72ebbf3584ae 08-Jan-2011 Mike Lockwood <lockwood@android.com> adb: Increase device descriptor buffer size in Linux host USB support

256 bytes wasn't big enough for some complicated USB configurations

Change-Id: I31f7841953d73b06958f44040f58166b159faff4
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
55dc9744c9a4e6805a27da5dd8619f27736dd8e6 08-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am cdeba125: Merge "Assembly coded android_memset16 and android_memset32"

* commit 'cdeba1258b511b6df450221bcfb2572e5523558a':
Assembly coded android_memset16 and android_memset32
f5cb0a138528144f3bb1cf6bbcb3c4e4ad5e9dc9 08-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am fc0b4ff1: Merge "init: Fix parser line numbering"

* commit 'fc0b4ff1c8675be3626510a5adfbcae507ecfa43':
init: Fix parser line numbering
16209418de5179603ddd93da91190b4c2e42eb39 07-Jan-2011 Gloria Wang <gwang@google.com> Merge "To remove drm service from groups of "system" and "root"."
60b5b408cfcac450ce0cc56952d3b1c087b25428 07-Jan-2011 Gloria Wang <gwang@google.com> To remove drm service from groups of "system" and "root".

Change-Id: Ieac11c667c72465f7082baab0787dc740797049f
ootdir/init.rc
bb12ac9b85adae96cbd38b2220c5da9a9d80bc54 28-Dec-2010 Lu, Hongjiu <hongjiu.lu@intel.com> Assembly coded android_memset16 and android_memset32

Change-Id: Ife2dd406e1dcb962e5e97788c515ac96f5c52e44
ibcutils/Android.mk
ibcutils/arch-arm/memset32.S
ibcutils/arch-x86/android_memset16.S
ibcutils/arch-x86/android_memset32.S
ibcutils/arch-x86/cache_wrapper.S
ibcutils/arch-x86/sse2-memset16-atom.S
ibcutils/arch-x86/sse2-memset32-atom.S
ibcutils/memory.c
ibcutils/memset32.S
cdeba1258b511b6df450221bcfb2572e5523558a 07-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Assembly coded android_memset16 and android_memset32"
9894bb43bd1de2a70efd8540adc5b3c453758424 07-Jan-2011 Robert Greenwalt <robdroid@android.com> Merge "Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet physical-layer up/down events can be tracked. Upper layers will use these events to enable/disable Ethernet connectivity."
1be6968d9d51f43fdb00535708a6fed0be6bfbca 26-Dec-2010 Bruce Beare <bruce.j.beare@intel.com> init: Fix parser line numbering

Change-Id: I1ac481a2cef749b26c73bc9e6a212e6ace7a0ae2
nit/init_parser.c
nit/parser.c
fc0b4ff1c8675be3626510a5adfbcae507ecfa43 07-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge "init: Fix parser line numbering"
d548bfd1ea8ed8fe29d6a659623adf5fc8f189e1 07-Jan-2011 Mike Lockwood <lockwood@android.com> am be1def8d: libusbhost: Tweak comments.

* commit 'be1def8d43d75e280cdd75d432ddcadeaff580b1':
libusbhost: Tweak comments.
be1def8d43d75e280cdd75d432ddcadeaff580b1 07-Jan-2011 Mike Lockwood <lockwood@android.com> libusbhost: Tweak comments.

Change-Id: I45fdba7a94438f7c15fbca5dd65f07df9b522fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
92a30415e940da398d14d5d271620b0eebec14c2 07-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
ca6fe5fd794c482efd97794a806dff84f5ec683f 07-Jan-2011 Mike Lockwood <lockwood@android.com> am e533c5f1: libusbhost: Support for multiple pending requests on a single endpoint

* commit 'e533c5f1005e8913f577d2aeac5a26f88f55a249':
libusbhost: Support for multiple pending requests on a single endpoint
0fb9a1cff43d520b5a9d5c824904d8caa0c647bc 06-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "rootdir: Fix system emulation startup."
b9634d05cf4fedb2ee49b0a41aeb129d35337ce9 02-Nov-2010 Brad Fitzpatrick <bradfitz@android.com> Permit 0 length writes.

Change-Id: I087d0074c8d9e13ce814187475966da94f693fc0
ibsysutils/src/SocketClient.cpp
a2a1f3149fb32d95bc81ddfd713d5bba9d6cbc61 27-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> Let SocketClient users write binary data to clients.

This is a dependency for the DNS proxy CLs.

This CL also adds a new socket for the netd process to inherit which
is owned by the inet group. (so only apps with the INTERNET
permission can use the DNS proxy...)

Change-Id: I8a51924e0ed56c6066f77e6f1b02d39bdadac51e
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
ootdir/init.rc
8629e393075acee9ebd8643c6ce69187f6b817a7 06-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to honeycomb
e533c5f1005e8913f577d2aeac5a26f88f55a249 05-Jan-2011 Mike Lockwood <lockwood@android.com> libusbhost: Support for multiple pending requests on a single endpoint

Add new usb_request struct to replace usb_endpoint, which is no longer needed.

Change-Id: Ia3637b3431a3597caced41bfec677ef0b044a453
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/Android.mk
ibusbhost/usbhost.c
730ff3b786058dadde98743522d760bd9331a9dd 06-Jan-2011 David 'Digit' Turner <digit@google.com> adb: improve debug traces readability.

This patch makes the traces easier to read. For example transports are
displayed by name/serial instead of their hex address.

Change-Id: I7e8df44ddbec19754d63d989bd56485998b4627b
db/adb.c
db/transport.c
1f2565ca08ecd92181eb662899f68f306695d74a 06-Jan-2011 David 'Digit' Turner <digit@google.com> rootdir: Fix system emulation startup.

This fixes the goldfish-specific config scripts used by init and ueventd
to properly setup the system under emulation. This fixes a lot of broken-ess
introduced by recent permission changes in the system.

Note that there are still several problems after this patch is applied, but
at least it becomes possible to get an adb connection to the emulated system,

Change-Id: I1e8f5828b4d5cbb3a4338878df875dc718276b38
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
ootdir/etc/ueventd.goldfish.rc
ootdir/ueventd.rc
90d07ae2b1316dbc8ad7e7ffbbb14eca357f1b28 06-Jan-2011 Colin Cross <ccross@android.com> Merge "uptime: Use clock_gettime to get monotonic time"
9d6d030f83f682a0ab944260eca8402d85fb008c 06-Jan-2011 Colin Cross <ccross@android.com> uptime: Use clock_gettime to get monotonic time

The first field in /proc/uptime is bootbased time, not monotonic
time. If the kernel tracks bootbased time correctly, it counts
elapsed run time as well as sleep time, which is the same as the
elapsed time in the android alarm driver, and sleep time is
always returned as 0.

Use clock_gettime(CLOCK_MONOTONIC) instead, which will return
elapsed run time not counting sleep time on all platforms.

Change-Id: I28a22e8c93d78f62666ee8c877c7c6718a2b640a
oolbox/uptime.c
576e4578d9699ad16fd47612e6f77f342fe4e9e5 05-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to master
51b6452987ee1d9f135dea8c72626fa05307a4e9 05-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to master
6b8caf0bb05c23da6f4d7ca1a23c98e6ca3c819a 05-Jan-2011 Paul Eastham <eastham@google.com> Merge "Fix refcounting in the rename case."
77085c570e7db2ea4a52e3a0fec5100687c31b46 05-Jan-2011 Paul Eastham <eastham@google.com> Fix refcounting in the rename case.

Change-Id: I59dbac8c92bda450e6d89f7f180241fd4b5bbae6
dcard/sdcard.c
8bc6fb3433c76428d2fffb83be8902052644fca2 05-Jan-2011 Colin Cross <ccross@android.com> am bf10797e: am f7ca6040: Fix infinite loop in init when debugging is turned off

* commit 'bf10797e538f9fa252d72710bd5ecf0ef1f6f3e0':
Fix infinite loop in init when debugging is turned off
bf10797e538f9fa252d72710bd5ecf0ef1f6f3e0 05-Jan-2011 Colin Cross <ccross@android.com> am f7ca6040: Fix infinite loop in init when debugging is turned off

* commit 'f7ca6040616f672a6f0039d55e39c610b7c1cf91':
Fix infinite loop in init when debugging is turned off
f7ca6040616f672a6f0039d55e39c610b7c1cf91 05-Jan-2011 Colin Cross <ccross@android.com> Fix infinite loop in init when debugging is turned off

If a keychord is pressed when debugging is turned off, the main
event poll in init will return an event on the keychord fd,
but handle_keychord never reads the data. Once this happens,
the poll will always return immediately, and init enters an
infinite loop. Fix it by always reading from the keychord fd,
but only handling the returned keychord if debugging is
enabled.

Change-Id: Ie4efa98247d3cc978d275dc8a4516b32aa710278
nit/keychords.c
951ad9b0e2f34ed01634419f5f0c62198d4d2d6f 04-Jan-2011 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to master
d7a295221a96b02ebe50b65799da323770e67915 28-Dec-2010 Bruce Beare <bruce.j.beare@intel.com> Assembly coded android_memset16 and android_memset32

Change-Id: Ifa05006df7ce7364d18eb10d64a818d619664475
Author: Lu, Hongjiu <hongjiu.lu@intel.com>
Signed-off-by: Mark Gross <mark.gross@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ibcutils/Android.mk
ibcutils/arch-arm/memset32.S
ibcutils/arch-x86/android_memset16.S
ibcutils/arch-x86/android_memset32.S
ibcutils/arch-x86/cache_wrapper.S
ibcutils/arch-x86/sse2-memset16-atom.S
ibcutils/arch-x86/sse2-memset32-atom.S
ibcutils/memory.c
ibcutils/memset32.S
378083a3f03db4eb623789c6f7a4bd827f44eb64 26-Dec-2010 Bruce Beare <bruce.j.beare@intel.com> init: Fix parser line numbering

Change-Id: I3885dd7d631e7330d92780df822b3ee1a8d0350b
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
nit/init_parser.c
nit/parser.c
512405a421fa69a7a003854d9270cd109b026267 30-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am f1c2a735: Merge "fastboot: Add help message for continue command"

* commit 'f1c2a7352f19cf729f91bf2559fc93ef12c74dca':
fastboot: Add help message for continue command
f1c2a7352f19cf729f91bf2559fc93ef12c74dca 29-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "fastboot: Add help message for continue command"
24ce4bc8d7c4706286ef0530870dea80a1a0cd11 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> fastboot: Add help message for continue command

Change-Id: I578b1b7c2d74d09d44ce9100bfe582aaa25c31b1
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
astboot/fastboot.c
7d700f8bdce747a26e3ee4737683194d77286ba3 29-Dec-2010 Mike Lockwood <lockwood@android.com> libusbhost: Add usb_device_get_name_from_unique_id()

This allows converting from unique IDs to USB device names

Change-Id: I8e3b300790c01383aed8e3d4f547b54bcb7c2cd4
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
123538954b9c8ad8fe7c2d755391f0b7cbaa1d6f 29-Dec-2010 Mike Lockwood <lockwood@android.com> Change libusbhost from static to shared library

Change-Id: I0c16cc4536c4ab700c33433c8a6323ade7cfc95d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibusbhost/Android.mk
oolbox/Android.mk
8418ac8ba59bd140b5a2432c99501cc79debdefc 27-Dec-2010 Stan Chesnutt <chesnutt@google.com> Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet
physical-layer up/down events can be tracked. Upper layers will use these
events to enable/disable Ethernet connectivity.

Change-Id: If07c30c4d79f26cf94eb5597be651ebbf9d072c6
nclude/sysutils/NetlinkEvent.h
nclude/sysutils/NetlinkListener.h
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
794cc3fdd32e713145a2aa55c7a34c91d2a8fa5f 22-Dec-2010 Mike Lockwood <lockwood@android.com> lsof: Add support for printing open files for a single process

Change-Id: If2afa0937064dffca6df2a8642ca75009dc6e70e
Signed-off-by: Mike Lockwood <lockwood@android.com>
oolbox/lsof.c
eb9f6b64b14ad08dbf4880d522464d886f8d99f2 22-Dec-2010 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to master
bdd483830d6b18a4840e5b8483bf058f3c4579eb 21-Dec-2010 Irfan Sheriff <isheriff@google.com> Merge "Reduce polling interval to 200ms"
b1723b68921512f26562384898b9600f8f11d25e 21-Dec-2010 Irfan Sheriff <isheriff@google.com> Reduce polling interval to 200ms

DHCP success can take up to 2 seconds to
be reported to the statemachine. Move wait
time after check and reduce it to 200ms

Change-Id: I6b2546f80435a84ee6f44f4d91f348bacfdc8433
ibnetutils/dhcp_utils.c
435fa64a416126e5aafc78d2e6f24481823c3ab0 21-Dec-2010 The Android Automerger <android-build@android.com> merge in honeycomb-release history after reset to master
5de6b95a9d35fe017f25b537de8443a9127cca8d 20-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release

* master:
Changes to init to support encrypted filesystems.
752923c168009d03e9e00e590155fbd0a2880ccb 04-Dec-2010 Ken Sumrall <ksumrall@android.com> Changes to init to support encrypted filesystems.

These are the changes to init and init.rc necessary to
support booting with and encrypted /data filesystem.
A corresponding change to init.<device>.rc goes along
with this change.

Change-Id: I0c7e2cc39568358014a82e317735c0eae14dd683
nit/builtins.c
nit/init.c
nit/init.h
nit/init_parser.c
nit/keywords.h
nit/signal_handler.c
ootdir/init.rc
258e2c52e1397667ff24d5b40cdb4e75305064e0 17-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release

* master:
fix undefined behavior with certain left-shift count values
36f93f01201bbff4a411c73adfbaf08bd93b1ad2 16-Dec-2010 Stan Chesnutt <chesnutt@google.com> fix undefined behavior with certain left-shift count values

Change-Id: I1b71de28312a56a3b1d27fcfaf0a7b71d5777e6c
ibnetutils/ifc_utils.c
c0d0155b66795fab91aa5a3175f04a4dc227beb7 16-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release

* master:
libusbhost: Fix breakage due to not storing dev_name in struct usb_device
don't run services with gid=0
e88a1b9e3d39376d2a33efff49229985fe8797e8 15-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "libusbhost: Fix breakage due to not storing dev_name in struct usb_device"
93aff72d9b469f4b77468bab654cd65243b662e6 15-Dec-2010 Mike Lockwood <lockwood@android.com> libusbhost: Fix breakage due to not storing dev_name in struct usb_device

Change-Id: Iefac9b31f900edb2dbd594f9eff9113b2038757d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibusbhost/usbhost.c
333f24bfbd9eea1347f20c2e88c5c1565b84aafe 10-Dec-2010 Nick Kralevich <nnk@google.com> don't run services with gid=0

Ensure that we drop privileges for servicemanager
and drmioserver. These should not be running with
gid=0.

Bug: 3275526
Testing: Applied change and successfully rebooted
the device. No obvious bugs.

Change-Id: I782fbda812cb88e0a365788b45b3b32894623177
ootdir/init.rc
51c7b7d3d4b5629a34937ecb4b7dc4aa67df99e1 15-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release
ee878753f915a0176ea411b71bdffde064e24ae0 15-Dec-2010 Mike Lockwood <lockwood@android.com> adb: Don't report negative number of bytes after pushing file > 2 gigabytes

BUG: 3198322

Change-Id: I6067857b9490984a21b597f6ee338446a9decaf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/file_sync_client.c
3227b5c25f17b19d65e1fe7ec27e62c5430bd258 15-Dec-2010 Paul Eastham <eastham@google.com> Prevent rollover when dumping data around PC, SP, etc.

Change-Id: Ifc5f0e8eb5fed191c39f0878869e04b4d4f3b9ca
ebuggerd/arm/machine.c
4387ed13567b243416ba8af3d0ee39c8e746b45b 14-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 660c8b71: am cbb9257a: Merge "Fix debuggerd (native crash dump)."

* commit '660c8b71952c4067fd9d9ae1d6def3d2a3127ddc':
Fix debuggerd (native crash dump).
660c8b71952c4067fd9d9ae1d6def3d2a3127ddc 14-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am cbb9257a: Merge "Fix debuggerd (native crash dump)."

* commit 'cbb9257a872a0f35b0aa1018410ca6025e628c36':
Fix debuggerd (native crash dump).
cbb9257a872a0f35b0aa1018410ca6025e628c36 14-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix debuggerd (native crash dump)."
0b4836f2cd2f3312d4b4aa0c278c751b0784144c 14-Dec-2010 Mike Dodd <mdodd@google.com> Fix debuggerd (native crash dump).

Change 44659e90f (6cc4923087 in AOSP) introduced walking
both the symbol table and dynamic symbol table. The problem
is that it was dereferencing values whether or not the two tables
were both present, which could wind up reading from invalid memory.
The read from a bad address would cause debuggerd itself to crash,
which isn't handled.

Change-Id: Ie936f660018b1980dee5b6ed669588db861f1a79
ebuggerd/symbol_table.c
584b8e30bc8e296f71bcd1cdad95e44c23b3e40f 14-Dec-2010 Mike Dodd <mdodd@google.com> Fix debuggerd (native crash dump).

Change 44659e90f (6cc4923087 in AOSP) introduced walking
both the symbol table and dynamic symbol table. The problem
is that it was dereferencing values whether or not the two tables
were both present, which could wind up reading from invalid memory.
The read from a bad address would cause debuggerd itself to crash,
which isn't handled.

Change-Id: Ie936f660018b1980dee5b6ed669588db861f1a79
ebuggerd/symbol_table.c
e4eb7eab2e8d26c01016518db1f3b740a4f273e6 14-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release
ec34ef58805a9dfe32da37210702c01ff0763f44 14-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "libusbhost: Add accessor for the USB device descriptor"
11549b08a360bf528760c2af0c8007668335d970 14-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "libusbhost: Add support for creating a usb_device struct from an existing fd"
50372073d2919480fb32d56cb3b91663b9fca0f1 13-Dec-2010 Mike Lockwood <lockwood@android.com> libusbhost: Add accessor for the USB device descriptor

Change-Id: Ic3a54e2a06f3b4fa72f99b64025a911fbf525daf
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
cd185f23cc6f062b252d1d19bca55e721290ee62 12-Dec-2010 Mike Lockwood <lockwood@android.com> libusbhost: Add support for creating a usb_device struct from an existing fd

We will use this for sharing USB file descriptors across address spaces via Binder

Change-Id: Iadbd3e0a4178f79d1d778fdfd5175f6fe0e2aaf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
bf5ababdb03907f44437af3294be73ab239d6eb7 14-Dec-2010 Alex Sakhartchouk <alexst@google.com> Merge "Adding Texas Instruments to the VID list."
ffe55f760d269d19bd06dd39f60e1a042881082f 13-Dec-2010 Alex Sakhartchouk <alexst@google.com> Adding Texas Instruments to the VID list.

Change-Id: Ifd35587c93ae7d5c8253f477a92cca2345dc8bb5
db/usb_vendors.c
07eddd885afce2ab4ad0439b19556daf4a759bec 13-Dec-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Remove services for adding SDP records."
1612425c50d2728542cac607fc71a4c8781bf1df 13-Dec-2010 Jaikumar Ganesh <jaikumar@google.com> Remove services for adding SDP records.

This was an inefficient way of doing things and was
temporary. There are now direct calls to Bluez to add reserved
SDP records.

This improves connection time after turning on BT by 6-8 secs.

Change-Id: I8750f44e1de73c9cc935d68710b8964e3f50c3a6
ootdir/init.rc
abf7378f1ebc9012701e84b0796397b0ba630f95 13-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 44659e90: am d3f59eab: Merge "debuggerd: IA version"

* commit '44659e90fe8df25c71195936eabe0cc9158c18a6':
debuggerd: IA version
44659e90fe8df25c71195936eabe0cc9158c18a6 13-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am d3f59eab: Merge "debuggerd: IA version"

* commit 'd3f59eab07d102b9506978aca9541dd62dcea919':
debuggerd: IA version
d3f59eab07d102b9506978aca9541dd62dcea919 13-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "debuggerd: IA version"
5599029c8dacd2c3dc348ac903b35dfa76a93bf0 13-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Manual merge of 144773f9

Change-Id: I0ac3f88ac85bbc604fdc151768da20e86318fb46
144773f9e1371a8d4b848c3136b931d5d0687b38 13-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am e382cc99: Merge "debuggerd: Reorganize to facilitate IA commit"

* commit 'e382cc999e48b3faabea7743ec8cec303b6005ba':
debuggerd: Reorganize to facilitate IA commit
e382cc999e48b3faabea7743ec8cec303b6005ba 13-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "debuggerd: Reorganize to facilitate IA commit"
bb5c1434e508a0107161bea2779127fea3ad6b6c 13-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release
195d04b2db9b1a5507d8f74be3b2148d28f27c63 10-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release
127fd070f038825fc05624e2e3632c47999ffb19 10-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "init: Allow non-root adbd to switch between TCP and USB modes"
58aa5b0ee0ec67d4e0f3b12e27cd58279bef0dee 10-Dec-2010 Mike Lockwood <lockwood@android.com> init: Allow non-root adbd to switch between TCP and USB modes

Change-Id: I9e93ceefadfaa2a4f8ec25cfa05fa4821fd98093
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/property_service.c
535615cf4feda46725859ad1eeee5ea9382196fe 10-Dec-2010 Erik Gilling <konkers@android.com> Merge "toolbox: add verbose option for lsusb"
bec29d4b48619bbbcf49421c78b3529c742e8506 10-Dec-2010 Erik Gilling <konkers@android.com> toolbox: add verbose option for lsusb

Change-Id: If9c51d96af7d69395917af55bb337352576f9422
oolbox/lsusb.c
67ebdce9821d33c41c8bd5cd8bf6259cc82db0cb 10-Dec-2010 Erik Gilling <konkers@android.com> Merge changes I4dcadf8e,I166d2859

* changes:
libusbhost: add usb chapter 9 include to usbhost.h
toolbox: add lsusb command
3af05b09eb116e48997a2d4611b0a1e033737d2e 10-Dec-2010 Erik Gilling <konkers@android.com> libusbhost: add usb chapter 9 include to usbhost.h

Change-Id: I4dcadf8e8d9b25782351c9aeefb0d2cea81bbc9e
nclude/usbhost/usbhost.h
fd1e8553232aa6f3bfbb609158b24fa2e1c3d40b 09-Dec-2010 Erik Gilling <konkers@android.com> toolbox: add lsusb command

Change-Id: I166d2859633ba4e15f170938262dcf6505b78dd3
oolbox/Android.mk
oolbox/lsusb.c
8d758271d4c4ec72e645691a4b9df18014b5aef1 09-Dec-2010 Dima Zavin <dima@android.com> sh: null check signame list since sig 0 is not valid

Change-Id: I1b293246ea1d822e098d0581830500e93633a879
Signed-off-by: Dima Zavin <dima@android.com>
h/trap.c
90493929b23ccd1b6c28702b78e73220e1924055 09-Dec-2010 Ying Wang <wangying@google.com> Merge "dist for dist_files"
1c061b9ea952ebdf6093ca1e7c29bfff6332857e 09-Dec-2010 Ying Wang <wangying@google.com> dist for dist_files

Change-Id: I665572a2212f1239b02b7816e37ada210afbdb48
db/Android.mk
pio/Android.mk
astboot/Android.mk
kbootimg/Android.mk
85235cf4f95222374c1a66c668267ad2a55b93a7 09-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release
d5c8ddfdf3f275226c02dc00ccbe63229acf6786 08-Dec-2010 Iliyan Malchev <malchev@google.com> Revert "Add "slow_start" keyword to init"

This reverts commit 50b3afd9f39619f69dc6f4efc29be88933eb3614.
nit/init.c
nit/init.h
nit/init_parser.c
nit/keywords.h
6388cfe03c1d5695d7cabe244b031af02ef686a8 08-Dec-2010 Iliyan Malchev <malchev@google.com> Revert "HACK: slow_start for mediaserver to prevent restart race condition"

This reverts commit 9db7945ed2f9eb5756aa0c1e5e72fa6240f74847.
ootdir/init.rc
cfb61c272075e0fc25c39110b105825c128ac91f 08-Dec-2010 Kenny Root <kroot@google.com> Cygwin needs HAVE_OFF64_T and fix description

During testing of compilation, it was discovered that Cygwin actually
has off64_t.

Also the description was wrong for HAVE_OFF64_T

Change-Id: I6eb73d13da5a53fb03bf99ab7de82bfb6acab058
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
fe7f8e79e7bb105599c5c93ff29db771ed773acf 07-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release
07ad9961aee0cfcae89e23d47f47314e1d3629c1 07-Dec-2010 Kenny Root <kroot@google.com> Add HAVE_OFF64_T to AndroidConfig.h

For platforms that have _FILE_OFFSET_BITS=32 and need to access large
files, we need some way to access 64-bit file APIs. This adds a hint to
allow programs to choose alternate APIs if possible.

Change-Id: Ifdc204df269350a22f52c0e4221e9d7d3b7a57fe
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-ppc/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
4f7568595283a80cf1021282bcb322b4cea31439 06-Dec-2010 The Android Automerger <android-build@android.com> Merge branch 'master' into honeycomb-release
360e3a68ab0ab5fbea680b3f240d42d76a62fa30 05-Dec-2010 Paul Eastham <eastham@google.com> HACK: slow_start for mediaserver to prevent restart race condition

Change-Id: Ia76385612fd127c5f11b3d64205e350f27acfd82
ootdir/init.rc
145d5063816fd595c1c8b9c26e68c6390270ec76 05-Dec-2010 Paul Eastham <eastham@google.com> Add "slow_start" keyword to init

This keyword will cause init to wait a few seconds before exec'ing
the target binary. Maybe only useful for hacks and debugging.

Change-Id: I85caa0bcbc0be7e48bd21eb9e31e039c0740c8d5
nit/init.c
nit/init.h
nit/init_parser.c
nit/keywords.h
9db7945ed2f9eb5756aa0c1e5e72fa6240f74847 05-Dec-2010 Paul Eastham <eastham@google.com> HACK: slow_start for mediaserver to prevent restart race condition

Change-Id: Ia76385612fd127c5f11b3d64205e350f27acfd82
ootdir/init.rc
50b3afd9f39619f69dc6f4efc29be88933eb3614 05-Dec-2010 Paul Eastham <eastham@google.com> Add "slow_start" keyword to init

This keyword will cause init to wait a few seconds before exec'ing
the target binary. Maybe only useful for hacks and debugging.

Change-Id: I85caa0bcbc0be7e48bd21eb9e31e039c0740c8d5
nit/init.c
nit/init.h
nit/init_parser.c
nit/keywords.h
7e06476f6daf75946d93972e4187f2d600b51fac 30-Nov-2010 Olivier Bailly <olivier@google.com> Merge "Add missing headers for compilation on x86 targets"
6cc492308712613cd23bee9240b1757428841a2f 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> debuggerd: IA version

Change-Id: I0c0d9c2d7e476b8d117aaf505a9480a47c0b5c05
Signed-off-by: Lei Li <lei.l.li@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ebuggerd/Android.mk
ebuggerd/arm/unwind.c
ebuggerd/debuggerd.c
ebuggerd/debuggerd.h
ebuggerd/symbol_table.c
ebuggerd/symbol_table.h
ebuggerd/utility.c
ebuggerd/x86/crashglue.S
ebuggerd/x86/machine.c
ebuggerd/x86/unwind.c
ebuggerd/x86/x86_utility.h
849249064cae9c1bb23b0204b5d35b832567801e 13-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> debuggerd: Reorganize to facilitate IA commit

Change-Id: I22dd02daf617672fc0a8ba7e396017c57f17e26e
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ebuggerd/Android.mk
ebuggerd/arm/crashglue.S
ebuggerd/arm/machine.c
ebuggerd/arm/pr-support.c
ebuggerd/arm/unwind.c
ebuggerd/crasher.c
ebuggerd/crashglue.S
ebuggerd/debuggerd.c
ebuggerd/debuggerd.h
ebuggerd/pr-support.c
ebuggerd/unwind-arm.c
ebuggerd/utility.c
ebuggerd/utility.h
9e04fcde67aca1596664e052c37424cbd910da57 24-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 8f461e5c: resolved conflicts for merge of 1a15cb7e to gingerbread-plus-aosp

* commit '8f461e5cc2972ed5054469b92bc841c07a50b7cf':
[PATCH] Init - make sure the last parameter to execve is NULL
8f461e5cc2972ed5054469b92bc841c07a50b7cf 24-Nov-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 1a15cb7e to gingerbread-plus-aosp

Change-Id: I6468f995c29c6e05f4cb89bedb02cff2ff4bac61
1a15cb7e904a562b0120039816fce5b8e6d5b147 24-Nov-2010 Jean-Baptiste Queru <jbq@google.com> Merge "[PATCH] Init - make sure the last parameter to execve is NULL"
f629a737ebf5d04a55d14b6699e89873d9b50d94 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 720fdebb: am 4906db21: Merge "codeflinger: Correct misleading comment of STM instruction"

* commit '720fdebb4ca2306133099126eb1f10b0b79ccce1':
codeflinger: Correct misleading comment of STM instruction
720fdebb4ca2306133099126eb1f10b0b79ccce1 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 4906db21: Merge "codeflinger: Correct misleading comment of STM instruction"

* commit '4906db21e041327042b87122b233e1f150618334':
codeflinger: Correct misleading comment of STM instruction
4906db21e041327042b87122b233e1f150618334 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> Merge "codeflinger: Correct misleading comment of STM instruction"
3e467f3ec5363bc638484b58b95fbeab4f7bc292 19-Nov-2010 Nick Kralevich <nnk@google.com> Merge "check the return value of setuid and friends"
d49b4ef51eeba026e77f51e9c454464d0c5b9cd9 19-Nov-2010 Mike Lockwood <lockwood@android.com> init.rc: Allow console in userdebug builds

Change-Id: Ib5734c6d3e2bf5a9da3d44721c529971f2345120
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/init.rc
2268718ee2b23936f6db88eff7af03762713c169 18-Nov-2010 Nick Kralevich <nnk@google.com> check the return value of setuid and friends

Under some circumstances, setuid() and family can fail,
returning a non-zero value. (see "man setuid" for details).
If this happens, we want to ensure that init doesn't spawn a
process which has root privileges when it's not suppose to.

Change-Id: Idd03f2c8f82a7eaf6e696b5bcfe308e51ea58b52
nit/init.c
b93e5812faffd3b6c5fb349072413aace31918d8 17-Nov-2010 Olivier Bailly <olivier@google.com> Add missing headers for compilation on x86 targets

Change-Id: I5f4dc797b353a0f01fa00d38375ec303bf863254
nit/devices.c
nit/keychords.c
nit/list.h
ibnetutils/dhcp_utils.c
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/ServiceManager.cpp
oolbox/cmp.c
oolbox/date.c
oolbox/dd.h
oolbox/hd.c
oolbox/ioctl.c
oolbox/nandread.c
oolbox/notify.c
oolbox/schedtop.c
oolbox/setconsole.c
609d8828d3b8266a80606bf902d1294296962cf3 10-Nov-2010 Benoit Goby <benoit@android.com> init: Abort firmware transfer if firmware is missing

If firmware is not found, write -1 /sys/$DEVPATH/loading to cancel the
firmware load. Otherwise the driver has to wait for the 60s timeout.

Change-Id: Id2787cda9b2be45b9adea41f6f161cd54cda212e
Signed-off-by: Benoit Goby <benoit@android.com>
nit/devices.c
a9791e12852a23c762d42aaafa55473cf4a5ed20 10-Nov-2010 Ethan <ethan.too@gmail.com> [PATCH] Init - make sure the last parameter to execve is NULL

We alloc exactly the number of parameters in parse_line_action.
When these parameters are for execve, which request the argv
terminated by a NULL, it may fail randomly, depends on what
is there after the end of the buffer we allocated

Extend the buffer to hold one more pointer, and make sure
it is NULL to fix this bug.

Change-Id: I180df8be3502f51f81a6abb6ebf5c156eb59c9fc
Signed-off-by: Ethan <ethan.too@gmail.com>
nit/parser.c
16ae478af46100a435c2875afa020721a59a411a 02-Nov-2010 Brad Fitzpatrick <bradfitz@android.com> Permit 0 length writes.

Change-Id: I087d0074c8d9e13ce814187475966da94f693fc0
ibsysutils/src/SocketClient.cpp
2e0047bdc067006d1e38418b2a0e24612d8068ba 29-Oct-2010 Mike Lockwood <lockwood@android.com> Add new AID_MEDIA_RW group to control write access to /data/media

BUG: 3113970

Change-Id: I233bd57e36d1e65847ead503e378304a958f492d
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/private/android_filesystem_config.h
4640fc0504ec69446b00dfb7ffcca48b085bf916 26-Oct-2010 Gloria Wang <gwang@google.com> Create directory for DRM plug-ins.

Change-Id: I1bfef96b1949f288852cd88222e0ce2bbb186f40
ootdir/init.rc
8394e8a4834b6db5a65190a9126923fd5b0e2267 28-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> Merge "Add ls -n to toolbox."
a215823fc92d6c0f8623fe18a407d9853aef87cf 28-Oct-2010 Brian Swetland <swetland@google.com> am b7171987: am b4d65399: disable console in user builds
b7171987382b768466a472c4c5f84cc496c95aea 28-Oct-2010 Brian Swetland <swetland@google.com> am b4d65399: disable console in user builds
b4d65399fde02280b718e3b5b5cb1464a885c4b0 28-Oct-2010 Brian Swetland <swetland@google.com> disable console in user builds

Also, run console as shell/log instead of root/root.

Change-Id: I6104f1edddfd5e11843ff41d7839d0c296e6a6f9
ootdir/init.rc
8c5669f9f9a228efebf4059fd4ceace5cece578b 27-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> Let SocketClient users write binary data to clients.

This is a dependency for the DNS proxy CLs.

This CL also adds a new socket for the netd process to inherit which
is owned by the inet group. (so only apps with the INTERNET
permission can use the DNS proxy...)

Change-Id: Ic3475c697913ba85805b4e49801b65e7a1d59289
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
ootdir/init.rc
7ffa661595df7bc71f1ae2e8cefcd658b0f9bdf5 27-Oct-2010 Brian Swetland <swetland@google.com> am 60afdedc: am 146481b9: add rules to set perms for input device sysfs attributes
7ca8f1243b68147c317aa5c6172fc4a7a1ef2567 27-Oct-2010 Brian Swetland <swetland@google.com> am 439b4dfb: am bc57d4ce: init: support owner/permission setting for sysfs attributes of devices
60afdedc4c1a8532893b09d95907d70d577f9d4b 27-Oct-2010 Brian Swetland <swetland@google.com> am 146481b9: add rules to set perms for input device sysfs attributes
439b4dfb27e56684a8d1c249af3cd5c45711618b 27-Oct-2010 Brian Swetland <swetland@google.com> am bc57d4ce: init: support owner/permission setting for sysfs attributes of devices
146481b9468ff60214e41c93896259a7201df7cb 27-Oct-2010 Brian Swetland <swetland@google.com> add rules to set perms for input device sysfs attributes

Change-Id: I28ab7f1ac5cc07ade7830e87f5e70c96464bb686
ootdir/ueventd.rc
bc57d4ce925a62f14c28c55e0ff28af1114f12be 27-Oct-2010 Brian Swetland <swetland@google.com> init: support owner/permission setting for sysfs attributes of devices

This should be much nicer than peppering init.rc with chown/chmod
directives.

Also, remove some dead code and obsolete comments.

Change-Id: I10895f10a9cf2f1226c8d12976cd3db3743da9ec
nit/devices.c
nit/devices.h
nit/ueventd.c
nit/ueventd_parser.h
e7fe5bf3ac2c0218bda75da78975d6a18fe7c167 25-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> Add ls -n to toolbox.

Change-Id: I641f9504554d14fb1289ac470e6e61c5bc12e9c7
oolbox/ls.c
98b1378606780c28501708ca02560c82bb1fda53 23-Oct-2010 Brian Swetland <swetland@google.com> am f3c29f0c: am 5988ea72: add sdcard access permission to ril daemon

Merge commit 'f3c29f0cf287ec3d329b012a2d48808b064632f6'

* commit 'f3c29f0cf287ec3d329b012a2d48808b064632f6':
add sdcard access permission to ril daemon
f3c29f0cf287ec3d329b012a2d48808b064632f6 23-Oct-2010 Brian Swetland <swetland@google.com> am 5988ea72: add sdcard access permission to ril daemon

Merge commit '5988ea726e91fbdc69485b729ea2f532fedfa1d6' into gingerbread-plus-aosp

* commit '5988ea726e91fbdc69485b729ea2f532fedfa1d6':
add sdcard access permission to ril daemon
5988ea726e91fbdc69485b729ea2f532fedfa1d6 23-Oct-2010 Brian Swetland <swetland@google.com> add sdcard access permission to ril daemon

Some RIL daemons write crashdumps to sdcard.

Change-Id: I49a8d2cb342fd7f8bd23dbb1bcc378726e10a579
ootdir/init.rc
43e21849da0ce47f25e198c78e7ca4335b76dde0 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am ec70a9e1: am f2ff2112: Merge "Add config header file for Linux/PPC."

Merge commit 'ec70a9e1b5c12cde090749dc07e29b396b12f656'

* commit 'ec70a9e1b5c12cde090749dc07e29b396b12f656':
Add config header file for Linux/PPC.
5fa7fcf89a978678bcf96730b89f9aad7b6ec97c 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 34961b26: am 6713a2e0: Merge "Fix USB endianness bugs on Linux."

Merge commit '34961b266773006ec6643446e7b5a1558d82e4f4'

* commit '34961b266773006ec6643446e7b5a1558d82e4f4':
Fix USB endianness bugs on Linux.
5985f6ceee15979beee6baa608098f80fc388ccd 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 89463984: am 81347d27: Merge "adb: Improved detection of big endian architecture"

Merge commit '89463984f5576d7ab61303e08f81eb9175afed59'

* commit '89463984f5576d7ab61303e08f81eb9175afed59':
adb: Improved detection of big endian architecture
ec70a9e1b5c12cde090749dc07e29b396b12f656 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am f2ff2112: Merge "Add config header file for Linux/PPC."

Merge commit 'f2ff2112309d03674b88433276a57500b723fa9e' into gingerbread-plus-aosp

* commit 'f2ff2112309d03674b88433276a57500b723fa9e':
Add config header file for Linux/PPC.
34961b266773006ec6643446e7b5a1558d82e4f4 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 6713a2e0: Merge "Fix USB endianness bugs on Linux."

Merge commit '6713a2e0c659be9d992e75ab420da5680f522658' into gingerbread-plus-aosp

* commit '6713a2e0c659be9d992e75ab420da5680f522658':
Fix USB endianness bugs on Linux.
f2ff2112309d03674b88433276a57500b723fa9e 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Add config header file for Linux/PPC."
6713a2e0c659be9d992e75ab420da5680f522658 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix USB endianness bugs on Linux."
89463984f5576d7ab61303e08f81eb9175afed59 20-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 81347d27: Merge "adb: Improved detection of big endian architecture"

Merge commit '81347d2764b32ec7224d4e2ab3348103816400b2' into gingerbread-plus-aosp

* commit '81347d2764b32ec7224d4e2ab3348103816400b2':
adb: Improved detection of big endian architecture
81347d2764b32ec7224d4e2ab3348103816400b2 20-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge "adb: Improved detection of big endian architecture"
12ddbea0fd87ff21da94d25f0ebe89cbfd004a3b 18-Oct-2010 Mike Lockwood <lockwood@google.com> am a8b8c0e2: am d02e521d: adb: Add support for Philips\'s USB vendor ID

Merge commit 'a8b8c0e21ac4bdb7838c8c1b8e7d60f632eda79b'

* commit 'a8b8c0e21ac4bdb7838c8c1b8e7d60f632eda79b':
adb: Add support for Philips's USB vendor ID
457ce8f67224529a6f3524e8bbca2ecba3a80cc3 17-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 67672e04: Merge a775965b from gingerbread

Merge commit '67672e04111a6cfdf572023a154675749c3fb550'

* commit '67672e04111a6cfdf572023a154675749c3fb550':
Add AID_NFC for use by the NFC service.
5ca7509f5b188231666973a66566e6de2e3d48db 16-Oct-2010 Xavier Ducrohet <xav@android.com> am fa5c690d: am 89aff1d2: Add Asus USB vendor ID to adb.

Merge commit 'fa5c690d93b92ccf57a0522c498ca2076a7ad98d'

* commit 'fa5c690d93b92ccf57a0522c498ca2076a7ad98d':
Add Asus USB vendor ID to adb.
de58105fad20e26c2997eec30a8dfebeacf28e32 16-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 287a9585: am 8e0e372a: Set PROT_EXEC on the whole pixelflinger code cache.

Merge commit '287a9585dc85bff9b81e962f6be4f2b36512d345'

* commit '287a9585dc85bff9b81e962f6be4f2b36512d345':
Set PROT_EXEC on the whole pixelflinger code cache.
b08f7d896af6e9132bc497eaf605551c1e962c90 22-Sep-2010 Marcus Comstedt <marcus@mc.pp.se> Add config header file for Linux/PPC.

Change-Id: I892e9d922ba4b4090bdb5de00d8cc7adf0123cfe
nclude/arch/linux-ppc/AndroidConfig.h
6f703a2e85a3098b3546a0ce254349b72b440628 22-Sep-2010 Marcus Comstedt <marcus@mc.pp.se> Fix USB endianness bugs on Linux.

The fields device->idVendor and device->idProduct should not be
converted from little endian to native byteorder, because the
kernel has in fact done so already!

On the other hand, the descriptors read using raw ioctl:s in
register_device() do need to be converted.

Change-Id: I5fe08b626b14ead56a592b68d026690e343c2656
db/usb_linux.c
d340d2f57dc0d414ea66b1b556caaf8c98b1e967 22-Sep-2010 Marcus Comstedt <marcus@mc.pp.se> adb: Improved detection of big endian architecture

Instead of testing for the (compiler specific) define
__ppc__ explicitly, use the define HAVE_BIG_ENDIAN provided by
AndroidConfig.h. That way, it should work on all big endian
systems.

Change-Id: Ic4d62afcefce4c8ad5716178ebfcb2b055ac73ce
db/file_sync_service.h
db/transport_local.c
db/transport_usb.c
a8b8c0e21ac4bdb7838c8c1b8e7d60f632eda79b 16-Oct-2010 Mike Lockwood <lockwood@google.com> am d02e521d: adb: Add support for Philips\'s USB vendor ID

Merge commit 'd02e521d79a49471b3f1dc3717e842948df64789' into gingerbread-plus-aosp

* commit 'd02e521d79a49471b3f1dc3717e842948df64789':
adb: Add support for Philips's USB vendor ID
67672e04111a6cfdf572023a154675749c3fb550 16-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge a775965b from gingerbread

Change-Id: I8c08cca033ef3efe6badd2a7ba4674dfb02d6b60
dc8827ee2388687a6f08a0c2da8505cdace737a6 16-Oct-2010 Raphael Moll <raphael@google.com> am 7e65ede6: am 9cd8057b: Merge "Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin." into gingerbread

Merge commit '7e65ede62065925e29b5b18f253758bb280f9383'

* commit '7e65ede62065925e29b5b18f253758bb280f9383':
Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.
d02e521d79a49471b3f1dc3717e842948df64789 16-Oct-2010 Mike Lockwood <lockwood@google.com> adb: Add support for Philips's USB vendor ID

Change-Id: Iaf2e3f6f111198740703b5c3581d95756f797224
Signed-off-by: Mike Lockwood <lockwood@google.com>
db/usb_vendors.c
3b5d79b78cfdeefccaa5b50c72fe2e5d0636178d 15-Oct-2010 Xavier Ducrohet <xav@android.com> am 1693c32f: am 6c263694: Fix KT Tech\'s usb vendor ID.

Merge commit '1693c32f42e69634b52df1bf827fd81dc3abda46'

* commit '1693c32f42e69634b52df1bf827fd81dc3abda46':
Fix KT Tech's usb vendor ID.
fa5c690d93b92ccf57a0522c498ca2076a7ad98d 15-Oct-2010 Xavier Ducrohet <xav@android.com> am 89aff1d2: Add Asus USB vendor ID to adb.

Merge commit '89aff1d22662c64cc2de384e7e2c699e4d1d5d47' into gingerbread-plus-aosp

* commit '89aff1d22662c64cc2de384e7e2c699e4d1d5d47':
Add Asus USB vendor ID to adb.
a775965b6c58b67f3d26a854a835db27c3244e0d 15-Oct-2010 Nick Pelly <npelly@google.com> Merge "Add AID_NFC for use by the NFC service." into gingerbread
89aff1d22662c64cc2de384e7e2c699e4d1d5d47 15-Oct-2010 Xavier Ducrohet <xav@android.com> Add Asus USB vendor ID to adb.

Bug: 3099385

Change-Id: Ic068fbf58abd23f4bddfe13ae33854a8b4053cf8
db/usb_vendors.c
b0a711ad8414b600155002f6257bc84e9f1f5f60 15-Oct-2010 Paul Eastham <eastham@google.com> Merge "Properly reflect RENAME ops in FUSE internal state"
287a9585dc85bff9b81e962f6be4f2b36512d345 15-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 8e0e372a: Set PROT_EXEC on the whole pixelflinger code cache.

Merge commit '8e0e372a388434a0553810e2b958e59a26a6bd96' into gingerbread-plus-aosp

* commit '8e0e372a388434a0553810e2b958e59a26a6bd96':
Set PROT_EXEC on the whole pixelflinger code cache.
85905a6ab4d970f04d421bd2077ba4ad6fe67c3e 15-Oct-2010 Nick Pelly <npelly@google.com> Add AID_NFC for use by the NFC service.

Change-Id: I5b92f87dbacb9d855d99e10b3811f290fb64a144
Signed-off-by: Nick Pelly <npelly@google.com>
nclude/private/android_filesystem_config.h
8e0e372a388434a0553810e2b958e59a26a6bd96 14-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Set PROT_EXEC on the whole pixelflinger code cache.

The pointer difference between word pointers is a number
of words, and it needs to be multiplied by the size of a word
to get a proper byte size.

Without this, we tend to see crashes when the code crosses
a page boundary.

Bug: 3026204
Bug: 3097482
Change-Id: I37776d26d5afcdb1da71680de02fbb95e6548371
ibpixelflinger/codeflinger/CodeCache.cpp
7e65ede62065925e29b5b18f253758bb280f9383 14-Oct-2010 Raphael Moll <raphael@google.com> am 9cd8057b: Merge "Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin." into gingerbread

Merge commit '9cd8057b6e8f5fc1254a4ed19e8127b5091b5dce' into gingerbread-plus-aosp

* commit '9cd8057b6e8f5fc1254a4ed19e8127b5091b5dce':
Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.
9cd8057b6e8f5fc1254a4ed19e8127b5091b5dce 14-Oct-2010 Raphael Moll <raphael@google.com> Merge "Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin." into gingerbread
1693c32f42e69634b52df1bf827fd81dc3abda46 14-Oct-2010 Xavier Ducrohet <xav@android.com> am 6c263694: Fix KT Tech\'s usb vendor ID.

Merge commit '6c2636947c43c2950488d8d82bfc691cb907518d' into gingerbread-plus-aosp

* commit '6c2636947c43c2950488d8d82bfc691cb907518d':
Fix KT Tech's usb vendor ID.
11ccdb3be67b22f677065715ace68aabf371acc7 14-Oct-2010 Paul Eastham <eastham@google.com> Properly reflect RENAME ops in FUSE internal state

In response to a RENAME, we actually need to rename and move the virtual
node. To support this, filenames are now allocated separately, as reallocing
the whole node to accommodate a longer filename would break the direct
mapping of fhs and inodes to fuse pointers.

Change-Id: I71e5a965f875dedc5f58f9d182156734b29ca179
dcard/sdcard.c
6c2636947c43c2950488d8d82bfc691cb907518d 14-Oct-2010 Xavier Ducrohet <xav@android.com> Fix KT Tech's usb vendor ID.

Change-Id: I77a6de8c11d490e2427f704ff64e7c09874a5d14
db/usb_vendors.c
bb8ebabfd47805e0d72273e91492f215a9994c00 14-Oct-2010 Raphael Moll <raphael@google.com> Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.

This is used by build\libs\host\CopyFile.c

Also define HAVE_PRINTF_ZD since printf %zd is not
supported on MinGW/Cygwin.
This is used by frmk/base/libs/utils/ZipFileRO.cpp

Change-Id: I570ac5dd0a5b256ee67ad62433f1226597da3ea4
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
503818eb662a9376b5d5d3ed06d7d2516db389ec 11-Oct-2010 Carl Shapiro <cshapiro@google.com> am 5c5ff87d: am 83c6b052: Print out the signal code along with signal number and address.

Merge commit '5c5ff87ded019537bbaf6383618ef2956aaa0407'

* commit '5c5ff87ded019537bbaf6383618ef2956aaa0407':
Print out the signal code along with signal number and address.
5c5ff87ded019537bbaf6383618ef2956aaa0407 10-Oct-2010 Carl Shapiro <cshapiro@google.com> am 83c6b052: Print out the signal code along with signal number and address.

Merge commit '83c6b052918178033875e7ea54ca746cf7303f87' into gingerbread-plus-aosp

* commit '83c6b052918178033875e7ea54ca746cf7303f87':
Print out the signal code along with signal number and address.
83c6b052918178033875e7ea54ca746cf7303f87 09-Oct-2010 Carl Shapiro <cshapiro@google.com> Print out the signal code along with signal number and address.

Change-Id: I60a8b13f706714e80b11bc517101715dfe1c73c1
ebuggerd/debuggerd.c
dff02374301f93860568c7805e20b55e2e04a179 07-Oct-2010 Benoit Goby <benoit@android.com> Don't build adb for sdk only builds

Change-Id: I0c56213e81a889fd3a7c5e72c4a6e63544a2a3bd
Signed-off-by: Benoit Goby <benoit@android.com>
db/Android.mk
cb56b712b559dc66d10a3993b60ee4886cebac73 07-Oct-2010 Benoit Goby <benoit@android.com> Don't build adb for simulator target

Change-Id: Ibe4ef6bb111dc7123e53262553deb8f5e25e9391
Signed-off-by: Benoit Goby <benoit@android.com>
db/Android.mk
c318833b359164f25d7a93f6395c0cad787bacd7 24-Sep-2010 John Michelau <john.michelau@motorola.com> Build adb for target-as-host

Added a new target for adb, so that the adb
host executable is built for the target as
well. This allows the target to connect to
any Android devices which are attached to it.

Bug: 3022194
Change-Id: Ib01983e70b75cec40a9ee161da7f4cf1343eecf2
db/Android.mk
db/adb.h
597e46aff44d972a6ca2942107d292fe612d8912 06-Oct-2010 Kenny Root <kroot@google.com> am d9387cfc: am 6be460d5: Add HAVE_PREAD definition to platforms

Merge commit 'd9387cfc95ec773359bd52b08a52d02624e6265f'

* commit 'd9387cfc95ec773359bd52b08a52d02624e6265f':
Add HAVE_PREAD definition to platforms
d9387cfc95ec773359bd52b08a52d02624e6265f 05-Oct-2010 Kenny Root <kroot@google.com> am 6be460d5: Add HAVE_PREAD definition to platforms

Merge commit '6be460d5b0b60aca4e8d649e2254f8a8920f4d98' into gingerbread-plus-aosp

* commit '6be460d5b0b60aca4e8d649e2254f8a8920f4d98':
Add HAVE_PREAD definition to platforms
6be460d5b0b60aca4e8d649e2254f8a8920f4d98 04-Oct-2010 Kenny Root <kroot@google.com> Add HAVE_PREAD definition to platforms

ZipFileRO uses pread() to guarantee atomic reads at an offset, so use
the HAVE_PREAD flag to trigger off of. The only platform that doesn't
implement it directly is Windows.

Change-Id: Ic927611dc45b75ff8f672ed59afee5be1ad07ab4
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
8adcde9534b56d18bfe45622117c91b20aa587b1 04-Oct-2010 Kenny Root <kroot@google.com> Add HAVE_PREAD definition to platforms

ZipFileRO uses pread() to guarantee atomic reads at an offset, so use
the HAVE_PREAD flag to trigger off of. The only platform that doesn't
implement it directly is Windows.

Change-Id: I52d4e61010bb97e2d50af09943a2e94c0417bb5f
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
cfa0d8439384a1aaa53d31fb720c234cabf796ee 03-Oct-2010 Wink Saville <wink@google.com> Allow AID_RADIO to restart the ril-daemon.

This enhances robustness by allowing the Telephony Framework to restart
ril-daemon if it notices some catastrophic failure.

Added setprop ctl.restart.
Added ril-daemon to setprop control_perms and allow users/groups
with the AID_RADIO ID to control it.

Change-Id: I195abdd754a731ce0b77e8f71ab47fde8c3e7977
nit/init.c
nit/property_service.c
4cfef735d54a752a183dcbe304ea2975c032666f 02-Oct-2010 Andy McFadden <fadden@android.com> Merge "Use DMB ST for store fence."
2bf937e6bbe3137cd97596e8f1f26ed45415eb4b 01-Oct-2010 Andy McFadden <fadden@android.com> Use DMB ST for store fence.

Change-Id: Ic713f30fcec0f2d2eb486c549917575ff0afa82f
nclude/cutils/atomic-arm.h
64092e852d0879d07ded15c429473c45da389454 01-Oct-2010 Mike Lockwood <lockwood@android.com> am 78ea2374: am 912ff85b: init: Add support for SOCK_SEQPACKET socket type

Merge commit '78ea2374c5c87d7bb58747b1a6173c598f386600'

* commit '78ea2374c5c87d7bb58747b1a6173c598f386600':
init: Add support for SOCK_SEQPACKET socket type
78ea2374c5c87d7bb58747b1a6173c598f386600 01-Oct-2010 Mike Lockwood <lockwood@android.com> am 912ff85b: init: Add support for SOCK_SEQPACKET socket type

Merge commit '912ff85b035e0e6bc109812c1ea5661ea4df5967' into gingerbread-plus-aosp

* commit '912ff85b035e0e6bc109812c1ea5661ea4df5967':
init: Add support for SOCK_SEQPACKET socket type
912ff85b035e0e6bc109812c1ea5661ea4df5967 01-Oct-2010 Mike Lockwood <lockwood@android.com> init: Add support for SOCK_SEQPACKET socket type

Change-Id: Ib264ecf9beb2685b070436d2bdec9655c7a31b47
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/init.c
nit/init_parser.c
nit/readme.txt
e3ba1801f0b6f9a1fc1c46e4c057afdd8a45efe1 29-Sep-2010 Brian Carlstrom <bdc@google.com> am f1fd5eb8: am 2f7b72f9: netstat should include /proc/net/tcp6 and /proc/net/udp6 data

Merge commit 'f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e'

* commit 'f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e':
netstat should include /proc/net/tcp6 and /proc/net/udp6 data
f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e 29-Sep-2010 Brian Carlstrom <bdc@google.com> am 2f7b72f9: netstat should include /proc/net/tcp6 and /proc/net/udp6 data

Merge commit '2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c' into gingerbread-plus-aosp

* commit '2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c':
netstat should include /proc/net/tcp6 and /proc/net/udp6 data
2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c 28-Sep-2010 Brian Carlstrom <bdc@google.com> netstat should include /proc/net/tcp6 and /proc/net/udp6 data

Update netstat.c to process /proc/net/tcp6 and /proc/net/udp6.
Example input and output and output follows.

cat /proc/net/tcp:
sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode
0: 0100007F:13AD 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 669 1 c74dbb40 300 0 0 2 -1
1: 0100007F:A432 0100007F:2253 01 00000000:00000000 00:00000000 00000000 0 0 15257 1 c74da040 22 4 16 2 -1

cat /proc/net/udp:
sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode ref pointer drops

cat /proc/net/tcp6:
sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode
0: 00000000000000000000000000000000:8A88 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15461 1 c730aaa0 300 0 0 2 -1
1: 00000000000000000000000000000000:2253 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15255 1 c7393060 300 0 0 2 -1
2: 00000000000000000000000000000000:C91B 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15261 1 c6591080 300 0 0 2 -1
3: 0000000000000000FFFF00000100007F:C91B 0000000000000000FFFF00000100007F:9238 01 00000000:00000000 00:00000000 00000000 0 0 15263 1 c7394aa0 22 4 29 4 -1
4: 0000000000000000FFFF00000100007F:C0E9 0000000000000000FFFF00000100007F:D3A4 01 00000000:00000000 00:00000000 00000000 0 0 15274 1 c7393aa0 22 4 26 4 -1
5: 0000000000000000FFFF00000100007F:C41A 0000000000000000FFFF00000100007F:B031 01 00000000:00000000 00:00000000 00000000 0 0 15269 1 c7126ac0 22 4 29 4 -1
6: 0000000000000000FFFF00000100007F:2253 0000000000000000FFFF00000100007F:A432 01 00000000:00000000 00:00000000 00000000 0 0 15256 1 c65e9040 21 0 0 5 -1
7: 0000000000000000FFFF00000100007F:9238 0000000000000000FFFF00000100007F:C91B 01 00000000:00000000 00:00000000 00000000 0 0 15262 1 c7394580 22 4 16 4 -1
8: 0000000000000000FFFF00000100007F:B031 0000000000000000FFFF00000100007F:C41A 01 00000000:00000000 00:00000000 00000000 0 0 15268 1 c71585a0 22 4 16 4 -1
9: 0000000000000000FFFF00000100007F:8A88 0000000000000000FFFF00000100007F:8A31 01 00000000:00000000 00:00000000 00000000 0 0 15503 1 c71265a0 22 4 30 2 -1
10: 0000000000000000FFFF00000100007F:D3A4 0000000000000000FFFF00000100007F:C0E9 01 00000000:00000000 00:00000000 00000000 0 0 15273 1 c7126080 22 4 12 4 -1
11: 0000000000000000FFFF00000100007F:8A31 0000000000000000FFFF00000100007F:8A88 01 00000000:00000000 00:00000000 00000000 0 0 15502 1 c730a060 22 0 0 3 -1

cat /proc/net/udp6:
sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode ref pointer drops
86: 00000000000000000000000000000000:A256 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14302 2 c6d13820 0
102: 00000000000000000000000000000000:A466 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14301 2 c6d13ac0 0
125: 00000000000000000000000000000000:8B7D 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14295 2 c6d13d60 0

netstat:
Proto Recv-Q Send-Q Local Address Foreign Address State
tcp 0 0 127.0.0.1:5037 0.0.0.0:* LISTEN
tcp 0 0 127.0.0.1:42034 127.0.0.1:8787 ESTABLISHED
tcp6 0 0 :::35464 :::* LISTEN
tcp6 0 0 :::8787 :::* LISTEN
tcp6 0 0 :::51483 :::* LISTEN
tcp6 0 0 ::ffff:127.0.0.1:51483 ::ffff:127.0.0.1:37432 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:49385 ::ffff:127.0.0.1:54180 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:50202 ::ffff:127.0.0.1:45105 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:8787 ::ffff:127.0.0.1:42034 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:37432 ::ffff:127.0.0.1:51483 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:45105 ::ffff:127.0.0.1:50202 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:35464 ::ffff:127.0.0.1:35377 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:54180 ::ffff:127.0.0.1:49385 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:35377 ::ffff:127.0.0.1:35464 ESTABLISHED
udp6 0 0 :::41558 :::* CLOSE
udp6 0 0 :::42086 :::* CLOSE
udp6 0 0 :::35709 :::* CLOSE

Bug: 2511871

Change-Id: I25e0470ba65e8a88e57506ae26232a7c43a9c16b
oolbox/Android.mk
oolbox/netstat.c
a4176578804e1b300f7652919161be035cf3cfd2 29-Sep-2010 Carl Shapiro <cshapiro@google.com> am df2f5a07: am d55f0adf: Qualify the source argument of atomic loads as a const pointer.

Merge commit 'df2f5a07aecac7be4ac2d1100668a0396fd256e7'

* commit 'df2f5a07aecac7be4ac2d1100668a0396fd256e7':
Qualify the source argument of atomic loads as a const pointer.
df2f5a07aecac7be4ac2d1100668a0396fd256e7 28-Sep-2010 Carl Shapiro <cshapiro@google.com> am d55f0adf: Qualify the source argument of atomic loads as a const pointer.

Merge commit 'd55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa' into gingerbread-plus-aosp

* commit 'd55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa':
Qualify the source argument of atomic loads as a const pointer.
d55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa 28-Sep-2010 Carl Shapiro <cshapiro@google.com> Qualify the source argument of atomic loads as a const pointer.

Also normalizes the opening brace placment in a few locations.

Change-Id: I8f518e933094337d5d3371321326ffc03b3a5f5a
nclude/cutils/atomic-arm.h
nclude/cutils/atomic-x86.h
nclude/cutils/atomic.h
ibcutils/atomic-android-sh.c
579ca37361b2b1ea9aa62d6b450866e1f48db064 28-Sep-2010 Xavier Ducrohet <xav@android.com> am 1e3f8f27: am f62b23f2: Add new USB vendor IDs.

Merge commit '1e3f8f2769f9a227fe4d4abfe3d26083e4da91e9'

* commit '1e3f8f2769f9a227fe4d4abfe3d26083e4da91e9':
Add new USB vendor IDs.
1e3f8f2769f9a227fe4d4abfe3d26083e4da91e9 28-Sep-2010 Xavier Ducrohet <xav@android.com> am f62b23f2: Add new USB vendor IDs.

Merge commit 'f62b23f2c1540221621024c850fdf615dda0c903' into gingerbread-plus-aosp

* commit 'f62b23f2c1540221621024c850fdf615dda0c903':
Add new USB vendor IDs.
f62b23f2c1540221621024c850fdf615dda0c903 28-Sep-2010 Xavier Ducrohet <xav@android.com> Add new USB vendor IDs.

Change-Id: Ie3b1ee09c67c4c8fdb294cfc99fa28e4ebe8dfae
db/usb_vendors.c
b07c78aa942a09fb1a3ae4eecaca793be9c431d1 27-Sep-2010 Mike Lockwood <lockwood@android.com> am d1971c4c: resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp

Merge commit 'd1971c4cac37fccdccd105f78f7252582685ccd9'

* commit 'd1971c4cac37fccdccd105f78f7252582685ccd9':
Add AID_GPS user ID for GPS daemon
d1971c4cac37fccdccd105f78f7252582685ccd9 27-Sep-2010 Mike Lockwood <lockwood@android.com> resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp

Change-Id: I860b7690c40428839e45e2c2b122661b00d47e0e
c29919c8d75ad218012daeda62e1e62200cad889 27-Sep-2010 Mike Lockwood <lockwood@android.com> Add AID_GPS user ID for GPS daemon

Change-Id: I2f8ffba40e3f5145b37296f19c698e08d768ce59
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/private/android_filesystem_config.h
0715f91223b2f7a91ea08bfa95998d846e7977cf 27-Sep-2010 Mathias Agopian <mathias@google.com> update adbd to use the new screencap command for taking screenshots.

Change-Id: I02c49240f9db9258824020f3f5f04463e17a537a
db/framebuffer_service.c
b32007c54b9a8b6670e78a42eb9f8b0a21ed9559 24-Sep-2010 Brian Carlstrom <bdc@google.com> Merge "Add definitions for store barrier."
464431e65fbede57b0d41d230fe6f6dc465c20f8 24-Sep-2010 Brian Carlstrom <bdc@google.com> Add definitions for store barrier.

I usually call this a "store/store barrier" for maximum clarity, but
the common way of describing it is "store barrier" or "store fence".

This doesn't use "dmb st" yet since we're waiting on the toolchain
update, but it gets the various macros and inline functions in place
so we can use them in the VM.

Bug 3003477

git cherry-pick 2ba5eec3972b4ce46feb677116534fcd3d136e0a

Change-Id: Ifd2d3588be96aa529d490789436cf48c962021ba
nclude/cutils/atomic-arm.h
nclude/cutils/atomic-inline.h
nclude/cutils/atomic-x86.h
f43219e0b1022b257499289ceb951f6a1a44bf9c 22-Sep-2010 Paul Eastham <eastham@google.com> Partially implement SETATTR for sdcard/FUSE

Handle truncate cases within SETATTR so that truncate() and ftruncate() call
will work.

Change-Id: I5a9862dcaa6ca7b5e9115cb5d3bfed88787fa7ac
Signed-off-by: Paul Eastham <eastham@google.com>
dcard/sdcard.c
d7482b2f4cdd6a35f8707d94536801a958120b6b 22-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 33357f54: am 6490257d: Make netd restart when system server hangs on it.

Merge commit '33357f5477a24cb16bd3dd692fe5ca14755ab033'

* commit '33357f5477a24cb16bd3dd692fe5ca14755ab033':
Make netd restart when system server hangs on it.
33357f5477a24cb16bd3dd692fe5ca14755ab033 22-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 6490257d: Make netd restart when system server hangs on it.

Merge commit '6490257d116c35d3da927ee7b91179dde64ef713' into gingerbread-plus-aosp

* commit '6490257d116c35d3da927ee7b91179dde64ef713':
Make netd restart when system server hangs on it.
6490257d116c35d3da927ee7b91179dde64ef713 22-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Make netd restart when system server hangs on it.

netd has been seen hanging (cause suspected but unconfirmed)
which then brings down the system server which blocks forever
on its main thread trying to connect to netd with its hung
event loop.

This then results in an infinite watchdog runtime restart loop
because the situation never improves: netd is still borked.

Instead, we should kill netd and give it another chance when
the system server dies.

Bug: 3018996
Bug: 3017876
Change-Id: Ibf9ecf0ffcb78e48c38e5167f21cbeefe0e2a47f
ootdir/init.rc
d06df51bcd7bcc2656089a529fa6a455bad00d37 19-Sep-2010 Brian Swetland <swetland@google.com> resolved conflicts for merge of 3b5214a6 to master

Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
3b5214a67f43e2e4f69428e98d3a2c130c7c87d8 19-Sep-2010 Brian Swetland <swetland@google.com> am 02863b95: add /vendor support

Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp

* commit '02863b957cfbfc302d3136ed78c0cba86accacd8':
add /vendor support
02863b957cfbfc302d3136ed78c0cba86accacd8 19-Sep-2010 Brian Swetland <swetland@google.com> add /vendor support

- look in /vendor/firmware/... in addition to /system/etc/firmware/... for firmware loading
- add /vendor/bin to path before /system/bin
- add /vendor/lib to ldpath before /system/lib
- configure appropriate permissions for /system/vendor/bin
- symlink /vendor -> /system/vendor

Change-Id: I0c06ca1e38a44f0c7024cee6cea8907aa93a4532
nclude/private/android_filesystem_config.h
nit/devices.c
ootdir/init.rc
1f7bc6d1a94d36547a7f5bbd5e039fffc37e9629 15-Sep-2010 Mathias Agopian <mathias@google.com> am 06b21887: am 2da0032c: add graphics events to the eventlog definitions

Merge commit '06b21887e8f5719e9b421371b4a47ef371c972b5'

* commit '06b21887e8f5719e9b421371b4a47ef371c972b5':
add graphics events to the eventlog definitions
3000e4f9c40a8fbccfae71a5885de6aa3eb77d64 15-Sep-2010 Kenny Root <kroot@google.com> am 1db75e7b: am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread

Merge commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860'

* commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860':
Fetch peer credentials for local sockets
9a5c61a2777ea41dbbe1fbfc4ad3ea4203993302 15-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 2c42e440: am 9915e3fd: Add dvm_lock_sample\'s new fields.

Merge commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987'

* commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987':
Add dvm_lock_sample's new fields.
f254ddc7616e281b59b6e68f8ad0020bf682ed0b 15-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 0e6242f7: am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread

Merge commit '0e6242f7e2c1181d486ae8f86592619738574dd3'

* commit '0e6242f7e2c1181d486ae8f86592619738574dd3':
Add missing lock in SocketListener.
89b01a815ea4eadcb4a8d609c9a449ccfd9cdcea 15-Sep-2010 Kenny Root <kroot@google.com> am c3fa6149: am f31d2ed1: Return false on socket read error

Merge commit 'c3fa6149284058b30e3eea5010c16d3133711afb'

* commit 'c3fa6149284058b30e3eea5010c16d3133711afb':
Return false on socket read error
06b21887e8f5719e9b421371b4a47ef371c972b5 15-Sep-2010 Mathias Agopian <mathias@google.com> am 2da0032c: add graphics events to the eventlog definitions

Merge commit '2da0032c9447d0e259be31872e123559b5442d8f' into gingerbread-plus-aosp

* commit '2da0032c9447d0e259be31872e123559b5442d8f':
add graphics events to the eventlog definitions
2da0032c9447d0e259be31872e123559b5442d8f 14-Sep-2010 Mathias Agopian <mathias@google.com> add graphics events to the eventlog definitions

by default this logging is turned off

Change-Id: Ic7e5fe2b377c4760e1673e7d19a69d34cc9333c9
ogcat/event.logtags
1db75e7b9b5159fa3bcf1cfdc4efba62c570d860 14-Sep-2010 Kenny Root <kroot@google.com> am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread

Merge commit '6fd75635d820754295557c300ccee89c643864cc' into gingerbread-plus-aosp

* commit '6fd75635d820754295557c300ccee89c643864cc':
Fetch peer credentials for local sockets
6fd75635d820754295557c300ccee89c643864cc 14-Sep-2010 Kenny Root <kroot@google.com> Merge "Fetch peer credentials for local sockets" into gingerbread
30abb7234de2a9caa1add4b00a189436f0b24560 14-Sep-2010 Kenny Root <kroot@google.com> Fetch peer credentials for local sockets

Fetch the PID, UID, and GID of the remote side of a local socket
connection in case any users of this library class want to check it.

Change-Id: Ia3230e6bc68ab6f93160df9f5996d2bf744b872c
nclude/sysutils/SocketClient.h
ibsysutils/src/SocketClient.cpp
2c42e4404bba0a1b065d223a1e84ef7184e1a987 14-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 9915e3fd: Add dvm_lock_sample\'s new fields.

Merge commit '9915e3fd389519764436ad029ef2f172eb1cc0ca' into gingerbread-plus-aosp

* commit '9915e3fd389519764436ad029ef2f172eb1cc0ca':
Add dvm_lock_sample's new fields.
9915e3fd389519764436ad029ef2f172eb1cc0ca 14-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Add dvm_lock_sample's new fields.

Change-Id: I2ec442834c38d3716695ab90bf0db220bd8dae27
ogcat/event.logtags
0e6242f7e2c1181d486ae8f86592619738574dd3 14-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread

Merge commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6' into gingerbread-plus-aosp

* commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6':
Add missing lock in SocketListener.
40c2b7cbedff612ce8bc7a51589a952cc1d047b6 14-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Merge "Add missing lock in SocketListener." into gingerbread
c3fa6149284058b30e3eea5010c16d3133711afb 14-Sep-2010 Kenny Root <kroot@google.com> am f31d2ed1: Return false on socket read error

Merge commit 'f31d2ed1fd3a39a92bccc12eb66728594290ef3b' into gingerbread-plus-aosp

* commit 'f31d2ed1fd3a39a92bccc12eb66728594290ef3b':
Return false on socket read error
86d01dec4b8690d94053fbe86d46c9ae26de9ae6 14-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Add missing lock in SocketListener.

Change-Id: I3d97a06381fce67ef13b1ccdeaa4e8e2830ab2aa
ibsysutils/src/SocketListener.cpp
f31d2ed1fd3a39a92bccc12eb66728594290ef3b 14-Sep-2010 Kenny Root <kroot@google.com> Return false on socket read error

FrameworkListener was returning the errno from a function marked as
returning bool which caused an implicit conversion to true since we were
in an error block where errno was set to something non-zero.

This caused the clients that had errors to stick around forever and not
get removed from the set of file descriptors that SocketListener was
listening to.

Change-Id: Ia27a4cac47459f3a3c2bb6a7f66803a3165c894a
ibsysutils/src/FrameworkListener.cpp
14200b4c3b04ccdcd45420fa9394fb6412728906 12-Sep-2010 Brian Swetland <swetland@google.com> am 5833769d: am 09dd3e57: make df more readable

Merge commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1'

* commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1':
make df more readable
5833769d9aa41dfb28a74c665fda0fca9c321fc1 12-Sep-2010 Brian Swetland <swetland@google.com> am 09dd3e57: make df more readable

Merge commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46' into gingerbread-plus-aosp

* commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46':
make df more readable
09dd3e57b920c8f65cb486313a4c0f35b8cb9f46 12-Sep-2010 Brian Swetland <swetland@google.com> make df more readable

Filesystem Size Used Free Blksize
/dev 164M 32K 164M 4096
/system 442M 117M 325M 4096
/cache 492M 8M 483M 4096
/data 984M 59M 925M 4096
/mnt/sdcard 12G 27M 12G 32768

Change-Id: I9a84b7b84ae528ee5cf0b1e92a8bee032b87703b
oolbox/df.c
0dd00036d2a292d96376fbbd22bdc89580f4559c 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 1d10577e: manual merge from readonly-korg-master

Merge commit '1d10577e9b474a5099d0f5a09468c55a0324d876'

* commit '1d10577e9b474a5099d0f5a09468c55a0324d876':
Don't alias 'stop' to 'kill -STOP'
a5220b24d1b17b142e373aacbadf79a00effbbf0 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 26ce6e0e: manual merge from readonly-korg-master

Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1'

* commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1':
- Add drm and drmio service
1d10577e9b474a5099d0f5a09468c55a0324d876 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> manual merge from readonly-korg-master

Change-Id: Id4a09fa11fee4262d9b945369b595644cca6d330
26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> manual merge from readonly-korg-master

Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
f41986bbc79055a4feed7266cac5c1b540296daf 10-Sep-2010 Jeff Hamilton <jham@android.com> Don't alias 'stop' to 'kill -STOP'

Android has already has a stop command used
to stop the main runtime and the alias
interferes with testing tools that expect
stop to kill the runtime.

Change-Id: I02b7efb9203dc39e97f63eb702a54ff79935b316
ksh/src/00-NOTE.txt
ksh/src/check.t
ksh/src/main.c
bb130ba7998e82e79cd94cddee2b97b1ed977f21 09-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM related data"
e6d8a5f1dfb81113b9421ea353915cde426023ed 09-Sep-2010 Brian Swetland <swetland@google.com> am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread

Merge commit '8df3a4a554184afba71887995c5f0983ce81196f'

* commit '8df3a4a554184afba71887995c5f0983ce81196f':
remount / as read-only only on post-fs to allow per-target config of /
8df3a4a554184afba71887995c5f0983ce81196f 09-Sep-2010 Brian Swetland <swetland@google.com> am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread

Merge commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4' into gingerbread-plus-aosp

* commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4':
remount / as read-only only on post-fs to allow per-target config of /
4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4 09-Sep-2010 Brian Swetland <swetland@google.com> Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread
56de7a1263431819ff9a53dcd9e8e3306149ed99 09-Sep-2010 Brian Swetland <swetland@google.com> remount / as read-only only on post-fs to allow per-target config of /

Change-Id: Ia89dd2021e0f960201b4cee573227f0addd48431
ootdir/init.rc
0159abaf0854eb639c91ea65f14dbd37064bae46 07-Sep-2010 Dan Bornstein <danfuzz@android.com> am 1f43492e: am deb9188f: It seems that Windows actually does have a header for <stdbool.h>.

Merge commit '1f43492e48fb6630f3200a9b3887c76377f1850d'

* commit '1f43492e48fb6630f3200a9b3887c76377f1850d':
It seems that Windows actually does have a header for <stdbool.h>.
1f43492e48fb6630f3200a9b3887c76377f1850d 07-Sep-2010 Dan Bornstein <danfuzz@android.com> am deb9188f: It seems that Windows actually does have a header for <stdbool.h>.

Merge commit 'deb9188f4f64d5d475ae28e0cc9eecc6c1f61312' into gingerbread-plus-aosp

* commit 'deb9188f4f64d5d475ae28e0cc9eecc6c1f61312':
It seems that Windows actually does have a header for <stdbool.h>.
3eaa4e52d3fd958b2856d890bb15247aced2e13f 03-Sep-2010 Colin Cross <ccross@android.com> am 49b8124a: am 17dcc5c5: Use makedev helper for device major and minor numbers

Merge commit '49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19'

* commit '49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19':
Use makedev helper for device major and minor numbers
49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19 03-Sep-2010 Colin Cross <ccross@android.com> am 17dcc5c5: Use makedev helper for device major and minor numbers

Merge commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874' into gingerbread-plus-aosp

* commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874':
Use makedev helper for device major and minor numbers
17dcc5c57dcffb919f3de65ff7a0134ffa3bd874 03-Sep-2010 Colin Cross <ccross@android.com> Use makedev helper for device major and minor numbers

Major and minor numbers can be greater than 255. Major numbers
are 12 bits, and minor numbers are 20 bits. Supporting major
and minor numbers > 255 allows the use of the extended block
device for extra mmc partitions.

Change-Id: I4c42bfe0781069e8e4cb13ebe26e860cdc03f866
nit/devices.c
14b91a829a9795e701b4f15cabc2770c40279bd5 03-Sep-2010 Jason Sams <rjsams@android.com> Merge "Remove ACC which has been replaced with llvm. Free up space in build."
dad578642b5c2410e4bd35beb972cdb3a23a7292 02-Sep-2010 Dan Bornstein <danfuzz@android.com> am 556f09c4: am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.

Merge commit '556f09c426084b62c34742ee0810fc97ae37abf7'

* commit '556f09c426084b62c34742ee0810fc97ae37abf7':
It seems that Windows actually does have a header for <stdbool.h>.
deb9188f4f64d5d475ae28e0cc9eecc6c1f61312 02-Sep-2010 Dan Bornstein <danfuzz@android.com> It seems that Windows actually does have a header for <stdbool.h>.

Change-Id: I25d7846c066135f0af1fef2995bcb86397b23226
nclude/arch/windows/AndroidConfig.h
556f09c426084b62c34742ee0810fc97ae37abf7 02-Sep-2010 Dan Bornstein <danfuzz@android.com> am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.

Merge commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c' into gingerbread-plus-aosp

* commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c':
It seems that Windows actually does have a header for <stdbool.h>.
f74af26d1899fd85aa80dd65947dac89ef30a42c 02-Sep-2010 Dan Bornstein <danfuzz@android.com> It seems that Windows actually does have a header for <stdbool.h>.

Change-Id: I443929d07972389a8c9837926a4b7df37bd6a16a
nclude/arch/windows/AndroidConfig.h
54adc5e8a1a4b43c67b8ae657453b5009e981b47 01-Sep-2010 Jason Sams <rjsams@android.com> Remove ACC which has been replaced with llvm.
Free up space in build.

Change-Id: Ic5cc48bacca47b45809b9bc649ae5b629b7427ed
nclude/acc/acc.h
ibacc/Android.mk
ibacc/FEATURES
ibacc/LICENSE
ibacc/MODULE_LICENSE_BSD_LIKE
ibacc/acc.cpp
ibacc/tests/.gitignore
ibacc/tests/Android.mk
ibacc/tests/accarm
ibacc/tests/armreg.h
ibacc/tests/data/addressOf.c
ibacc/tests/data/array.c
ibacc/tests/data/assignment.c
ibacc/tests/data/assignmentop.c
ibacc/tests/data/b2071670.c
ibacc/tests/data/bellard.otccex.c
ibacc/tests/data/brackets.c
ibacc/tests/data/casts.c
ibacc/tests/data/char.c
ibacc/tests/data/comma.c
ibacc/tests/data/constants.c
ibacc/tests/data/continue.c
ibacc/tests/data/defines.c
ibacc/tests/data/double.c
ibacc/tests/data/error.c
ibacc/tests/data/expr-ansi.c
ibacc/tests/data/expr.c
ibacc/tests/data/expr2.c
ibacc/tests/data/film.c
ibacc/tests/data/float.c
ibacc/tests/data/floatdouble.c
ibacc/tests/data/flops.c
ibacc/tests/data/funcargs.c
ibacc/tests/data/hello.c
ibacc/tests/data/inc.c
ibacc/tests/data/iops.c
ibacc/tests/data/locals.c
ibacc/tests/data/macros.c
ibacc/tests/data/missing-main.c
ibacc/tests/data/otcc-ansi.c
ibacc/tests/data/otcc-noinclude.c
ibacc/tests/data/otcc.c
ibacc/tests/data/pointers.c
ibacc/tests/data/pointers2.c
ibacc/tests/data/returnval-ansi.c
ibacc/tests/data/returnval.c
ibacc/tests/data/rollo3.c
ibacc/tests/data/short.c
ibacc/tests/data/simplest.c
ibacc/tests/data/structs.c
ibacc/tests/data/testStringConcat.c
ibacc/tests/data/typedef.c
ibacc/tests/disassem.cpp
ibacc/tests/disassem.h
ibacc/tests/main.cpp
ibacc/tests/runtimeTest.cpp
ibacc/tests/test
ibacc/tests/test.py
c34f1951496a0debd89477d088f5f2d664760fbf 01-Sep-2010 Nick Kralevich <nnk@google.com> am 095a6a6e: am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread

Merge commit '095a6a6ecb8039067c077db381bd02abc2496422'

* commit '095a6a6ecb8039067c077db381bd02abc2496422':
get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
095a6a6ecb8039067c077db381bd02abc2496422 01-Sep-2010 Nick Kralevich <nnk@google.com> am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread

Merge commit '739cd9d2d4718913889a15d95c840506a2af04d1' into gingerbread-plus-aosp

* commit '739cd9d2d4718913889a15d95c840506a2af04d1':
get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
739cd9d2d4718913889a15d95c840506a2af04d1 01-Sep-2010 Nick Kralevich <nnk@google.com> Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
4688ac5b73abf15798415f7260f21bd87d23dd2b 31-Aug-2010 Nick Kralevich <nnk@google.com> get rid of compile time warning: "warning: ‘android_ids’ defined but not used"

Change-Id: If365bd88f735d425f37d61bcd5a6903f99f6a454
nclude/private/android_filesystem_config.h
4358544a3ffde4ffd1e9434b99b2a7179f05cce4 31-Aug-2010 Dmitry Shmidt <dimitrysh@google.com> toolbox: top: Add processor field

Change-Id: I9f8e45a963a0773f27ddcd1d249aecac1ab9152e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
oolbox/top.c
cb020611f950a326599a1b9b7676b148d51fb772 30-Aug-2010 Nick Kralevich <nnk@google.com> am c1858e5c: (-s ours) am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch

Merge commit 'c1858e5cefbd643737e978cbbca3f264d04d2d1b'

* commit 'c1858e5cefbd643737e978cbbca3f264d04d2d1b':
do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch
c1858e5cefbd643737e978cbbca3f264d04d2d1b 30-Aug-2010 Nick Kralevich <nnk@google.com> am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch

Merge commit '81ff156bea2804d689fed98b076c2cea0928d752' into gingerbread-plus-aosp

* commit '81ff156bea2804d689fed98b076c2cea0928d752':
do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch
81ff156bea2804d689fed98b076c2cea0928d752 30-Aug-2010 Nick Kralevich <nnk@google.com> am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch

Merge commit '2ad6067ce491446ab22f59a363d36575a942f5c7' into gingerbread

* commit '2ad6067ce491446ab22f59a363d36575a942f5c7':
do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch
430185526b019e3bbe58f15a0365a07607619c90 30-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am bb1d8e42: resolved conflicts for merge of 9682e24b to gingerbread-plus-aosp

Merge commit 'bb1d8e42dddcc89422b7add4b250d016d332bba8'

* commit 'bb1d8e42dddcc89422b7add4b250d016d332bba8':
libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic
bb1d8e42dddcc89422b7add4b250d016d332bba8 30-Aug-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 9682e24b to gingerbread-plus-aosp

Change-Id: I8cd7e43ee9689bc5c86ed0976536ef5235cbfd84
9682e24bae0539babbcd3f33b8e310e6a6427a44 30-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Merge "libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic"
2ad6067ce491446ab22f59a363d36575a942f5c7 27-Aug-2010 Nick Kralevich <nnk@google.com> do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch

Change-Id: I03e99bfa70ab86eb8eaa2984b6da26a92bd2718a
db/adb.c
9abea13a0a5015a401c15ad6a2a1db1b337d9cdf 28-Aug-2010 Nick Kralevich <nnk@google.com> am 4692599c: am 44db990d: Fix bug 2950316. Check return values.

Merge commit '4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3'

* commit '4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3':
Fix bug 2950316. Check return values.
4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3 28-Aug-2010 Nick Kralevich <nnk@google.com> am 44db990d: Fix bug 2950316. Check return values.

Merge commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723' into gingerbread-plus-aosp

* commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723':
Fix bug 2950316. Check return values.
bc4d60af3ce2f4d08069992ef6bbfa2e2ad063a5 28-Aug-2010 Iliyan Malchev <malchev@google.com> Merge "Debuggerd now outputs the offset of libc.so on the device as a separate item."
c031a3b006129ca408eaade325a53a334daee3b2 27-Aug-2010 Hristo Bojinov <hristo@google.com> Debuggerd now outputs the offset of libc.so on the device as a separate item.

Change-Id: I350c9ddb496a76d1ee897ae84893bf0e86abd45c
ebuggerd/debuggerd.c
44db990d3a4ce0edbdd16fa7ac20693ef601b723 27-Aug-2010 Nick Kralevich <nnk@google.com> Fix bug 2950316. Check return values.

Change-Id: I687bb5fb8195d4c1fc863e32a5e233a8b9e74196
db/adb.c
50360b20c8fdcdf50a4285e0819700f867b3003b 26-Aug-2010 Robert Greenwalt <robdroid@android.com> am 64a053b6: am 705ab8db: Fix sim build - remove unncesessary header.

Merge commit '64a053b67371595d2b541cd4f945fcec1fb8e9d2'

* commit '64a053b67371595d2b541cd4f945fcec1fb8e9d2':
Fix sim build - remove unncesessary header.
64a053b67371595d2b541cd4f945fcec1fb8e9d2 26-Aug-2010 Robert Greenwalt <robdroid@android.com> am 705ab8db: Fix sim build - remove unncesessary header.

Merge commit '705ab8db827b0f7f3389463af67d173c8a94fc8a' into gingerbread-plus-aosp

* commit '705ab8db827b0f7f3389463af67d173c8a94fc8a':
Fix sim build - remove unncesessary header.
705ab8db827b0f7f3389463af67d173c8a94fc8a 25-Aug-2010 Robert Greenwalt <robdroid@android.com> Fix sim build - remove unncesessary header.

Change-Id: Ibeba75848eaf732b7d0c7aecc9e7be8dbd509a1c
ibnetutils/ifc_utils.c
ec16e4fc3ec6435b200d9e68e15d667efa7f04de 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 41c3eed8: Manual merge

Merge commit '41c3eed8ab210530c1bebd284eb247cad2cd67b0'

* commit '41c3eed8ab210530c1bebd284eb247cad2cd67b0':
Add mksh from CVS 2010/08/24 as system/core/mksh module
a2f3cb8ca47651cbb39aec94de025194f5a52374 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 468f23ac: Manual merge

Merge commit '468f23ac2fa3db150b6c626417de44f5c0f17fa0'

* commit '468f23ac2fa3db150b6c626417de44f5c0f17fa0':
Build ash as ash with shell_ash tag; install sh symlink
Copyright message changed
3d092d0a89a18918cd8ac80913ccefd73231ca74 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am bdcf98dd: Manual merge

Merge commit 'bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df'

* commit 'bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df':
Add API to add a route to IPv4/IPv6 host/gateway.
feb391d4bee1241ffbbc17c98ddeae62f2bee0c4 25-Aug-2010 Szymon Jakubczak <szym@google.com> am 8c85a00d: - creates proper ifc.h and dhcp.h headers for libnetutils - adds ifc_set_hwaddr - adds hwaddr command to netcfg - code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing - consistency: use net.XXX.dnsX properties in favor of dhcp.XX

Merge commit '8c85a00db6da092ec3766facd49132fa4fc319a1'

* commit '8c85a00db6da092ec3766facd49132fa4fc319a1':
- creates proper ifc.h and dhcp.h headers for libnetutils
41c3eed8ab210530c1bebd284eb247cad2cd67b0 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Manual merge

Change-Id: I91cabbae567a62e9000446c692175f729cbe67f4
468f23ac2fa3db150b6c626417de44f5c0f17fa0 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Manual merge

Change-Id: I849703a709fe4bf9ea7181268221d9b648b2e73d
bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Manual merge

Change-Id: Ic71ed9c392c5dee4a5a9be184d071eb688741f6f
8c85a00db6da092ec3766facd49132fa4fc319a1 09-Jun-2010 Szymon Jakubczak <szym@google.com> - creates proper ifc.h and dhcp.h headers for libnetutils
- adds ifc_set_hwaddr
- adds hwaddr command to netcfg
- code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing
- consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties
(see related change to WifiStateTracker)
- updated system/core/nexus to use new headers, although not sure if
anybody still uses nexus

Change-Id: Idd70c0ac6e89b38e86816578c33eff805d30cac4
nclude/netutils/dhcp.h
nclude/netutils/ifc.h
ibnetutils/dhcp_utils.c
ibnetutils/dhcpclient.c
ibnetutils/ifc_utils.c
ibnetutils/ifc_utils.h
etcfg/netcfg.c
exus/DhcpClient.cpp
b8185d9108ad9f049d496ddd6d5c097f9bf07c33 25-Aug-2010 Maarten Hooft <mthooft@google.com> am 2c72df99: am 65e461c4: Fix the pagesize argument parsing

Merge commit '2c72df998799738662a77cef3f522fdc6ae22fde'

* commit '2c72df998799738662a77cef3f522fdc6ae22fde':
Fix the pagesize argument parsing
2c72df998799738662a77cef3f522fdc6ae22fde 25-Aug-2010 Maarten Hooft <mthooft@google.com> am 65e461c4: Fix the pagesize argument parsing

Merge commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad' into gingerbread-plus-aosp

* commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad':
Fix the pagesize argument parsing
65e461c478b000246ef81c3ca5fdd2dbb819d7ad 25-Aug-2010 Maarten Hooft <mthooft@google.com> Fix the pagesize argument parsing

Change-Id: I8a3d1a2a70c5ad972d3e150b320ee2184c9d5b4a
kbootimg/mkbootimg.c
50acaab0d69dcbaff2ddb1351ef39e389b76bed0 24-Aug-2010 Ying Wang <wangying@google.com> am 0cd43305: am fc2f7cb6: Fix usage string.

Merge commit '0cd43305e9e12e0f2d622fe05286a2ed07fb2990'

* commit '0cd43305e9e12e0f2d622fe05286a2ed07fb2990':
Fix usage string.
ba2627c6cdb3aaa40aebd362170c382b55b7b511 24-Aug-2010 Thorsten Glaser <tg@mirbsd.org> Add mksh from CVS 2010/08/24 as system/core/mksh module

Both shells (ash from system/core/sh, and mksh) are built by
default but only the one where $(TARGET_SHELL) is set to is
actually installed (the shell and the mkshrc configuration
file are tagged shell_mksh for this to work).

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
ksh/Android.mk
ksh/MODULE_LICENSE_BSD_LIKE
ksh/NOTICE
ksh/mkmf.sh
ksh/mkshrc
ksh/src/00-NOTE.txt
ksh/src/Build.sh
ksh/src/check.pl
ksh/src/check.t
ksh/src/edit.c
ksh/src/emacsfn.h
ksh/src/eval.c
ksh/src/exec.c
ksh/src/expr.c
ksh/src/funcs.c
ksh/src/histrap.c
ksh/src/jobs.c
ksh/src/lalloc.c
ksh/src/lex.c
ksh/src/main.c
ksh/src/misc.c
ksh/src/sh.h
ksh/src/sh_flags.h
ksh/src/shf.c
ksh/src/syn.c
ksh/src/tree.c
ksh/src/var.c
ksh/src/var_spec.h
bdc36d641c2d557cc20b8cf044048f0a8c72e774 07-Jun-2010 Thorsten Glaser <tg@mirbsd.org> Build ash as ash with shell_ash tag; install sh symlink

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
h/Android.mk
69507eb065d676d6303f964215237e395cc087d3 24-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Copyright message changed"
0cd43305e9e12e0f2d622fe05286a2ed07fb2990 23-Aug-2010 Ying Wang <wangying@google.com> am fc2f7cb6: Fix usage string.

Merge commit 'fc2f7cb69e3f15a616330a69f0675675c68112f3' into gingerbread-plus-aosp

* commit 'fc2f7cb69e3f15a616330a69f0675675c68112f3':
Fix usage string.
fc2f7cb69e3f15a616330a69f0675675c68112f3 23-Aug-2010 Ying Wang <wangying@google.com> Fix usage string.

Change-Id: Iaa99a1bb8bb6998082f3553689b5b812a6471514
kbootimg/mkbootimg.c
fa5a26885cd75e4b2054ade38955d9d48fe99913 21-Aug-2010 Jesse Wilson <jessewilson@google.com> am 2c9ea21d: am 7ab237f1: Including dl heap stubs for the dalvikvm host build

Merge commit '2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43'

* commit '2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43':
Including dl heap stubs for the dalvikvm host build
fc1a13bfdd9f7acd36bd4ae8f87cd57aa298f5ac 20-Aug-2010 Mike Lockwood <lockwood@android.com> sdcard: Add support for the O_TRUNC open() flag

BUG: 2935163

Change-Id: I9f76b24147b2f87ddb7869bb72baac03e86ef7e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
97970b0be61002cf4c6927b8bbecdcd493a388c2 19-Aug-2010 Brian Swetland <swetland@google.com> Merge "Support an additional alias for 'adb shell.'"
ef18202fd1530e5c3106d6d3fc484a68857d3cb0 19-Aug-2010 Dave Butcher <david.butcher@arm.com> Copyright message changed

Change requested by Android Open Source Project
ibpixelflinger/col32cb16blend.S
ibpixelflinger/col32cb16blend_neon.S
2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43 19-Aug-2010 Jesse Wilson <jessewilson@google.com> am 7ab237f1: Including dl heap stubs for the dalvikvm host build

Merge commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda' into gingerbread-plus-aosp

* commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda':
Including dl heap stubs for the dalvikvm host build
ff91ab855b84cdcf110f1a899320d3920e7c55a5 19-Aug-2010 Daniel Sandler <dsandler@google.com> Support an additional alias for 'adb shell.'

Change-Id: Ie8d667407fef8ee5a6c7ab86b30307fb61869170
db/commandline.c
7ab237f1efe578fc0462154bc239ad3b6cde2bda 19-Aug-2010 Jesse Wilson <jessewilson@google.com> Including dl heap stubs for the dalvikvm host build

Change-Id: I9d0ce98d433f71db25c58bf464ec9317552cfae6
ibcutils/Android.mk
021195ef97f97b52433bb77d76f310001835ae58 19-Aug-2010 Dmitry Shmidt <dimitrysh@google.com> Merge "ps: Add -c flag to show CPU number last executed on"
8b37c91b934bf22d8ae52bebad7f1f22f16d1132 19-Aug-2010 Dmitry Shmidt <dimitrysh@google.com> ps: Add -c flag to show CPU number last executed on

Change-Id: I9a8faef0824c390ef980ce6c33e9c79102884879
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
oolbox/ps.c
7002edeb3dee2d7f854a24a94a70b5997b2a1058 19-Aug-2010 Danica Chang <danicachang@google.com> Merge "added network.conf to android_filesystem_config"
70e2b183e5c32c8f3e66651ee25b0a8f0c5ed5d9 19-Aug-2010 Carl Shapiro <cshapiro@google.com> am 703c85c6: am 0c0f68e8: Fix a long standing bug in the output buffer size computation.

Merge commit '703c85c69d3822067623a6dd7bfde4b734c7f84f'

* commit '703c85c69d3822067623a6dd7bfde4b734c7f84f':
Fix a long standing bug in the output buffer size computation.
703c85c69d3822067623a6dd7bfde4b734c7f84f 18-Aug-2010 Carl Shapiro <cshapiro@google.com> am 0c0f68e8: Fix a long standing bug in the output buffer size computation.

Merge commit '0c0f68e8ff9fb88eaae614d1da316f0037484886' into gingerbread-plus-aosp

* commit '0c0f68e8ff9fb88eaae614d1da316f0037484886':
Fix a long standing bug in the output buffer size computation.
7f7047eb6b704410a925409cddc76d04db8faf81 18-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 58b64ace: Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"

Merge commit '58b64acef07e6426914a8cb2d972778fbe138655'

* commit '58b64acef07e6426914a8cb2d972778fbe138655':
Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
58b64acef07e6426914a8cb2d972778fbe138655 18-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"

This reverts commit c88e09cb98fb3690c3cf49f5a825532e0d9bf300.
nclude/netutils/dhcp.h
nclude/netutils/ifc.h
ibnetutils/dhcp_utils.c
ibnetutils/dhcpclient.c
ibnetutils/ifc_utils.c
ibnetutils/ifc_utils.h
etcfg/netcfg.c
exus/DhcpClient.cpp
a7e96642a9f91620b69716cc3198c6ebb4d0553c 04-May-2010 Kan-Ru Chen <kanru@0xlab.org> codeflinger: Correct misleading comment of STM instruction

According to the ARM Architecture Reference Manual, the comment on
STM instruction should be in reverse order.

Change-Id: I4af852a0478798ff7b02ab9c29c68e320ff78696
Signed-off-by: Kan-Ru Chen <kanru@0xlab.org>
ibpixelflinger/codeflinger/ARMAssembler.cpp
8984bb9691f8d3e2665f7aae0896b9bd2ade0c19 10-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> Add API to add a route to IPv4/IPv6 host/gateway.

Add API to create a route to an IPv4/IPv6 host/gateway through a particular
interface.

Change-Id: I0ab5d2d211e0fc05f65ee6bb202b7f435cccae2a
nclude/netutils/ifc.h
ibnetutils/ifc_utils.c
0c0f68e8ff9fb88eaae614d1da316f0037484886 10-Apr-2010 Carl Shapiro <cshapiro@google.com> Fix a long standing bug in the output buffer size computation.

git cherry-pick -e 2a7f2ae7d4b25f89e36be04e47b9e7a3d76e0cfd
iblog/fake_log_device.c
8fa95f966088f13b14895aefea87b6c5f0cc78eb 17-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 838336fa: am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"

Merge commit '838336fa61f2f06898322f059570708def823398'

* commit '838336fa61f2f06898322f059570708def823398':
pixelflinger: Fix function naming typo: gglBitBlti
aa3061dab61f9a0960cd85972fb5279bb7a8d51a 17-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 933dc059: am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."

Merge commit '933dc05929fba064286bd43a7c72c7d4e1775582'

* commit '933dc05929fba064286bd43a7c72c7d4e1775582':
libpixelflinger: ARMv6 specific objects are not used. Remove.
d8e0e26db78e73293adaa9170dede3b2e18db069 17-Aug-2010 Jim Huang <jserv@0xlab.org> am 7caef0c7: am 6090dacd: libpixelflinger: Move codeflinger test function to test-opengl-codegen

Merge commit '7caef0c70f51a4863969a537c5d5e954483304f6'

* commit '7caef0c70f51a4863969a537c5d5e954483304f6':
libpixelflinger: Move codeflinger test function to test-opengl-codegen
838336fa61f2f06898322f059570708def823398 17-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"

Merge commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34' into gingerbread-plus-aosp

* commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34':
pixelflinger: Fix function naming typo: gglBitBlti
933dc05929fba064286bd43a7c72c7d4e1775582 17-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."

Merge commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84' into gingerbread-plus-aosp

* commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84':
libpixelflinger: ARMv6 specific objects are not used. Remove.
7caef0c70f51a4863969a537c5d5e954483304f6 17-Aug-2010 Jim Huang <jserv@0xlab.org> am 6090dacd: libpixelflinger: Move codeflinger test function to test-opengl-codegen

Merge commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f' into gingerbread-plus-aosp

* commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f':
libpixelflinger: Move codeflinger test function to test-opengl-codegen
c174b7102ede9c30b5d8cc879d00d203cf9e5852 17-Aug-2010 Mike Lockwood <lockwood@android.com> am b1fb9538: am 4553b08d: sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard

Merge commit 'b1fb953877a08400b90ed1a6078cac5f6b849c98'

* commit 'b1fb953877a08400b90ed1a6078cac5f6b849c98':
sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
b1fb953877a08400b90ed1a6078cac5f6b849c98 17-Aug-2010 Mike Lockwood <lockwood@android.com> am 4553b08d: sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard

Merge commit '4553b08d7555a103fdbe8623a9cbd826a7e413ff' into gingerbread-plus-aosp

* commit '4553b08d7555a103fdbe8623a9cbd826a7e413ff':
sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
4553b08d7555a103fdbe8623a9cbd826a7e413ff 16-Aug-2010 Mike Lockwood <lockwood@android.com> sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard

Change-Id: Iac2c4ec47af7d47d76a82916866ad36782caf25c
Signed-off-by: Mike Lockwood <lockwood@android.com>
dcard/sdcard.c
5dfd90e5c79774d9981d25ab4defbd1e1f652c34 16-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Merge "pixelflinger: Fix function naming typo: gglBitBlti"
4ea1a52b1bbbd6e78c5909c75d773416108f5b84 16-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."
d06aee5da121fa61071d5655a824fd233c585bd1 14-Aug-2010 Brian Swetland <swetland@google.com> am a8280783: am b14a2c6e: fix up permissions

Merge commit 'a82807839758a58bc16781b2e0ef9bce15677343'

* commit 'a82807839758a58bc16781b2e0ef9bce15677343':
fix up permissions
a82807839758a58bc16781b2e0ef9bce15677343 13-Aug-2010 Brian Swetland <swetland@google.com> am b14a2c6e: fix up permissions

Merge commit 'b14a2c6e34b197870433386fb809d34b58b30fc0' into gingerbread-plus-aosp

* commit 'b14a2c6e34b197870433386fb809d34b58b30fc0':
fix up permissions
b14a2c6e34b197870433386fb809d34b58b30fc0 13-Aug-2010 Brian Swetland <swetland@google.com> fix up permissions

Change-Id: I93c828ebc755ad2a2055066c8af65dfde7dc7b2e
dcard/sdcard.c
d305c4a24d577c0bb2828f284e64bf8027f3715f 13-Aug-2010 Brian Swetland <swetland@google.com> am 4b2fc45c: am 03ee9479: sdcard: a program to create a "virtual" /sdcard pointed at a path

Merge commit '4b2fc45c151382cdf4b5cc00d9a8a7159378264c'

* commit '4b2fc45c151382cdf4b5cc00d9a8a7159378264c':
sdcard: a program to create a "virtual" /sdcard pointed at a path
4b2fc45c151382cdf4b5cc00d9a8a7159378264c 13-Aug-2010 Brian Swetland <swetland@google.com> am 03ee9479: sdcard: a program to create a "virtual" /sdcard pointed at a path

Merge commit '03ee9479a4ed67689b9bbccda20c60800a38b178' into gingerbread-plus-aosp

* commit '03ee9479a4ed67689b9bbccda20c60800a38b178':
sdcard: a program to create a "virtual" /sdcard pointed at a path
78fdd23c92b6d92396f64d99f38939f3990c2175 13-Aug-2010 Danica Chang <danicachang@google.com> added network.conf to android_filesystem_config

Change-Id: I393720a2c1632c311f794e14c17b197083a70621
nclude/private/android_filesystem_config.h
03ee9479a4ed67689b9bbccda20c60800a38b178 13-Aug-2010 Brian Swetland <swetland@google.com> sdcard: a program to create a "virtual" /sdcard pointed at a path

sdcard is a program that uses FUSE to emulate FAT-on-sdcard style
directory permissions (all files are given fixed owner, group, and
permissions at creation, owner, group, and permissions are not
changeable, symlinks and hardlinks are not createable, etc.

usage: sdcard <path> <uid> <gid>

It must be run as root, but will change to uid/gid as soon as it
mounts a filesystem on /sdcard. It will refuse to run if uid or
gid are zero.

Change-Id: I9a5d2e5daaebeee632f8470172cbb77b7fa689f8
Signed-off-by: Brian Swetland <swetland@google.com>
dcard/Android.mk
dcard/fuse.h
dcard/sdcard.c
b17505bf46e168e369f591443685d9afbc23b1f1 12-Aug-2010 Brian Swetland <swetland@google.com> am 7b9e7d90: am 8417d698: handle 4096 byte pages if requested via --pagesize

Merge commit '7b9e7d9006d52b78d189abe16c7c2bfe20fcb467'

* commit '7b9e7d9006d52b78d189abe16c7c2bfe20fcb467':
handle 4096 byte pages if requested via --pagesize
7b9e7d9006d52b78d189abe16c7c2bfe20fcb467 12-Aug-2010 Brian Swetland <swetland@google.com> am 8417d698: handle 4096 byte pages if requested via --pagesize

Merge commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795' into gingerbread-plus-aosp

* commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795':
handle 4096 byte pages if requested via --pagesize
8417d698cff733f3c5de08f2fa96b67bf4a9f795 12-Aug-2010 Brian Swetland <swetland@google.com> handle 4096 byte pages if requested via --pagesize

Change-Id: I9299ebeced85dcf5e6e4686b99b28b9786be4f25
Signed-off-by: Brian Swetland <swetland@google.com>
kbootimg/mkbootimg.c
d2278638d6b37717b51d622929eb4c8f6e16cb0c 03-Aug-2010 Benoit Goby <benoit@android.com> init: Add symlinks to USB character devices

Since we now support USB host mode, devices might get a different device
file depending if other devices are connected on the host port. This
patch creates symlinks to USB character devices that depend on the port
devices are connected to, but not on the order they have been probed.
(e.g. /dev/usb/tty2-1:1.0 -> /dev/ttyUSB0)

Change-Id: I285bcc2d59446fbff8a7abbe39c21781f3bb4bd3
nit/devices.c
6e1a9430e8e8de13109f1b234d937541a45a8ac5 09-Aug-2010 Jim Huang <jserv@0xlab.org> pixelflinger: Fix function naming typo: gglBitBlti

From the functionality, the function gglBitBlti() implemented bit-block
(image) transfer operation in which several bitmaps are combined into
one using a raster operator. Renaming to gglBitBlit() should be
explicit.

Change-Id: I23886623b5421131cf7c7bfb8ec67c3809566c93
nclude/pixelflinger/pixelflinger.h
ibpixelflinger/raster.cpp
9fcaff46210bcb7a739a0e1922b6e95b999b1882 09-Aug-2010 Jim Huang <jserv@0xlab.org> libpixelflinger: ARMv6 specific objects are not used. Remove.

This patch attempts to remove the generation of libpixelflinger_armv6,
which contains the ARMv6 specific object - rotate90CW_4x4_16v6.o. But,
libpixelflinger_armv6 is not actually used by other projects.

Change-Id: I0e26fa2cf8b4dacfd208dd4279539c3e5b07580e
ibpixelflinger/Android.mk
6090dacd1894429baaf13f7b30b2f6e9e2c1617f 09-Aug-2010 Jim Huang <jserv@0xlab.org> libpixelflinger: Move codeflinger test function to test-opengl-codegen

There is no need to include codeflinger test function in
libpixelflinger. Instead, it should exist in test-opengl-codegen.

Change-Id: Ic5b0bd1f754b2ac678d4e16565568c70ceb8d325
ibpixelflinger/scanline.cpp
ibpixelflinger/tests/codegen/Android.mk
ibpixelflinger/tests/codegen/codegen.cpp
fddc33858c857fe54d8c7f6527a3713580642252 08-Aug-2010 Jim Huang <jserv@0xlab.org> libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic

This patch reflect the changes that macro _ARM_HAVE_LDREX_STREX had
been renamed to __ARM_HAVE_LDREX_STREX in bionic.

Change-Id: I03e8b9f95bdf6ed0da1f53326170f6ee57a37066
ibcutils/atomic-android-arm.S
da7723ce905b0d39cb5605d3a26d836553853610 05-Aug-2010 Brian Carlstrom <bdc@google.com> am 3c659a8d: am f2af88e8: Tracking merge of dalvik-dev to gingerbread

Merge commit '3c659a8d647b2650d83712f9a6724b8ac50ef5ae'

* commit '3c659a8d647b2650d83712f9a6724b8ac50ef5ae':
Tracking merge of dalvik-dev to gingerbread
3c659a8d647b2650d83712f9a6724b8ac50ef5ae 05-Aug-2010 Brian Carlstrom <bdc@google.com> am f2af88e8: Tracking merge of dalvik-dev to gingerbread

Merge commit 'f2af88e81af5efb2d585963507f798d5a8b93d67' into gingerbread-plus-aosp

* commit 'f2af88e81af5efb2d585963507f798d5a8b93d67':
Tracking merge of dalvik-dev to gingerbread
f2af88e81af5efb2d585963507f798d5a8b93d67 05-Aug-2010 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit b99a099c
git cherry-pick --no-commit 9811671e023ceb82029040f7acf599013c773e6b
git cherry-pick --no-commit d0645bf0cc76ef7be11cf77a8e1995233a1972e4

Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1
nclude/cutils/mspace.h
ibcutils/mspace.c
ootdir/init.rc
e306a9044a1ef97019871eb8cdd102223307f1c9 31-Jul-2010 Iliyan Malchev <malchev@google.com> Revert "system/core: add system/audio persmissions for /dev/audio*"

This reverts commit 7e8b01229dde701bee555ea1cf10986b773d5de0.
ootdir/ueventd.rc
7e8b01229dde701bee555ea1cf10986b773d5de0 30-Jul-2010 Iliyan Malchev <malchev@google.com> system/core: add system/audio persmissions for /dev/audio*

Change-Id: If214241f8150f5ff6cce8b9a76c6c8e5bad9c35a
Signed-off-by: Iliyan Malchev <malchev@google.com>
ootdir/ueventd.rc
30be93c6e2b5c2eb6c6e9e21a04dc0dbe2f4c8ca 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp

Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53'

* commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53':
Userland support for VM interconnection
60c8f863ca84f3e5bb8e78d8001c53511f094d53 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp

Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
0fcbdb4147858d40d581d3b034f5150962632943 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Userland support for VM interconnection"
69f2d3ce91f18dd20441dc4c51839add63cac3e1 29-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 42b871f1: am c37ba1c9: Merge "Check fastboot oem command line length"

Merge commit '42b871f1bfc116d53d1bff9d7497415494b2e0e0'

* commit '42b871f1bfc116d53d1bff9d7497415494b2e0e0':
Check fastboot oem command line length
42b871f1bfc116d53d1bff9d7497415494b2e0e0 29-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am c37ba1c9: Merge "Check fastboot oem command line length"

Merge commit 'c37ba1c916d73fbf35c6faba1e252e2916d2d41d' into gingerbread-plus-aosp

* commit 'c37ba1c916d73fbf35c6faba1e252e2916d2d41d':
Check fastboot oem command line length
c37ba1c916d73fbf35c6faba1e252e2916d2d41d 29-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Check fastboot oem command line length"
e1de54455565b318089a7aff8b5e9a6ce51c7574 28-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "libusbhost: add usb_device_get_unique_id_from_name()"
07eb4af174f31c449a86dd459e2c81702f74acf1 28-Jul-2010 Mike Lockwood <lockwood@android.com> libusbhost: add usb_device_get_unique_id_from_name()

Change-Id: Idce54fc26d0432d4dc46f605623c4960c0e8690f
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
7a58bcfb1e8b5c80703be8cd88caefe1c0433d0b 27-Jul-2010 Kenny Root <kroot@google.com> am 331eb52d: am 5a0adf95: Merge "Add basic lsof command" into gingerbread

Merge commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657'

* commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657':
Add basic lsof command
331eb52d611de6bd2e70a2b0bde1f3c3733ce657 27-Jul-2010 Kenny Root <kroot@google.com> am 5a0adf95: Merge "Add basic lsof command" into gingerbread

Merge commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4' into gingerbread-plus-aosp

* commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4':
Add basic lsof command
5a0adf95b1170d3d9ec91b0106662cd17514f0e4 27-Jul-2010 Kenny Root <kroot@google.com> Merge "Add basic lsof command" into gingerbread
c2424504b6ffff9ef63a063fd69d88460028cbb2 27-Jul-2010 Irfan Sheriff <isheriff@google.com> Merge "Update eventlog tags for WifiStateTracker"
2d392f24b8dc30553b6e7992af5315e458fbbabc 27-Jul-2010 Kenny Root <kroot@google.com> am 65757da0: am 53308d4c: Correct copyright header for uptime and NOTICE

Merge commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd'

* commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd':
Correct copyright header for uptime and NOTICE
65757da0c99cb4b49e1dc9e21facc7b4e67192cd 27-Jul-2010 Kenny Root <kroot@google.com> am 53308d4c: Correct copyright header for uptime and NOTICE

Merge commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f' into gingerbread-plus-aosp

* commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f':
Correct copyright header for uptime and NOTICE
53308d4cd5c4414402e979a6771f7ef3b35f5c2f 27-Jul-2010 Kenny Root <kroot@google.com> Correct copyright header for uptime and NOTICE

Change-Id: I89f91c21db87955b20b1ef9b4590f7009f106b26
oolbox/NOTICE
oolbox/uptime.c
8b9b105bc7bf6428591d55462b3e727ba7504b29 27-Jul-2010 Kenny Root <kroot@google.com> Add basic lsof command

Basic "list open files" command.

Supports reading all processes for their "exe", "cwd", "root", and "fd"
entries.

Change-Id: I2e2f0911dd65a1993aa1ce9f51222bf264a9d68d
oolbox/Android.mk
oolbox/lsof.c
e572d596b3715198fb48b3d8cef4939a71d58db2 27-Jul-2010 aimitakeshi <aimitakeshi@gmail.com> - Add drm and drmio service
- Add /data/drm directory for storing DRM related data

Change-Id: Ifd8922a3de109dbf5cd3f9cabbf4e5689b16c1d7
nclude/private/android_filesystem_config.h
ootdir/init.rc
cb0d07b0e0f955f9175ce472a12c5a6f9363bc39 24-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "libusbhost: Add usb_device_send_control for sending raw commands on endpoint 0."
1b7d991b433cf6d6fae4f40cb37f9b6c6043cfbc 24-Jul-2010 Mike Lockwood <lockwood@android.com> libusbhost: Add usb_device_send_control for sending raw commands on endpoint 0.

Change-Id: If883f2690c4031b9ba4d5cf943b5bf5c13193bce
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
efc69582fe9a9e3577b6695e9ee63a80d8980ed5 21-Jul-2010 Irfan Sheriff <isheriff@google.com> Update eventlog tags for WifiStateTracker

Change-Id: I43137ba87df7ec30f068997c86957e6bda14aaeb
ogcat/event.logtags
d16de9fd2ec733d4dafef7754c31808ace39ac13 23-Jul-2010 Bruce Beare <brucex.j.beare@intel.com> am 1298bb79: am 96a2bb62: Set the modes for rc.* files in /system/etc

Merge commit '1298bb79938cb1f4cf920433b86716bd4108de0f'

* commit '1298bb79938cb1f4cf920433b86716bd4108de0f':
Set the modes for rc.* files in /system/etc
1298bb79938cb1f4cf920433b86716bd4108de0f 23-Jul-2010 Bruce Beare <brucex.j.beare@intel.com> am 96a2bb62: Set the modes for rc.* files in /system/etc

Merge commit '96a2bb622d38f3c875997e4cacb423fa9ef4ea76' into gingerbread-plus-aosp

* commit '96a2bb622d38f3c875997e4cacb423fa9ef4ea76':
Set the modes for rc.* files in /system/etc
96a2bb622d38f3c875997e4cacb423fa9ef4ea76 24-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> Set the modes for rc.* files in /system/etc

Change-Id: I0897897cdffa66afa4f818f7ebcf0a9b70c517ea
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
nclude/private/android_filesystem_config.h
8137a8d941d7b8db16be23a06a834ef4aaaabef9 23-Jul-2010 Nick Pelly <npelly@google.com> Merge "Allow OSX fastboot to work with more devices."
668f7dc61f891a19742ee139a1e8e202ec6dcbb1 22-Jul-2010 Jack Palevich <jackpal@google.com> Merge "Set LOCAL_MODULE_TAGS := optional, to save space in system.img."
3d6ee5d0297b16509aa8c0c21b41b7471316d9e5 22-Jul-2010 Shih-wei Liao <sliao@google.com> Set LOCAL_MODULE_TAGS := optional, to save space in system.img.

Change-Id: I3de6564d913f56f459a717a1010311826e3f527f
ibacc/Android.mk
286d50fe34edef9b93cde6a3e2d052b2b96d071c 22-Jul-2010 Nick Pelly <npelly@google.com> Allow OSX fastboot to work with more devices.

ClearPipeStallBothEnds() appears to fail on some devices, but if we ignore
that error then fastboot does work. So ignore the error.

Change-Id: Ic866ece28a57c081e34079e1a032fa8155301ddf
astboot/usb_osx.c
93d672cc06199902b486683fd022bb1f425afe3e 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 1ab3d67f: am 315c3a74: Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way"

Merge commit '1ab3d67f534943018067e2db18a6377404138f52'

* commit '1ab3d67f534943018067e2db18a6377404138f52':
libsysutils: reimplement NetlinkEvent::findParam in the proper way
1ab3d67f534943018067e2db18a6377404138f52 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 315c3a74: Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way"

Merge commit '315c3a74a1fcf1d421ffff0857f998a98a1c224a' into gingerbread-plus-aosp

* commit '315c3a74a1fcf1d421ffff0857f998a98a1c224a':
libsysutils: reimplement NetlinkEvent::findParam in the proper way
315c3a74a1fcf1d421ffff0857f998a98a1c224a 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way"
90ea28e3511c81809242d7431c513eb7a9ab473d 22-Jul-2010 Takeshi Kishimoto <kishimoto@google.com> am 9060ebb5: am 91c38539: Added Toshiba\'s USB VID (0x0930) upon their request.

Merge commit '9060ebb5f7f1b9d979e6ac32e32c719452583363'

* commit '9060ebb5f7f1b9d979e6ac32e32c719452583363':
Added Toshiba's USB VID (0x0930) upon their request.
aee3acd9e44c996643db7805589327e34ac12291 22-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am ef582bdb: merge from open-source master

Merge commit 'ef582bdb8f24197caf921af7bf7ee63503626cdd'

* commit 'ef582bdb8f24197caf921af7bf7ee63503626cdd':
Added NEC and PMC's USB VIDs upon their request.
9060ebb5f7f1b9d979e6ac32e32c719452583363 22-Jul-2010 Takeshi Kishimoto <kishimoto@google.com> am 91c38539: Added Toshiba\'s USB VID (0x0930) upon their request.

Merge commit '91c3853911ab23728728728276a21dc6fe5fd622' into gingerbread-plus-aosp

* commit '91c3853911ab23728728728276a21dc6fe5fd622':
Added Toshiba's USB VID (0x0930) upon their request.
ef582bdb8f24197caf921af7bf7ee63503626cdd 22-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Iaf64136785853002b44ea59759d57816f943096a
91c3853911ab23728728728276a21dc6fe5fd622 20-Jul-2010 Takeshi Kishimoto <kishimoto@google.com> Added Toshiba's USB VID (0x0930) upon their request.

Change-Id: I9f7fca6b98b0664ef9af4f7b86f0f5863e91e4c1
db/usb_vendors.c
81fbbc2d0b3db4eb9565fd8367db00a6dc1c9c66 18-Jun-2010 Takeshi Kishimoto <kishimoto@google.com> Added NEC and PMC's USB VIDs upon their request.

Change-Id: I332ee1e68ff960d41a365aeb96d012253056edd2
db/usb_vendors.c
29a96aff5f8b3e4370684064f6a72b33b5d71785 21-Jul-2010 Xavier Ducrohet <xav@google.com> am deafd15f: am 4309d602: Merge "Added Toshiba\'s USB VID (0x0930) upon their request." into gingerbread

Merge commit 'deafd15f2c3ee7c7356634787c8463e1f5f937d3'

* commit 'deafd15f2c3ee7c7356634787c8463e1f5f937d3':
Added Toshiba's USB VID (0x0930) upon their request.
deafd15f2c3ee7c7356634787c8463e1f5f937d3 21-Jul-2010 Xavier Ducrohet <xav@google.com> am 4309d602: Merge "Added Toshiba\'s USB VID (0x0930) upon their request." into gingerbread

Merge commit '4309d602b562eb9f181b0314837e6096577c6c18' into gingerbread-plus-aosp

* commit '4309d602b562eb9f181b0314837e6096577c6c18':
Added Toshiba's USB VID (0x0930) upon their request.
4309d602b562eb9f181b0314837e6096577c6c18 21-Jul-2010 Xavier Ducrohet <xav@google.com> Merge "Added Toshiba's USB VID (0x0930) upon their request." into gingerbread
e8849d190a3097274dcb64416e564538a1017054 20-Jul-2010 Mike Lockwood <lockwood@android.com> libusbhost: Fix deadlock on devices without USB host support.

Change-Id: Ic91f99d1169fcdc00474dd6a870eb7e614128bc2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibusbhost/usbhost.c
72f3a00cc7b9a53120a4fb38a3d374d6d692618d 20-Jul-2010 Nick Kralevich <nnk@google.com> am 3fc108ac: am fad7204e: resolved conflicts for merge of 5f5d5c8c to gingerbread

Merge commit '3fc108acf2b05153489730178c85b8db94f603af'

* commit '3fc108acf2b05153489730178c85b8db94f603af':
validate the source of uevent messages
3fc108acf2b05153489730178c85b8db94f603af 20-Jul-2010 Nick Kralevich <nnk@google.com> am fad7204e: resolved conflicts for merge of 5f5d5c8c to gingerbread

Merge commit 'fad7204e9eac20a87afacd7547ed8202a39319f8' into gingerbread-plus-aosp

* commit 'fad7204e9eac20a87afacd7547ed8202a39319f8':
validate the source of uevent messages
f0a66c807b4cd7b561decc8d5c82d65537cf421a 20-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 3c5581da: merge from open-source master

Merge commit '3c5581da1d58d0b7e3bac0f03d7ec1e63d71b86d'

* commit '3c5581da1d58d0b7e3bac0f03d7ec1e63d71b86d':
print msg.command in human-readable format
4984f54c4c232121f736f0d9011014e7e1e1e709 20-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 02565fec: merge from open-source master

Merge commit '02565fec8240bbff105f285e9e25aade52c15450'

* commit '02565fec8240bbff105f285e9e25aade52c15450':
Fix ADB daemon file descriptor leak
3c5581da1d58d0b7e3bac0f03d7ec1e63d71b86d 20-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I90bd618ff8c6bcbe1071468e0d75574feee58d27
02565fec8240bbff105f285e9e25aade52c15450 20-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ice679e12b8393621b21a8dafe640dd880a09d35e
a805519ceedc53afa5453a6d8a7d80038d885d9f 20-Jul-2010 Mike Lockwood <lockwood@android.com> libusbhost: Add callback to usb_host_run to notify when initial device discovery is done

This can be used to eliminate race conditions in clients that operate immediately
on the currently connected device list.

Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I14954b9fcc84239950ead6bdc1a0a888882c2226
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
29837f94b56c3eeaf39f447507324ecdb207ba96 20-Jul-2010 Takeshi Kishimoto <kishimoto@google.com> Added Toshiba's USB VID (0x0930) upon their request.

Change-Id: I9f7fca6b98b0664ef9af4f7b86f0f5863e91e4c1
db/usb_vendors.c
fad7204e9eac20a87afacd7547ed8202a39319f8 20-Jul-2010 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 5f5d5c8c to gingerbread

Change-Id: Ieee2cd67d33f3e774fcfd96f8a5f67a0374aa873
899913f8168b54e00971c0e8d4ae16d06a4651fe 16-Jun-2010 Viral Mehta <viral.vkm@gmail.com> print msg.command in human-readable format

to print msg.command as some odd decimal number is just not helping in debugging;
instead print msg.command as a string

Change-Id: Id1ec770c20c86b8bdae40a0262bf4b63c0213b0a
db/adb.c
fdb13f793742bd981f45333f056e4baa5281e4b5 20-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix ADB daemon file descriptor leak"
5f5d5c8cef10f28950fa108a8bd86d55f11b7ef4 19-Jul-2010 Nick Kralevich <nnk@google.com> validate the source of uevent messages

Bug: 2844206
Change-Id: If2eee54181abfc6c7fda0232f98fa6bb5d12c60c
nit/devices.c
d5c4d2ae3af12f13f1d6700b395fcac13143d01c 17-Jul-2010 Mike Dodd <mdodd@google.com> am 7fdcc435: am 89118032: Merge "Fix bug in debuggerd so it can successfully find the exidx section in libraries. This should fix the bug where the exception stack wasn\'t being printed past the PC." into gingerbread

Merge commit '7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77'

* commit '7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77':
Fix bug in debuggerd so it can successfully find the exidx section in
7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77 17-Jul-2010 Mike Dodd <mdodd@google.com> am 89118032: Merge "Fix bug in debuggerd so it can successfully find the exidx section in libraries. This should fix the bug where the exception stack wasn\'t being printed past the PC." into gingerbread

Merge commit '891180320f0b08758d053a8562dfcd601ef846b0' into gingerbread-plus-aosp

* commit '891180320f0b08758d053a8562dfcd601ef846b0':
Fix bug in debuggerd so it can successfully find the exidx section in
891180320f0b08758d053a8562dfcd601ef846b0 17-Jul-2010 Mike Dodd <mdodd@google.com> Merge "Fix bug in debuggerd so it can successfully find the exidx section in libraries. This should fix the bug where the exception stack wasn't being printed past the PC." into gingerbread
f13c2ba5f85f6cd5499f90978b635724856b7eb3 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 742150c0: merge from open-source master

Merge commit '742150c031756da1393bf4223b2468b17cb79326'

* commit '742150c031756da1393bf4223b2468b17cb79326':
Use complete hardware name without spaces.
742150c031756da1393bf4223b2468b17cb79326 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I29602fecafc2b6d93b849ada89696a67cfd23353
4e246965bbd124bad1c1d98c5936d13b4db0d566 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 64ba76c1: merge from open-source master

Merge commit '64ba76c1431afe17c1f4553f1dbc595db064316e'

* commit '64ba76c1431afe17c1f4553f1dbc595db064316e':
Fixed LOG_ASSERT() compilation errors in native debug builds.
64ba76c1431afe17c1f4553f1dbc595db064316e 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I612711a84996e22e826e4920be29c204cf5d7d44
534bc027a2fc5136988e6785c2d647054daf2713 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 869cc685: merge from open-source master

Merge commit '869cc685b171c5c0c1efbad5df693cfaebe0af43'

* commit '869cc685b171c5c0c1efbad5df693cfaebe0af43':
fix insmod reading more than one module parameter
5687abe6ef0fe5820547cf68bbcec9c968c28870 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 544e1f86: merge from open-source master

Merge commit '544e1f866edcbe55b3d8f65d50bc831dfb818657'

* commit '544e1f866edcbe55b3d8f65d50bc831dfb818657':
Fix sdcard mount issue.
869cc685b171c5c0c1efbad5df693cfaebe0af43 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9365615f5f94484fb5ab28bb076b25fb4721e2bc
544e1f866edcbe55b3d8f65d50bc831dfb818657 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I03f6a73a782706a7c77041db4e626c40dffa647a
0515c65a20104e263470cb0049e98db34d1da181 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am a2657b83: am 84a60712: add meta-files about 3rd party projects

Merge commit 'a2657b83ede5870c52c9a3bfa3ab6f339c5643f1'

* commit 'a2657b83ede5870c52c9a3bfa3ab6f339c5643f1':
add meta-files about 3rd party projects
a2657b83ede5870c52c9a3bfa3ab6f339c5643f1 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 84a60712: add meta-files about 3rd party projects

Merge commit '84a60712ddf32fb98793e38ea8dd9703ae1290e2' into gingerbread-plus-aosp

* commit '84a60712ddf32fb98793e38ea8dd9703ae1290e2':
add meta-files about 3rd party projects
84a60712ddf32fb98793e38ea8dd9703ae1290e2 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> add meta-files about 3rd party projects

Change-Id: I7a6205fa12f2aa08eff591fb0ce808a48b1e9e74
hirdPartyProject.prop
h/ThirdPartyProject.prop
22b0b56531737deb226658672569fcf38dfad5d1 16-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Use complete hardware name without spaces."
19299904343daf191267564fe32e6cd5c165cd42 03-Jun-2010 Chris Pearson <christopherx.c.pearson@intel.com> Fixed LOG_ASSERT() compilation errors in native debug builds.

Invoking LOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF variadic macros
without the printf format string arg caused compilation errors because the
variable arg list (__VA_ARGS__) was eventually passed to
__android_log_assert() func in place of a required parameter. This error
only occured in debug builds because LOG_ASSERT() is a no-op in release
builds. This change allows debug builds to succeed.

Change-Id: I7e7b7de3e501133468ce083e0e0d6e699dd59667
Signed-off-by: Chris Pearson <christopherx.c.pearson@intel.com>
nclude/cutils/log.h
iblog/logd_write.c
e3f6a6e1d3e52c1d25d55b6556cc1f2c0598b576 16-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "fix insmod reading more than one module parameter"
f848a429dde741742988e2365d257058d57acbf8 15-Jul-2010 Kenny Root <kroot@google.com> resolved conflicts for merge of 3cac9cb3 to master

Change-Id: I86b5173ad49522eae082bf2a3d096dbfb5240129
3cac9cb3991d85616536e82e8ded0af4ba034ef6 15-Jul-2010 Kenny Root <kroot@google.com> am 38cb1b89: Merge "Add directories for OBB mounting" into gingerbread

Merge commit '38cb1b898c048a5f562c5a2381ec0310f020a587' into gingerbread-plus-aosp

* commit '38cb1b898c048a5f562c5a2381ec0310f020a587':
Add directories for OBB mounting
38cb1b898c048a5f562c5a2381ec0310f020a587 15-Jul-2010 Kenny Root <kroot@google.com> Merge "Add directories for OBB mounting" into gingerbread
c7858a3dde9db1c4cf2563a4388f422ff1bcb334 15-Jul-2010 Kenny Root <kroot@google.com> Add directories for OBB mounting

Change-Id: Ib73e9bca50fb168ab5d147cc260666a770092961
ootdir/init.rc
097b7df625f200178299d15a2da92e5406565fb3 15-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix sdcard mount issue."
50b3995d027b53f24bbba099b3b6884d5845b614 15-Jul-2010 Bruce Beare <brucex.j.beare@intel.com> Check fastboot oem command line length

Change-Id: I301af09c4ec460c9049b75cc7f4d2c50cfe00ceb
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
astboot/engine.c
2ee12e7a3404749add55e3d98358ab52b579fd57 15-Jul-2010 Ravi K Yenduri <yenduri@pv.com> Fix sdcard mount issue.

Push vold.fstab on to the emulator, which is now denoted by
TARGET_PRODUCT=full.

Change-Id: I502af9b06903808fa2448c1013ddd8904f6000ca
ootdir/Android.mk
2a743730c7d1a8adba8a922f7af46cef0b35363a 18-Jan-2010 Dries Harnie <botje.linux@gmail.com> Userland support for VM interconnection

Change-Id: I699608f3072b39c8da1a7cc313bd0b736e90f225
ootdir/etc/init.goldfish.sh
oolbox/Android.mk
oolbox/route.c
f4f7697f69a68abc755d9c4d1ef384984d81b164 15-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 0bcda269: merge from open-source master

Merge commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60'

* commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60':
Add -R to chmod
Add -p support to mkdir
0bcda269708bbc4f4bd729765e3d4d84e0fd5e60 15-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: If9a300a80228f30166ed42853ae13236aaa2eee5
6cebee264761cf9ed3a9b8b1ec939baf6e446afd 15-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Add -R to chmod"
34225919abe715f9ac34acfbb6eba88a282628b2 15-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Add -p support to mkdir"
365a09e817e919c491a1e8abce0b734af14d3e5f 07-Jul-2010 Anthony Newnam <anthony.newnam@garmin.com> Add -R to chmod

Change-Id: I30f976598bd937f656a3ad3395349f09e695cfce
oolbox/chmod.c
b55de6798507178dc7a50570108b435afa9a8346 07-Jul-2010 Anthony Newnam <anthony.newnam@garmin.com> Add -p support to mkdir

Change-Id: Ia0298ccc6b476d6bd6756471c05ef2a345312734
oolbox/mkdir.c
6b657472331ddb2cf5286167ff2460047a321be7 14-Jul-2010 Mike Dodd <mdodd@google.com> Fix bug in debuggerd so it can successfully find the exidx section in
libraries. This should fix the bug where the exception stack wasn't
being printed past the PC.

Change-Id: Ia69ebd49606ee34e329ba43c07b325660248e8fa
ebuggerd/debuggerd.c
80ec37aa15c138beee5889a257d1241c30a1e8d7 14-Jul-2010 Chih-Wei Huang <cwhuang@linux.org.tw> libsysutils: reimplement NetlinkEvent::findParam in the proper way

The original implementation can not find correct parameters for certain
cases. For example, if you have both foo_bar and foo, try to find foo
may be mismatched. The correct way is to match with "=".

Change-Id: I403b1a7b889583a57a4f3a14e575181ce93b10ff
ibsysutils/src/NetlinkEvent.cpp
335cc39928ba4ff8daca360376bc2d7fd241122d 14-Jul-2010 Brian Swetland <swetland@google.com> am 62a54f3b: am 25b15be9: init: use tmpfs/ftruncate for properties backing store instead of ashmem

Merge commit '62a54f3b1343043528b7e93c1a4311a5e9d5f358'

* commit '62a54f3b1343043528b7e93c1a4311a5e9d5f358':
init: use tmpfs/ftruncate for properties backing store instead of ashmem
587c286f988a99469b8961f024c3be13f43c847a 14-Jul-2010 Brian Swetland <swetland@google.com> am beb72464: am 63e5205c: fastboot: make it so I can actually see the bootloader chatter

Merge commit 'beb72464ff8c501597cd7e098090f7d131dc5ccb'

* commit 'beb72464ff8c501597cd7e098090f7d131dc5ccb':
fastboot: make it so I can actually see the bootloader chatter
62a54f3b1343043528b7e93c1a4311a5e9d5f358 14-Jul-2010 Brian Swetland <swetland@google.com> am 25b15be9: init: use tmpfs/ftruncate for properties backing store instead of ashmem

Merge commit '25b15be9120bcdaa0aba622c67ad2c835d9e91ca' into gingerbread-plus-aosp

* commit '25b15be9120bcdaa0aba622c67ad2c835d9e91ca':
init: use tmpfs/ftruncate for properties backing store instead of ashmem
beb72464ff8c501597cd7e098090f7d131dc5ccb 14-Jul-2010 Brian Swetland <swetland@google.com> am 63e5205c: fastboot: make it so I can actually see the bootloader chatter

Merge commit '63e5205cd2f693bbfa54411f2dd20354bd30ffd8' into gingerbread-plus-aosp

* commit '63e5205cd2f693bbfa54411f2dd20354bd30ffd8':
fastboot: make it so I can actually see the bootloader chatter
25b15be9120bcdaa0aba622c67ad2c835d9e91ca 14-Jul-2010 Brian Swetland <swetland@google.com> init: use tmpfs/ftruncate for properties backing store instead of ashmem

This removes the need for ashmem for early bringup and avoids an issue
with permissions enforcement.

Change-Id: I405b080660934d73048c79d614b6b2ebc43ab182
Signed-off-by: Brian Swetland <swetland@google.com>
nit/property_service.c
68fec9a751ee943ba1d48e5af8d68c8ff33c66d8 28-Feb-2009 Sean McNeil <sean.mcneil@windriver.com> Use complete hardware name without spaces.

Many targets use generic first portions like 'OMAP'

Change-Id: I00ba4e64cffc48353c29e409c3c19238024fbd8c
nit/init.c
5db1ebe0292a021ebb54c5981bc12bd6ee12eb7a 13-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 8e9cacc5: merge from open-source master

Merge commit '8e9cacc5eb1618b34373ac9131561560a56b4661'

* commit '8e9cacc5eb1618b34373ac9131561560a56b4661':
Disable building libdiskconfig on non-Linux hosts
8e9cacc5eb1618b34373ac9131561560a56b4661 13-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I308dce25270cffc5d1f0056e1e3d3a3fbc6be532
bedaac52a677c152e051c17ef456cc9e43f3812b 13-Jul-2010 Kenny Root <kroot@google.com> Disable building libdiskconfig on non-Linux hosts

libdiskconfig depends deeply on some Linux-specific things like
/usr/include/linux/fs.h which don't exist on other OSes. Disable
building the host library for those platforms.

Change-Id: Ibccdfaa65be788f049ea3c1500f884c8d541e60b
ibdiskconfig/Android.mk
41b92c20f82d10291bd65d68111edafbf53a9471 13-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 8d6da447: merge from open-source master

Merge commit '8d6da4478c27c1b65629a4c2966e7382e3f45fb1'

* commit '8d6da4478c27c1b65629a4c2966e7382e3f45fb1':
Build the host version of libdiskconfig
8d6da4478c27c1b65629a4c2966e7382e3f45fb1 13-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I5f7a14b12ccff63b9e1813bb4a93c44654a92e4a
07b3d09e841ea8544f72c3b2bf268f07df6357f7 29-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> Build the host version of libdiskconfig

Change-Id: I5541d02676b12b728492321ec1344bd826ee560a
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
ibdiskconfig/Android.mk
c0c799c6609e2810259759ad070cab9a143db272 02-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 0796f618: merge from open-source master

Merge commit '0796f618775b34e14ff624bcfca828d55183b4c5'

* commit '0796f618775b34e14ff624bcfca828d55183b4c5':
DBUS is not fully implemented. Disable it for now
0796f618775b34e14ff624bcfca828d55183b4c5 02-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I1be135f087795bf1789dbf911c585a606bf25778
63e5205cd2f693bbfa54411f2dd20354bd30ffd8 28-Jun-2010 Brian Swetland <swetland@google.com> fastboot: make it so I can actually see the bootloader chatter

- prefix bootloader messages with (bootloader)
- remove the fancy right justified no newline business

Change-Id: Ica16ebe6a25971db423c5db06300a280d93faf3e
Signed-off-by: Brian Swetland <swetland@google.com>
astboot/engine.c
astboot/protocol.c
64e76cc63716b2ae844587c6567a0fc05bd37abd 01-Jul-2010 Carl Shapiro <cshapiro@google.com> Merge "Remove an obsolete compatibility macro."
7ae24be753f5d4a2fc00e1c408a6aca5edd17acb 01-Jul-2010 Andy McFadden <fadden@android.com> am 635dc574: am 57dbb2cb: Merge "Add a HAVE define for pthread_setname_np()." into gingerbread

Merge commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9'

* commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9':
Add a HAVE define for pthread_setname_np().
83d11a7ef86047b32dd6488cd277e3ac00b4f347 01-Jul-2010 Andy McFadden <fadden@android.com> am efca2263: am cc4d11c2: Merge "Fix sim-eng build." into gingerbread

Merge commit 'efca22636f4036da32f2f6734926442f5ebb422b'

* commit 'efca22636f4036da32f2f6734926442f5ebb422b':
Fix sim-eng build.
635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9 01-Jul-2010 Andy McFadden <fadden@android.com> am 57dbb2cb: Merge "Add a HAVE define for pthread_setname_np()." into gingerbread

Merge commit '57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6' into gingerbread-plus-aosp

* commit '57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6':
Add a HAVE define for pthread_setname_np().
57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6 01-Jul-2010 Andy McFadden <fadden@android.com> Merge "Add a HAVE define for pthread_setname_np()." into gingerbread
7a96ba436c9a2bacc64e712bdb53bd7accc5c3a9 01-Jul-2010 Mike Lockwood <lockwood@android.com> libusbhost: The client is now responsible for creating the thread that monitors the bus

This is to allow using a thread that is capable of calling through JNI to Java code
to report USB device attached/removed events.

Change-Id: Ia58592607a2c1f4357b31072044f5db5617d7f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
efca22636f4036da32f2f6734926442f5ebb422b 01-Jul-2010 Andy McFadden <fadden@android.com> am cc4d11c2: Merge "Fix sim-eng build." into gingerbread

Merge commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae' into gingerbread-plus-aosp

* commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae':
Fix sim-eng build.
cc4d11c245d5b514ba758cc095a59cd481c92cae 01-Jul-2010 Andy McFadden <fadden@android.com> Merge "Fix sim-eng build." into gingerbread
8e9d5c972e3eda8d1b7b9a62cd6e8a324286cfe9 30-Jun-2010 Andy McFadden <fadden@android.com> Add a HAVE define for pthread_setname_np().

Due to conflicts with recent WebKit, we need to call it
HAVE_ANDROID_PTHREAD_SETNAME_NP.

https://review.source.android.com/#change,15227 has the original
change, which was reverted after the conflict was found.

Change-Id: I7111960a16505558338756dba91eb50cadb582ff
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
9f6d28dc454e053ddcfe21879e4575ac86654050 01-Jul-2010 Andy McFadden <fadden@android.com> Fix sim-eng build.

Include <stddef.h> to get definition of size_t. Remove inclusion
of <stdint.h>, which doesn't seem to be needed.

Change-Id: Ib7ff231b5ec4b8c672084801fbb294a50cb7c3d7
nclude/cutils/ashmem.h
4272a7ad70721acd68cf9f73c0455bda3102c80f 01-Jul-2010 Werner Johansson <werner.johansson@sonyericsson.com> am a8c74049: am 931bdcc0: Set explicit timeout on USB control transfer

Merge commit 'a8c7404956b4370162a87ae09b851266a4933b54'

* commit 'a8c7404956b4370162a87ae09b851266a4933b54':
Set explicit timeout on USB control transfer
a8c7404956b4370162a87ae09b851266a4933b54 01-Jul-2010 Werner Johansson <werner.johansson@sonyericsson.com> am 931bdcc0: Set explicit timeout on USB control transfer

Merge commit '931bdcc09a3d805cf25033951adb95c8e5159e46' into gingerbread-plus-aosp

* commit '931bdcc09a3d805cf25033951adb95c8e5159e46':
Set explicit timeout on USB control transfer
931bdcc09a3d805cf25033951adb95c8e5159e46 01-Jul-2010 Werner Johansson <werner.johansson@sonyericsson.com> Set explicit timeout on USB control transfer

This attempts to solve the intermittent issues with serial number
showing up as all question marks when issuing "fastboot devices"
astboot/usb_linux.c
a3405403a0e3c6337da6f8658d76a026b7290863 01-Jul-2010 Carl Shapiro <cshapiro@google.com> Remove an obsolete compatibility macro.

Change-Id: Ibeae0986b6c68f40e414917405a31cc0ad810fc4
nclude/cutils/atomic.h
d0645bf0cc76ef7be11cf77a8e1995233a1972e4 30-Jun-2010 Brian Carlstrom <bdc@google.com> updated BOOTCLASSPATH to track merge from dalvik-dev

Change-Id: I10e6895ad3647dd789fe5fc7a7d37c4b71c61717
ootdir/init.rc
fe722218ddf92429a72792ccde4f8528f0abcd3d 29-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "ueventd.rc: Give the USB group read/write access to the MTP USB driver."
69286093d00186ecf2354d8f19934630500b21c4 29-Jun-2010 Mike Lockwood <lockwood@android.com> ueventd.rc: Give the USB group read/write access to the MTP USB driver.

Change-Id: I305671848dbdf427333dc088f83f88cea1b33945
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/ueventd.rc
b22fd04b63d390bce5a5745aed95481243ca780a 29-Jun-2010 Nick Kralevich <nnk@google.com> Merge "Mount /dev with nosuid"
e48b78a2b290ba580bc1b2d63ab95fd3a726f7f9 25-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 0e5a6b12: merge from froyo-plus-aosp

Merge commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0'

* commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0':
Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
AndroidConfig: define HAVE_PTHREAD_SETNAME_NP
45f7fde3c96b99d23f188bec7a269734bb1d0d35 25-Jun-2010 Kenny Root <kroot@google.com> am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly

Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1'

* commit '0b1ff6be08844c541e36fd735b41990453582ec1':
Display file sizes larger than 2GB correctly
0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0 25-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp

Change-Id: I1a3c106234a7910194fe39ca17339796aaf5cfe1
0b1ff6be08844c541e36fd735b41990453582ec1 25-Jun-2010 Kenny Root <kroot@google.com> am eb42170e: Display file sizes larger than 2GB correctly

Merge commit 'eb42170e6c8b70f11dca9965785aa04a80290c72' into gingerbread-plus-aosp

* commit 'eb42170e6c8b70f11dca9965785aa04a80290c72':
Display file sizes larger than 2GB correctly
eb42170e6c8b70f11dca9965785aa04a80290c72 25-Jun-2010 Kenny Root <kroot@google.com> Display file sizes larger than 2GB correctly

File size was cast to a signed integer which displayed files over 2GB as
negative sizes on devices. Use a long long for printing instead which
matches the stat struct.

Change-Id: I0ec07f33716bb4c2e5d120633ed435f637238f46
oolbox/ls.c
e94df975ff0d5ff23df5fb7b9102b5cfdd78641b 24-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> DBUS is not fully implemented. Disable it for now

Change-Id: I2286064bffc7e9fa7381aa04d5d20abf11c3aab7
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
nclude/arch/target_linux-x86/AndroidConfig.h
3de5dba5590d5f1c9b33da8463502905b0ebfc58 23-Jun-2010 Carl Shapiro <cshapiro@google.com> am 2c4676de: am 93b0cb40: Define inline atomic operations for x86 and ARM.

Merge commit '2c4676de62cf8ca7e3759f7f709e29c623495f55'

* commit '2c4676de62cf8ca7e3759f7f709e29c623495f55':
Define inline atomic operations for x86 and ARM.
2c4676de62cf8ca7e3759f7f709e29c623495f55 23-Jun-2010 Carl Shapiro <cshapiro@google.com> am 93b0cb40: Define inline atomic operations for x86 and ARM.

Merge commit '93b0cb40c18cae594c931677be2b9214420610b7' into gingerbread-plus-aosp

* commit '93b0cb40c18cae594c931677be2b9214420610b7':
Define inline atomic operations for x86 and ARM.
93b0cb40c18cae594c931677be2b9214420610b7 04-Jun-2010 Carl Shapiro <cshapiro@google.com> Define inline atomic operations for x86 and ARM.

This change moves the ARM definitions into GCC extended inline
assembler. In addition, the same set of x86 definitions are now
shared among all x86 targets.

Change-Id: I6e5aa3a413d0af2acbe5d32994983d35a01fdcb3
nclude/cutils/atomic-arm.h
nclude/cutils/atomic-inline.h
nclude/cutils/atomic-x86.h
nclude/cutils/atomic.h
ibcutils/Android.mk
ibcutils/atomic-android-arm.S
ibcutils/atomic.c
150f19e373f57c245609c2252be257b8a9ab15fd 23-Jun-2010 Nick Kralevich <nnk@google.com> Mount /dev with nosuid

Change-Id: I66c7fcf9b65405dfc12d344ef3ed225d0ad2db84
nit/init.c
ec219a2ee73dba139e31105f8f57ee5ffbaaa432 23-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I01315984e45ecc0261ea35b5370cbe624cc90cea
d05d26893de34fd8407f40406a3c57cc08699d2c 23-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"

This reverts commit de50fc1a87447b5e9c2b5dc3c074c72af5e57b1f.
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
6d4113f859c2c970712dc69594dcc5ecc7ffba26 22-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ibc43e8da821400022726b119940708efb052908b
424875b818811c04b472b28a9f5d3b6fbcbec219 22-Jun-2010 Andy McFadden <fadden@android.com> Merge "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
fbd08273725adaf324be7493cc58494132314364 21-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 67e6fcd1: merge from froyo-plus-aosp

Merge commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333'

* commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333':
added vendor ID for http://www.onthegovideo.com/
Fix build - cpu-features is ARM-specific
eliminate a compiler warning: signed/unsigned length
adb: optimize socket-list-walking code
adb: remove unneeded assignment of id to zero
adb: clean up 0 --> NULL for pointers
- creates proper ifc.h and dhcp.h headers for libnetutils
Adds support for UBFX to JIT and Disassembler
67e6fcd19533f54ca37cbe72425f55a40a7f0333 21-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp

Change-Id: Ie231effb4d9dfd63aa98ec08b269c31ce32aa1c0
96db405f379548ad7a85cd7bdad4e5d21ba5bbf4 18-Jun-2010 Wink Saville <wink@google.com> Merge "Update the help text to reflect new capabilities of -b parameter."
9ac7fb7d61dd2633b09de88af47e904067a6fd7c 18-Jun-2010 Takeshi Kishimoto <kishimoto@google.com> am f1792b3d: am 2124afee: Added NEC and PMC\'s USB VIDs upon their request.

Merge commit 'f1792b3d125a6adefa6941d20b3f26833570ab65'

* commit 'f1792b3d125a6adefa6941d20b3f26833570ab65':
Added NEC and PMC's USB VIDs upon their request.
f1792b3d125a6adefa6941d20b3f26833570ab65 18-Jun-2010 Takeshi Kishimoto <kishimoto@google.com> am 2124afee: Added NEC and PMC\'s USB VIDs upon their request.

Merge commit '2124afeee1f19423e71c52ede6f4926f5389e917' into gingerbread-plus-aosp

* commit '2124afeee1f19423e71c52ede6f4926f5389e917':
Added NEC and PMC's USB VIDs upon their request.
ba9608ff633724ded86aab7a9a401c87c7faafa1 18-Jun-2010 Wink Saville <wink@google.com> Update the help text to reflect new capabilities of -b parameter.

The -b parameter now support specifying multiple ring buffers
and the results are interleaved. In addition a new ring buffer
has been created, 'system', and the default is now -b main -b system.

Change-Id: Ibc25a31fb8fe21d75dda4598a83cf3426f759eb1
ogcat/logcat.cpp
8f5daadcc13a238344f5121a38345a18abc5aa9a 15-Feb-2010 Teddie Stenvi <teddie.xx.stenvi@stericsson.com> Fix ADB daemon file descriptor leak

The ADB (Android Debug Bridge) daemon suffers from a file descriptor leak.
When transfering file descriptors, opened by the adbd daemon, to a JDWP
process for debugging through sendmsg, the file descriptor is duplicated
by the kernel and a copy is transfered to the JDWP process.
Adbd neglects to close it's copy of the descriptor after the sendmsg call
which causes a file descriptor leak in the process.
Eventually this causes the daemon to hit its maximum roof of opened file
descriptors thus making it impossible for the process to serve any new
commands from the adb server.
Jdwp_service.c has been modified to close the file descriptor after the
send message call has succeded.
Also, the socket used for transfering the file descriptor is set to blocking
mode before the sendmsg call since the adbd processes needs to know when the
duplication has been completed by the kernel.
The flags are reset to its original state after the sendmsg call.

Change-Id: I76b15460301ac01e432f5ce8678ff58c658c16f2
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
db/jdwp_service.c
2124afeee1f19423e71c52ede6f4926f5389e917 18-Jun-2010 Takeshi Kishimoto <kishimoto@google.com> Added NEC and PMC's USB VIDs upon their request.

Change-Id: I332ee1e68ff960d41a365aeb96d012253056edd2
db/usb_vendors.c
5f81c272c18a0ef8b5e6e56f1528dd46db310d0d 17-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> Move UART device permissions to device specific init files.

Change-Id: I548386601d7546831bfeb044d15b1c9bf71f3e96
ootdir/ueventd.rc
49a7822ab3befdd1e037eea3393d7c83da46b1c8 16-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "init.rc: Move SD card support to device specific init.rc files"
a2dffa9db6c08c240e9511faee1c16fea535ef3e 16-Jun-2010 Mike Lockwood <lockwood@android.com> init.rc: Move SD card support to device specific init.rc files

Change-Id: I5745e91df2b7c5722bd6e650931d3d2d7d0eadcb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/etc/init.goldfish.rc
ootdir/init.rc
4ea085064236fc23ff7f8398345b0fa45646ade7 16-Jun-2010 Nick Kralevich <nnk@google.com> Revert "Mount /dev with noexec and nosuid"

This reverts commit 4ec97f2b257f5c9ed7cf6f0245212f4e3eb60c1b.
nit/init.c
1adbb607d2b6a74b7871a8cecd7c5690c8c5cf6d 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I8cfc9c0b699eceef77a905ca2f8cbdb1ab06bf1d
2ef569417d1136f9dcb8c2bbc6e3c3c59c4ea28d 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia99df155e4abf0585ed46943b75a2a1569d0534f
ee0306b93386340c86d6ca9f70bd147fba16d901 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I183a933e96222f8c01516210cfa4be5f18e35b70
d9a1904d3f873f7733e3b7b91c70027781b463c5 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I14853c1f8a1d392d7ee9dfae3914d9ee3107794c
6f29e5a27b552297295f5570d2de6a8bc9e76738 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I2dacf7f8895debd0452c3601424e32a3b9e19059
07a804b83ae9aff836bf6e66eb4f2bbe8f88cc90 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia8d41f96f3885bd7159571182d09c1da079e5bc9
f0d644fa235418d3f6b7abf53808ee767d650dd2 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I1ec0e1e702687697eccd3bf6c4f115cac85e382c
177e78efe60e1ed127e38a97c2a424d4aa1ef536 15-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "- creates proper ifc.h and dhcp.h headers for libnetutils - adds ifc_set_hwaddr - adds hwaddr command to netcfg - code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing - consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties (see related change to WifiStateTracker) - updated system/core/nexus to use new headers, although not sure if anybody still uses nexus"
83cb93b4016cbd6029a2d215a7b63fa716b103e4 03-Jun-2010 Michael Richardson <mcr@credil.org> added vendor ID for http://www.onthegovideo.com/

Change-Id: I38e3a6f252728d93177745778147e6f6ed45d5c5
db/usb_vendors.c
feff3a8b8d1da8aaeaf36a09adc44e0fb3789737 15-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "eliminate a compiler warning: signed/unsigned length"
7b67993a9efc90825d42455cc72dd80a3876a2cd 15-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "adb: optimize socket-list-walking code"
b660bfc778470e009c794416562d12395a625ecb 15-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "adb: remove unneeded assignment of id to zero"
1dbfce3dfc66046402ccbd1e83928942f824294d 15-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "adb: clean up 0 --> NULL for pointers"
62f4d86b7c9143860bc5e9679382fcf159b788b4 15-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Fix build - cpu-features is ARM-specific

Change-Id: I66521f279545a249e3dcb645914f7b66f23cef21
ibpixelflinger/codeflinger/load_store.cpp
91012214eb5123ffc0cd7cac4170865d5facc0de 15-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Adds support for UBFX to JIT and Disassembler"
eb558b9240743e24c87796191f54c99890641b14 03-Jun-2010 Michael Richardson <mcr@credil.org> eliminate a compiler warning: signed/unsigned length

Change-Id: I6139a1b3f9caa8fe3492e4850dcc58d8d5ff0cfb
db/usb_vendors.c
5ab8fed240cea2263d593864837fa1372188ce2d 14-Jun-2010 Mike Lockwood <lockwood@android.com> Merge changes Iac3d757b,Ic31463d2,I27e95c1d,Ibd6e8769

* changes:
Revert "adb: Use new libusbhost library for USB support on Linux host."
Revert "adb: remove unnecessary include"
Revert "adb: Adjust usb_linux.c for changes in libusbhost API."
Revert "adb: avoid potential race conditions in detecting device disconnects"
ac3d757b815efa3f2fbfed680c8cb0832c5f984d 14-Jun-2010 Mike Lockwood <lockwood@android.com> Revert "adb: Use new libusbhost library for USB support on Linux host."

This reverts commit d7249c45f6c245652de7c510d450f4577dc19197.
db/Android.mk
db/usb_linux.c
c31463d244d2e37d3329350a545e1f21f4f1e994 14-Jun-2010 Mike Lockwood <lockwood@android.com> Revert "adb: remove unnecessary include"

This reverts commit e380c27e9fdca66fa2f4aa9fd599568c568fc33d.
db/usb_linux.c
27e95c1daf2e95400c678bb4b6fd847db0249f2b 14-Jun-2010 Mike Lockwood <lockwood@android.com> Revert "adb: Adjust usb_linux.c for changes in libusbhost API."

This reverts commit 36b99e4cac293ae4b2400ae3fcc06b7056893060.
db/usb_linux.c
bd6e87693fe57e94d211807cfd3c763812b56012 14-Jun-2010 Mike Lockwood <lockwood@android.com> Revert "adb: avoid potential race conditions in detecting device disconnects"

This reverts commit a78012adc80ffcd48bc84a7a5f85d3e93df1e2d3.
db/usb_linux.c
fc86c58a08c84dc732ff405c16cb893de8723d93 14-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "adb: avoid potential race conditions in detecting device disconnects"
a78012adc80ffcd48bc84a7a5f85d3e93df1e2d3 14-Jun-2010 Mike Lockwood <lockwood@android.com> adb: avoid potential race conditions in detecting device disconnects

I am hoping this will fix b/2767449 and b/2752393

Change-Id: I230310d37f50eb2a2e1bad31e374427fd44393a5
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
044422e82890f6dbd0981f6b665b2ee59f0c26b0 14-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 50ca0c77: merge from froyo-plus-aosp

Merge commit '50ca0c7720b66cfc322247b7f407b3cbe5823053'

* commit '50ca0c7720b66cfc322247b7f407b3cbe5823053':
debuggerd: Show function names in tombstone backtraces
50ca0c7720b66cfc322247b7f407b3cbe5823053 14-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp

Change-Id: Ibe4e2029776429eea21c7ced877e21607e66504d
8182829ccb46fc5b043ea258672602dc2928dee2 12-Jun-2010 André Goddard Rosa <andre.goddard@gmail.com> adb: optimize socket-list-walking code

Change-Id: I8bbb8b671c1ce7a2ce736b60b0cdb7b21ccdc372
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
db/sockets.c
8e78dc64d2fedccc77966b0636f7530f452dc7d5 11-Jun-2010 André Goddard Rosa <andre.goddard@gmail.com> adb: remove unneeded assignment of id to zero

... as memory was already obtained zero'ed by calloc().

Change-Id: Ic73bad09b54cb778fd40bdf86bb40888ea504c5f
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
db/sockets.c
c419e2a210ad7e37a1f749f2ab4de7c7f95b90d7 11-Jun-2010 André Goddard Rosa <andre.goddard@gmail.com> adb: clean up 0 --> NULL for pointers

Change-Id: I9216fdf534d807a55dfbc6800b5c3ef5f8c83368
db/sockets.c
c5947806740172e66c1fd5259e86bc5543d873ac 11-Jun-2010 Dianne Hackborn <hackbod@google.com> am 0c6672c6: am 8b0ec20d: Update OOM adj levels.

Merge commit '0c6672c66a93f7a81d07ff3f59eee87ddb16db3c'

* commit '0c6672c66a93f7a81d07ff3f59eee87ddb16db3c':
Update OOM adj levels.
0c6672c66a93f7a81d07ff3f59eee87ddb16db3c 11-Jun-2010 Dianne Hackborn <hackbod@google.com> am 8b0ec20d: Update OOM adj levels.

Merge commit '8b0ec20d6f9636def6740085b203302c1680fa81' into gingerbread-plus-aosp

* commit '8b0ec20d6f9636def6740085b203302c1680fa81':
Update OOM adj levels.
8b0ec20d6f9636def6740085b203302c1680fa81 11-Jun-2010 Dianne Hackborn <hackbod@google.com> Update OOM adj levels.

This introduces some new buckets that will be used by the activity
manager, and adjusts the default levels to match what we had been
setting for Droid.

It turns out Passion has been using the old levels, which makes no
sense for how much memory it has. Also it is a problem with these
definitions spreading to other projects for different devices, so
I am going to update the defaults to be appropriate for our newer
devices, and put here a file to tune them down for something like
the sapphire.

Change-Id: Ia4f33c4c3b94aeb3656f60b9222072a1d11e9e68
ootdir/init.lowmem.rc
ootdir/init.rc
7ad012bde5fe312ddc8ecfb515e16aebd39386d4 11-Jun-2010 Nick Kralevich <nnk@google.com> Merge "Mount /dev with noexec and nosuid"
de50fc1a87447b5e9c2b5dc3c074c72af5e57b1f 10-Jun-2010 André Goddard Rosa <andre.goddard@gmail.com> AndroidConfig: define HAVE_PTHREAD_SETNAME_NP

It indicates if the underlying libc provides pthread_setname_np().

Change-Id: Ifef7730970033e834daf2fa710919722d64673e1
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
75a1d218d82b8a7d6e0196465dc02ca03fc173c6 10-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I50b7bc6faa6d0abd4998cae8fc7dda1e8fa49407
e15af09876c5e0301084f46b8036aed147cf9c24 10-Jun-2010 Mike Lockwood <lockwood@android.com> libusbhost: Use logcat for debugging when building device library.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ibusbhost/Android.mk
ibusbhost/usbhost.c
13b012aafff1bcc3a87e69eca82a9611e8842bac 10-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "debuggerd: Show function names in tombstone backtraces"
7570ab61d40190a1e9c5d4cd9dfc8220dbb18235 10-Jun-2010 Jean-Baptiste Queru <jbq@google.com> am f72961d0: merge from froyo-plus-aosp
f72961d068d7a89403f0bb828f65021ac73a5cff 10-Jun-2010 Jean-Baptiste Queru <jbq@google.com> merge from froyo-plus-aosp

Change-Id: I82ec6dbd7c8c3b37b9505eaef351042f2ee53fb5
c88e09cb98fb3690c3cf49f5a825532e0d9bf300 09-Jun-2010 Szymon Jakubczak <szym@google.com> - creates proper ifc.h and dhcp.h headers for libnetutils
- adds ifc_set_hwaddr
- adds hwaddr command to netcfg
- code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing
- consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties
(see related change to WifiStateTracker)
- updated system/core/nexus to use new headers, although not sure if
anybody still uses nexus

Change-Id: Idd70c0ac6e89b38e86816578c33eff805d30cac4
nclude/netutils/dhcp.h
nclude/netutils/ifc.h
ibnetutils/dhcp_utils.c
ibnetutils/dhcpclient.c
ibnetutils/ifc_utils.c
ibnetutils/ifc_utils.h
etcfg/netcfg.c
exus/DhcpClient.cpp
7c84efe083f4cd6b4a322bfe018f26b2f7d1e844 09-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I2f725ca20bf08748a4b3e81a4e98fbe08fcf1a47
f2df6bb982c8e0f84b2aabdfa9843fa992b9e5e4 09-Jun-2010 David 'Digit' Turner <digit@android.com> Merge "toolbox-ls: sort file and directory lists"
36d25509daa5a3f19fbfc2802c5fd75bc6d73cc8 09-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ie1dc11ee5c184b8f355ca8e2c1a74f86aea4c299
885e5a7104e6503666bde00187efbf0b9f6c6230 09-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Spell system correctly"
4ec97f2b257f5c9ed7cf6f0245212f4e3eb60c1b 08-Jun-2010 Nick Kralevich <nnk@google.com> Mount /dev with noexec and nosuid

Change-Id: Iea182c1e6a72c281abd17bf83ff765bb9cb59270
nit/init.c
aa2106b008921ed8f33ee14ee70fb1b944f547ec 04-Jun-2010 David 'Digit' Turner <digit@android.com> toolbox-ls: sort file and directory lists

Sorts file and directory names properly in 'ls'
+ accept group flags (e.g. '-ld' instead of '-l -d')
+ accept flags in any position on the command line (e.g. 'ls foo -l' works)

Change-Id: Idc24a69ae31fe0c13726d39892357ac89a8830db
oolbox/ls.c
7b84e72cc4609e04afdd7cc9a337be99444f74a9 04-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 0659dd56: am c8c8c050: merge from open-source master
0659dd5625cb6abf09ac756eab92923b1002138a 04-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am c8c8c050: merge from open-source master

Merge commit 'c8c8c050259a0b1222b827b53775e0496c280b7f' into kraken

* commit 'c8c8c050259a0b1222b827b53775e0496c280b7f':
Improve linenoise.c compatability.
c8c8c050259a0b1222b827b53775e0496c280b7f 04-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I70c032cb8d1b3fbc4ae59c1e408b6fd0d23d4f2a
6d1b47b505bcace0890fd359c57283420495c3ff 04-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am c491fdc6: am 6be163b1: merge from open-source master
c491fdc6f5436245783c1a61cf0dee8ca0b8277d 04-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 6be163b1: merge from open-source master

Merge commit '6be163b167e986b4fafda9290e5d74fc3945b273' into kraken

* commit '6be163b167e986b4fafda9290e5d74fc3945b273':
Emit shell prompt even when in non-interactive mode.
6be163b167e986b4fafda9290e5d74fc3945b273 04-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I8b1e7e238d9d0e828bea72530b5356b8386e48bc
192a28831520dee50410a17953d87280d0fd8996 04-Jun-2010 Jack Palevich <jackpal@google.com> Improve linenoise.c compatability.

+ Don't flush characters when switching into and out of raw mode. This
avoids eating characters that follow '\n'. (Such characters can occur
when pasting multiple line input, or when scripts are driving input.)

+ Try to be slightly cleverer about calculating the length of the prompt,
so that prompts with embedded '\n' characters are handled OK. This is
an area that really needs to be replaced with a query of the cursor
position from the terminal.

+ As a hack, just assume the screen is very wide if we don't know how
wide it is. This allows dexpropt to work correctly. (It was getting
confused by the editing commands emitted when the end-of-line was reached.)

Change-Id: I988dd0f0bceb22b298e915be0dde085c9358ef66
iblinenoise/linenoise.c
ad5431d2ca9c4dd454dfb3bc8e9de3ee0ad28a27 03-Jun-2010 Jack Palevich <jackpal@google.com> Emit shell prompt even when in non-interactive mode.

Change-Id: If85c509efe13e4bdb40216c79d560ea7f83ba813
h/input.c
h/input.h
h/parser.c
6f5096b1885459bc0818c7634ba33c03e455dc7b 03-Jun-2010 Colin Cross <ccross@android.com> am 982a815c: Reap firmware child processes to prevent zombies
982a815c10cc28707d81c46112fc45b1c10df3be 03-Jun-2010 Colin Cross <ccross@android.com> Reap firmware child processes to prevent zombies

Change-Id: Ic6c50b929a025f05450cd309238e60a857690d9b
nit/devices.c
2ddc27d0df310a21d96a998151933fab6b2e156d 03-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am f1a4618e: am 324a98f1: merge from open-source master
42cd1c99c4bd3247233321df2819d36c98b811e4 03-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 7bea36bd: am f7e148c1: merge from open-source master
f1a4618e99b26a588e15e8c467b21b3a1df74f64 03-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 324a98f1: merge from open-source master

Merge commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4' into kraken

* commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4':
sh: Fix problem with stray '\r' character that was introduced in previous change
7bea36bdeb9829a9d7ca4bce18b85c2125668817 03-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am f7e148c1: merge from open-source master

Merge commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9' into kraken

* commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9':
adb connect and disconnect improvements:
324a98f1901fb84ec4c88196e01c3e14c2b5a4a4 03-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I6262a725068f89c989e2e6706bcd220ddb217c8e
f7e148c1bc482fe7f8df49d216b1f9390f0638b9 03-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9b051ebd6e785e4d68e148a005a0485e79aa55ea
f96e700b338e9a0edee6c2114cc7310f7be48bc4 03-Jun-2010 Christopher Tate <ctate@google.com> am 25e7b8fc: am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
1bc4eae3492b5e5fd8afdb3bb92c63287e8e994c 02-Jun-2010 Mike Lockwood <lockwood@android.com> sh: Fix problem with stray '\r' character that was introduced in previous change

Change-Id: I53148089bcb1989c129c7af465c724495e13e156
Signed-off-by: Mike Lockwood <lockwood@android.com>
h/input.c
25e7b8fcc3708b58736c7825ecf612d04020716e 02-Jun-2010 Christopher Tate <ctate@google.com> am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable

Merge commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163' into kraken

* commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163':
Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163 02-Jun-2010 Christopher Tate <ctate@google.com> am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable

Merge commit '230cb33fd1ab335c6f808c72db891993b00110a0' into froyo-plus-aosp

* commit '230cb33fd1ab335c6f808c72db891993b00110a0':
Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
cbbe79add1410b53ec65936cfb1b74cac68467f0 24-May-2010 Mike Lockwood <lockwood@android.com> adb connect and disconnect improvements:

Port number is now optional. Will use default port 5555 if not specified.
"adb disconnect" with no additional arguments will disconnect all TCP devices.

Change-Id: I7fc26528ed85e66a73b8f6254cea7bf83d98109f
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/transport.c
b0e270fd2403532500e6ee6bb4021e4c7a9944bd 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 5458065f: am 456688bf: merge from open-source master
5458065fbbf170ba9d2c216c512744625867fc17 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 456688bf: merge from open-source master

Merge commit '456688bfb4fa7817031a1d704e8353e1dd5efb3c' into kraken

* commit '456688bfb4fa7817031a1d704e8353e1dd5efb3c':
adb: remove obsolete shell history support.
f296c5bc3942723a6558d9accf17fb052924f3f3 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 12e549b0: am 5dc0f5db: merge from open-source master
f35012b0930fd2f5e1b67929b6f0abf636fc4f20 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 7e81a617: am c57a22c8: merge from open-source master
5da46c90dbb04bed88bea9a468b41a4ffd1e4506 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am a11a001f: am 705b37b8: merge from open-source master
12e549b0061940593bf0cfbf0d4d10e6672a4c84 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 5dc0f5db: merge from open-source master

Merge commit '5dc0f5db7152a604377af30f7d2139a84fd7b30c' into kraken

* commit '5dc0f5db7152a604377af30f7d2139a84fd7b30c':
Use linenoise to add simple editing and history to the Android shell.
456688bfb4fa7817031a1d704e8353e1dd5efb3c 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I99ae03ba51ee185b9cfecf4f26e94a757f3815c2
7e81a617720a9411af205378d3a8b02ebb2155e5 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am c57a22c8: merge from open-source master

Merge commit 'c57a22c8561cc571d23cd7f321103b2b4d2c7cde' into kraken

* commit 'c57a22c8561cc571d23cd7f321103b2b4d2c7cde':
Let "adb connect" connect to emulators too
5dc0f5db7152a604377af30f7d2139a84fd7b30c 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9e7ebc99f0de12ed3ae38a3882481485a96f9680
a11a001fc63d3731c04e77cf9f4544dcc1e57849 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 705b37b8: merge from open-source master

Merge commit '705b37b84c0c13407963fb1cea0309b9c3081368' into kraken

* commit '705b37b84c0c13407963fb1cea0309b9c3081368':
Fix adb remount on non-MTD devices
a48c07008ec6fc949d0cdf771f89a01b6124638e 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 62f30537: am c0b3ad16: merge from open-source master
c57a22c8561cc571d23cd7f321103b2b4d2c7cde 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I44bd527e51d102a56a1efe40cb6e634859b09461
62f305371de98f00824b102b82c5414e818bf165 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am c0b3ad16: merge from open-source master

Merge commit 'c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f' into kraken

* commit 'c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f':
adb: Add Qualcomm USB id
705b37b84c0c13407963fb1cea0309b9c3081368 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I5f7880bec0c15ae7a42175107d8192ad44b847ca
c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f 02-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I71f2e47509695ba9ec626f4a6917a645b00a4e70
203f102028c4df33c191d8cd610775eba8d5366d 27-May-2010 Mike Lockwood <lockwood@android.com> libusbhost: Added usb_device_get_unique_id

Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
230cb33fd1ab335c6f808c72db891993b00110a0 02-Jun-2010 Christopher Tate <ctate@google.com> Make /proc/kmsg and /proc/sysrq-trigger system-process-readable

This is so that the system process can capture kernel thread stacks when the
watchdog detects a deadlock. Previously, /proc/kmsg was root/root and mode
0400, and /proc/sysrq-trigger was root/root and mode 0200. With this
change, /proc/kmsg becomes root/system and 0440, and /proc/sysrq-trigger
becomes root/system and 0220.

Change-Id: Iac46bd10bd11d495024afeb5d693107ce5074791
ootdir/init.rc
f4dd883389585aaf8fad2e586bc451295b668191 01-Jun-2010 Andy McFadden <fadden@android.com> Fix build.

Missing a #define to map android_atomic_swap to its new name. Worked
fine in the other branches, because nobody was using android_atomic_swap
in the other branches.

Change-Id: I0e730e9823ac5cd2fee5a3f856ce05d36df5d87e
nclude/cutils/atomic.h
8264358f5b59592d7e8d2902edf9a5c316cb6723 31-May-2010 Andy McFadden <fadden@android.com> am 8dfa47da: Atomic/SMP update, part 2.
4dc1fa8e8d1f14868ab8bba93a8cbb87f847c4e3 04-Dec-2009 Martyn Capewell <martyn.capewell@arm.com> Adds support for UBFX to JIT and Disassembler

This introduces UBFX instruction generation abilities to the Pixelflinger JIT,
and also modifies the component extraction function to generate the
instruction.

The extract function contains defines to prevent generation of UBFX on pre-v7
cores. The JIT itself retains the ability to produce the instruction even on
v5/6.

This patch only generates UBFX when MOV, AND or BIC can't be used. Based on
the TRM, this appears to be faster on A9 than using UBFX in all cases.

On startup, Pixelflinger JITs three chunks of code. UBFX improves these as
follows:

00000077:03515104_00000000_00000000
(Blends a single colour into an RGB565 buffer.)
Before: 27 inst/pixel, After: 24 inst/pixel, Improvement: 12.5%
00000077:03545404_00000A01_00000000
(Blends RGBA8888 texture into an RGB565 buffer using alpha.)
Before: 30 inst/pixel, After: 27 inst/pixel, Improvement: 11.1%
00000077:03545404_00000A04_00000000
(Blends RGB565 texture into an RGB565 buffer using alpha.)
Before: 29 inst/pixel, After: 27 inst/pixel, Improvement: 7.4%
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/ARMAssemblerProxy.cpp
ibpixelflinger/codeflinger/ARMAssemblerProxy.h
ibpixelflinger/codeflinger/disassem.c
ibpixelflinger/codeflinger/load_store.cpp
0e67a037488c3b5a410ba301c408010120264f0b 28-May-2010 Brian Carlstrom <bdc@google.com> Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
8dfa47da8cb33ebaf7aae6db6548e75ed86e8f1e 27-May-2010 Andy McFadden <fadden@android.com> Atomic/SMP update, part 2.

Added new atomic functions, renamed some old ones. Some #defines have
been added for backward compatibility.

Merged the pre- and post-ARMv6 implementations into a single file.

Renamed the semi-private __android_membar_full_smp to USE_SCREAMING_CAPS
since that's more appropriate for a macro.

Added lots of comments.

Note Mac OS X primitives have not been tested.

Change-Id: If827260750aeb61ad5c2b760e30658e29dbb26f2
nclude/cutils/atomic-inline.h
nclude/cutils/atomic.h
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-armv6.S
ibcutils/atomic-android-sh.c
ibcutils/atomic.c
67d5358e2a870f9e9447517bfa49bf5c6b410a50 25-May-2010 Mike Lockwood <lockwood@android.com> adb: remove obsolete shell history support.

Change-Id: I85a7cda176ca3bb7cb9f96e18556d53daaac3023
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/Android.mk
db/commandline.c
db/history.h
db/shlist.c
db/shlist.h
3de417e16a4e683125206854713f34dfffab00d3 25-May-2010 Mike Lockwood <lockwood@android.com> Merge "adb: Adjust usb_linux.c for changes in libusbhost API."
cc6ff1071d69165c8ba57766f35e45715d0303a1 25-May-2010 Mike Lockwood <lockwood@android.com> Merge "libusbhost: Remove global data to allow multiple instances in the same process."
36b99e4cac293ae4b2400ae3fcc06b7056893060 25-May-2010 Mike Lockwood <lockwood@android.com> adb: Adjust usb_linux.c for changes in libusbhost API.

Change-Id: Ie63e4455460100b579fa87120e63c913dc5f16ad
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
6ac3aa157493ef24bc837b679dd8292fad8961e0 25-May-2010 Mike Lockwood <lockwood@android.com> libusbhost: Remove global data to allow multiple instances in the same process.

Change-Id: I977145f44131ec8b588dd274e0afbc563f3aa4c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
7fe202f160ca1926bc0277e3c276ad7b3f9b9aeb 25-May-2010 Jack Palevich <jackpal@google.com> Use linenoise to add simple editing and history to the Android shell.

The linenoise library is from http://github.com/antirez/linenoise

This patch also disables command-line editing and history from adb. The
adb implementation was shadowing the Android shell's implementation.

The adb implementation was also shadowing the editing and history
implementation in alternative shells such as BusyBox's ash.

Change-Id: I7ebd4cb391d0ce966c0ce0e707d80ecd659f9079
db/Android.mk
iblinenoise/Android.mk
iblinenoise/MODULE_LICENSE_BSD_LIKE
iblinenoise/NOTICE
iblinenoise/linenoise.c
iblinenoise/linenoise.h
h/Android.mk
h/input.c
h/parser.c
c6793c5290763362e70fd60a8d735c49af09c76e 25-May-2010 Jack Palevich <jackpal@google.com> Include the linenoise.h header in a cleaner way.

(This was a comment to an earlier change that I
overlooked.)
h/Android.mk
h/input.c
0cf08ed5ad723b55a5b020cb566de391ac2cce5b 25-May-2010 Jack Palevich <jackpal@google.com> Move linenoise to its own static library.

This allows us to publish its license, as required
by the terms of its license.
iblinenoise/Android.mk
iblinenoise/MODULE_LICENSE_BSD_LIKE
iblinenoise/NOTICE
iblinenoise/linenoise.c
iblinenoise/linenoise.h
h/Android.mk
h/input.c
h/linenoise.c
h/linenoise.h
e7de18e4451760dffbb3170cbd7651d05dd77987 24-May-2010 Jack Palevich <jackpal@google.com> Add simple readline-like input editing to the android shell.

Adapted from http://github.com/antirez/linenoise
h/Android.mk
h/input.c
h/linenoise.c
h/linenoise.h
h/parser.c
ae7b91b68008ab09635a97a18e7d07a35e8404aa 05-Nov-2009 Meng Hu <meng.hu@garmin.com> debuggerd: Show function names in tombstone backtraces

This change enables debuggerd to provide backtraces with function
names in tombstone files and log messages. It does this by reading
the image file that the address is found in, and parsing the dynamic
symbol table to try to extract the symbol corresponding to the given
address.

This works best when "-Wl,-export-dynamic" is added to the LDFLAGS
of each library and executable, because this will cause all symbols
to be added to the dynamic symbol table. If this flag is not present,
it will still work, but it will only be able to identify functions
which are part of the external API of the library/executable.

Change-Id: I618baaff9ed9143b7d1a1f302224e9f21d2b0626
ebuggerd/Android.mk
ebuggerd/debuggerd.c
ebuggerd/symbol_table.c
ebuggerd/symbol_table.h
ebuggerd/unwind-arm.c
ebuggerd/utility.h
d9d1ca47802395e9e42e7deb05b2683d9d306598 26-Apr-2010 Stefan Hilzinger <hilzinger@google.com> Let "adb connect" connect to emulators too

- adb can now connect to an emulator configured with an arbitrary
pair of <console port, adb port>. These two ports do not have to be
adjacent.
This can be done from the commandline at any time using
adb connect emu:<console_port>,<adb_port>
- Emulators running on ports outside the normal range
(5554/5555-5584/5585) register themselves on startup if they follow
the convention "console port+1==abd port".
- Emulators outside the normal port range will not be auto-detected on
adb startup as these ports are not probed.
- The index into local_transports[] array in transport_local.c does no
longer indicate the port number of the local transport. Use the altered
atransport struct to get the port number.
- I have chosen not to document the adb connect emu:console_port,adb_port
syntax on adb's help screen as this might be confusing to most readers
and useful to very few.
- I don't expect this to introduce any (backwards) compatibility issues.

Change-Id: Iad3eccb2dcdde174b24ef0644d705ecfbff6e59d
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/transport_local.c
5762ec29056936decf23b498724cd38d4a702edc 07-May-2010 Colin Cross <ccross@android.com> Fix adb remount on non-MTD devices

Change-Id: If8e07502bcface53aaac81022f6183c6a147edc8
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/remount_service.c
f1c03de74e56a82551c8d8165021bc23c6ac11a5 07-May-2010 Dima Zavin <dima@android.com> adb: Add Qualcomm USB id

Change-Id: I044a77f14d7a90e9dff191919e4aeb39723ea429
Signed-off-by: Dima Zavin <dima@android.com>
db/usb_vendors.c
f6e83f7eb8cab99b416c5be299f70adc4722a8bf 21-May-2010 Jeff Brown <jeffbrown@google.com> am dc594284: Merge "Fix kernel panics in fastboot on OS X." into kraken
dc5942840e1d1501a7ac4d633e8c5311e90c903b 21-May-2010 Jeff Brown <jeffbrown@google.com> Merge "Fix kernel panics in fastboot on OS X." into kraken
b64063737e93638a09205e9310b58d8ddd7138ec 21-May-2010 Jeff Brown <jeffbrown@google.com> Fix kernel panics in fastboot on OS X.

The kernel panic seems to be related to the driver trying to allocate
too many pages from the IO mapper. That may be caused by the fact
that we try to perform a 100+ MiB transfer in a single IO operation.
This change breaks the transfer down into 1 MiB chunks.

So far after a day of testing, no kernel panics have occurred compared
to 5 in the previous 24 hours!

Change-Id: I8d27a546e0c0bf4fe2f0fc7fcad65a88d3e6bee0
astboot/usb_osx.c
62af8f258367c68b346f691387495284973f681c 20-May-2010 Andy McFadden <fadden@android.com> Atomic/SMP update. [manual merge to dalvik-dev]

Added atomic-inline.h. Added a platform-specific memory barrier call
there.

Added android_atomic_acquire_cmpxchg() and android_atomic_release_store().
Not tested on Mac OS X or SH.

Added memory barrier calls to linux-x86 atomics. Mac OS X has barrier
functions already. sh isn't really SMP-ready. linux-arm needs work
(to be done in a separate change).

Updated the makefile to make the SMP state visible to the code here.
Note that host binaries are NOT built with SMP enabled; while our hosts
are very likely SMP, it's not worth figuring out e.g. whether it's okay
to use the SSE2 mfence instruction or have to use something else. We
haven't had barriers enabled in host tools before, so there's probably
no need to stat now.

Removed quasiatomic 64-bit calls (now part of Dalvik).

Change-Id: I42ae05f5db2cc9a5b64ad87f15481e2838371f1d
nclude/cutils/atomic-inline.h
nclude/cutils/atomic.h
ibcutils/Android.mk
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-sh.c
ibcutils/atomic.c
0bc248f9830901a047161fb9cedc9c6213cf70e0 21-May-2010 Andy McFadden <fadden@android.com> am ac322da6: Atomic/SMP update.
ac322da69ee48aa792baf5c48cfb719ce077f67e 20-May-2010 Andy McFadden <fadden@android.com> Atomic/SMP update.

Added atomic-inline.h. Added a platform-specific memory barrier call
there.

Added android_atomic_acquire_cmpxchg() and android_atomic_release_store().
Not tested on Mac OS X or SH.

Added memory barrier calls to linux-x86 atomics. Mac OS X has barrier
functions already. sh isn't really SMP-ready. linux-arm needs work
(to be done in a separate change).

Updated the makefile to make the SMP state visible to the code here.
Note that host binaries are NOT built with SMP enabled; while our hosts
are very likely SMP, it's not worth figuring out e.g. whether it's okay
to use the SSE2 mfence instruction or have to use something else. We
haven't had barriers enabled in host tools before, so there's probably
no need to stat now.

Removed quasiatomic 64-bit calls (now part of Dalvik).

Change-Id: I49e5e6c8abe70f304cdedb9d7b8e6e65f8925815
nclude/cutils/atomic-inline.h
nclude/cutils/atomic.h
ibcutils/Android.mk
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-sh.c
ibcutils/atomic.c
2bdcf63c4cefac4711336156481973d56362aa15 20-May-2010 Dima Zavin <dmitriyz@google.com> Merge "Don't define __linux__ if it is already defined by the toolchain. This change does not affect existing behavior at all and makes the file compatible with new toolchain."
a92be64809e3927790c7a8535f548ab5a9105e45 19-May-2010 The Android Open Source Project <initial-contribution@android.com> am 53a79a84: am 49337b27: merge from open-source master
53a79a841b4afa5e7dc3e05cfd04b5ae44de95b6 19-May-2010 The Android Open Source Project <initial-contribution@android.com> am 49337b27: merge from open-source master

Merge commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d' into kraken

* commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d':
Fix "route add default dev <iface>" behaviour
49337b27d9a90d7c3f703f618e7c6bfaffc2a96d 19-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I77e33ce567b9682f51785cc574e37dc2cd15028f
5099d3447da53a5eb91fba503e1da1e01eee3fd3 19-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix "route add default dev <iface>" behaviour"
165db2a19888673548a1a7bd1ffd39e89a8dfe78 18-May-2010 Jing Yu <jingyu@google.com> Don't define __linux__ if it is already defined by the toolchain.
This change does not affect existing behavior at all and makes
the file compatible with new toolchain.

Change-Id: Ia33bb9372d1705ec538b414bf69773f093e4543c
nclude/arch/linux-arm/AndroidConfig.h
d8642579381c6e11b2c32cbc11b2249cc692bb6c 17-May-2010 Mike Lockwood <lockwood@android.com> am c0d8fb58: (-s ours) DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken
c0d8fb5842f57bbc244e9c9596707787caabf44e 17-May-2010 Mike Lockwood <lockwood@android.com> DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken

this change is already in master

Change-Id: Ica43eae28b50d89d50217851aff7e62978abfa27
Signed-off-by: Mike Lockwood <lockwood@android.com>
e95aad61d841e7a472b4141808bbca0c7135b0f5 17-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I414c9479f4f913c777ef18b7ff27e410f49d35b9
93ac1559b8c7ad3125ddcd896082b030faadbbd4 06-May-2010 Mike Lockwood <lockwood@android.com> init: Add support for /dev/bus/usb/ file system and add new unix group AID_USB.

init now creates files in /dev/bus/usb/ for user access to USB devices.
Files are chmod 660 with group AID_USB.

Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/private/android_filesystem_config.h
nit/devices.c
c09b7cf1c96d007b35cfa47f464156bf628107de 14-May-2010 Dima Zavin <dima@android.com> am 509f7399: fastboot: Add more vendor usb ids
509f7399b8f246f506307b22039e63323ec09622 14-May-2010 Dima Zavin <dima@android.com> fastboot: Add more vendor usb ids

Change-Id: Ied48302b50412f27dcf49d40913e4b900f3bd153
Signed-off-by: Dima Zavin <dima@android.com>
astboot/fastboot.c
80bdda42359bf38ef0c1a10205c2031a902c48ea 14-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Added a move flag for init's mount command that maps to MS_MOVE."
855ddb623137cf463d6a33e6114474218eee73a1 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am 156b9f3d: am 538e5778: merge from open-source master
156b9f3d12db7c3680630bfded9483e1fbe5f467 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am 538e5778: merge from open-source master

Merge commit '538e5778be15382669b0058de5bafa9f4961247e' into kraken

* commit '538e5778be15382669b0058de5bafa9f4961247e':
sys_signame[] was added to libc, remove conflicting definition
538e5778be15382669b0058de5bafa9f4961247e 14-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia81df7e22e563b01091778043bba65dee1699e83
34ed47a378cffe6350a64cd361045b6341d0a5a0 14-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "sys_signame[] was added to libc, remove conflicting definition"
fcb44c4e2fbb541d93ff4a2fd1393ceeb5ffd28c 14-May-2010 Nick Kralevich <nnk@google.com> am a523b5b2: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
a523b5b2ca70469e42fb48e2a99500e68a700f68 14-May-2010 Nick Kralevich <nnk@google.com> Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
40754cfbb0cf1d4b745960090a81e37c213db7b1 14-May-2010 Nick Kralevich <nnk@google.com> am 4f55adc3: Get rid of warnings when compiled with -Wformat-security
4f55adc323a32cf2c7fb851fab86c9372e3b2cbf 14-May-2010 Nick Kralevich <nnk@google.com> Get rid of warnings when compiled with -Wformat-security

Change-Id: Ib38b2c152474ed83be1a5716457d0b374c0e5c68
ibnetutils/dhcpclient.c
dd26bb3a00b95dc8448d2d35bcee52c8e1880096 14-May-2010 Nick Kralevich <nnk@google.com> Get rid of warnings when compiled with -Wformat-security

Change-Id: I2bfc6582a8198b22af08e4b8d58f532dc138cc02
ogwrapper/logwrapper.c
98c9784d297b67beff5030cb9c1a13350c2ea711 14-May-2010 Jesse Wilson <jessewilson@google.com> Moving junit out of core.jar and into core-junit.jar.

Patched from master.
https://android-git.corp.google.com/g/50609

Change-Id: Idbcebbd3ba3599234cf9615b4cf3d38e99d2983f
ootdir/init.rc
bc3a04df0279f8a8336a4ff1313364d08988204f 13-May-2010 Brian Carlstrom <bdc@google.com> Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into mm
4a8becbf161ec1d286c7e74ecb298cc17d7d2c10 13-May-2010 Jesse Wilson <jessewilson@google.com> Merge "Moving junit out of core.jar and into core-junit.jar."
01e11a1a3044dcec24bba612bc43e8cd461f7549 12-May-2010 The Android Open Source Project <initial-contribution@android.com> am 0253ffde: am d00eba45: merge from open-source master
0253ffdee4c6ef3652219b1ce07f9db366ca10fa 12-May-2010 The Android Open Source Project <initial-contribution@android.com> am d00eba45: merge from open-source master

Merge commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba' into kraken

* commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba':
Add a printf format.
d00eba458706a38f6c072ed90c5da35f3e3f1bba 12-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I8e7903bcd3fe7ddf88b63462dc9123f12b779c64
9e3a6d176acf20133cf1f8d6e4612af4b01635c5 12-May-2010 Mike Lockwood <lockwood@android.com> Merge changes Ibe4ce055,I3bcba4c9

* changes:
libusbhost: add usb_endpoint_get_device()
adb: remove unnecessary include
5e567cb34b5e54467f501fc9703db82ca6639ff3 12-May-2010 Mike Lockwood <lockwood@android.com> libusbhost: add usb_endpoint_get_device()

Change-Id: Ibe4ce0551faca5d2d8bec0fbd21315a393b9f208
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
e380c27e9fdca66fa2f4aa9fd599568c568fc33d 12-May-2010 Mike Lockwood <lockwood@android.com> adb: remove unnecessary include

Change-Id: I3bcba4c93834d0ac08bded0f2e3c74984f1f3f54
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
9811671e023ceb82029040f7acf599013c773e6b 05-May-2010 Jesse Wilson <jessewilson@google.com> Moving junit out of core.jar and into core-junit.jar.

Change-Id: I603cba084c06ddbec21fc88bbaab7cde96952cb1
ootdir/init.rc
758582c91632d0d3e1a399a949a3c7fe91ee29c3 11-May-2010 Ying Wang <wangying@google.com> Fix sim build.

Change-Id: I6d2af129c2584ef2ea99d038c9cf394de800108b
ndroid.mk
70b262ad3eb8c596ccfa44e7d964ff2442572c99 10-May-2010 Anthony Newnam <anthony.newnam@garmin.com> Spell system correctly

Change-Id: I3a7b0b8c5c0a3dac23192a32abe88d60ce1f00c0
ootdir/init.rc
28a8dab590a5f2e3db4489e162858f386fbcb9e8 12-Feb-2010 christian.bejram <christian.bejram@stericsson.com> Add a printf format.

This makes sure that data sent through logwrapper
is interpreted as strings

Change-Id: Ifafa7c3a39433743250aeb76da3c4d9cce05a13f
ogwrapper/logwrapper.c
3db6050d516882a2386f314d82eb88ac65c2bc3b 10-May-2010 Brian Carlstrom <bdc@google.com> Merge commit '253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad' into mm
e717020da0c097bc68b51a2e32d6729ac057bb02 10-May-2010 Mike Lockwood <lockwood@android.com> Merge "adb: Use new libusbhost library for USB support on Linux host."
8a154aee8d17b8ca181f9360078a5b9501584ee7 10-May-2010 Nick Kralevich <nnk@google.com> am 42d38127: Merge "Allow pixelflinger to work when NX (No Execute) is enabled." into kraken
42d38127d243b099e984beceb5361120ab6e2655 10-May-2010 Nick Kralevich <nnk@google.com> Merge "Allow pixelflinger to work when NX (No Execute) is enabled." into kraken
cb6d5c1e54c2548af3c242f7f022dc05060dcd3b 10-May-2010 Brad Fitzpatrick <bradfitz@android.com> am b20e9851: am 25ffaff6: am 86b12152: fix windows SDK build
b4b7477dfc19b6dc7fabb47a817634439bbbd2f6 10-May-2010 Brad Fitzpatrick <bradfitz@android.com> am c279d3c5: am 218faa30: am e43c2483: More fixes to Binder perf regression from Eclair
b20e98511dc5715f9f80e64d52fa0feb825a2e27 10-May-2010 Brad Fitzpatrick <bradfitz@android.com> am 25ffaff6: am 86b12152: fix windows SDK build

Merge commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d' into kraken

* commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d':
fix windows SDK build
c279d3c542ff266670ae8aef8d57932cda2c249a 10-May-2010 Brad Fitzpatrick <bradfitz@android.com> am 218faa30: am e43c2483: More fixes to Binder perf regression from Eclair

Merge commit '218faa30d547e549c1efbf9bacf23cc56c8bf481' into kraken

* commit '218faa30d547e549c1efbf9bacf23cc56c8bf481':
More fixes to Binder perf regression from Eclair
25ffaff6b1eb8706a893cf255db123d0644b4a7d 10-May-2010 Brad Fitzpatrick <bradfitz@android.com> am 86b12152: fix windows SDK build

Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into froyo-plus-aosp

* commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a':
fix windows SDK build
218faa30d547e549c1efbf9bacf23cc56c8bf481 10-May-2010 Brad Fitzpatrick <bradfitz@android.com> am e43c2483: More fixes to Binder perf regression from Eclair

Merge commit 'e43c248316d0faa7bdc23de823b068c2aa3520ab' into froyo-plus-aosp

* commit 'e43c248316d0faa7bdc23de823b068c2aa3520ab':
More fixes to Binder perf regression from Eclair
d7249c45f6c245652de7c510d450f4577dc19197 07-May-2010 Mike Lockwood <lockwood@android.com> adb: Use new libusbhost library for USB support on Linux host.

Change-Id: I341e3be0a3eed48b6c5b6559fdbd0e956e2d8fb9
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/Android.mk
db/usb_linux.c
30ff2c70ce05d761e8cb0ab7ee02b39a681fe0cb 09-May-2010 Mike Lockwood <lockwood@android.com> libusbhost: new library for Linux USB host support.

Supports access to Linux usbdevfs on both device and Linux host.

Change-Id: Ie88a5193be3ee715792b10b34b3da32ffc4ca57b
Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/usbhost/usbhost.h
ibusbhost/Android.mk
ibusbhost/usbhost.c
86b121523d7d3634bf5ac07b6e238b36b3e75f0a 08-May-2010 Brad Fitzpatrick <bradfitz@android.com> fix windows SDK build

Change-Id: I2c563b20197803cafa91214aeff2c06fc0c75580
ibcutils/sched_policy.c
beeeee705bcf16d705748713ea40dca3486cc7b7 07-May-2010 Nick Kralevich <nnk@google.com> Allow pixelflinger to work when NX (No Execute) is enabled.

Instead of allocating memory from the (non executable) heap,
allocate memory using mspace and ensure that we use mprotect
to mark it as PROT_EXEC. This allows pixelflinger to
continue to work even when NX protections are enabled.

Testing: Using the ApiDemos market app, verify that
Apidemos -> Graphics -> OpenGL ES -> GLSurfaceView
works when "adb shell setprop debug.egl.hw 0" is set.

Change-Id: Ib569cd2543c6fa25688ee76325a712bc2347450b
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/CodeCache.h
e43c248316d0faa7bdc23de823b068c2aa3520ab 07-May-2010 Brad Fitzpatrick <bradfitz@android.com> More fixes to Binder perf regression from Eclair

Re-use the file descriptor to change the cgroups. There's a fast path
in the kernel for the case where the value's already uncahnged. Also,
this is okay because the kernel ignores the write offset. This is
essentially a ioctl-ish/datagram interface, despite being a fd we're
writing to.

This reduces Dalvik->Dalvik void/void Binder calls on Sapphire from
~1.2 to ~0.8 ms. This is a bit slower than the ~0.7 ms we get
avoiding the write altogether.

strace confirms:

[pid 1557] ioctl(21, 0xc0186201 <unfinished ...>
[pid 1556] <... ioctl resumed> , 0x45399cd0) = 0
[pid 1556] write(22, "1556", 4) = 4
[pid 1556] ioctl(21, 0xc0186201 <unfinished ...>
[pid 1555] <... ioctl resumed> , 0x45299cd0) = 0
[pid 1555] write(22, "1555", 4) = 4
[pid 1555] ioctl(21, 0xc0186201 <unfinished ...>
[pid 1554] <... ioctl resumed> , 0x45199cd0) = 0
[pid 1554] write(22, "1554", 4) = 4

BUG=2660235

Change-Id: Ia9f9e1d5b792eaebc9560f89931faf6df0cf9c0d
ibcutils/sched_policy.c
aebae19598acba8cedbcecd1acfe83de2f0a4be6 07-May-2010 Colin Cross <ccross@android.com> Merge changes If8e07502,I48c84fab

* changes:
Fix adb remount on non-MTD devices
mount: Add support for remounting without specifying device
c880ee0265a4057fd5086f4b9e8e5fae6e053087 07-May-2010 Colin Cross <ccross@android.com> Fix adb remount on non-MTD devices

Change-Id: If8e07502bcface53aaac81022f6183c6a147edc8
db/remount_service.c
4e7dd3d270aaf0b43e94b2ccaf840f86e541d21b 07-May-2010 Colin Cross <ccross@android.com> mount: Add support for remounting without specifying device

Change-Id: I48c84fab3ab2a9704ec5b7bf7002b8960fa53c27
oolbox/mount.c
63b15a32495620eb53134970be3390e19ce191bd 07-May-2010 Mike Lockwood <lockwood@google.com> Merge "Let "adb connect" connect to emulators too - adb can now connect to an emulator configured with an arbitrary pair of <console port, adb port>. These two ports do not have to be adjacent. This can be done from the commandline at any time using adb connect emu:<console_port>,<adb_port> - Emulators running on ports outside the normal range (5554/5555-5584/5585) register themselves on startup if they follow the convention "console port+1==abd port". - Emulators outside the normal port range will not be auto-detected on adb startup as these ports are not probed. - The index into local_transports[] array in transport_local.c does no longer indicate the port number of the local transport. Use the altered atransport struct to get the port number. - I have chosen not to document the adb connect emu:console_port,adb_port syntax on adb's help screen as this might be confusing to most readers and useful to very few. - I don't expect this to introduce any (backwards) compatibility issues."
879263ce758db7caa45580a9ab492658caa596c2 07-May-2010 Dima Zavin <dima@android.com> am 7f2ad58a: adb: Add Qualcomm USB id
7f2ad58a6d9cb70da934825a7648a5d3f8cbc498 07-May-2010 Dima Zavin <dima@android.com> adb: Add Qualcomm USB id

Change-Id: I044a77f14d7a90e9dff191919e4aeb39723ea429
Signed-off-by: Dima Zavin <dima@android.com>
db/usb_vendors.c
714828be46a23f04e0bd66c30592474c7efdc44d 07-May-2010 Brian Carlstrom <bdc@google.com> Merge commit '458f06335a73438865bf633aeff399cbaedb71e1' into mm
f7cc9c2a40adb090b718adf7353ddf89db876b58 06-May-2010 Brad Fitzpatrick <bradfitz@android.com> am 4e226a50: am ba9025ce: am 253e27ac: Optimize set_sched_policy(), which gets called in every binder call.
4e226a5006a5c64385b6c88a36c6a4044bd6ffdd 06-May-2010 Brad Fitzpatrick <bradfitz@android.com> am ba9025ce: am 253e27ac: Optimize set_sched_policy(), which gets called in every binder call.

Merge commit 'ba9025ce958bf07f843c2301fa60b6a5499f20ca' into kraken

* commit 'ba9025ce958bf07f843c2301fa60b6a5499f20ca':
Optimize set_sched_policy(), which gets called in every binder call.
ba9025ce958bf07f843c2301fa60b6a5499f20ca 06-May-2010 Brad Fitzpatrick <bradfitz@android.com> am 253e27ac: Optimize set_sched_policy(), which gets called in every binder call.

Merge commit '253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad' into froyo-plus-aosp

* commit '253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad':
Optimize set_sched_policy(), which gets called in every binder call.
253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad 06-May-2010 Brad Fitzpatrick <bradfitz@android.com> Optimize set_sched_policy(), which gets called in every binder call.

- use static /dev/cpuctl filenames, rather than sprintf() on the fly
- use a custom formatter instead of sprintf() for the tid number

This is a simplified version of Dan's original
Ifc9c81f74fe65f0695ead53b30194bc6adf00da0 to be less risky for Froyo.

Bug: 2660235
Change-Id: I744bbc2ec01fd2569612c814a497df40a933b622
ibcutils/sched_policy.c
b717dc85d8aca2431a553ca0e1b3438d1d8e2072 06-May-2010 Mike Lockwood <lockwood@android.com> init: Add support for /dev/bus/usb/ file system and add new unix group AID_USB.

init now creates files in /dev/bus/usb/ for user access to USB devices.
Files are chmod 660 with group AID_USB.

Signed-off-by: Mike Lockwood <lockwood@android.com>
nclude/private/android_filesystem_config.h
nit/devices.c
ootdir/ueventd.rc
ba8a2d7a37649cb92ae7ff97ea9c3f2499df128a 06-May-2010 Dan Bornstein <danfuzz@android.com> am 7a9f4c26: am 83b97a6a: am 458f0633: For issue #2651381, allow library prelinking.
7a9f4c26902b012aec0aa7373a03feaffd2134d1 06-May-2010 Dan Bornstein <danfuzz@android.com> am 83b97a6a: am 458f0633: For issue #2651381, allow library prelinking.

Merge commit '83b97a6a267a4ed9806191277289870156b2c372' into kraken

* commit '83b97a6a267a4ed9806191277289870156b2c372':
For issue #2651381, allow library prelinking.
232fcee51c9b57b9278eac68d2d8f617487b7e81 06-May-2010 The Android Open Source Project <initial-contribution@android.com> am cc42a2d6: am 44bce0fb: merge from open-source master
83b97a6a267a4ed9806191277289870156b2c372 06-May-2010 Dan Bornstein <danfuzz@android.com> am 458f0633: For issue #2651381, allow library prelinking.

Merge commit '458f06335a73438865bf633aeff399cbaedb71e1' into froyo-plus-aosp

* commit '458f06335a73438865bf633aeff399cbaedb71e1':
For issue #2651381, allow library prelinking.
cc42a2d6f45ca74d64994908e8483c446b734036 06-May-2010 The Android Open Source Project <initial-contribution@android.com> am 44bce0fb: merge from open-source master

Merge commit '44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3' into kraken

* commit '44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3':
cpu-features.h is only available for ARM
44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3 06-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ic4cfffc3c8d465224b062cef7bcfe5827441057c
458f06335a73438865bf633aeff399cbaedb71e1 05-May-2010 Dan Bornstein <danfuzz@android.com> For issue #2651381, allow library prelinking.

Change-Id: I4933c968b84eaca2441c76c4b5a29de48fa093ef
ibdiskconfig/Android.mk
6da145af673ac5a3302b2362cae98b91d3102969 26-Apr-2010 Stefan Hilzinger <hilzinger@google.com> Let "adb connect" connect to emulators too
- adb can now connect to an emulator configured with an arbitrary
pair of <console port, adb port>. These two ports do not have to be
adjacent.
This can be done from the commandline at any time using
adb connect emu:<console_port>,<adb_port>
- Emulators running on ports outside the normal range
(5554/5555-5584/5585) register themselves on startup if they follow
the convention "console port+1==abd port".
- Emulators outside the normal port range will not be auto-detected on
adb startup as these ports are not probed.
- The index into local_transports[] array in transport_local.c does no
longer indicate the port number of the local transport. Use the altered
atransport struct to get the port number.
- I have chosen not to document the adb connect emu:console_port,adb_port
syntax on adb's help screen as this might be confusing to most readers
and useful to very few.
- I don't expect this to introduce any (backwards) compatibility issues.

Change-Id: Iad3eccb2dcdde174b24ef0644d705ecfbff6e59d
db/adb.c
db/adb.h
db/transport_local.c
2bef93cc20155c3a59cdbb22c564c4b385b2c160 03-May-2010 Bruce Beare <brucex.j.beare@intel.com> cpu-features.h is only available for ARM

Change-Id: I1e8001a1875bfd9cebfe18dfd757556b55c8213c
ibpixelflinger/codeflinger/texturing.cpp
6c36cd5c9ecad2338510d0efa1cd674fc4b82445 04-May-2010 The Android Open Source Project <initial-contribution@android.com> am 3b9255e3: am e57d8918: merge from open-source master
3b9255e3f5ff68c03e9c0df9d82a74891bede6d7 04-May-2010 The Android Open Source Project <initial-contribution@android.com> am e57d8918: merge from open-source master

Merge commit 'e57d89186def9dfabe39cec7a91397079514dc2a' into kraken

* commit 'e57d89186def9dfabe39cec7a91397079514dc2a':
fix sim build
Fix LDM addressing mode disassembly
Add documentation for some adb environmental variables.
NEON shortcut for flat colour blending into 16-bit
Adds UXTB16 support to Pixelflinger
e57d89186def9dfabe39cec7a91397079514dc2a 04-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ibc1c58aa757910f2b00acf6883127dd027f01d73
9b6c850d24df82451862b81f059361b586f5ef0b 03-May-2010 Jean-Baptiste Queru <jbq@google.com> fix sim build

Change-Id: Ide300eafbcbbc6dfae25fe86188302c6676c4a3b
ibpixelflinger/codeflinger/texturing.cpp
7a5c35905485c20edca5b45c2558f7a95c440b06 02-May-2010 Brian Carlstrom <bdc@google.com> Merge commit 'b419c35c660d7421e18a9efef38eca11966b44c7' into mm
f42d2fac2b09547295e353ddffb281aa7932403f 07-Dec-2009 Martyn Capewell <martyn.capewell@arm.com> Fix LDM addressing mode disassembly

The Pixelflinger disassembler does not handle LDM addressing modes correctly,
assuming that the P and U bits in the instruction mean the same in both LDM and
STM. This results in the disassembler producing sequences like:

stmfd r13!, {r4-r11, r14}
...
...
...
ldmea r13!, {r4-r11, r14}

This small patch fixes it by EORing the P and U bits with the Load/Store bit.

Change-Id: Ic7a1556642c4e29415fc3697019f1239b6c26fc2
ibpixelflinger/codeflinger/disassem.c
86abd5fcabd78216f61448987e092ff084a655a9 29-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Adds UXTB16 support to Pixelflinger"
8ecf93485f7907cd22e584346e60bb05dedd2dba 29-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Merge "NEON shortcut for flat colour blending into 16-bit"
cd64315f72537359537c66eebe482495ffefba57 16-Feb-2010 Tim <tdhutt@gmail.com> Add documentation for some adb environmental variables.

The ADB_TRACE one is particularly important.

Change-Id: I125a5930c43065c8cf505eea40d20e3f209bc858
db/commandline.c
deb7a12ae53ffc6256304c8b614272992c8c7777 28-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 7e113e39: am 9a22c68e: merge from open-source master
7e113e396d50868e5c2f3ee6c94da20a2cb64813 28-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 9a22c68e: merge from open-source master

Merge commit '9a22c68e8697a2ec86cd238a87a32ea42d7f8d39' into kraken

* commit '9a22c68e8697a2ec86cd238a87a32ea42d7f8d39':
Fixing spelling errors in adb docs
Make adb's daemon-port on the host machine configurable.
adb: remove obsolete adb.connected system property.
Add Pantech's USB vendor ID to adb.
Added Kyocera's VID (0x0482), upon their request.
adb: Add five second timeout for USB writes on Linux host.
Add missing newlines to adb usage message
adb: do not mix printf() with write() when writing to stdout.
Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request.
Added USB vendor id of Sharp, based on Sharp's request.
9a22c68e8697a2ec86cd238a87a32ea42d7f8d39 28-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Id824d3427cb4808a8768f14e7b46c0eaf5e02e73
26bb6e92ba392b28eb2edabb639f8750f859ce20 26-Apr-2010 Brian Carlstrom <bdc@google.com> Fixing spelling errors in adb docs

Change-Id: I9376717165a01e207034f84a31f85335d3740f18
db/OVERVIEW.TXT
db/SERVICES.TXT
a84a42eb20d43ffa2695a69d583a6e09532b49d9 19-Apr-2010 Stefan Hilzinger <hilzinger@google.com> Make adb's daemon-port on the host machine configurable.

This is the first CL of a somewhat larger effort which, among other things,
will involve changing the emulator and ddms to talk to adb running on a
configurable port.

The port can be configured using environment variable ANDROID_ADB_SERVER_PORT.

Further CLs will also address the set of ports used for the local transport.

Change-Id: Ib2f431801f0adcd9f2dd290a28005644a36a780a
db/adb.c
db/adb.h
db/adb_client.c
db/adb_client.h
db/commandline.c
db/transport_local.c
23e64161be09ce26cb4d213a860f61e1fe77d975 15-Apr-2010 Mike Lockwood <lockwood@android.com> adb: remove obsolete adb.connected system property.

This was used for adb networking, which no longer exists.
This code also failed when adb was not running as root.

Change-Id: Ied86fb1930094d5ae5009684d25e15385fd31d03
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
4f660699bf3317e299f9fda780c711178f6ea932 31-Mar-2010 Xavier Ducrohet <xav@android.com> Add Pantech's USB vendor ID to adb.

Change-Id: I5334f46ee52ca1bd8067860701aef7b93296bedb
db/usb_vendors.c
c22b9bf1a8e9f1cc73a1407ccf12183f07736a04 12-Mar-2010 Takeshi Kishimoto <kishimoto@google.com> Added Kyocera's VID (0x0482), upon their request.

Change-Id: I8f2f2a02c22d618c0b42d4f287d88a98af3ac4fa
db/usb_vendors.c
505bd6e5fcc576eb3bea87ac86db8aeed86d9a0d 19-Feb-2010 Mike Lockwood <lockwood@android.com> adb: Add five second timeout for USB writes on Linux host.

This helps us recover when things go wrong during automated testing.

Change-Id: I006dbfaff7f70d51398ff12fbddcaee751453b78
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.h
db/usb_linux.c
805c4a70300ed918853eec2f67e7b45919e48e10 02-Mar-2010 Brian Carlstrom <bdc@google.com> Add missing newlines to adb usage message
db/commandline.c
c519c00c367c9017eed70973022813e828448818 22-Sep-2009 Mike Lockwood <lockwood@android.com> adb: do not mix printf() with write() when writing to stdout.

Change-Id: I3598cc951778080bec9a21d646656d5aba57120a
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/commandline.c
16f1550b51a12187799bb9d577839f2812c949d6 22-Feb-2010 Takeshi Kishimoto <kishimoto@google.com> Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request.
db/usb_vendors.c
17273091e960ba683a90974aa6f0629e1575350d 09-Feb-2010 Takeshi Kishimoto <kishimoto@google.com> Added USB vendor id of Sharp, based on Sharp's request.
Sharp's vendor id: 0x04dd
db/usb_vendors.c
db3fd7f60898f19f55aa9450d7d9cb3baf4386de 27-Apr-2010 Nick Kralevich <nnk@google.com> am 88f29fef: fix build on darwin.
88f29fefa86c9fe32c888c2b161e38b20c478cf5 27-Apr-2010 Nick Kralevich <nnk@google.com> fix build on darwin.

Change-Id: I655b92f0a09bc4bc1b2b277b24ca24c081b4da94
ibacc/acc.cpp
016be30b154a7f5cd31dd6efa2d5d7c552432600 26-Apr-2010 Brian Carlstrom <bdc@google.com> Merge "Fixing spelling errors in adb docs"
ec92c4fc183869eb02e1590d44256b516d2da8b8 26-Apr-2010 Nick Kralevich <nnk@google.com> am 8e274f34: Merge "make libacc run with execute stack protections enabled." into kraken
1166c9b6cf5ba84bd2de3b4cf4aa9254afa98f7c 26-Apr-2010 Raphael <raphael@google.com> am ecf835e2: am a00a69e0: am b419c35c: Fix adb, fastboot to compile in Windows SDK under Linux.
23d2df52473117027eec9ca7b41e3eec0fbc4af6 26-Apr-2010 Brian Carlstrom <bdc@google.com> Fixing spelling errors in adb docs

Change-Id: I9376717165a01e207034f84a31f85335d3740f18
db/OVERVIEW.TXT
db/SERVICES.TXT
8e274f34768870eebc14a4044dbf0dc0e69f9f81 26-Apr-2010 Nick Kralevich <nnk@google.com> Merge "make libacc run with execute stack protections enabled." into kraken
ecf835e291a974ad29fa9cbc3c401911c273b98f 24-Apr-2010 Raphael <raphael@google.com> am a00a69e0: am b419c35c: Fix adb, fastboot to compile in Windows SDK under Linux.

Merge commit 'a00a69e07d959f73495e42637fe1f493eb01193d' into kraken

* commit 'a00a69e07d959f73495e42637fe1f493eb01193d':
Fix adb, fastboot to compile in Windows SDK under Linux.
a00a69e07d959f73495e42637fe1f493eb01193d 24-Apr-2010 Raphael <raphael@google.com> am b419c35c: Fix adb, fastboot to compile in Windows SDK under Linux.

Merge commit 'b419c35c660d7421e18a9efef38eca11966b44c7' into froyo-plus-aosp

* commit 'b419c35c660d7421e18a9efef38eca11966b44c7':
Fix adb, fastboot to compile in Windows SDK under Linux.
86c25d3499e99fc278e049ae054ccbe0ab4a1543 24-Apr-2010 Brian Carlstrom <bdc@google.com> Merge commit 'f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe' into mm
b419c35c660d7421e18a9efef38eca11966b44c7 14-Apr-2010 Raphael <raphael@google.com> Fix adb, fastboot to compile in Windows SDK under Linux.

(Merged from master Change I3d0e4cab)

Change-Id: Ib3fd566bdaf09d5893a6b0c66168c76c6b0d92eb
db/Android.mk
astboot/Android.mk
nclude/arch/windows/AndroidConfig.h
eb31c0bdc0eac0898f01cdc1737cea94269f8f27 23-Apr-2010 Brian Carlstrom <bdc@google.com> fastboot should return non-zero exit code on error

When using fastboot in scripts, it currently is necessary to parse the
output for FAILED messages and possible other indications of
error. This happens relatively often, for example when there are radio
update issues. Fortunately, fb_execute_queue already has a notion that
an error has occured which is used to abort the queue execution.

This change makes the status value be returned from fb_execute_queue
to main which can then return it as an exit status. usage cases were
also changed to return 1.

Note the code already returned 1 for error in one other case when
there was a problem with boot, so there is a precedent for return 1 on
error in this program.

Change-Id: Ib0463b08c8f2569495e248dd84e331f7e3691039
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
093ba2599137453d015e04896a2971f3e9c0a251 23-Apr-2010 Nick Kralevich <nnk@google.com> make libacc run with execute stack protections enabled.

libacc was allocating memory using malloc for executable pages.
When running on a system where the stack and heap are not
executable, using malloc for executable pages will result in
a segfault.

This change modifies libacc to allow the code to run, even
if the system is running with executable stack and heap disabled.

Change-Id: Ia74e3d83750c09b7eefd865ff059db920093040d
ibacc/acc.cpp
f538d8c76b9fb8377f279cd4e8227d2c389e7767 22-Apr-2010 Colin Cross <ccross@android.com> am 33680b10: init: Use a relative symlink for ueventd to init
24827fe35d73c5528f2365a11b028ac6ccc43874 22-Apr-2010 Colin Cross <ccross@android.com> am ebd4613b: init: Fix init spinning once init.rc is complete
33680b106dcb7025de0c37340869e32db61ad190 22-Apr-2010 Colin Cross <ccross@android.com> init: Use a relative symlink for ueventd to init

make doesn't seem to handle the absolute symlink from
$OUT/root/sbin/ueventd to /init well - it follows the link during
dependency resolution, decides $OUT/root/sbin/ueventd doesn't exist
because /init doesn't exist, and relinks it every time.

Change-Id: I9ca1c14fe5fa80634f51ffc51a7c73146d29d42e
nit/Android.mk
d0eacb8aee77f01edadf525019f8dd1e43671ce7 19-Apr-2010 Stefan Hilzinger <hilzinger@google.com> Make adb's daemon-port on the host machine configurable.

This is the first CL of a somewhat larger effort which, among other things,
will involve changing the emulator and ddms to talk to adb running on a
configurable port.

The port can be configured using environment variable ANDROID_ADB_SERVER_PORT.

Further CLs will also address the set of ports used for the local transport.

Change-Id: Ib2f431801f0adcd9f2dd290a28005644a36a780a
db/adb.c
db/adb.h
db/adb_client.c
db/adb_client.h
db/commandline.c
db/transport_local.c
ebd4613bfc8d926503f7de38240529ce0b1997ee 22-Apr-2010 Colin Cross <ccross@android.com> init: Fix init spinning once init.rc is complete

When the init process ran out of actions to execute, cur_action was
NULL and action_queue_empty() was true, but cur_command was still
set. This patch clears cur_command when a new action is retreived,
and only depends on cur_action and action_queue_empty() to determine
the poll timeout.

Change-Id: Iaa95063c8c267a5b1ada9f20363b99c433e61ac4
nit/init.c
3532722be02d6c88b172af10f80149eac36da0e8 22-Apr-2010 Colin Cross <ccross@android.com> am ec353361: Merge changes Iea53050d,Iea6c5601,I451ebc4f,I4f876571,I6b4c10f8,I298f575c,I459cfbfe,Id11bb7cd,I679059da into kraken
ec35336102d2e73167e970e6287c045917d9574b 22-Apr-2010 Colin Cross <ccross@android.com> Merge changes Iea53050d,Iea6c5601,I451ebc4f,I4f876571,I6b4c10f8,I298f575c,I459cfbfe,Id11bb7cd,I679059da into kraken

* changes:
init: Add ueventd.rc parsing to ueventd
init: Move uevent handling to an external ueventd process
init: Split parser into generic parser and init parser
init: Allow services to start before property triggers are up
init: Add wait command and mount wait flag
init: Move list and log handling to list.h and log.h
init: reap exited child processes on signal_init
init: create symlinks to block device nodes
init: Handle commands in event queue loop
44b65d047cc39baf30e21bfd8dd438f6bc1f77f5 20-Apr-2010 Colin Cross <ccross@android.com> init: Add ueventd.rc parsing to ueventd

Change-Id: Iea53050d6c10e8cabf563e5d80e84eaf78873695
nit/Android.mk
nit/devices.c
nit/list.h
nit/ueventd.c
nit/ueventd_parser.c
nit/ueventd_parser.h
nit/util.h
ootdir/Android.mk
ootdir/etc/ueventd.goldfish.rc
ootdir/ueventd.rc
f83d0b9af5cbe4440cc41ceaa8a7806a13c86282 21-Apr-2010 Colin Cross <ccross@android.com> init: Move uevent handling to an external ueventd process

Change-Id: Iea6c56013062ade633a1754f7bcf8cf09b3dedc1
nit/Android.mk
nit/builtins.c
nit/devices.c
nit/devices.h
nit/init.c
nit/keywords.h
nit/ueventd.c
nit/ueventd.h
nit/util.c
nit/util.h
ootdir/init.rc
6310a8261c922533a692fb3e74ece2da98d4bafa 20-Apr-2010 Colin Cross <ccross@android.com> init: Split parser into generic parser and init parser

Change-Id: I451ebc4ff12f2ac660eb533fa10ad561fa25c9dd
nit/Android.mk
nit/builtins.c
nit/init.c
nit/init.h
nit/init_parser.c
nit/init_parser.h
nit/parser.c
nit/parser.h
3294bbbad9494eb4ca534624b96e39f8ed15aaf2 20-Apr-2010 Colin Cross <ccross@android.com> init: Allow services to start before property triggers are up

Change-Id: I4f87657123bea88b7b5c537781868908d8d66b01
nit/init.c
nit/property_service.c
nit/property_service.h
cd0f173e2790ee068fd2a20bcfc6c20468e97e51 20-Apr-2010 Colin Cross <ccross@android.com> init: Add wait command and mount wait flag

Change-Id: I6b4c10f8f246095a7fb7342388ec4f6ff97d5733
nit/builtins.c
nit/keywords.h
nit/parser.c
nit/util.c
nit/util.h
ed8a7d84428ec945c48b6b53dc5a3a18fabaf683 20-Apr-2010 Colin Cross <ccross@android.com> init: Move list and log handling to list.h and log.h

Change-Id: I298f575c590d0f28b7ad78747f3ebdbba56b7a27
nit/builtins.c
nit/devices.c
nit/init.c
nit/init.h
nit/keychords.c
nit/list.h
nit/log.h
nit/logo.c
nit/parser.c
nit/property_service.c
nit/signal_handler.c
nit/util.c
12541c61311e0488e9873df754f8328cd12f99b4 17-Apr-2010 Colin Cross <ccross@android.com> init: reap exited child processes on signal_init

If any child processes exit before signal_init, they won't get reaped
unless another child process exits after signal_init. Calling
handle_signal from signal_init forces them to be reaped immediately.

Change-Id: I459cfbfe6cf00f29454c62a8c840baf21cb1fb03
nit/signal_handler.c
b0ab94b7d5a888f0b6920b156e5c6a075fa0741a 09-Apr-2010 Colin Cross <ccross@android.com> init: create symlinks to block device nodes

eMMC block device names may change based on the detection order of
the eMMC device and any other SD bus devices, such as a removable SD
card.

This patch adds support to init for:
* Symlinks to block devices. When a block device uevent is
processed, if it starts with "/devices/platform", the platform
driver name is parsed out, and symlinks to the block device are
created in /dev/block/platform/<platform driver>/
* Symlinks based on partition name and number. If the uevent for
a block device contains information on the partition name or
number, symlinks are created under
/dev/block/platform/<platform driver>/by-num/p<partition>
and
/dev/block/platform/<platform driver>/by-name/<partition name>

init.rc can then use a device path like the following to mount an
eMMC device:
/dev/block/platform/<platform>/by-name/system /system ro

Change-Id: Id11bb7cdf1e2ada7752a5bd671cbf87237b34ae2
nit/devices.c
nit/util.c
nit/util.h
c239e53f12dde4ff7d3c60461e903b85bc5ee610 21-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 9819bdb3: am 775a8df6: merge from open-source master
9819bdb34e120496d89fbda76119be67ff86b8d3 21-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 775a8df6: merge from open-source master

Merge commit '775a8df614d364fcb82e280069a3f533381240b4' into kraken

* commit '775a8df614d364fcb82e280069a3f533381240b4':
adb: Add persistent system property for running adb in TCPIP mode
775a8df614d364fcb82e280069a3f533381240b4 21-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I686f28fcfcff1cca7cf254de9e4334cc4ea2fef7
e898faddb3d5074a4489ce255927c6735b6f8b0d 07-Oct-2009 Daniel Baeyens <daniel.baeyens@gmail.com> Fix "route add default dev <iface>" behaviour

Previous behaviour was to set route's network mask as 255.255.255.255
Setting a destination network with netmask /32 blocks the connections
just to the specified host. 0.0.0.0/32 defines the exact IPv4 address
0.0.0.0 and not the whole IPv4 hosts range.
This patch allows traffic to any network, setting a 0.0.0.0/0 route.

Change-Id: I1665f2fac52526337bb2c48e3b09564d9da448e7
oolbox/route.c
ed33625a4a15b00372e3b2155a3ce18f28d8f1ad 13-Jan-2009 Jay Freeman (saurik) <saurik@saurik.com> Added a move flag for init's mount command that maps to MS_MOVE.

Change-Id: I7bc1a8ac5f73a34c101247f984cbf9ff29e02e7f
nit/builtins.c
05f202a94bd7c51db10f041bde6006b4e719929e 20-Apr-2010 Mike Lockwood <lockwood@android.com> Merge "adb: Add persistent system property for running adb in TCPIP mode"
8e2ceaeacf9fa1eb5ac41e4d3498836a6e2c7c97 20-Apr-2010 Mike Lockwood <lockwood@android.com> adb: Add persistent system property for running adb in TCPIP mode

In addition to service.adb.tcp.port, you can now set persist.adb.tcp.port
to specify the port number for adb to listen to instead of USB.
This allows the adb TCP configuration to persist across reboots.

Change-Id: I897ffcb019e8dd1785996d2f3c571cfc2f8ded38
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
b26c8562b0dc21050bd5a6fc40ef5aee1e1f2c96 01-Dec-2009 Thorsten Glaser <tg@mirbsd.org> sys_signame[] was added to libc, remove conflicting definition

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
h/trap.c
7cd914e223ef7a358b952f64ae1d6209f3eeb365 20-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 9110b6c8: am 3523412f: merge from open-source master
9110b6c8a5a611051c0ecc085920cbd0ffed379a 20-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 3523412f: merge from open-source master

Merge commit '3523412f43ec616775a73f5fb8a2615370a1ee3a' into kraken

* commit '3523412f43ec616775a73f5fb8a2615370a1ee3a':
Add -l option to `adb sync`
vold: fix a bug of crash
3523412f43ec616775a73f5fb8a2615370a1ee3a 20-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ib9250bd9d73664b07facaef362beba57a1519411
918fb893e889b30fd1836668870a4a46586c8d25 20-Apr-2010 Viral Mehta <viral.vkm@gmail.com> fix insmod reading more than one module parameter

it seems wrong to put '/0' after reading one argument
if we are passing more than one module parameters, they are not being propogated
to the kernel properly.

Second module parameters onwards are simply being ignored by kernel
since insmod incorrectly put '/0' after reading first module parameter

Change-Id: I54283eb30a66a83d5c619ffb1fb174ccf5fdcaf7
oolbox/insmod.c
705c944c0e2a50150ffb41707b6b3daebb45cf79 22-Feb-2010 Anthony Newnam <anthony.newnam@garmin.com> Add -l option to `adb sync`

Change-Id: I87c01663dff319dde24b70560e6fe5647ebf9d49
db/commandline.c
db/file_sync_client.c
db/file_sync_service.h
944f7cadd77614bf930631d79741f2a369ca95f7 20-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Merge "vold: fix a bug of crash"
ebc6ff105a114ff5b5465e64fa0f3889730da19d 14-Apr-2010 Colin Cross <ccross@android.com> init: Handle commands in event queue loop

Change-Id: I679059dae43143f3c8f16b68de5694539b699e50
nit/builtins.c
nit/init.c
nit/init.h
nit/parser.c
nit/parser.h
998be767f55f2ad6880970e29c8df1fa01e365d4 17-Apr-2010 Colin Cross <ccross@android.com> am bc39871b: Merge changes I46a91849,I3a24afa2,I1df96964,Ic7a19073,I31db51eb,I11ed0f3e,I8fba9f5f,I04e8f0ae into kraken
bc39871bf95f6c61034eaf89a6933a02da1b348a 17-Apr-2010 Colin Cross <ccross@android.com> Merge changes I46a91849,I3a24afa2,I1df96964,Ic7a19073,I31db51eb,I11ed0f3e,I8fba9f5f,I04e8f0ae into kraken

* changes:
init: Move prototypes for util.c into util.h
init: Move signal handling to signal_handler.c
init: Move gettime() to util.c
init: Move property_set_fd to property_service.c
init: Move parser prototypes to parser.h
init: Move device_fd to devices.c
init: Move keychords to keychords.c
init: Move mtd functions from init.c to util.c
a76ef122e4c06bb04fca9266b50b414646c4365b 16-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 34bff9ae: am 8ac50107: merge from open-source master
34bff9ae7a7fc09b852eaf662933e842822a2bc4 16-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 8ac50107: merge from open-source master

Merge commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe' into kraken

* commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe':
Allow 'adb pull' to pull symlinked files
8ac50107a21b96f6e9c77ab23820d164543c5bbe 16-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I7f30144c12c340501f161fba70a917eb62afc41f
162fd5fba5a153451ae3b37b0eef22ea13cdf9f6 16-Apr-2010 Brian Carlstrom <bdc@google.com> Merge commit '7c2be0426ef7f39266735389cd765e7aaaf997e8' into mm
c8a454acb019246c694db422c086004485fd07f4 16-Apr-2010 Carl Shapiro <cshapiro@google.com> am 7ae4e690: am db2f5ad4: am f54e0a4b: Add a log tag entry for the dalvik lock profiling event.
1271b0193b275026e803ce69ad937b08ca436af2 15-Apr-2010 Mike Lockwood <lockwood@android.com> am eedc5f35: adb: remove obsolete adb.connected system property.
457d81cec12fce6e38c0dcd94d33d06036c2618a 04-Jan-2010 Matt Fischer <matt.fischer@garmin.com> Allow 'adb pull' to pull symlinked files

Change-Id: I02f31334e4ee0c7b0e7b379016629a465e711905
db/file_sync_client.c
7ae4e690b0cc17d9fd04014e652febeb06d177d0 15-Apr-2010 Carl Shapiro <cshapiro@google.com> am db2f5ad4: am f54e0a4b: Add a log tag entry for the dalvik lock profiling event.

Merge commit 'db2f5ad494c4dfc5bd0ee1840468df329678c75c' into kraken

* commit 'db2f5ad494c4dfc5bd0ee1840468df329678c75c':
Add a log tag entry for the dalvik lock profiling event.
db2f5ad494c4dfc5bd0ee1840468df329678c75c 15-Apr-2010 Carl Shapiro <cshapiro@google.com> am f54e0a4b: Add a log tag entry for the dalvik lock profiling event.

Merge commit 'f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe' into froyo-plus-aosp

* commit 'f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe':
Add a log tag entry for the dalvik lock profiling event.
eedc5f352549aad28de2da83e1862e00154de113 15-Apr-2010 Mike Lockwood <lockwood@android.com> adb: remove obsolete adb.connected system property.

This was used for adb networking, which no longer exists.
This code also failed when adb was not running as root.

Change-Id: Ied86fb1930094d5ae5009684d25e15385fd31d03
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
e572e9c77e188b3875db24219c87ee6505aba523 15-Apr-2010 Raphael <raphael@google.com> Merge "Fix adb, fastboot to compile in Windows SDK under Linux."
c7f0f60326b80ea0392140ed7718306df5d8f5c0 14-Apr-2010 Colin Cross <ccross@android.com> am 31712bea: Move filesystem mounting into a new "fs" init level
d7faeab5b263664737593d8ff362bae4617d5d4e 14-Apr-2010 Colin Cross <ccross@android.com> am dc61c9cd: Add a build dependency for ramdisk.img on system/core/rootdir/init.rc
3899e9fc01cf608f19f716749c54cc5c4d17e766 14-Apr-2010 Colin Cross <ccross@android.com> init: Move prototypes for util.c into util.h

Change-Id: I46a91849ce5297eb2597dd6134412f817564ec24
nit/builtins.c
nit/init.c
nit/init.h
nit/parser.c
nit/property_service.c
nit/signal_handler.c
nit/util.h
9c5366ba55b1553b2d66f48e3d14fbd274a2944d 14-Apr-2010 Colin Cross <ccross@android.com> init: Move signal handling to signal_handler.c

Change-Id: I3a24afa28a1cd279c749d6f384f687b8de56067e
nit/Android.mk
nit/init.c
nit/init.h
nit/signal_handler.c
nit/signal_handler.h
504bc5175a8fe5a2f2552903afee761a86283cf4 14-Apr-2010 Colin Cross <ccross@android.com> init: Move gettime() to util.c

Change-Id: I1df96964763f8baedbc1cea6875d3dfc5e48c065
nit/init.c
nit/init.h
nit/util.c
d11beb2b1516144327c3f730f75e6b4bc65f1374 14-Apr-2010 Colin Cross <ccross@android.com> init: Move property_set_fd to property_service.c

Change-Id: Ic7a19073eae8f353d48cabee80fa9722b35a82b5
nit/init.c
nit/property_service.c
nit/property_service.h
ca7648ddfb46347c60014a849b0150a74df4e1d2 14-Apr-2010 Colin Cross <ccross@android.com> init: Move parser prototypes to parser.h

Change-Id: I31db51eb8e8a33a0bd06b41206bc9f9147d16d41
nit/builtins.c
nit/init.c
nit/init.h
nit/parser.c
nit/parser.h
0dd7ca6e87abb689700c5e3a816a949b03b1154b 14-Apr-2010 Colin Cross <ccross@android.com> init: Move device_fd to devices.c

Change-Id: I11ed0f3e1b95d2cff4fdbd80b915c01572f76b0e
nit/devices.c
nit/devices.h
nit/init.c
a866695ebe3a396a0ec411c0f99e0921c74c0fd2 14-Apr-2010 Colin Cross <ccross@android.com> init: Move keychords to keychords.c

Change-Id: I8fba9f5f73439a451fc961f8111612dff4fb5dfd
nit/Android.mk
nit/init.c
nit/keychords.c
nit/keychords.h
f24ed8ca0a13f1b97bd55d10f75a289bf9ccd98d 13-Apr-2010 Colin Cross <ccross@android.com> init: Move mtd functions from init.c to util.c

Change-Id: I04e8f0ae6cc88af974372872e5617d16e0b1a2c8
nit/init.c
nit/util.c
31712beaf7de127a1249b909cdefffbc25fff076 09-Apr-2010 Colin Cross <ccross@android.com> Move filesystem mounting into a new "fs" init level

Devices with non-MTD storage need to override the filesystem mounting
commands in init.rc. Moving them to a new "fs" init level allows a
custom init.<device>.rc to handle the mounting.

Change-Id: If0e655139b9734650fb798b6eb0a90e2241fc29b
nit/init.c
ootdir/init.rc
dc61c9cda5d1b9ec455ff4b26595f523a36557c8 09-Apr-2010 Colin Cross <ccross@android.com> Add a build dependency for ramdisk.img on system/core/rootdir/init.rc

Change-Id: Id9698a88720cc0c70e3d9c43c9bac9b74f4798b6
ootdir/Android.mk
fab167850d751a817c39e074334fe7a0987ce647 14-Apr-2010 Raphael <raphael@google.com> Fix adb, fastboot to compile in Windows SDK under Linux.

Change-Id: I3d0e4cabd65d9de17036901a22ec3277a6d58e64
db/Android.mk
astboot/Android.mk
nclude/arch/windows/AndroidConfig.h
f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe 12-Apr-2010 Carl Shapiro <cshapiro@google.com> Add a log tag entry for the dalvik lock profiling event.
ogcat/event.logtags
3adde56de1f8878553dd0c89a2fc19b1b93b0f2f 13-Apr-2010 Carl Shapiro <cshapiro@google.com> Merge "Add a log tag entry for the dalvik lock profiling event."
2110ea6853464803203da19704ce34f509d324d9 13-Apr-2010 Jean-Baptiste Queru <jbq@google.com> am 1ded19f4: fix build
11dc79260f87d0f5c977532ab876884435bf5b96 13-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am a8415325: am 1888de8e: merge from open-source master
c24b4d8cc88c534581b3dd10559a4a2e27410712 12-Apr-2010 Carl Shapiro <cshapiro@google.com> Add a log tag entry for the dalvik lock profiling event.

Change-Id: I4897da78ee6c6b32c8a588ff689c60a59bc60ed7
ogcat/event.logtags
1ded19f455cee554ae482d99d53b6912da5e7f21 12-Apr-2010 Jean-Baptiste Queru <jbq@google.com> fix build

Change-Id: I93714131dc9d18797009154e6e25dc6e122058c7
oolbox/Android.mk
a8415325a8b2638c25a6364c191ac1046c925906 12-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 1888de8e: merge from open-source master

Merge commit '1888de8e13f82f7af21bce267254fac124237afe' into kraken

* commit '1888de8e13f82f7af21bce267254fac124237afe':
toolbox: add "uptime" command
1888de8e13f82f7af21bce267254fac124237afe 12-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ife9c7a92ed7abd59b6b3612ba908bcae77055767
59ab0c534095afdab0765240a6eaeaad2ab43ab0 12-Apr-2010 Mike Lockwood <lockwood@android.com> Revert "Make adb's daemon-port on the host machine configurable."

Fix the build.
This reverts commit 5a00fd1c5542b302e5534d7c424ee92da3d6bceb.
db/adb.c
db/adb.h
db/adb_client.c
db/adb_client.h
db/commandline.c
db/transport_local.c
35c8cba41779657a0ec84f9380d9a2cff2a5f7f5 12-Apr-2010 Mike Lockwood <lockwood@google.com> Merge "Make adb's daemon-port on the host machine configurable."
2a7f2ae7d4b25f89e36be04e47b9e7a3d76e0cfd 10-Apr-2010 Carl Shapiro <cshapiro@google.com> Fix a long standing bug in the output buffer size computation.

Change-Id: I55aca04fdd3822ac06db183bf2ff0cbd61f778e8
iblog/fake_log_device.c
5ffbf26ebf9e29fe38b325e3c8f9502a31d2ff4c 09-Apr-2010 Mike Lockwood <lockwood@android.com> toolbox: add "uptime" command

Prints elapsed real time since boot, as well as idle time and sleep time.

Change-Id: I97f482d6087e9f802d74e91147bf767e6b2d4f42
Signed-off-by: Mike Lockwood <lockwood@android.com>
oolbox/Android.mk
oolbox/uptime.c
a699d6256fca0336b173c524c5b3d8f7d4fcdc25 09-Apr-2010 Mike Lockwood <lockwood@android.com> toolbox: add "uptime" command

Prints elapsed real time since boot, as well as idle time and sleep time.

Change-Id: I97f482d6087e9f802d74e91147bf767e6b2d4f42
Signed-off-by: Mike Lockwood <lockwood@android.com>
oolbox/Android.mk
oolbox/uptime.c
7c2be0426ef7f39266735389cd765e7aaaf997e8 08-Apr-2010 Brad Fitzpatrick <bradfitz@android.com> Rename logtag for clarity.

BUG=2581935

Change-Id: Icf1c4fcf123fa4ec74fda80f72a27d3db85aa7a9
ogcat/event.logtags
5a00fd1c5542b302e5534d7c424ee92da3d6bceb 28-Mar-2010 Stefan Hilzinger <hilzinger@google.com> Make adb's daemon-port on the host machine configurable.

This is the first CL of a somewhat larger effort which, among other things,
will involve changing the emulator and ddms to talk to adb running on a
configurable port.

The port can be configured using environment variable ANDROID_ADB_PORT.

Further CLs will also address the set of ports used for the local transport.

Change-Id: I8082ee10ce504dab1cf89fe6d189eccf43ce9cf4
db/adb.c
db/adb.h
db/adb_client.c
db/adb_client.h
db/commandline.c
db/transport_local.c
a68049a8cc3f1eacda1e27b2040af73f6faa42ab 07-Apr-2010 Brian Carlstrom <bdc@google.com> Merge remote branch 'goog/froyo' into mm
7c19bbe086b3cd81499829c0a79ed0ed0ae4fb16 31-Mar-2010 Xavier Ducrohet <xav@android.com> Add Pantech's USB vendor ID to adb.

Change-Id: I5334f46ee52ca1bd8067860701aef7b93296bedb
db/usb_vendors.c
7e8529a8b528fd30586aa037f15a31b29582c537 25-Mar-2010 San Mehat <san@google.com> system/core: Switch libsysutils & sched_policy LOG -> SLOG

Change-Id: Id74c6895a8012c5915f2e259339101844de7c085
Signed-off-by: San Mehat <san@google.com>
ibcutils/sched_policy.c
ibsysutils/src/FrameworkClient.cpp
ibsysutils/src/FrameworkCommand.cpp
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
ibsysutils/src/ServiceManager.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
1620a61fd3faa2fb27cf53d414e22d79908aab70 25-Mar-2010 Chih-Wei Huang <cwhuang@linux.org.tw> vold: fix a bug of crash

The condition to quit the for loop is fs->name is NULL,
not fs itself.

Change-Id: I5f18f92d7488bd89183ba4ddab582f3f3347df46
old/volmgr.c
c741f22d8533226ce60903649a7a57b3f05a65af 24-Mar-2010 Nick Pelly <npelly@google.com> Add NET_RAW to mediaserver so that it can open a raw HCI socket to configure
BT chip.

Change-Id: I22065b313c7af28b4791c74ea3d403a628738102
ootdir/init.rc
830abe0424da52a715592077feaa5d1c2762f58d 24-Mar-2010 Nick Pelly <npelly@google.com> MOAR GROUPS

We were hitting the old limit with mediaserver.

Change-Id: Ia8217a9f2a1076fa247d7f5ed5159e3c91244d78
nit/init.h
3555019d783089084d8cb4ceca6609152db445d3 16-Mar-2010 Eric Olsen <eolsen@android.com> Add Bluetooth SCO connection blacklist

Change-Id: Ieb11debfea66ec715f48e8069619c2c15acf2035
Signed-off-by: Eric Olsen <eolsen@android.com>
nclude/private/android_filesystem_config.h
92f66cd254af190d0e475eccc0c32d4b0b09a24d 18-Mar-2010 Mathias Agopian <mathias@google.com> Merge "fix [2483384] logcat crash when malloc debug is enabled"
50844525a31fa41d7d432efb3c0355b38adb2f5f 18-Mar-2010 Mathias Agopian <mathias@google.com> fix [2483384] logcat crash when malloc debug is enabled

fix a couple of uninitialized variables

Change-Id: I1f7552ecb20d85dbf0fec5cae9778a70ff9281a2
ogcat/logcat.cpp
1f4d95296acf34a93128332441782a80c10845b4 03-Mar-2010 David 'Digit' Turner <digit@google.com> Add 'run-as' command implementation as set-uid program.

Typical usage is 'run-as <package-name> <command>' to run <command>
in the data directory, and the user id, of <package-name> if, and only
if <package-name> is the name of an installed and debuggable application.

This relies on the /data/system/packages.list file generated by the
PackageManager service.

BEWARE: This is intended to be available on production devices !
nclude/private/android_filesystem_config.h
un-as/Android.mk
un-as/NOTICE
un-as/package.c
un-as/package.h
un-as/run-as.c
5fc070be8593f39f5140ab63fb6f5eccceb1dc83 17-Mar-2010 Oscar Montemayor <oam@google.com> Merge "cleanup init.rc"
bbf3ea46fb6df3b666cb66a09104d3a7694926dc 13-Mar-2010 Jean-Baptiste Queru <jbq@google.com> cleanup init.rc

Change-Id: I7f7fefd61c6032c84fa63e597ea0e6bbe66d2e79
ootdir/init.rc
8d2f91db21271a253bfe1bbe7716ff59e88572bd 12-Mar-2010 Takeshi Kishimoto <kishimoto@google.com> Added Kyocera's VID (0x0482), upon their request.

Change-Id: I8f2f2a02c22d618c0b42d4f287d88a98af3ac4fa
db/usb_vendors.c
d1d3b6dbedd720349aef3e93c4f61a43ffe5ada3 12-Mar-2010 Dan Egnor <egnor@google.com> Add '-t N' flag to logcat, to print only the last N lines of logcat
(to be used in capturing a merged mini logcat for crash reports)

Change-Id: I68149eb80f2f79812f43b07d80fbea822476859e
ogcat/logcat.cpp
bbf1c64527dde837a236b4d6b9f75343adbca119 12-Mar-2010 Wink Saville <wink@google.com> Change permissions on pppd-ril

On devices that use a pppd for cellular network access, a pppd-ril
process needs to run as root to configure the connection. Changing
the process to suid-root in the build image is the only known way
to avoid needing to remount the system image at boot to accomplish
the same thing.

Change-Id: I6c778391b8040ee818343e304891e7d341cc729b
nclude/private/android_filesystem_config.h
d475d09567eb710a13e1588c5fec3ca53a3d79c8 11-Mar-2010 San Mehat <san@google.com> Merge "system: libdiskconfig: Add libdiskconfig"
bde9e134bd9d43017fe964093bc20f1036c6e3fc 11-Mar-2010 Daniel Sandler <dsandler@google.com> Merge "Add wall-clock timing for each fastboot Action."
95ee753a5e5822548d25c926f1ee71b2fe5dad1c 11-Mar-2010 Colin Cross <ccross@android.com> Merge "Use arch flags instead of TARGET_ARCH_VARIANT, and add support for VFP_D16"
a6391f1006b961ca89d1c79a826375380684a4de 10-Mar-2010 San Mehat <san@google.com> system: libdiskconfig: Add libdiskconfig

Change-Id: Ie7a7b5d8016dec60cdfb17228c3f519789c98564
Signed-off-by: San Mehat <san@google.com>
nclude/diskconfig/diskconfig.h
ibdiskconfig/Android.mk
ibdiskconfig/config_mbr.c
ibdiskconfig/diskconfig.c
ibdiskconfig/diskutils.c
ibdiskconfig/dump_diskconfig.c
ibdiskconfig/write_lst.c
e951f60e77a986494fafeadf53ba726fe79c498d 09-Mar-2010 Colin Cross <ccross@android.com> Use arch flags instead of TARGET_ARCH_VARIANT, and add support for VFP_D16

Change-Id: I6007ff21076e92b04a17fb030472a9f8842f0315
ebuggerd/Android.mk
ebuggerd/debuggerd.c
ebuggerd/vfp.S
36cf32f6bd2274574b2e84d1e4600455ca832682 10-Mar-2010 Dan Egnor <egnor@google.com> Remove an obsolete event log tag.

Change-Id: Idb718bdc88bca244eb88af5f391055cd40b42fd8
ogcat/event.logtags
732799eca9f2767996bc423503937c4c935bb630 09-Mar-2010 Dmitry Shmidt <dimitrysh@google.com> Merge "sysutils: Increase number of command arguments to 16"
1159d7f800e5ddaf9d2d994e23d11e2f6dd67b8e 09-Mar-2010 Dmitry Shmidt <dimitrysh@google.com> sysutils: Increase number of command arguments to 16

Change-Id: I0bba579634b334d24645c2af55ab3fab6da03fc6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
nclude/sysutils/FrameworkListener.h
fe582b5d32d08d075be87f4c9193e24029963361 19-Feb-2010 Mike Lockwood <lockwood@android.com> adb: Add five second timeout for USB writes on Linux host.

This helps us recover when things go wrong during automated testing.

Change-Id: I006dbfaff7f70d51398ff12fbddcaee751453b78
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.h
db/usb_linux.c
f91c96895d63791324ae8a74ab8901af26bb49bc 09-Mar-2010 Jean-Baptiste Queru <jbq@google.com> Add an empty CleanSpec.mk

Change-Id: Ia3bea2f0adddfed8af6d7cde4ea6546ab37e7e56
leanSpec.mk
7df6349a63b89d279131ec7dd7e6ef1b065854f5 09-Mar-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I698b3c16bdef8751cc857b00f815cb2f95465431
b51cb880c02836a57426620f40a1ba9331b6c52a 08-Mar-2010 Arve Hjønnevåg <arve@android.com> Merge "toolbox: nandread: Add options to extract raw images, partial images, and fix bad block check."
3e1aac6c4d656d09043cef114e38e4b3f42378f5 08-Mar-2010 Nick Kralevich <nnk@google.com> Change netcfg permissions to 2750.
Fix bug 2104034.

Change-Id: I30bcc41f33623cadc63693fd54206ccbb1886a5a
nclude/private/android_filesystem_config.h
b6b8793b8b6dad500f6884539e47efb4c161576a 04-Mar-2010 Arve Hjønnevåg <arve@android.com> toolbox: nandread: Add options to extract raw images, partial images, and fix bad block check.
oolbox/nandread.c
3b6bd0267ac8fc4ea7eb7dc676cf98d6c731da9c 03-Mar-2010 Joe Onorato <joeo@android.com> remove stray printfs.
iblog/logd_write.c
661aff600c5cb8e72aa2892a2a75ea6015bf1457 03-Mar-2010 San Mehat <san@google.com> newfs_msdos: Allow -s option to work by itself

Signed-off-by: San Mehat <san@google.com>
oolbox/newfs_msdos.c
503df2075991cd03ddf43d14e05768a2138b9028 03-Mar-2010 San Mehat <san@google.com> cutils: sched_policy: Make getSchedulerGroup() play nicely with multiple control groups

Signed-off-by: San Mehat <san@google.com>
ibcutils/sched_policy.c
fd7ebb367330ea3b999ca9c2a48431c437c05f67 02-Mar-2010 Andy McFadden <fadden@android.com> Merge "Fix Heap Corruption from too long of a TAG"
026b017a9b922604e9dcd1dbcce88df153250ae7 02-Mar-2010 Mike Chan <mike@android.com> Merge "init.rc: Add cpuacct to cgroup mount for cpu statistic"
6fcc801eadcccd09d92045f851f9fbf1ed0f25ea 02-Mar-2010 Brian Carlstrom <bdc@google.com> Add missing newlines to adb usage message
db/commandline.c
89f235c5e028466bb273dbaacb3346f1f0ba9f1e 01-Mar-2010 Mike Chan <mike@android.com> init.rc: Add cpuacct to cgroup mount for cpu statistic

Cpu accounting statistics expored in /acct

Change-Id: I8a35816e94b69d9e67a3dd65aae16520864777d7
Signed-off-by: Mike Chan <mike@android.com>
ootdir/init.rc
e2bf2ea4d2846031edfc52b942ad53e5467243f6 01-Mar-2010 Joe Onorato <joeo@android.com> Make logcat print both the main and system buffers by default. Make SLOGx macros work.
nclude/cutils/log.h
nclude/cutils/logger.h
nclude/cutils/logprint.h
iblog/logd_write.c
iblog/logprint.c
ogcat/logcat.cpp
b91bf4ba864a392412397913ee09a8c1f2e7cc87 27-Feb-2010 San Mehat <san@google.com> Revert "init.rc: Add cpuacct to cgroup mount for cpu statistics"

This reverts commit a7d88224ff7283c210c25ce6d57239b4053b5f14.

This cgroup subsys should be mounted on it's own mount-point, since it's
addition to /dev/cpuctl causes the cpu subsys to EPERM
ootdir/init.rc
bfb0477f1d0210e117f66f36128f9cc0ca962b6e 27-Feb-2010 Mike Lockwood <lockwood@android.com> Merge "adb: do not mix printf() with write() when writing to stdout."
85cf56892dcc4d38cdd62e0690b2c5388e0880b2 26-Feb-2010 San Mehat <san@google.com> cutils: schedpolicy: remove stray include

Signed-off-by: San Mehat <san@google.com>
ibcutils/iosched_policy.c
81689b60b5528742b3c4a6973efc97c0acdf5b4d 26-Feb-2010 Joe Onorato <joeo@google.com> Merge "Allow logcat to take multiple -b options, and interleave the results."
a7d88224ff7283c210c25ce6d57239b4053b5f14 26-Feb-2010 Mike Chan <mike@android.com> init.rc: Add cpuacct to cgroup mount for cpu statistics

Change-Id: Ic1893e1bf7b2c45659419b0bc55d42f50d030c9f
Signed-off-by: Mike Chan <mike@android.com>
ootdir/init.rc
6fa09a066d6b6898a394a3ccf6c32111665cdbcb 26-Feb-2010 Joe Onorato <joeo@android.com> Allow logcat to take multiple -b options, and interleave the results.
ogcat/logcat.cpp
e2fe261d1ac775e9e6501bf976cd4fef4c1cf5dd 26-Feb-2010 San Mehat <san@google.com> cutils: iosched_policy: Don't do anything for simulator

Signed-off-by: San Mehat <san@google.com>
ibcutils/iosched_policy.c
f0cb74e3b07d5de49dc875f8405e21d2a102e749 26-Feb-2010 San Mehat <san@google.com> rootdir: init.rc: Enable I/O priorities for media server and vold

Sets the media-server to class 'real-time' pri 4, and vold to class 'best effort'
pri 2

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
4e221f0077373b37ca70e862eface2987557295b 25-Feb-2010 San Mehat <san@google.com> init: Add support for specifying a services i/o priority

Signed-off-by: San Mehat <san@google.com>
nit/init.c
nit/init.h
nit/keywords.h
nit/parser.c
1bfb4803ea64d7072f183cabd4cb704147dbf749 26-Feb-2010 San Mehat <san@google.com> Merge "system: Add support for getting/setting i/o priorities and include a userspace tool"
1d01c295a9fa8cd543af046c4232d3430b73ac13 26-Feb-2010 Satoshi Kataoka <satok@google.com> Merge "Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request."
dd6b36e334809e7a99f0bce45353cdd7e4dac4e1 22-Sep-2009 Mike Lockwood <lockwood@android.com> adb: do not mix printf() with write() when writing to stdout.

Change-Id: I3598cc951778080bec9a21d646656d5aba57120a
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/commandline.c
eafdd86f4d8f4ccc69f0c16550c65aa392f678d6 08-Jan-2010 Jaikumar Ganesh <jaikumar@google.com> Update bluetooth data files path.
nclude/private/android_filesystem_config.h
ootdir/init.rc
10d469bff9031e857c7a290dae7d6ccf7b3a18f8 25-Feb-2010 San Mehat <san@google.com> system: Add support for getting/setting i/o priorities and include a userspace tool

Signed-off-by: San Mehat <san@google.com>
nclude/cutils/iosched_policy.h
ibcutils/Android.mk
ibcutils/iosched_policy.c
oolbox/Android.mk
oolbox/ionice.c
cb6e22b687eee5a47c642620d2e995b60f60f3e7 25-Feb-2010 Daniel Sandler <dsandler@google.com> Add wall-clock timing for each fastboot Action.

(For diagnosing slow flashes.)

Change-Id: Ibbcbd080db551c8590ca8bfe50e9ddb45eea5661
astboot/engine.c
d969faa161310d0a3792766320daa3200b84bd74 24-Feb-2010 Mike Lockwood <lockwood@android.com> adb: Attempt to unmount the SD card before rebooting.

Change-Id: Idd4d96b4704f4e1bd324e72bca87611a23e30801
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/services.c
a9db22f1228996d8f81e4f4903fa5c598a606fbd 24-Feb-2010 San Mehat <san@google.com> rootdir: init.rc: Add 'ASEC_MOUNTPOINT' environment variable.

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
71122f9a538e64333fbf4f999f8e38785e1eec43 24-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am d6391c6a: merge from open-source master

Merge commit 'd6391c6aaaa40c20761b7a2a8d4be115163e4194'

* commit 'd6391c6aaaa40c20761b7a2a8d4be115163e4194':
ADB: Garmin-Asus's USB Vendor ID
adb: add Nvidia's vendor id to adb
make "adb bugreport" run "bugreport" (which invokes "dumpstate"
adb: Fix problems detecting adb in more complicated USB configurations.
Make adb pull use . as the target file directory if you don't supply one.
8ccb3a55ce80b4087add0a764fffa1ae39d610bf 24-Feb-2010 San Mehat <san@google.com> system: Remove dead vold1 code

Signed-off-by: San Mehat <san@google.com>
old/Android.mk
old/ProcessKiller.c
old/blkdev.c
old/blkdev.h
old/cmd_dispatch.c
old/cmd_dispatch.h
old/devmapper.c
old/devmapper.h
old/diskmbr.h
old/format.c
old/format.h
old/geom_mbr_enc.c
old/logwrapper.c
old/logwrapper.h
old/media.c
old/media.h
old/misc.c
old/mmc.c
old/mmc.h
old/switch.c
old/switch.h
old/uevent.c
old/uevent.h
old/ums.c
old/ums.h
old/vold.c
old/vold.h
old/volmgr.c
old/volmgr.h
old/volmgr_ext3.c
old/volmgr_ext3.h
old/volmgr_vfat.c
old/volmgr_vfat.h
d6391c6aaaa40c20761b7a2a8d4be115163e4194 23-Feb-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master
01512aa3b0e3709e97054ffd1ff265a2d4193646 22-Feb-2010 Takeshi Kishimoto <kishimoto@google.com> Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request.
db/usb_vendors.c
bbfe1368d909be470f919b2349a974bee8dd0a9c 17-Feb-2010 Chia-chi Yeh <chiachi@android.com> Remove dead services from init.rc.
ootdir/init.rc
6f957c3f25ed96a5ea13122764c66e18f1e72d2d 20-Feb-2010 San Mehat <san@google.com> generic_rootdir: vold_fstab: Change '/sdcard' -> '/mnt/sdcard'

Signed-off-by: San Mehat <san@google.com>
ootdir/etc/vold.fstab
6ea3cc6089393286ab8b6cc459cfa9d7e58fc203 20-Feb-2010 San Mehat <san@google.com> rootdir: init.rc: Create secure staging directories, and a compat symlink

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
0ef3fd048aeaeb59467e43e543f66b96e4e6c7f5 19-Feb-2010 Mike Lockwood <lockwood@android.com> adb: add -s option to adb install for installing apps on SD card.

Change-Id: Ic6b24411e594d160ddcf862cc9f1283e1e17bb4d
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/commandline.c
b45b5c9f227473050ef785d11e518e947c8754fb 11-Feb-2010 Keith Preston <keithpre@gmail.com> Fix Heap Corruption from too long of a TAG

snprintf has a weird return value. It returns what would have been written given a large enough buffer.
In the case that the prefix is longer then our buffer(128), it messes up the calculations below possibly causing heap corruption.
To avoid this we double check and set the length at the maximum (size minus null byte
iblog/logprint.c
fa36f2c3b7707865867ce2b4710efeaeef993b1d 17-Feb-2010 Mathias Agopian <mathias@google.com> fix [2448319] out of bounds array index in fog
nclude/private/pixelflinger/ggl_context.h
ibpixelflinger/pixelflinger.cpp
5dca8493452e5b443e58b3316c7128a1de612fc1 17-Feb-2010 Mathias Agopian <mathias@google.com> remove unused YUV constants
nclude/pixelflinger/format.h
ibpixelflinger/format.cpp
8e4f143d45722bf1e8584e84e55ff844b176c75a 17-Feb-2010 Dima Zavin <dima@android.com> pixelflinger: add defines for nv12_tiled semi-planar and nv21 semi-planar

Change-Id: Ib56c19f3c5a71730dd7a7a82b10a59c2bb9b5de8
Signed-off-by: Dima Zavin <dima@android.com>
nclude/pixelflinger/format.h
b99a099cad7066274b25de9d603e7ced37d20e19 15-Feb-2010 Carl Shapiro <cshapiro@google.com> Add a new method to export the extent of the break, akin to return
value of sbrk(0) in UNIX. In terms of dlmalloc and our proprietary
contiguous mspace class, this is the highest address returned by its
morecore method.
nclude/cutils/mspace.h
ibcutils/mspace.c
a1dca2fd9ce8d8ac8cbe373dec330cce7d813e53 16-Feb-2010 Andy Stadler <stadler@google.com> Merge "Allow numeric uid & gid in chown"
931175a1c5f01f57781c9fcf64beade6ed5148ff 13-Feb-2010 Dima Zavin <dima@android.com> fastboot: add nand page size param, used for boot and flash:raw commands

Change-Id: I07451363f4d4ac8665598722491968e6ee0953ee
Signed-off-by: Dima Zavin <dima@android.com>
astboot/fastboot.c
d77caaa94e8cfc1ef09699f88ed0d4bb2853e7f4 16-Feb-2010 Satoshi Kataoka <satok@google.com> Merge "Added USB vendor id of Sharp, based on Sharp's request. Sharp's vendor id: 0x04dd"
5a912bf03e62a8d37624d6323d43253c76022130 01-Feb-2010 Raphael <raphael@google.com> ADB: Garmin-Asus's USB Vendor ID

Change-Id: I3249d629f59d40f291079fc214b643ac6c927f76
db/usb_vendors.c
2f6c2b04fbc0a3b1103b2c42ccdd2e4917fef455 21-Jan-2010 Erik Gilling <konkers@android.com> adb: add Nvidia's vendor id to adb

Signed-off-by: Erik Gilling <konkers@android.com>
db/usb_vendors.c
7eced2b86aa4ad91307b6531cae73ce1a4064b18 20-Jan-2010 Dan Egnor <egnor@google.com> make "adb bugreport" run "bugreport" (which invokes "dumpstate"
indirectly via system service) rather than "dumpstate", that way
even when adb is not running as root, dumpstate does run as root,
and can do things like collect VM traces.
db/commandline.c
429c5ae4618a454120a0fa353a378916f38d2fd7 17-Jan-2010 Mike Lockwood <lockwood@android.com> adb: Fix problems detecting adb in more complicated USB configurations.

Change-Id: Ib5b13960a1c75efc97abeca46204c85bba905c71
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
8071a4bdb6e437baa4efcb8cf777d4caeaf069e4 05-Jan-2010 Joe Onorato <joeo@android.com> Make adb pull use . as the target file directory if you don't supply one.
db/commandline.c
63b396d89c3a535675808282e2563ecabc04ef76 13-Feb-2010 Carl Shapiro <cshapiro@google.com> Eliminate the stdint.h include. In retrospect, it seems that the
source of the aforementioned build breakage was then errant include of
this header when stddef.h was intended. Nothing in this file uses any
of the symbols exported from stdint.h, only symbols from stddef.h.
nclude/cutils/ashmem.h
715c889713a7b3bd2f487dd14482af9675afc5cf 12-Feb-2010 Andrew Stadler <stadler@android.com> Allow numeric uid & gid in chown

This makes it more like the POSIX version which accepts number or name.
oolbox/chown.c
143b370748150000fb54b676213470e736488766 12-Feb-2010 Carl Shapiro <cshapiro@google.com> Include stddef.h to make the size_t visible. Resolves a simulator
build break caused by a use of ashmem.h in an environment without
size_t.
nclude/cutils/ashmem.h
9b0bf529440552ab2fb45a30f52c4e7a6abd3e5e 11-Feb-2010 Dan Egnor <egnor@google.com> Remove some log tags, which have moved to their own
EventLogTags.logtags file in various directories.
ogcat/event.logtags
17128f6e433afae326a57a7961499f529f532c61 06-Jan-2010 Barry Hayes <bhayes@google.com> Break out create_contiguous_mspace_with_base
This routine allows creating a contiguous mspace from raw mapped memory.
In turn, this will enable preallocation of the 3 heap spaces, which will help
remembered sets and zygote/app checks given pointer values.
nclude/cutils/mspace.h
ibcutils/mspace.c
123331adeaed6c54e4869b0fd7001c5f1b19bdc4 09-Feb-2010 Takeshi Kishimoto <kishimoto@google.com> Added USB vendor id of Sharp, based on Sharp's request.
Sharp's vendor id: 0x04dd
db/usb_vendors.c
2dcf1fb9ff3f7a64c0f914c524db146dd8683b6a 09-Feb-2010 Barry Hayes <bhayes@google.com> Merge "Break out create_contiguous_mspace_with_base This routine allows creating a contiguous mspace from raw mapped memory. In turn, this will enable preallocation of the 3 heap spaces, which will help remembered sets and zygote/app checks given pointer values."
92b25666d96ffbac7959f142eb4cc3d122d1c20b 05-Feb-2010 Jean-Baptiste Queru <jbq@google.com> am d8bdf217: resolved conflicts for merge of e577a83a to eclair-plus-aosp

Merge commit 'd8bdf2171af548f321d417147807256e1022c89f'

* commit 'd8bdf2171af548f321d417147807256e1022c89f':
android-2.1_r1 snapshot
d8bdf2171af548f321d417147807256e1022c89f 05-Feb-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of e577a83a to eclair-plus-aosp
e577a83ac173dab41f550ada526de6a3cbb44b9c 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> reconcile main tree with open-source eclair
157bf769be61f7d50bd1421a9be43d1ee315828b 04-Feb-2010 Dima Zavin <dima@android.com> Remove libjnigraphics. moved to frameworks/base/native

Change-Id: Ieb65ab1428198a82e583059f75661808f350ea2b
Signed-off-by: Dima Zavin <dima@android.com>
nclude/android/bitmap.h
ibjnigraphics/Android.mk
ibjnigraphics/bitmap.cpp
32f51664c8c44b8a4ab357e34590deb62c582c7c 02-Feb-2010 Iliyan Malchev <malchev@google.com> am 4f4ccaa1: am 1404c27b: Merge "system/core/init: set proper permissions for tpa2018d1 (CDMA)" into eclair

Merge commit '4f4ccaa1bd079ebc67a97709bbb7ab5ada7449d5'

* commit '4f4ccaa1bd079ebc67a97709bbb7ab5ada7449d5':
system/core/init: set proper permissions for tpa2018d1 (CDMA)
4f4ccaa1bd079ebc67a97709bbb7ab5ada7449d5 02-Feb-2010 Iliyan Malchev <malchev@google.com> am 1404c27b: Merge "system/core/init: set proper permissions for tpa2018d1 (CDMA)" into eclair

Merge commit '1404c27bff1499dae9b640870ce2251d78cdc5ef' into eclair-plus-aosp

* commit '1404c27bff1499dae9b640870ce2251d78cdc5ef':
system/core/init: set proper permissions for tpa2018d1 (CDMA)
1404c27bff1499dae9b640870ce2251d78cdc5ef 02-Feb-2010 Iliyan Malchev <malchev@google.com> Merge "system/core/init: set proper permissions for tpa2018d1 (CDMA)" into eclair
1340a095ac9f1ea007752288a4407490ddb6935c 02-Feb-2010 Iliyan Malchev <malchev@google.com> system/core/init: set proper permissions for tpa2018d1 (CDMA)

Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
3332d6e69d3182a756c029e9d499a78f17c4b17a 02-Feb-2010 Raphael <raphael@google.com> resolved conflicts for merge of 190cabb3 to master
190cabb376d9a393b65a0d8c123196bf58ef7ab4 02-Feb-2010 Raphael <raphael@google.com> am 1873adc2: ADB: Garmin-Asus\'s USB Vendor ID

Merge commit '1873adc2b12d5a9045bae90650bb331c7c7aa3c7' into eclair-plus-aosp

* commit '1873adc2b12d5a9045bae90650bb331c7c7aa3c7':
ADB: Garmin-Asus's USB Vendor ID
1873adc2b12d5a9045bae90650bb331c7c7aa3c7 01-Feb-2010 Raphael <raphael@google.com> ADB: Garmin-Asus's USB Vendor ID

Change-Id: I3249d629f59d40f291079fc214b643ac6c927f76
db/usb_vendors.c
4c5e7ffd806cdfe345fe589f2b60f02d00daba13 29-Jan-2010 The Android Open Source Project <initial-contribution@android.com> reconcile android-2.1_r1 snapshot
4ab909d044eb6dec592171e1d6f6055dbfd57d0b 29-Jan-2010 Ben Cheng <bccheng@android.com> Merge "Bug fix for pre-NEON platforms and enhancement for JIT debugging."
5e12d739c6b86b79d761f45a1c0399e0d42d1cb5 29-Jan-2010 Doug Zongker <dougz@android.com> make DumpPublicKeys write 32-bit values as unsigned

Write the 32-bit chunks of N and RR as unsigned, so we get:

{64,0xc926ad21,{1795090719,2141396315,950055447,2581568430,4268923165,...

instead of:

{64,0xc926ad21,{1795090719,2141396315,950055447,-1713398866,-26044131,...

Change-Id: I575224fd7f7c34e06a1b6ae976eaa0bef41d2942
ibmincrypt/tools/DumpPublicKey.java
2854db8969cd061d83a931769dfaf4e57108d9df 28-Jan-2010 Ben Cheng <bccheng@android.com> Bug fix for pre-NEON platforms and enhancement for JIT debugging.

Use __ARM_NEON__ instead of __VFP_FP__ to detect the need to retrieve FP
registers.

Dump more code around PC and LR to facilitate JIT debugging.
ebuggerd/debuggerd.c
2f3d96ee5b6ba43b49d0e08c75b9a74b05f37b8b 28-Jan-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 20f410a4 to master

Change-Id: I187f29848c223c8c548323e0fa20ea0f3b8a3909
9aa6b0453321cc542d3b0eefd6563b4614292f4d 28-Jan-2010 Android Git Automerger <android-git-automerger@android.com> am 114e398f: Merge commit \'f71f068fb9082ad78c78493c1295074e88a5526c\' into eclair-plus-aosp

Merge commit '114e398f66bf5d521721abfa1933dc989bb5a135'

* commit '114e398f66bf5d521721abfa1933dc989bb5a135':
Add DELL's USB Vendor ID to adb - DO NOT MERGE
4544a9f7b46aab4c7a261f321ffdd35711d62099 28-Jan-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of c8472186 to master

Change-Id: I41acaaa3a5d6aeb6873472f17db4cfa756b2d23f
4fb0dba9905b8e2584c159ccd0f9b445227c865d 27-Jan-2010 Vasu Nori <vnori@google.com> Merge "dont create sqlite_stmt_journals dir."
55a1f0827be9920b093152cffb6eddd613d04bc9 27-Jan-2010 Vasu Nori <vnori@google.com> dont create sqlite_stmt_journals dir.

this shoudl not be required any longer. in fact, some test-writers are
abusing this dir.
ootdir/init.rc
b17772dcc8ac2acccf658da262edcc303fafcafb 06-Jan-2010 Barry Hayes <bhayes@google.com> Break out create_contiguous_mspace_with_base
This routine allows creating a contiguous mspace from raw mapped memory.
In turn, this will enable preallocation of the 3 heap spaces, which will help
remembered sets and zygote/app checks given pointer values.
nclude/cutils/mspace.h
ibcutils/mspace.c
fe5684ef3a452ab27e6f75ccb74728b6185fa558 26-Jan-2010 Andy McFadden <fadden@android.com> Try to fix Mac build.

Throwing in an include of <unistd.h> and <sys/types.h> to get off_t
defined. Might work.
ibcutils/open_memstream.c
cf63d5d00f5a631a2905da7812b5c029b5211cf6 23-Jan-2010 Andy McFadden <fadden@android.com> Implementation of open_memstream().

POSIX seems to have chosen open_memstream() over the BSD variant. We
want something for Dalvik that will work on both GNU/Linux and Android,
so this is open_memstream() implemented in terms of BSD funopen().

For Windows there's just a stub that calls abort().

I'm putting this in libcutils since it seems inappropriate for bionic
(which provides the BSD alternatives) but isn't Dalvik-specific.
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
nclude/cutils/open_memstream.h
ibcutils/Android.mk
ibcutils/open_memstream.c
58936f72b239fa8c065673dab065d3a8c98b95d6 23-Jan-2010 Nick Pelly <npelly@google.com> Merge "Clean fix for the chown race condition on new input devices."
6405c6953fa02d41d9f6377f4cdb947604f481c4 22-Jan-2010 Nick Pelly <npelly@google.com> Clean fix for the chown race condition on new input devices.

Drop init's egid to AID_INPUT while creating the device node, so that it is
created with the correct gid. This eliminates the
possibility of system_server opening the device node before its permissions
are set correctly.

Using setegid() allows us to swap back to AID_ROOT immediately after mknod().

Bug: 2375632
nit/devices.c
20f410a41890113de126680518c13cdab359c66d 22-Jan-2010 Android Git Automerger <android-git-automerger@android.com> resolved simple conflict with dc9cf66c
114e398f66bf5d521721abfa1933dc989bb5a135 22-Jan-2010 Android Git Automerger <android-git-automerger@android.com> Merge commit 'f71f068fb9082ad78c78493c1295074e88a5526c' into eclair-plus-aosp
dc9cf66c6e470f0ebcd77006e3f549c338ab4fab 22-Jan-2010 Xavier Ducrohet <xav@google.com> Merge "Add Dell's vendor ID to fastboot." into eclair
af82f21df7b87af2b378a46c8f338ebdd9c66175 22-Jan-2010 Xavier Ducrohet <xav@android.com> Add Dell's vendor ID to fastboot.

Change-Id: I1d88d2a8b3f5c0a9bade2a207b5d9c5a0b776655
astboot/fastboot.c
f71f068fb9082ad78c78493c1295074e88a5526c 22-Jan-2010 Xavier Ducrohet <xav@android.com> Add DELL's USB Vendor ID to adb - DO NOT MERGE

Change-Id: Ie1a6b6a81f50956362aee2a2d6d1b805f0e85b7a
db/usb_vendors.c
288c7cfe1b702dc669a8c4b7094035efc1cf7e30 22-Jan-2010 Dan Egnor <egnor@google.com> Merge "make "adb bugreport" run "bugreport" (which invokes "dumpstate" indirectly via system service) rather than "dumpstate", that way even when adb is not running as root, dumpstate does run as root, and can do things like collect VM traces."
25eab084c5bc6b6ed68001b4f67ca405fc541fcb 22-Jan-2010 Erik Gilling <konkers@android.com> Merge "adb: add Nvidia's vendor id to adb"
d89a501f8fff097b023a43e577e2d93e4f6278eb 21-Jan-2010 Wink Saville <wink@google.com> resolved conflicts for merge of 988ad28e to master

Change-Id: I02dda00585d5eb4ea74ca7c77bd46f97bb562440
c8472186e15ab6968342bae839277b82cf2584c4 21-Jan-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master
91a54c11cbfbe3adc1df2f523c75ad76affb0ae9 20-Sep-2009 Kenny Root <kenny@the-b.org> Add x86-64 checking for Darwin

Detect byte endianness when compiled in x86-64 mode in Mac OS X 10.6
Snow Leopard environments or above. Allows compilation of host binaries
in these environments without any changes from its default stock
configuration.

This change doesn't require that the binaries be built in 64-bit, but it
does allow this. One could still use "gcc_select 4.0" with the 10.4 SDK
installed on Snow Leopard to compile in 32-bit mode.

Change-Id: I155a531a9bff450dd6c077b5275652731c59a908
nclude/arch/darwin-x86/AndroidConfig.h
6ac5e192997478ae166981ddf66136c865d21a40 21-Jan-2010 Erik Gilling <konkers@android.com> adb: add Nvidia's vendor id to adb

Signed-off-by: Erik Gilling <konkers@android.com>
db/usb_vendors.c
37e9e904360d6a8757c958dacaab1343eacb7fa8 21-Jan-2010 Erik Gilling <konkers@android.com> fastboot: add Nvidia vendor id to fastboot

Signed-off-by: Erik Gilling <konkers@android.com>
astboot/fastboot.c
c130ea7c29b0149939c8fd6b8da2c981944636f9 20-Jan-2010 Dan Egnor <egnor@google.com> make "adb bugreport" run "bugreport" (which invokes "dumpstate"
indirectly via system service) rather than "dumpstate", that way
even when adb is not running as root, dumpstate does run as root,
and can do things like collect VM traces.
db/commandline.c
eb4ae9c6c353e1bb7a45ad971638387521e0c713 19-Jan-2010 Colin Cross <ccross@android.com> Merge "Remove definitions that are now in bionic libc"
2b9c1a8b0f0d6ef20a023207051b1b3ec21eaf69 19-Jan-2010 Mike Lockwood <lockwood@google.com> Merge "init: Support bugreports to SD card in user builds if adb is enabled."
7a36210cdb39bde3a7d73095d5891678685e431f 19-Jan-2010 Mike Lockwood <lockwood@android.com> init: Support bugreports to SD card in user builds if adb is enabled.

The rationale being that we do not want this enabled by default, but
tying it to adb being enabled allows convenient bugreport collection
for savvy users and developers using production devices.

Change-Id: I71535b33f0774faf1975c98d106080f2ff12e349
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/init.c
37ddce736ce7700ee1e120f7371e6ee6a526f3ca 19-Jan-2010 Mike Lockwood <lockwood@android.com> adb: Add Dell's USB vendor ID.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
cc7a5dc770e50272f3c14dacf8b0d7ad5f68032d 19-Jan-2010 Mike Lockwood <lockwood@android.com> adb: Add Dell's USB vendor ID.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
c4fc728e7062cb6269c7669f947b4573cf8c2d02 17-Jan-2010 Mike Lockwood <lockwood@google.com> Merge "adb: Fix problems detecting adb in more complicated USB configurations."
92175e04a56db804d4dae75fc49fdd5edc6a2968 17-Jan-2010 San Mehat <san@google.com> rootdir: init.rc: Fix typo in chown of /dev/cpuctl

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
07e8f7e8758d5ce44fe6cf3bacb670962750a92e 17-Jan-2010 Mike Lockwood <lockwood@android.com> adb: Fix problems detecting adb in more complicated USB configurations.

Change-Id: Ib5b13960a1c75efc97abeca46204c85bba905c71
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
192277c0154eff542ddbce27d7c35995c0671748 15-Jan-2010 San Mehat <san@google.com> rootdir: init.rc: Add netd to startup services list

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
988ad28e7f94fc9e421bc5dc5338022b3ef78957 15-Jan-2010 John Wang <johnwang@google.com> am 904ac578: Add gsm_rat_switched event tag.

Merge commit '904ac578d583f4615ee934da3467b84130285c44' into eclair-plus-aosp

* commit '904ac578d583f4615ee934da3467b84130285c44':
Add gsm_rat_switched event tag.
1b1fd61295d76b734f68309d0057699a1ba1cc37 14-Jan-2010 Colin Cross <ccross@android.com> Remove definitions that are now in bionic libc
h/miscbltin.c
oolbox/newfs_msdos.c
904ac578d583f4615ee934da3467b84130285c44 14-Jan-2010 John Wang <johnwang@google.com> Add gsm_rat_switched event tag.
ogcat/event-log-tags
8547a09ff1424d7f1ba61044d342e89d5a769467 13-Jan-2010 The Android Open Source Project <initial-contribution@android.com> android-2.1_r1 snapshot
ibcutils/sched_policy.c
ogcat/event-log-tags
ootdir/init.rc
eab453c612d6d422f863c31da67f00bc4beec914 10-Jan-2010 San Mehat <san@google.com> toolbox: newfs_msdos: Exit on write failure, and handle bogus geometry from the kernel

Signed-off-by: San Mehat <san@google.com>
oolbox/newfs_msdos.c
1851d80959bd314af730451ebfb2a5e00bb0a83a 07-Jan-2010 San Mehat <san@google.com> init.rc: Adjust perms on /asec

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
d0aa32c3d99aeb0e6949ab1c4fae83283a946567 06-Jan-2010 Oscar Montemayor <oam@google.com> Apps on SD project. Small change to support apps on SD file system key storage.
ootdir/init.rc
900570e2a833bde0683cce5254d9dc102509cabc 06-Jan-2010 San Mehat <san@google.com> init.rc: Create a small tmpfs on /asec so we can create mountpoints

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
6890db33cb9e6615fd98d03a8f2e57c1b27f7ced 06-Jan-2010 San Mehat <san@google.com> Merge "toolbox: newfs_msdos: If geometry is not available, use some sane-ish defaults"
c40e955727e1dd95ab0dc480f64e513749f62417 06-Jan-2010 San Mehat <san@google.com> Merge "init.rc: Add new /asec mount point"
ff3bcd03079d9e0e94f70955370f3eb940d6244a 05-Jan-2010 San Mehat <san@google.com> toolbox: newfs_msdos: If geometry is not available, use some sane-ish defaults

Signed-off-by: San Mehat <san@google.com>
oolbox/newfs_msdos.c
00c0eeac6be1597ce24fccf8e2afaaffab223cb3 05-Jan-2010 Joe Onorato <joeo@android.com> Make adb pull use . as the target file directory if you don't supply one.
db/commandline.c
37c71dd9a7f488563c97fdca88cca701e2962e45 04-Jan-2010 San Mehat <san@google.com> init.rc: Add new /asec mount point

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
d674413ff460afe1da049e54bb7a489132799749 24-Dec-2009 San Mehat <san@google.com> sysutils: Add dump() to NetlinkEvent

Signed-off-by: San Mehat <san@google.com>
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
3528f6ba2769abb09ae0a27a9336b96ab0a97225 17-Dec-2009 San Mehat <san@google.com> vold: Disable build of old vold

Signed-off-by: San Mehat <san@google.com>
old/Android.mk
5184fc5c797849ee861dd4068ad57cbbe829c9d6 17-Dec-2009 San Mehat <san@google.com> rootdir: Switch to vold.fstab

Signed-off-by: San Mehat <san@google.com>
ootdir/Android.mk
ootdir/etc/vold.conf
ootdir/etc/vold.fstab
a1871d2a72e0cdd8fefc658dec389f2945b4cf2f 22-Dec-2009 Mike Lockwood <lockwood@android.com> adb: Add USB vendor ID for Foxconn

Change-Id: I88e4051b6e5cd820cab7e3ec417a545f50925a33
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
a48d43a0777494b3a686fa0c6d58f986547982eb 14-Dec-2009 Romain Guy <romainguy@android.com> Add adb reboot-bootloader to match fastboot reboot-bootloader.

Also fix the formatting of one of the options in the help message.
db/commandline.c
a59387b508efd99031de2f23363092fdf4dfc130 28-Nov-2009 Mike Lockwood <lockwood@android.com> adb: fix -d and -e options for "adb forward" command.

Change-Id: I9166572a1c398ce5ef1423d19a30895385118ee5
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/commandline.c
6170404867631317ab57c67bf074494e6e775556 22-Dec-2009 Mike Lockwood <lockwood@android.com> adb: Add USB vendor ID for Foxconn

Change-Id: I88e4051b6e5cd820cab7e3ec417a545f50925a33
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
bdcff7d66ef8f6602e017d03cf4ffa57bac39b92 17-Dec-2009 Ben Cheng <bccheng@google.com> Dump VFP registers and status word when native app crashes.

Bug: 2226399
Caveat: d0/d1 appear to be clobbered by ptrace. It will be tracked by a new bug.
ebuggerd/Android.mk
ebuggerd/debuggerd.c
ebuggerd/vfp-crasher.c
ebuggerd/vfp.S
b202c54aca4d84086a4dcc0f3c0bbc02d1dd9625 15-Dec-2009 Android Git Automerger <android-git-automerger@android.com> Merge commit 'goog/eclair-plus-aosp'
ea036dec458fb61e8c6ff880f52575cce59f6851 15-Dec-2009 Dmitry Shmidt <dimitrysh@google.com> am 2ed5a457: am 9363b7d5: dhcp: Add hostname support

Merge commit '2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93'

* commit '2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93':
dhcp: Add hostname support
2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93 15-Dec-2009 Dmitry Shmidt <dimitrysh@google.com> am 9363b7d5: dhcp: Add hostname support

Merge commit '9363b7d5da7e17842432251384f8dc46902ac323' into eclair-mr2-plus-aosp

* commit '9363b7d5da7e17842432251384f8dc46902ac323':
dhcp: Add hostname support
9363b7d5da7e17842432251384f8dc46902ac323 15-Dec-2009 Dmitry Shmidt <dimitrysh@google.com> dhcp: Add hostname support

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnetutils/dhcp_utils.c
311add489e4a1712d201c3b83fa364d5569e6788 14-Dec-2009 Romain Guy <romainguy@android.com> Add adb reboot-bootloader to match fastboot reboot-bootloader.

Also fix the formatting of one of the options in the help message.
db/commandline.c
8cd186d9e0aac1b18e4c8b32e3d79beedb728ab3 09-Dec-2009 Barry Hayes <bhayes@google.com> Fix bogus pointer math.
ibcutils/mspace.c
b80acad7d6daa5d4279131e47afeffddabe838f0 10-Dec-2009 Mike Reed <reed@google.com> am eedfd9d5: am 021529fe: link explicitly against libskia

Merge commit 'eedfd9d50490886cb681c0b73ef34649f3d94360'

* commit 'eedfd9d50490886cb681c0b73ef34649f3d94360':
link explicitly against libskia
a4e26ca9409d1bbb21c103f7a6c42ad926f81dbd 10-Dec-2009 Mike Reed <reed@google.com> am f8190342: am 086d66dc: Merge change Ib5291c02 into eclair-mr2

Merge commit 'f8190342e7fad57a9540316bb1bc3125a3ebd6aa'

* commit 'f8190342e7fad57a9540316bb1bc3125a3ebd6aa':
first impl for NDK access to bitmaps
ecfd7eae2d0b4559cf9d187c5bf68cfab8f6219c 10-Dec-2009 San Mehat <san@google.com> am eaa8432d: am 1b217b0c: system: vold: Conditionalize build (default on)

Merge commit 'eaa8432d3f5495f19a06836501d7538211529d98'

* commit 'eaa8432d3f5495f19a06836501d7538211529d98':
system: vold: Conditionalize build (default on)
eedfd9d50490886cb681c0b73ef34649f3d94360 10-Dec-2009 Mike Reed <reed@google.com> am 021529fe: link explicitly against libskia

Merge commit '021529fe63d931815fe7aad09578caf130c28670' into eclair-mr2-plus-aosp

* commit '021529fe63d931815fe7aad09578caf130c28670':
link explicitly against libskia
f8190342e7fad57a9540316bb1bc3125a3ebd6aa 10-Dec-2009 Mike Reed <reed@google.com> am 086d66dc: Merge change Ib5291c02 into eclair-mr2

Merge commit '086d66dc9c7d0e11f924f8346a67f5c8f4bb4d33' into eclair-mr2-plus-aosp

* commit '086d66dc9c7d0e11f924f8346a67f5c8f4bb4d33':
first impl for NDK access to bitmaps
eaa8432d3f5495f19a06836501d7538211529d98 10-Dec-2009 San Mehat <san@google.com> am 1b217b0c: system: vold: Conditionalize build (default on)

Merge commit '1b217b0c6d36b7f6f550f45d2b694b0f154a22b7' into eclair-mr2-plus-aosp

* commit '1b217b0c6d36b7f6f550f45d2b694b0f154a22b7':
system: vold: Conditionalize build (default on)
021529fe63d931815fe7aad09578caf130c28670 08-Dec-2009 Mike Reed <reed@google.com> link explicitly against libskia
ibjnigraphics/Android.mk
086d66dc9c7d0e11f924f8346a67f5c8f4bb4d33 08-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib5291c02 into eclair-mr2

* changes:
first impl for NDK access to bitmaps
1b217b0c6d36b7f6f550f45d2b694b0f154a22b7 08-Dec-2009 San Mehat <san@google.com> system: vold: Conditionalize build (default on)

Signed-off-by: San Mehat <san@google.com>
old/Android.mk
83782909a35bd5cf61369ec74c653145657766d4 08-Dec-2009 Mike Reed <reed@google.com> am 31b5d4b9: am 45e5ca1c: Merge change I0deb0117 into eclair-mr2

Merge commit '31b5d4b98e8079a1d97aff8dc3e0824b95d1e294'

* commit '31b5d4b98e8079a1d97aff8dc3e0824b95d1e294':
NDK header for accessing pixels of a java bitmap
97a5f615eeddf4e967a7cef25e0bbd8751efdd5c 07-Dec-2009 Ben Winslow <rain@bluecherry.net> am 6d83685d: am 88660fa5: vold: Check partitions 1-4 instead of 0-3

Merge commit '6d83685d5bf146835977e56017f8c485932e8047'

* commit '6d83685d5bf146835977e56017f8c485932e8047':
vold: Check partitions 1-4 instead of 0-3
0d43429100e377485e9d5948edbdc3c009c934fc 07-Dec-2009 Doug Zongker <dougz@android.com> am 7bae08ca: am dd75019d: remove ActivityManager-related event log tags

Merge commit '7bae08ca9d7ed068f97549e904e2a4e2bba1614e'

* commit '7bae08ca9d7ed068f97549e904e2a4e2bba1614e':
remove ActivityManager-related event log tags
8cd7bd5efbb1809fe657718d6754c7762ca6653b 07-Dec-2009 Mike Reed <reed@google.com> first impl for NDK access to bitmaps
ibjnigraphics/Android.mk
ibjnigraphics/bitmap.cpp
f9e8ab03bd93d98567e96822535090a877594aba 07-Dec-2009 Martyn Capewell <martyn.capewell@arm.com> NEON shortcut for flat colour blending into 16-bit

This is a shortcut for the needs descriptor
00000077:03515104_00000000_00000000. It requires blending a single 32-bit
colour value into a 16-bit framebuffer.
It's used when fading out the screen, eg. when a modal requester pops-up.

The PF JIT produces code for this using 24 instructions/pixel. The NEON
implementation requires 2.1 instructions/pixel. Performance hasn't been
benchmarked, but the improvement is quite visible.

This code has only been tested by inspection of the fading effect described
above, when press+holding a finger on the home screen to pop up the
Shortcuts/Widgets/Folders/Wallpaper requester.

Along with the NEON version, a fallback v5TE implementation is also provided.

This ARM version of col32cb16blend is not fully optimised, but is a reasonable
implementation, and better than the version produced by the JIT. It is here as
a fallback, if NEON is not available.
ibpixelflinger/Android.mk
ibpixelflinger/col32cb16blend.S
ibpixelflinger/col32cb16blend_neon.S
ibpixelflinger/scanline.cpp
31b5d4b98e8079a1d97aff8dc3e0824b95d1e294 07-Dec-2009 Mike Reed <reed@google.com> am 45e5ca1c: Merge change I0deb0117 into eclair-mr2

Merge commit '45e5ca1c7047b20d36bd31b30b7d2a4786baab0f' into eclair-mr2-plus-aosp

* commit '45e5ca1c7047b20d36bd31b30b7d2a4786baab0f':
NDK header for accessing pixels of a java bitmap
45e5ca1c7047b20d36bd31b30b7d2a4786baab0f 07-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I0deb0117 into eclair-mr2

* changes:
NDK header for accessing pixels of a java bitmap
96dbb4fc58fe2dcf4390e073dbb42cc77ef2f0b5 07-Dec-2009 Martyn Capewell <martyn.capewell@arm.com> Adds UXTB16 support to Pixelflinger

* Add support for UXTB16 to the disassembler
* Add encoding of the UXTB16 instruction to the Pixelflinger JIT.

Introducing the UXTB16 instruction allows removal of some masking code, and is
beneficial from a pipeline point of view - lots of UXTB16 followed by MUL
sequences.

Also, further rescheduling and use of SMULWB brings extra performance
improvements.

* Use UXTB16 in bilinear filtered texturing

Uses UXTB16 to extract channels for SIMD operations, rather than creating and
ANDing with masks. Saves a register and is faster on A8, as UXTB16 result can
feed into first stage of multiply, unlike AND.

Also, used SMULWB rather than SMULBB, which allows removal of MOVs used to
rescale results.

Code has been scheduled for A8 pipeline, specifically aiming to allow
multiplies to issue in pipeline 0, for efficient dual issue operation.

Testing on SpriteMethodTest (http://code.google.com/p/apps-for-android/) gives
8% improvement (12.7 vs. 13.7 fps.)

SMULBB to SMULWB trick could be used in <v6 code path, but this hasn't been
implemented.
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/ARMAssemblerProxy.cpp
ibpixelflinger/codeflinger/ARMAssemblerProxy.h
ibpixelflinger/codeflinger/disassem.c
ibpixelflinger/codeflinger/texturing.cpp
6d83685d5bf146835977e56017f8c485932e8047 05-Dec-2009 Ben Winslow <rain@bluecherry.net> am 88660fa5: vold: Check partitions 1-4 instead of 0-3

Merge commit '88660fa5d897a74f2fe07f4b827d37a453e32181' into eclair-mr2-plus-aosp

* commit '88660fa5d897a74f2fe07f4b827d37a453e32181':
vold: Check partitions 1-4 instead of 0-3
88660fa5d897a74f2fe07f4b827d37a453e32181 15-Aug-2009 Ben Winslow <rain@bluecherry.net> vold: Check partitions 1-4 instead of 0-3

In mmc_bootstrap_mmcblk, bootstrap partitions 1-4 instead of 0-3, since
that's how the kernel labels them. Additionally, use the NDOSPART constant
from diskmbr.h instead of hardcoding 4 when scanning partitions.

Signed-off-by: San Mehat <san@google.com>
old/blkdev.c
old/mmc.c
7bae08ca9d7ed068f97549e904e2a4e2bba1614e 05-Dec-2009 Doug Zongker <dougz@android.com> am dd75019d: remove ActivityManager-related event log tags

Merge commit 'dd75019da80cf49361fd355d4d6b66c02c73896e' into eclair-mr2-plus-aosp

* commit 'dd75019da80cf49361fd355d4d6b66c02c73896e':
remove ActivityManager-related event log tags
dd75019da80cf49361fd355d4d6b66c02c73896e 05-Dec-2009 Doug Zongker <dougz@android.com> remove ActivityManager-related event log tags

These have been migrated to the ActivityManagerService package.
ogcat/event.logtags
f0e57609ecb844656dd95c23193df90e06554a71 04-Dec-2009 Doug Zongker <dougz@android.com> am 5f168861: am a43d2753: remove system server tags from global event.logtags file

Merge commit '5f168861beceef1d8c2220993c56312ce0b87dfd'

* commit '5f168861beceef1d8c2220993c56312ce0b87dfd':
remove system server tags from global event.logtags file
5f168861beceef1d8c2220993c56312ce0b87dfd 04-Dec-2009 Doug Zongker <dougz@android.com> am a43d2753: remove system server tags from global event.logtags file

Merge commit 'a43d27539156daf08b34bcaa07661fe0e66fa345' into eclair-mr2-plus-aosp

* commit 'a43d27539156daf08b34bcaa07661fe0e66fa345':
remove system server tags from global event.logtags file
3c47f68d46125a3fdb7613a7ec46cf0de83b4129 04-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I85967b66

* changes:
Encrypted File Systems Project.
a43d27539156daf08b34bcaa07661fe0e66fa345 04-Dec-2009 Doug Zongker <dougz@android.com> remove system server tags from global event.logtags file

These tags are being moved to a .logtags file in the system server
package.
ogcat/event.logtags
22078f2c05281763726d152f62b59f7cce96c73e 04-Dec-2009 Mike Reed <reed@google.com> NDK header for accessing pixels of a java bitmap
nclude/android/bitmap.h
ac854f3376e86efcc7bd70a5def203ee21950308 04-Dec-2009 Doug Zongker <dougz@android.com> am 73bec02c: am 7fa28666: Merge change I502d5a9b into eclair-mr2

Merge commit '73bec02cc3c5e4598c5a4c56cf7843b5a24af31d'

* commit '73bec02cc3c5e4598c5a4c56cf7843b5a24af31d':
construct event-log-tags via the new build mechanism
d7dbd7b78ae5c60a6a6071667eaf964b2619fb78 04-Dec-2009 San Mehat <san@google.com> am f95837a1: am cf9f442e: am c1c38dd0: system: sched_policy: Don\'t return an error when the thread we\'re trying to move exits on us

Merge commit 'f95837a1e13c9b63bfe0b0f95f00ec0d72ba2e74'

* commit 'f95837a1e13c9b63bfe0b0f95f00ec0d72ba2e74':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
092799072fc215b6f95b2d628e670ba2bb14d13b 04-Dec-2009 Doug Kwan <dougkwan@google.com> Add missing symbol type directives.
ebuggerd/crashglue.S
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-armv6.S
73bec02cc3c5e4598c5a4c56cf7843b5a24af31d 04-Dec-2009 Doug Zongker <dougz@android.com> am 7fa28666: Merge change I502d5a9b into eclair-mr2

Merge commit '7fa286662790bce1687bd4ff25a6735491392b9c' into eclair-mr2-plus-aosp

* commit '7fa286662790bce1687bd4ff25a6735491392b9c':
construct event-log-tags via the new build mechanism
7fa286662790bce1687bd4ff25a6735491392b9c 04-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I502d5a9b into eclair-mr2

* changes:
construct event-log-tags via the new build mechanism
f95837a1e13c9b63bfe0b0f95f00ec0d72ba2e74 04-Dec-2009 San Mehat <san@google.com> am cf9f442e: am c1c38dd0: system: sched_policy: Don\'t return an error when the thread we\'re trying to move exits on us

Merge commit 'cf9f442ef336d4fb6300318a3137b23a4697e048' into eclair-mr2-plus-aosp

* commit 'cf9f442ef336d4fb6300318a3137b23a4697e048':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
37c586e6b11138beab400d1208183d49c12a9ef2 03-Dec-2009 Oscar Montemayor <oam@google.com> Encrypted File Systems Project.

Temporarily creating emulated encrypted directories manually.
Will remove those lines once a true encrypted FS is mounted, and proper
framework chanfes have been made. This is required for the feature to
work with the other changes.
ootdir/init.rc
859e45716b94fe7cdaa63543804cc08acfa139cf 03-Dec-2009 San Mehat <san@google.com> am c1c38dd0: system: sched_policy: Don\'t return an error when the thread we\'re trying to move exits on us

Merge commit 'c1c38dd01c43079ed24b9030bc8a20c649bacc3f' into eclair-plus-aosp

* commit 'c1c38dd01c43079ed24b9030bc8a20c649bacc3f':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
cf9f442ef336d4fb6300318a3137b23a4697e048 03-Dec-2009 San Mehat <san@google.com> am c1c38dd0: system: sched_policy: Don\'t return an error when the thread we\'re trying to move exits on us

Merge commit 'c1c38dd01c43079ed24b9030bc8a20c649bacc3f' into eclair-mr2

* commit 'c1c38dd01c43079ed24b9030bc8a20c649bacc3f':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
c1c38dd01c43079ed24b9030bc8a20c649bacc3f 03-Dec-2009 San Mehat <san@google.com> system: sched_policy: Don't return an error when the thread we're trying to move exits on us

Signed-off-by: San Mehat <san@google.com>
ibcutils/sched_policy.c
da077ee77a298f370a0df991aa43794916fe25b4 25-Nov-2009 Doug Zongker <dougz@android.com> construct event-log-tags via the new build mechanism

The build system now unions together all *.logtags files found in
LOCAL_SRC_FILES to construct /system/etc/event-log-tags.
ogcat/Android.mk
ogcat/event-log-tags
ogcat/event.logtags
3bfdcc979da0f857b014318f3df5d95a0f93eb27 01-Dec-2009 Andy McFadden <fadden@android.com> Minor tweaks to debuggerd.

Changed "process has crashed" message:
- say ":5039" instead of ":port" so mouse-paste of command is trivial
- removed trailing spaces, which consume log buffer to little effect
- improved (I hope) the short explanation of what's going on and
what the HOME key does

Fixed typo ("ignorning").
ebuggerd/debuggerd.c
e7629a3bea1ec3ebd50e436812f70e7626d0398a 30-Nov-2009 Dan Egnor <egnor@google.com> am ab12933e: am f837a755: am bf95c70f: Don\'t copy /proc/last_kmsg to /data/dontpanic/last_kmsg -- it gets generated on every boot, so this is a bunch of writing for no particularly good reason.

Merge commit 'ab12933ee0f4082a7585c19062fd7a7a1d16a6bc'

* commit 'ab12933ee0f4082a7585c19062fd7a7a1d16a6bc':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
ab12933ee0f4082a7585c19062fd7a7a1d16a6bc 30-Nov-2009 Dan Egnor <egnor@google.com> am f837a755: am bf95c70f: Don\'t copy /proc/last_kmsg to /data/dontpanic/last_kmsg -- it gets generated on every boot, so this is a bunch of writing for no particularly good reason.

Merge commit 'f837a7551e78e53ae1478023283fac60f3426cd4' into eclair-mr2-plus-aosp

* commit 'f837a7551e78e53ae1478023283fac60f3426cd4':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
6b80016c42c31056258553949ad3bd31d431fd17 30-Nov-2009 Dan Egnor <egnor@google.com> am bf95c70f: Don\'t copy /proc/last_kmsg to /data/dontpanic/last_kmsg -- it gets generated on every boot, so this is a bunch of writing for no particularly good reason.

Merge commit 'bf95c70f83ebb1a3ea92ca3fa440c7ee21e7f6af' into eclair-plus-aosp

* commit 'bf95c70f83ebb1a3ea92ca3fa440c7ee21e7f6af':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
f837a7551e78e53ae1478023283fac60f3426cd4 30-Nov-2009 Dan Egnor <egnor@google.com> am bf95c70f: Don\'t copy /proc/last_kmsg to /data/dontpanic/last_kmsg -- it gets generated on every boot, so this is a bunch of writing for no particularly good reason.

Merge commit 'bf95c70f83ebb1a3ea92ca3fa440c7ee21e7f6af' into eclair-mr2

* commit 'bf95c70f83ebb1a3ea92ca3fa440c7ee21e7f6af':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
255ed555d692853ac9b343c94371862bdbe0ca31 29-Nov-2009 Mike Lockwood <lockwood@android.com> am 3c0c6dca: am 64e99545: adb: fix -d and -e options for "adb forward" command.

Merge commit '3c0c6dca1abc350035efedafa9ee9d705499c334'

* commit '3c0c6dca1abc350035efedafa9ee9d705499c334':
adb: fix -d and -e options for "adb forward" command.
3c0c6dca1abc350035efedafa9ee9d705499c334 29-Nov-2009 Mike Lockwood <lockwood@android.com> am 64e99545: adb: fix -d and -e options for "adb forward" command.

Merge commit '64e99545d4b5600bb5ca044fcad636ae8389b381' into eclair-mr2-plus-aosp

* commit '64e99545d4b5600bb5ca044fcad636ae8389b381':
adb: fix -d and -e options for "adb forward" command.
64e99545d4b5600bb5ca044fcad636ae8389b381 28-Nov-2009 Mike Lockwood <lockwood@android.com> adb: fix -d and -e options for "adb forward" command.

Change-Id: I9166572a1c398ce5ef1423d19a30895385118ee5
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/commandline.c
feb187002d7da68fb906d0758db68b6cbd725883 27-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Iba48fe2f

* changes:
Fix memory deallocation bug in toy vector class.
ba48fe2f4e8bbcf53dbf66c40503a5751354f379 27-Nov-2009 Jack Palevich <jackpal@google.com> Fix memory deallocation bug in toy vector class.

Yet another reason to use standard collection classes. :-)
ibacc/acc.cpp
9d76a446193ada3c4855f88bc835463b43c1d22b 24-Nov-2009 Dan Egnor <egnor@google.com> am d2633cb7: am 7359c16a: Don\'t copy /proc/last_kmsg to /data/dontpanic/last_kmsg -- it gets generated on every boot, so this is a bunch of writing for no particularly good reason.

Merge commit 'd2633cb70978b42bc8b2c524951a39de197a5edd'

* commit 'd2633cb70978b42bc8b2c524951a39de197a5edd':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
d2633cb70978b42bc8b2c524951a39de197a5edd 24-Nov-2009 Dan Egnor <egnor@google.com> am 7359c16a: Don\'t copy /proc/last_kmsg to /data/dontpanic/last_kmsg -- it gets generated on every boot, so this is a bunch of writing for no particularly good reason.

Merge commit '7359c16a852c23740ef2874aa6b66f629d1473b7' into eclair-mr2-plus-aosp

* commit '7359c16a852c23740ef2874aa6b66f629d1473b7':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
bf95c70f83ebb1a3ea92ca3fa440c7ee21e7f6af 24-Nov-2009 Dan Egnor <egnor@google.com> Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
it gets generated on every boot, so this is a bunch of writing
for no particularly good reason.
ootdir/init.rc
4c2ec3a1b2ef3e05b10a6dbf6bd0c18c4f05a18d 24-Nov-2009 Jean-Baptiste Queru <jbq@google.com> am 85f02ef4: merge from open-source master

Merge commit '85f02ef42d1bbcd9c2b58697f543c7aee5e3c441'

* commit '85f02ef42d1bbcd9c2b58697f543c7aee5e3c441':
Define HAVE_SYS_SENDFILE_H.
85f02ef42d1bbcd9c2b58697f543c7aee5e3c441 24-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
8145c3dba1183ea8c0600415a71fc0fc050b9405 24-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
7359c16a852c23740ef2874aa6b66f629d1473b7 24-Nov-2009 Dan Egnor <egnor@google.com> Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
it gets generated on every boot, so this is a bunch of writing
for no particularly good reason.
ootdir/init.rc
2247319157db4b3ec364c01781f47300081bc962 24-Nov-2009 Dan Egnor <egnor@google.com> am 30ae9fd9: am d3fe19fa: Update db_operation log tag information to match updated sampling code.

Merge commit '30ae9fd9513e97b7ce4cea93501ea6971a0bfc8c'

* commit '30ae9fd9513e97b7ce4cea93501ea6971a0bfc8c':
Update db_operation log tag information to match updated sampling code.
30ae9fd9513e97b7ce4cea93501ea6971a0bfc8c 24-Nov-2009 Dan Egnor <egnor@google.com> am d3fe19fa: Update db_operation log tag information to match updated sampling code.

Merge commit 'd3fe19fa14102bbd520365beb1a86778ffb8014c' into eclair-mr2-plus-aosp

* commit 'd3fe19fa14102bbd520365beb1a86778ffb8014c':
Update db_operation log tag information to match updated sampling code.
d3fe19fa14102bbd520365beb1a86778ffb8014c 23-Nov-2009 Dan Egnor <egnor@google.com> Update db_operation log tag information to match updated sampling code.
ogcat/event-log-tags
0a10808f234bfc7415c636b182a53d4414a43475 20-Nov-2009 Doug Zongker <dougz@android.com> am 6114b2df: am eb67fac4: change /cache/recovery group to cache

Merge commit '6114b2dfb4170e07e075b134a35c20ff3f5292a2'

* commit '6114b2dfb4170e07e075b134a35c20ff3f5292a2':
change /cache/recovery group to cache
6114b2dfb4170e07e075b134a35c20ff3f5292a2 20-Nov-2009 Doug Zongker <dougz@android.com> am eb67fac4: change /cache/recovery group to cache

Merge commit 'eb67fac4723892ac8ae3fae87c05e776c49029c5' into eclair-mr2-plus-aosp

* commit 'eb67fac4723892ac8ae3fae87c05e776c49029c5':
change /cache/recovery group to cache
eb67fac4723892ac8ae3fae87c05e776c49029c5 20-Nov-2009 Doug Zongker <dougz@android.com> change /cache/recovery group to cache

To unbundle system update, we need users other than system to be able
to write the /cache/recovery directory.
ootdir/init.rc
303254eb674991bbb79b887b0d49fef48ae5abd4 31-Oct-2009 Dan Bornstein <danfuzz@android.com> Define HAVE_SYS_SENDFILE_H.

Platforms differ on whether sys/sendfile.h or sys/socket.h is where to
find the declaration for sendfile().

Change-Id: Ib6e882534b7dc605d30aefed55732dc1ee2b6772
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
b18c1507f88f1ff807764856c8f9957a795d7036 17-Nov-2009 Dianne Hackborn <hackbod@google.com> am 6577c082: am 65b109a2: am bace0107: Work on issue #2259506: camera ANRed and then device runtime restarted

Merge commit '6577c0824332165fc49941f813cfefad4fe10a51'

* commit '6577c0824332165fc49941f813cfefad4fe10a51':
Work on issue #2259506: camera ANRed and then device runtime restarted
6577c0824332165fc49941f813cfefad4fe10a51 17-Nov-2009 Dianne Hackborn <hackbod@google.com> am 65b109a2: am bace0107: Work on issue #2259506: camera ANRed and then device runtime restarted

Merge commit '65b109a246cc7c21da398ccf02083b2abd84f669' into eclair-mr2-plus-aosp

* commit '65b109a246cc7c21da398ccf02083b2abd84f669':
Work on issue #2259506: camera ANRed and then device runtime restarted
65b109a246cc7c21da398ccf02083b2abd84f669 17-Nov-2009 Dianne Hackborn <hackbod@google.com> am bace0107: Work on issue #2259506: camera ANRed and then device runtime restarted

Merge commit 'bace01078259614f54c5082fae9ccdb37f27590c' into eclair-mr2

* commit 'bace01078259614f54c5082fae9ccdb37f27590c':
Work on issue #2259506: camera ANRed and then device runtime restarted
e929fbae102c8786eda98bf0e37146ff61fbf8d1 17-Nov-2009 Dianne Hackborn <hackbod@google.com> am bace0107: Work on issue #2259506: camera ANRed and then device runtime restarted

Merge commit 'bace01078259614f54c5082fae9ccdb37f27590c' into eclair-plus-aosp

* commit 'bace01078259614f54c5082fae9ccdb37f27590c':
Work on issue #2259506: camera ANRed and then device runtime restarted
bace01078259614f54c5082fae9ccdb37f27590c 17-Nov-2009 Dianne Hackborn <hackbod@google.com> Work on issue #2259506: camera ANRed and then device runtime restarted

New event log tag for when a process fails to start.

Change-Id: Icb08757e1514a1d6f5462d22b931114c10b964b2
ogcat/event-log-tags
ecbba06162f6f664c1888f1e0d89a23395eb10e5 17-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ief4e2152

* changes:
Encrypted File SYstems project. Enabling EFS security properties. This change enables persist.security.* flags in the device, allowing oly the system to modify them. Change is necessary to allow for further progress in the project, as this is an ideal location for access both from the framework as well as from the recovery mode / transition.
1acde9b749bfb46fd8afdcf113266ed4ec2d0cf8 16-Nov-2009 Jean-Baptiste Queru <jbq@google.com> am efdbf044: merge from open-source master

Merge commit 'efdbf044b89fad22a1792debb09388d2a7d95a66'

* commit 'efdbf044b89fad22a1792debb09388d2a7d95a66':
eclair snapshot
efdbf044b89fad22a1792debb09388d2a7d95a66 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
9fb61f39f3e34aac592aed22083ec0e67693a724 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
333a80cf9ffc975aee91d82bee2bb17cdfe458a7 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from eclair
4b29fe640ae852c04d5d87d0f9527bdc32177ad1 13-Nov-2009 Jean-Baptiste Queru <jbq@google.com> eclair snapshot
gitignore
db/MODULE_LICENSE_APACHE2
db/NOTICE
db/adb.c
db/adb.h
db/commandline.c
db/framebuffer_service.c
db/get_my_path_darwin.c
db/jdwp_service.c
db/services.c
db/sysdeps.h
db/sysdeps_win32.c
db/transport.c
db/transport_local.c
db/transport_usb.c
db/usb_linux.c
db/usb_linux_client.c
db/usb_osx.c
db/usb_vendors.c
db/usb_windows.c
ebuggerd/debuggerd.c
astboot/fastboot.c
astboot/usb_linux.c
astboot/util_osx.c
nclude/acc/acc.h
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
nclude/cutils/abort_socket.h
nclude/cutils/ashmem.h
nclude/cutils/compiler.h
nclude/cutils/sched_policy.h
nclude/cutils/tztime.h
nclude/mincrypt/sha.h
nclude/private/android_filesystem_config.h
nclude/private/pixelflinger/ggl_context.h
nclude/sysutils/SocketListener.h
nit/builtins.c
nit/devices.c
nit/init.c
nit/keywords.h
nit/parser.c
nit/property_service.c
ibacc/Android.mk
ibacc/FEATURES
ibacc/LICENSE
ibacc/MODULE_LICENSE_BSD_LIKE
ibacc/acc.cpp
ibacc/tests/.gitignore
ibacc/tests/Android.mk
ibacc/tests/accarm
ibacc/tests/armreg.h
ibacc/tests/data/addressOf.c
ibacc/tests/data/array.c
ibacc/tests/data/assignment.c
ibacc/tests/data/assignmentop.c
ibacc/tests/data/b2071670.c
ibacc/tests/data/bellard.otccex.c
ibacc/tests/data/brackets.c
ibacc/tests/data/casts.c
ibacc/tests/data/char.c
ibacc/tests/data/comma.c
ibacc/tests/data/constants.c
ibacc/tests/data/defines.c
ibacc/tests/data/double.c
ibacc/tests/data/error.c
ibacc/tests/data/expr-ansi.c
ibacc/tests/data/expr.c
ibacc/tests/data/expr2.c
ibacc/tests/data/film.c
ibacc/tests/data/float.c
ibacc/tests/data/floatdouble.c
ibacc/tests/data/flops.c
ibacc/tests/data/funcargs.c
ibacc/tests/data/hello.c
ibacc/tests/data/inc.c
ibacc/tests/data/iops.c
ibacc/tests/data/locals.c
ibacc/tests/data/missing-main.c
ibacc/tests/data/otcc-ansi.c
ibacc/tests/data/otcc-noinclude.c
ibacc/tests/data/otcc.c
ibacc/tests/data/pointers.c
ibacc/tests/data/pointers2.c
ibacc/tests/data/returnval-ansi.c
ibacc/tests/data/returnval.c
ibacc/tests/data/rollo3.c
ibacc/tests/data/short.c
ibacc/tests/data/simplest.c
ibacc/tests/data/structs.c
ibacc/tests/data/testStringConcat.c
ibacc/tests/disassem.cpp
ibacc/tests/disassem.h
ibacc/tests/main.cpp
ibacc/tests/runtimeTest.cpp
ibacc/tests/test
ibacc/tests/test.py
ibcutils/Android.mk
ibcutils/abort_socket.c
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-armv6.S
ibcutils/process_name.c
ibcutils/sched_policy.c
ibcutils/strdup16to8.c
ibcutils/tztime.c
iblog/logd_write.c
iblog/logprint.c
ibmincrypt/sha.c
ibnetutils/ifc_utils.c
ibpixelflinger/Android.mk
ibpixelflinger/codeflinger/blending.cpp
ibpixelflinger/t32cb16blend.S
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketListener.cpp
ibzipfile/centraldir.c
ibzipfile/zipfile.c
ogcat/event-log-tags
exus/Android.mk
exus/CommandListener.cpp
exus/Controller.cpp
exus/Controller.h
exus/DhcpClient.cpp
exus/DhcpClient.h
exus/DhcpEvent.cpp
exus/DhcpEvent.h
exus/DhcpListener.cpp
exus/DhcpListener.h
exus/DhcpState.cpp
exus/DhcpState.h
exus/ErrorCode.h
exus/IControllerHandler.h
exus/IDhcpEventHandlers.h
exus/IPropertyProvider.h
exus/ISupplicantEventHandler.h
exus/IWifiStatusPollerHandler.h
exus/InterfaceConfig.cpp
exus/InterfaceConfig.h
exus/LoopController.cpp
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/Property.cpp
exus/Property.h
exus/PropertyManager.cpp
exus/PropertyManager.h
exus/ResponseCode.h
exus/Supplicant.cpp
exus/Supplicant.h
exus/SupplicantState.cpp
exus/TiwlanWifiController.cpp
exus/VpnController.cpp
exus/VpnController.h
exus/WifiController.cpp
exus/WifiController.h
exus/WifiNetwork.cpp
exus/WifiNetwork.h
exus/WifiStatusPoller.cpp
exus/WifiStatusPoller.h
ootdir/Android.mk
ootdir/etc/vold.conf
ootdir/init.rc
oolbox/ls.c
oolbox/mount.c
oolbox/ps.c
oolbox/smd.c
oolbox/top.c
old/blkdev.c
old/format.c
old/media.h
old/mmc.c
old/uevent.c
old/volmgr.c
old/volmgr_vfat.c
ef4e21520cef69aaa7b488a3f44b2490dc2e3eb5 12-Nov-2009 Oscar Montemayor <oam@google.com> Encrypted File SYstems project. Enabling EFS security properties.
This change enables persist.security.* flags in the device, allowing oly the system to modify them.
Change is necessary to allow for further progress in the project, as this is an ideal location for access both from the
framework as well as from the recovery mode / transition.
nit/property_service.c
a998b1c407ecfed5000d84acbc6934975a5e39fe 12-Nov-2009 Jack Palevich <jackpal@google.com> Fix static and shared library usage for acc and accRuntimeTest
ibacc/tests/Android.mk
b5d2ad66dfb042ac87017f944b3aabc1eb7b5783 12-Nov-2009 Jack Palevich <jackpal@google.com> Build accRuntimeTest with static library rather than shared library.
ibacc/tests/Android.mk
e0f9d91dc73d293764822dcb1b49a4cef5d12275 12-Nov-2009 Jack Palevich <jackpal@google.com> Skip OTCCANSI test on OS X

OS X can't load stderr/stdin/stdout through the DLL symbol lookup
interface, so it can't compile the otcc-ansi.c test.
ibacc/tests/test.py
464407588fce5991b7e6e654695f0665d7f2d008 12-Nov-2009 Jack Palevich <jackpal@google.com> Build acc tool with static rather than shared library.

OS X does not allow relative shared library path names in compiled apps,
so we have to create and link with a static library version of libacc.
ibacc/Android.mk
ibacc/tests/Android.mk
13edb721c0a933b943f77385c412563c26425c05 10-Nov-2009 Jack Palevich <jackpal@google.com> am 556c60f4: am 51da51a2: am 02effee6: Correctly compute the type of an assignment expression.

Merge commit '556c60f4f27e2a3bfde6a47acf876716ea8d5795'

* commit '556c60f4f27e2a3bfde6a47acf876716ea8d5795':
Correctly compute the type of an assignment expression.
556c60f4f27e2a3bfde6a47acf876716ea8d5795 10-Nov-2009 Jack Palevich <jackpal@google.com> am 51da51a2: am 02effee6: Correctly compute the type of an assignment expression.

Merge commit '51da51a2d11a745909b4ad9a9b6ac5d9858632d5' into eclair-mr2-plus-aosp

* commit '51da51a2d11a745909b4ad9a9b6ac5d9858632d5':
Correctly compute the type of an assignment expression.
51da51a2d11a745909b4ad9a9b6ac5d9858632d5 10-Nov-2009 Jack Palevich <jackpal@google.com> am 02effee6: Correctly compute the type of an assignment expression.

Merge commit '02effee6a9224b531cb3fe6eac8278b46b9fbe86' into eclair-mr2

* commit '02effee6a9224b531cb3fe6eac8278b46b9fbe86':
Correctly compute the type of an assignment expression.
e953386ed467df99033364a477b9449684c551e6 10-Nov-2009 Jack Palevich <jackpal@google.com> am 02effee6: Correctly compute the type of an assignment expression.

Merge commit '02effee6a9224b531cb3fe6eac8278b46b9fbe86' into eclair-plus-aosp

* commit '02effee6a9224b531cb3fe6eac8278b46b9fbe86':
Correctly compute the type of an assignment expression.
c923980e785c533e41e403e9644368643dbac952 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> am ef063fe3: merge from open-source master

Merge commit 'ef063fe3066153dab5389b6baba6cb4e36888106'

* commit 'ef063fe3066153dab5389b6baba6cb4e36888106':
Add support for Acer devices
FreeBSD support for usb-connected devices in adb
Make get_my_path() safer
Fix use of memset function
ef063fe3066153dab5389b6baba6cb4e36888106 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
02effee6a9224b531cb3fe6eac8278b46b9fbe86 08-Nov-2009 Jack Palevich <jackpal@google.com> Correctly compute the type of an assignment expression.

This change enables following types of statements to work correctly:

a = b = 3;
if ((a = getchar()) < 0) { ... }

This fixes 2232082 acc: assignment in comparison segfaults
ibacc/acc.cpp
ibacc/tests/data/assignment.c
ibacc/tests/test.py
436db2e382f0cf47bf3255783c12f35e5750cdf7 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
ac61a69b235110a17493f8e05e5a2467476965fc 06-Nov-2009 Erik Gilling <konkers@android.com> am 9fdf607c: am b63747d4: am f6eba8fa: cutils: make set_process_name set kernel thread name as well

Merge commit '9fdf607c20f9610e442baa87cac5479c98f9d200'

* commit '9fdf607c20f9610e442baa87cac5479c98f9d200':
cutils: make set_process_name set kernel thread name as well
9fdf607c20f9610e442baa87cac5479c98f9d200 06-Nov-2009 Erik Gilling <konkers@android.com> am b63747d4: am f6eba8fa: cutils: make set_process_name set kernel thread name as well

Merge commit 'b63747d4d9d2e26c90a5310c996210e722159d04' into eclair-mr2-plus-aosp

* commit 'b63747d4d9d2e26c90a5310c996210e722159d04':
cutils: make set_process_name set kernel thread name as well
b63747d4d9d2e26c90a5310c996210e722159d04 06-Nov-2009 Erik Gilling <konkers@android.com> am f6eba8fa: cutils: make set_process_name set kernel thread name as well

Merge commit 'f6eba8fac812c70087af225f207f2d924f6e1ffa' into eclair-mr2

* commit 'f6eba8fac812c70087af225f207f2d924f6e1ffa':
cutils: make set_process_name set kernel thread name as well
4b328d3be37caaa155595473eaa5a6c73bd1794d 06-Nov-2009 Erik Gilling <konkers@android.com> am f6eba8fa: cutils: make set_process_name set kernel thread name as well

Merge commit 'f6eba8fac812c70087af225f207f2d924f6e1ffa' into eclair-plus-aosp

* commit 'f6eba8fac812c70087af225f207f2d924f6e1ffa':
cutils: make set_process_name set kernel thread name as well
f6eba8fac812c70087af225f207f2d924f6e1ffa 28-Oct-2009 Erik Gilling <konkers@android.com> cutils: make set_process_name set kernel thread name as well

Signed-off-by: Erik Gilling <konkers@android.com>
ibcutils/process_name.c
e25ff1c682ae5cc87af5e76de7e31a2702b620f3 21-Sep-2009 Robert CH Chou <Robert_CH_Chou@acer.com.tw> Add support for Acer devices
astboot/fastboot.c
d475db400bc3176468d0b284182d7ca4f906e9c2 03-Nov-2009 Android Code Review <code-review@android.com> Merge change I4e5c1c26

* changes:
Fix use of memset function
2c7548519fad680e867942aa1d38105e55fbd5c4 03-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 879f398a: am 5a8cf57e: am 5e7db233: Make the RIL daemon part of the audio group so it can load region-specific acoustic parameters.

Merge commit '879f398a44f8cbb73dec71d8c21931f8a5c46073'

* commit '879f398a44f8cbb73dec71d8c21931f8a5c46073':
Make the RIL daemon part of the audio group so it can load region-specific
879f398a44f8cbb73dec71d8c21931f8a5c46073 03-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 5a8cf57e: am 5e7db233: Make the RIL daemon part of the audio group so it can load region-specific acoustic parameters.

Merge commit '5a8cf57eb7aa70f1647b28315a2419c4a6d36828' into eclair-mr2-plus-aosp

* commit '5a8cf57eb7aa70f1647b28315a2419c4a6d36828':
Make the RIL daemon part of the audio group so it can load region-specific
2012dc3762a937e72e7dfc1227168429faa55b52 03-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 5e7db233: Make the RIL daemon part of the audio group so it can load region-specific acoustic parameters.

Merge commit '5e7db233004a0869125d0f2d64a9e747faf252da' into eclair-plus-aosp

* commit '5e7db233004a0869125d0f2d64a9e747faf252da':
Make the RIL daemon part of the audio group so it can load region-specific
5a8cf57eb7aa70f1647b28315a2419c4a6d36828 03-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 5e7db233: Make the RIL daemon part of the audio group so it can load region-specific acoustic parameters.

Merge commit '5e7db233004a0869125d0f2d64a9e747faf252da' into eclair-mr2

* commit '5e7db233004a0869125d0f2d64a9e747faf252da':
Make the RIL daemon part of the audio group so it can load region-specific
5e7db233004a0869125d0f2d64a9e747faf252da 03-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> Make the RIL daemon part of the audio group so it can load region-specific
acoustic parameters.
ootdir/init.rc
0c9281f4bbdb369aca35776bb848527a159f9c75 02-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib6e88253

* changes:
Define HAVE_SYS_SENDFILE_H.
3b01d5481931eae541afd9e429b6456b9487269d 02-Nov-2009 Xavier Ducrohet <xav@android.com> am 96f0d140: am df872bec: am 1b9f8c6a: am 23433b93: Add Sony-Ericsson to adb.

Merge commit '96f0d140df11c2efeecd8b0eed9ffad514456034'

* commit '96f0d140df11c2efeecd8b0eed9ffad514456034':
Add Sony-Ericsson to adb.
96f0d140df11c2efeecd8b0eed9ffad514456034 02-Nov-2009 Xavier Ducrohet <xav@android.com> am df872bec: am 1b9f8c6a: am 23433b93: Add Sony-Ericsson to adb.

Merge commit 'df872bec830fc2af491e0b72e924b85381215fde' into eclair-mr2-plus-aosp

* commit 'df872bec830fc2af491e0b72e924b85381215fde':
Add Sony-Ericsson to adb.
604e06a22b5889a3a564c4cf7cf362e0eba00389 02-Nov-2009 Xavier Ducrohet <xav@android.com> am 1b9f8c6a: am 23433b93: Add Sony-Ericsson to adb.

Merge commit '1b9f8c6ad85c773ffcafe8198e899e0405940862' into eclair-plus-aosp

* commit '1b9f8c6ad85c773ffcafe8198e899e0405940862':
Add Sony-Ericsson to adb.
df872bec830fc2af491e0b72e924b85381215fde 02-Nov-2009 Xavier Ducrohet <xav@android.com> am 1b9f8c6a: am 23433b93: Add Sony-Ericsson to adb.

Merge commit '1b9f8c6ad85c773ffcafe8198e899e0405940862' into eclair-mr2

* commit '1b9f8c6ad85c773ffcafe8198e899e0405940862':
Add Sony-Ericsson to adb.
1b9f8c6ad85c773ffcafe8198e899e0405940862 02-Nov-2009 Xavier Ducrohet <xav@android.com> am 23433b93: Add Sony-Ericsson to adb.

Merge commit '23433b93d1acb01650c9480d9bb5d5d869ba4f79' into eclair

* commit '23433b93d1acb01650c9480d9bb5d5d869ba4f79':
Add Sony-Ericsson to adb.
43ba23f30889f9e4dee0afd762f2f9a1cd5a99a8 31-Oct-2009 Dan Bornstein <danfuzz@android.com> Define HAVE_SYS_SENDFILE_H.

Platforms differ on whether sys/sendfile.h or sys/socket.h is where to
find the declaration for sendfile().

Change-Id: Ib6e882534b7dc605d30aefed55732dc1ee2b6772
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-sh/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
23433b93d1acb01650c9480d9bb5d5d869ba4f79 30-Oct-2009 Xavier Ducrohet <xav@android.com> Add Sony-Ericsson to adb.
db/usb_vendors.c
1c2ce696c8758e4e96a45576768a17e4f8335595 30-Oct-2009 San Mehat <san@google.com> am 525fb03e: am 58e50f80: am 805d67ab: cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground

Merge commit '525fb03e18f9b08651e3d8abb262d70c3482b405'

* commit '525fb03e18f9b08651e3d8abb262d70c3482b405':
cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground
f15b4ef6884744dcda44f263cf7a0559339add12 30-Oct-2009 San Mehat <san@google.com> am 748cb49e: am cc43ee42: am d2e4e46c: cutils: schedpolicy: Add debug code to log sched policy transitions

Merge commit '748cb49e0049e0f504137a4930ec8502affbb03a'

* commit '748cb49e0049e0f504137a4930ec8502affbb03a':
cutils: schedpolicy: Add debug code to log sched policy transitions
525fb03e18f9b08651e3d8abb262d70c3482b405 30-Oct-2009 San Mehat <san@google.com> am 58e50f80: am 805d67ab: cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground

Merge commit '58e50f80307577268ecb6b86aa97236e008a9aa0' into eclair-mr2-plus-aosp

* commit '58e50f80307577268ecb6b86aa97236e008a9aa0':
cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground
748cb49e0049e0f504137a4930ec8502affbb03a 30-Oct-2009 San Mehat <san@google.com> am cc43ee42: am d2e4e46c: cutils: schedpolicy: Add debug code to log sched policy transitions

Merge commit 'cc43ee42acc3df89f584c670c4287e25808f23b2' into eclair-mr2-plus-aosp

* commit 'cc43ee42acc3df89f584c670c4287e25808f23b2':
cutils: schedpolicy: Add debug code to log sched policy transitions
58e50f80307577268ecb6b86aa97236e008a9aa0 30-Oct-2009 San Mehat <san@google.com> am 805d67ab: cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground

Merge commit '805d67ab11c1bb21d494459d6167f5f67f0002eb' into eclair-mr2

* commit '805d67ab11c1bb21d494459d6167f5f67f0002eb':
cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground
cc43ee42acc3df89f584c670c4287e25808f23b2 30-Oct-2009 San Mehat <san@google.com> am d2e4e46c: cutils: schedpolicy: Add debug code to log sched policy transitions

Merge commit 'd2e4e46ce4bc29c3328fccfbbbe0590eaa8713f7' into eclair-mr2

* commit 'd2e4e46ce4bc29c3328fccfbbbe0590eaa8713f7':
cutils: schedpolicy: Add debug code to log sched policy transitions
46f2bd2080115122f1ba5f3e12f6ce6a81a82fae 30-Oct-2009 Jack Palevich <jackpal@google.com> Fix type bug that breaks 64-bit OSX build.
ibacc/acc.cpp
c951c59232f59f1e0235725103f8636fe2f580f7 29-Oct-2009 Jack Palevich <jackpal@google.com> Add support for the continue statement

Add error check for a break statement that's not inside a loop. (We just
generated bad code before. Oops!)
ibacc/acc.cpp
ibacc/tests/data/continue.c
ibacc/tests/test.py
a9bf89ab7c45e5d68317c3bea73663beb774b318 29-Oct-2009 San Mehat <san@google.com> am 805d67ab: cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground

Merge commit '805d67ab11c1bb21d494459d6167f5f67f0002eb' into eclair-plus-aosp

* commit '805d67ab11c1bb21d494459d6167f5f67f0002eb':
cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground
805d67ab11c1bb21d494459d6167f5f67f0002eb 29-Oct-2009 San Mehat <san@google.com> cutils: sched_policy: Fix bug where we were unable to move backgrounded threads into the foreground

Signed-off-by: San Mehat <san@google.com>
ibcutils/sched_policy.c
b22f804c639b2f47fdd6841c90da0e6df7b572f6 29-Oct-2009 San Mehat <san@google.com> am d2e4e46c: cutils: schedpolicy: Add debug code to log sched policy transitions

Merge commit 'd2e4e46ce4bc29c3328fccfbbbe0590eaa8713f7' into eclair-plus-aosp

* commit 'd2e4e46ce4bc29c3328fccfbbbe0590eaa8713f7':
cutils: schedpolicy: Add debug code to log sched policy transitions
d2e4e46ce4bc29c3328fccfbbbe0590eaa8713f7 29-Oct-2009 San Mehat <san@google.com> cutils: schedpolicy: Add debug code to log sched policy transitions

Signed-off-by: San Mehat <san@google.com>
ibcutils/sched_policy.c
0163f77a831e915bcbb7b18cde486d2b081da478 29-Oct-2009 San Mehat <san@google.com> am 6dba735a: am 0d6f587f: am 39274417: toolbox: Add scheduling policy display to top/ps

Merge commit '6dba735a61d4b65594fa0ad7fd15ec09c3c42ce9'

* commit '6dba735a61d4b65594fa0ad7fd15ec09c3c42ce9':
toolbox: Add scheduling policy display to top/ps
5f64815d8a300f42262cf29538203051f3c16063 29-Oct-2009 San Mehat <san@google.com> am 38b2ddc4: am 17bfbd3c: am c0dfca7a: cutils: Add support for reading a processes scheduler policy

Merge commit '38b2ddc4a7cf1c47397af118a6d466d45f59da04'

* commit '38b2ddc4a7cf1c47397af118a6d466d45f59da04':
cutils: Add support for reading a processes scheduler policy
ee1f829dd45a3a45fd0eb453b76a30cb99043be2 29-Oct-2009 Jack Palevich <jackpal@google.com> Implement typedef.
ibacc/FEATURES
ibacc/acc.cpp
ibacc/tests/data/typedef.c
ibacc/tests/test.py
6dba735a61d4b65594fa0ad7fd15ec09c3c42ce9 28-Oct-2009 San Mehat <san@google.com> am 0d6f587f: am 39274417: toolbox: Add scheduling policy display to top/ps

Merge commit '0d6f587f92048b61e8737795824ca68a09f3b6a8' into eclair-mr2-plus-aosp

* commit '0d6f587f92048b61e8737795824ca68a09f3b6a8':
toolbox: Add scheduling policy display to top/ps
38b2ddc4a7cf1c47397af118a6d466d45f59da04 28-Oct-2009 San Mehat <san@google.com> am 17bfbd3c: am c0dfca7a: cutils: Add support for reading a processes scheduler policy

Merge commit '17bfbd3ccbb798aa4068cd59150ce712660a62a4' into eclair-mr2-plus-aosp

* commit '17bfbd3ccbb798aa4068cd59150ce712660a62a4':
cutils: Add support for reading a processes scheduler policy
0d6f587f92048b61e8737795824ca68a09f3b6a8 28-Oct-2009 San Mehat <san@google.com> am 39274417: toolbox: Add scheduling policy display to top/ps

Merge commit '392744175c4de67dc98e72da6745e6351118c985' into eclair-mr2

* commit '392744175c4de67dc98e72da6745e6351118c985':
toolbox: Add scheduling policy display to top/ps
17bfbd3ccbb798aa4068cd59150ce712660a62a4 28-Oct-2009 San Mehat <san@google.com> am c0dfca7a: cutils: Add support for reading a processes scheduler policy

Merge commit 'c0dfca7ae1f6016461235552091c2cacacca82a2' into eclair-mr2

* commit 'c0dfca7ae1f6016461235552091c2cacacca82a2':
cutils: Add support for reading a processes scheduler policy
22f5c6b8a28dba60cda05110e4bd514329a37f67 28-Oct-2009 Jack Palevich <jackpal@google.com> Update FEATURES for recent additions.
ibacc/FEATURES
188a5a7a3af54bd45383c72e452d627d33e63391 28-Oct-2009 Jack Palevich <jackpal@google.com> Support nested macros. (Still don't support macro arguments.)

Now you can say:

#define A B
#define B C
#define C 4

int x = A;

And it will work as expected.

Print an error message rather than assert when we're expecting a
function value, but don't find one.
ibacc/acc.cpp
ibacc/tests/data/macros.c
ibacc/tests/main.cpp
ibacc/tests/test.py
66d487487fd117df392e6bb88ffa7d7b3d16d45d 27-Oct-2009 Jack Palevich <jackpal@google.com> Print out error message when symbol lookup fails.
ibacc/tests/main.cpp
6e7240a6d0f7ed63cc340df4950b1cd8b83569ae 27-Oct-2009 San Mehat <san@google.com> am 39274417: toolbox: Add scheduling policy display to top/ps

Merge commit '392744175c4de67dc98e72da6745e6351118c985' into eclair-plus-aosp

* commit '392744175c4de67dc98e72da6745e6351118c985':
toolbox: Add scheduling policy display to top/ps
067f57f2480aa08dfebd759e74e84f8c05804132 27-Oct-2009 San Mehat <san@google.com> am c0dfca7a: cutils: Add support for reading a processes scheduler policy

Merge commit 'c0dfca7ae1f6016461235552091c2cacacca82a2' into eclair-plus-aosp

* commit 'c0dfca7ae1f6016461235552091c2cacacca82a2':
cutils: Add support for reading a processes scheduler policy
392744175c4de67dc98e72da6745e6351118c985 27-Oct-2009 San Mehat <san@google.com> toolbox: Add scheduling policy display to top/ps

Signed-off-by: San Mehat <san@google.com>
oolbox/ps.c
oolbox/top.c
c0dfca7ae1f6016461235552091c2cacacca82a2 27-Oct-2009 San Mehat <san@google.com> cutils: Add support for reading a processes scheduler policy

Signed-off-by: San Mehat <san@google.com>
nclude/cutils/sched_policy.h
ibcutils/sched_policy.c
3b226f9e3b893a3e088d7b854b0e7c523e79063f 24-Oct-2009 Alexey Tarasov <tarasov@dodologics.com> FreeBSD support for usb-connected devices in adb

FreeBSD (and other systems as well) may use libusb to work with USB devices.
libusb is integrated in FreeBSD base system in recent builds (8.0+),
however in other systems it may need include libusb.h like <libusb/libusb.h>
and install library from devel/libusb port or other repository.

Submitted change not supports events (attach/detach) as libusb 1.0 lacks
such functionality and in order to make code more portable I've not used
workarounds as in earlier changeset.

Code was tested on FreeBSD 8.0-RC1, HTC Hero (1.0.0.A6288, Android 1.5)
db/Android.mk
db/get_my_path_freebsd.c
db/usb_libusb.c
fe20a7abf1c39e0c08725c866a619d005f218a23 22-Oct-2009 Ben Cheng <bccheng@google.com> am 779c0a9a: am 491489bb: am 21ec779a: Add stack unwinding directives to atomic-android-arm.S.

Merge commit '779c0a9a7a9d21b031167c21ca32004c23af6de4'

* commit '779c0a9a7a9d21b031167c21ca32004c23af6de4':
Add stack unwinding directives to atomic-android-arm.S.
779c0a9a7a9d21b031167c21ca32004c23af6de4 22-Oct-2009 Ben Cheng <bccheng@google.com> am 491489bb: am 21ec779a: Add stack unwinding directives to atomic-android-arm.S.

Merge commit '491489bbb89c62df4442afda173e0f953ba84dcb' into eclair-mr2-plus-aosp

* commit '491489bbb89c62df4442afda173e0f953ba84dcb':
Add stack unwinding directives to atomic-android-arm.S.
491489bbb89c62df4442afda173e0f953ba84dcb 22-Oct-2009 Ben Cheng <bccheng@google.com> am 21ec779a: Add stack unwinding directives to atomic-android-arm.S.

Merge commit '21ec779abe2df0c2e9e170a40c8cf7c2f2eb4ac9' into eclair-mr2

* commit '21ec779abe2df0c2e9e170a40c8cf7c2f2eb4ac9':
Add stack unwinding directives to atomic-android-arm.S.
4fa0046d989b48f21840dd76dd0abedce33559cd 21-Oct-2009 Ben Cheng <bccheng@google.com> am 21ec779a: Add stack unwinding directives to atomic-android-arm.S.

Merge commit '21ec779abe2df0c2e9e170a40c8cf7c2f2eb4ac9' into eclair-plus-aosp

* commit '21ec779abe2df0c2e9e170a40c8cf7c2f2eb4ac9':
Add stack unwinding directives to atomic-android-arm.S.
21ec779abe2df0c2e9e170a40c8cf7c2f2eb4ac9 13-Oct-2009 Ben Cheng <bccheng@google.com> Add stack unwinding directives to atomic-android-arm.S.

For bug 2182296.

Eclair branch Dr. No approved by: hiroshi
ibcutils/atomic-android-arm.S
3166410a82f43d39201be98a8d35c51baa86cb53 21-Oct-2009 Alexey Tarasov <tarasov@dodologics.com> Make get_my_path() safer

Adds maxLen parameter to get_my_path().
Some small cosmetic fixes.
db/adb.c
db/adb.h
db/commandline.c
db/get_my_path_darwin.c
db/get_my_path_linux.c
db/get_my_path_windows.c
1a4ce8dc30e8f87c982c604973664bb81adabd48 15-Oct-2009 Dima Zavin <dima@android.com> am 5c204f59: am 7789f4cc: am 065694b3: init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu

Merge commit '5c204f59f7b7a1038bed1ac7764f77e6a2172cf0'

* commit '5c204f59f7b7a1038bed1ac7764f77e6a2172cf0':
init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu
8a0c88cc7551a0212dd00478ce23d9a14cb0da12 15-Oct-2009 Dima Zavin <dima@android.com> am 68b88de4: am 68221b91: am 8234aa37: init: Add qdsp6 video encoder, q6venc, device owned by system.audio

Merge commit '68b88de455deb57dcdd4620b2b87e0e3753f2502'

* commit '68b88de455deb57dcdd4620b2b87e0e3753f2502':
init: Add qdsp6 video encoder, q6venc, device owned by system.audio
5c204f59f7b7a1038bed1ac7764f77e6a2172cf0 15-Oct-2009 Dima Zavin <dima@android.com> am 7789f4cc: am 065694b3: init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu

Merge commit '7789f4cc4b712f15e0e5306a874ad6f47dc8c5c0' into eclair-mr2-plus-aosp

* commit '7789f4cc4b712f15e0e5306a874ad6f47dc8c5c0':
init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu
68b88de455deb57dcdd4620b2b87e0e3753f2502 15-Oct-2009 Dima Zavin <dima@android.com> am 68221b91: am 8234aa37: init: Add qdsp6 video encoder, q6venc, device owned by system.audio

Merge commit '68221b91b13b174c9bc14c43f2d88bada0fa9546' into eclair-mr2-plus-aosp

* commit '68221b91b13b174c9bc14c43f2d88bada0fa9546':
init: Add qdsp6 video encoder, q6venc, device owned by system.audio
7789f4cc4b712f15e0e5306a874ad6f47dc8c5c0 15-Oct-2009 Dima Zavin <dima@android.com> am 065694b3: init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu

Merge commit '065694b32e481a50e57a793d61181494fbf6ef04' into eclair-mr2

* commit '065694b32e481a50e57a793d61181494fbf6ef04':
init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu
68221b91b13b174c9bc14c43f2d88bada0fa9546 15-Oct-2009 Dima Zavin <dima@android.com> am 8234aa37: init: Add qdsp6 video encoder, q6venc, device owned by system.audio

Merge commit '8234aa375896718e19b4450bcb44fa4376f53486' into eclair-mr2

* commit '8234aa375896718e19b4450bcb44fa4376f53486':
init: Add qdsp6 video encoder, q6venc, device owned by system.audio
c459372bc721322ff0977b8d3d2fc805001f6dc7 15-Oct-2009 Dima Zavin <dima@android.com> am 065694b3: init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu

Merge commit '065694b32e481a50e57a793d61181494fbf6ef04' into eclair-plus-aosp

* commit '065694b32e481a50e57a793d61181494fbf6ef04':
init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu
d8189382802fdd789ab18170f56a0b1f004a3d01 15-Oct-2009 Dima Zavin <dima@android.com> am 8234aa37: init: Add qdsp6 video encoder, q6venc, device owned by system.audio

Merge commit '8234aa375896718e19b4450bcb44fa4376f53486' into eclair-plus-aosp

* commit '8234aa375896718e19b4450bcb44fa4376f53486':
init: Add qdsp6 video encoder, q6venc, device owned by system.audio
065694b32e481a50e57a793d61181494fbf6ef04 15-Oct-2009 Dima Zavin <dima@android.com> init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu

Change-Id: I2f8f0440d9a21230c7711cb6d9a20ec6887b7cb9
Signed-off-by: Dima Zavin <dima@android.com>
nit/devices.c
8234aa375896718e19b4450bcb44fa4376f53486 28-Sep-2009 Dima Zavin <dima@android.com> init: Add qdsp6 video encoder, q6venc, device owned by system.audio

Change-Id: I86173e07163b70ce8990b8508afba44729c0d8ca
Signed-off-by: Dima Zavin <dima@android.com>
nit/devices.c
573463c31ca8c96a7916e187f968ba108131a3ea 15-Oct-2009 Jean-Baptiste Queru <jbq@google.com> am 62f39c10: merge from open-source master

Merge commit '62f39c105af8789fd9308fa6a5b91f0963a7c59b'

* commit '62f39c105af8789fd9308fa6a5b91f0963a7c59b':
adb: Add "adb disconnect" command for disconnecting TCP/IP devices.
Add support for Acer devices
adb: Add USB Vendor IDs for LG and Huawei
Add NOTICE file and license tag for adb
adb: Clean up argument passing for create_service_thread()
Revert "adb: Another attempted workaround for the adb disconnect problem."
libsysutils: Fix some bugs in NetlinkListener and NetlinkEvent
added SuperH atomic support to libcutils
62f39c105af8789fd9308fa6a5b91f0963a7c59b 15-Oct-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
b029e924285dfe5bd36d93d837eb00db1c7661fc 14-Oct-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
a1b273ebb7edaef1680c72f07f3f3bf652cd356d 14-Oct-2009 San Mehat <san@google.com> am dd7105a7: am aaad7ab4: am fd110c7f: Merge change I831d8e1e into eclair

Merge commit 'dd7105a7a11553260be0ea71985ff026aad2cf21'

* commit 'dd7105a7a11553260be0ea71985ff026aad2cf21':
rootdir: init.rc: Adjust background dirty writeout policy
afdf977b8d79a8c76dcbfd4a5f159c32a8833aab 14-Oct-2009 Ben Cheng <bccheng@google.com> am 22f9d880: am 8a0a5274: Add stack unwinding directives to atomic-android-arm.S.

Merge commit '22f9d880941cf1db87fd19437bce71420eedf8bd'

* commit '22f9d880941cf1db87fd19437bce71420eedf8bd':
Add stack unwinding directives to atomic-android-arm.S.
a01fdd534dd40865c966b5c5347cf74d0ff3116f 14-Oct-2009 Mike Lockwood <lockwood@android.com> am 96b6bf3e: am 8cf0d59f: adb: Add "adb disconnect" command for disconnecting TCP/IP devices.

Merge commit '96b6bf3e923e23d695c1322fc41a57c9346b3e90'

* commit '96b6bf3e923e23d695c1322fc41a57c9346b3e90':
adb: Add "adb disconnect" command for disconnecting TCP/IP devices.
bf146b8fc0ec19ca26aa13babe36a1d408a99197 14-Oct-2009 Nicolas Catania <niko@google.com> am 9f6c3d60: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

Merge commit '9f6c3d6036a7c8043217f112c2f1bb9eaebc9b11'

* commit '9f6c3d6036a7c8043217f112c2f1bb9eaebc9b11':
Force the mediaserver process to restart whenever the zygote or system
dd7105a7a11553260be0ea71985ff026aad2cf21 13-Oct-2009 San Mehat <san@google.com> am aaad7ab4: am fd110c7f: Merge change I831d8e1e into eclair

Merge commit 'aaad7ab4ae9e6913481fe4348b040e5d3e2aaec1' into eclair-mr2-plus-aosp

* commit 'aaad7ab4ae9e6913481fe4348b040e5d3e2aaec1':
rootdir: init.rc: Adjust background dirty writeout policy
aaad7ab4ae9e6913481fe4348b040e5d3e2aaec1 13-Oct-2009 San Mehat <san@google.com> am fd110c7f: Merge change I831d8e1e into eclair

Merge commit 'fd110c7fb36966a7b917c7661e5497b4ffccd7da' into eclair-mr2

* commit 'fd110c7fb36966a7b917c7661e5497b4ffccd7da':
rootdir: init.rc: Adjust background dirty writeout policy
96912ff719a506f43ad02b8f9cc741f52567cabb 13-Oct-2009 San Mehat <san@google.com> am fd110c7f: Merge change I831d8e1e into eclair

Merge commit 'fd110c7fb36966a7b917c7661e5497b4ffccd7da' into eclair-plus-aosp

* commit 'fd110c7fb36966a7b917c7661e5497b4ffccd7da':
rootdir: init.rc: Adjust background dirty writeout policy
fd110c7fb36966a7b917c7661e5497b4ffccd7da 13-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I831d8e1e into eclair

* changes:
rootdir: init.rc: Adjust background dirty writeout policy
831d8e1e3a08520369561087112ebf898e31704c 13-Oct-2009 San Mehat <san@google.com> rootdir: init.rc: Adjust background dirty writeout policy

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
d98635c7ae1cb1ddb1213f4277d568cb519708e6 13-Oct-2009 John Wang <johnwang@google.com> am aae5b1d1: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

Merge commit 'aae5b1d11e98c705084b28da604735387ae1eb8d'

* commit 'aae5b1d11e98c705084b28da604735387ae1eb8d':
Make vmallocinfo readable by group log so we can put it in bugreports
22f9d880941cf1db87fd19437bce71420eedf8bd 13-Oct-2009 Ben Cheng <bccheng@google.com> am 8a0a5274: Add stack unwinding directives to atomic-android-arm.S.

Merge commit '8a0a5274ff37cbf3acad0199735a05e5fe3b5c9d' into eclair-mr2-plus-aosp

* commit '8a0a5274ff37cbf3acad0199735a05e5fe3b5c9d':
Add stack unwinding directives to atomic-android-arm.S.
74d7ff8cfd490852d3df1c4b9d8a21beed619caa 12-Oct-2009 Mike Lockwood <lockwood@android.com> adb: Add "adb disconnect" command for disconnecting TCP/IP devices.

Also check that device is not already connected in "adb connect"

Change-Id: I5f84b56b63d8c6932f23791cac319fd6bc39d36c
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/jdwp_service.c
db/sysdeps.h
db/sysdeps_win32.c
db/transport.c
db/transport_local.c
1fbf27bf22d9bc47caea7373e31d472dcbef345a 21-Sep-2009 Robert CH Chou <Robert_CH_Chou@acer.com.tw> Add support for Acer devices

Change-Id: I7045249f86e2b628c31c888e95eb5ba6f6c47251
db/usb_vendors.c
89f9a84af07292e71b209aaab91001132e137b63 21-Sep-2009 Mike Lockwood <lockwood@android.com> adb: Add USB Vendor IDs for LG and Huawei

Change-Id: Ib47e3e39609bac9cf34f2b9334aa95184b3db71d
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
4a0da39db4b6a6062cfd1152ec3c9a266b907808 21-Sep-2009 Jean-Baptiste Queru <jbq@google.com> Add NOTICE file and license tag for adb

BUG=1716164
db/MODULE_LICENSE_APACHE2
db/NOTICE
d6e3ecb70f0e6a037ea07f3f91a4c28988b8e434 19-Sep-2009 Mike Lockwood <lockwood@android.com> adb: Clean up argument passing for create_service_thread()

Change-Id: Id68b312e76215e8e217b42ca0301713dbddfee9e
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/services.c
e5c8b6dd79787e74d7f6afd313352c19a001ab63 04-Sep-2009 Joe Onorato <joeo@android.com> Revert "adb: Another attempted workaround for the adb disconnect problem."

This reverts commit cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad.

lockwood says to take this out.
db/services.c
8a0a5274ff37cbf3acad0199735a05e5fe3b5c9d 13-Oct-2009 Ben Cheng <bccheng@google.com> Add stack unwinding directives to atomic-android-arm.S.
ibcutils/atomic-android-arm.S
96b6bf3e923e23d695c1322fc41a57c9346b3e90 12-Oct-2009 Mike Lockwood <lockwood@android.com> am 8cf0d59f: adb: Add "adb disconnect" command for disconnecting TCP/IP devices.

Merge commit '8cf0d59f61ae0b8554ecf3fe051850508b761b79' into eclair-mr2-plus-aosp

* commit '8cf0d59f61ae0b8554ecf3fe051850508b761b79':
adb: Add "adb disconnect" command for disconnecting TCP/IP devices.
02120026e8e9d4010ab64e093254233517e6fe55 12-Oct-2009 Jason Sams <rjsams@android.com> am 0261190e: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

Merge commit '0261190ebb679f588d5d979ca845bb735134e128'

* commit '0261190ebb679f588d5d979ca845bb735134e128':
add free space on system and cache to free_storage_left log event
677c1e907b38ba979c7fb253d9c5de61cb784202 12-Oct-2009 Mike Lockwood <lockwood@android.com> am 8cf0d59f: adb: Add "adb disconnect" command for disconnecting TCP/IP devices.

Merge commit '8cf0d59f61ae0b8554ecf3fe051850508b761b79' into eclair-plus-aosp

* commit '8cf0d59f61ae0b8554ecf3fe051850508b761b79':
adb: Add "adb disconnect" command for disconnecting TCP/IP devices.
cab7fb361ea1d1a3edf45d0a302e5cb5c7271123 12-Oct-2009 Romain Guy <romainguy@android.com> am 1f29a94b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

Merge commit '1f29a94bc40b886494fd7692f84dc13e7f709a0d'

* commit '1f29a94bc40b886494fd7692f84dc13e7f709a0d':
init.rc: don't mount debugfs
052fe8c807c7280230bdf4eb6d4dcf056724a69a 12-Oct-2009 San Mehat <san@google.com> am 9bb6c20e: am 529520e8: Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"

Merge commit '9bb6c20eb28e26a840d4e67ccc8c70227ce05e96'

* commit '9bb6c20eb28e26a840d4e67ccc8c70227ce05e96':
Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"
3fcaeb9a0f6502dfda85b0eb4de4ca61db03a4c5 12-Oct-2009 Fred Quintana <fredq@google.com> am c0b1c0ac: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

Merge commit 'c0b1c0ac80bdd080dd3b3dfe0a580eae388e27b5'

* commit 'c0b1c0ac80bdd080dd3b3dfe0a580eae388e27b5':
7b5f63f8ab17c0f361d049d807bac1c4813238b5 12-Oct-2009 Jean-Baptiste Queru <jbq@google.com> am f184b94a: am b084929f: Make AudioPara4 world-readable

Merge commit 'f184b94ad32c50ccf5bb1792a963551b5841e772'

* commit 'f184b94ad32c50ccf5bb1792a963551b5841e772':
Make AudioPara4 world-readable
8cf0d59f61ae0b8554ecf3fe051850508b761b79 12-Oct-2009 Mike Lockwood <lockwood@android.com> adb: Add "adb disconnect" command for disconnecting TCP/IP devices.

Also check that device is not already connected in "adb connect"

Change-Id: I5f84b56b63d8c6932f23791cac319fd6bc39d36c
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/jdwp_service.c
db/sysdeps.h
db/sysdeps_win32.c
db/transport.c
db/transport_local.c
ebfe3db361c51d9d99bf6cfd495bd16bdf815e1f 11-Oct-2009 San Mehat <san@android.com> libsysutils: Fix some bugs in NetlinkListener and NetlinkEvent

Signed-off-by: San Mehat <san@android.com>
nclude/sysutils/NetlinkListener.h
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
9f6c3d6036a7c8043217f112c2f1bb9eaebc9b11 10-Oct-2009 Nicolas Catania <niko@google.com> Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp
46c9658f4f29cf06e8d84cafdfcda3eba7f37741 10-Oct-2009 Dan Bornstein <danfuzz@android.com> am 1dec5032: Force the mediaserver process to restart whenever the zygote or system server do.

Merge commit '1dec5032cfadc1a3d7687ce5b6cd322e4151ce9d' into eclair-plus-aosp

* commit '1dec5032cfadc1a3d7687ce5b6cd322e4151ce9d':
Force the mediaserver process to restart whenever the zygote or system
1dec5032cfadc1a3d7687ce5b6cd322e4151ce9d 09-Oct-2009 Dan Bornstein <danfuzz@android.com> Force the mediaserver process to restart whenever the zygote or system
server do.

Change-Id: I16ce4ae656473055e7e244ccd4af7055959e3c1c
ootdir/init.rc
aae5b1d11e98c705084b28da604735387ae1eb8d 09-Oct-2009 John Wang <johnwang@google.com> Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp
b44224d56d2625f341f7526ccad4844527254b55 09-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ic0e6195f

* changes:
toolbox: Add nandread command
19257e7c00afaed6ba9fa0b3557e8bd5de094fad 09-Oct-2009 Rebecca Schultz Zavin <rebecca@android.com> am ea935c1d: Merge change I7b04795c into eclair

Merge commit 'ea935c1d9771fa2cc00583720586c209463f2791' into eclair-plus-aosp

* commit 'ea935c1d9771fa2cc00583720586c209463f2791':
Make vmallocinfo readable by group log so we can put it in bugreports
ea935c1d9771fa2cc00583720586c209463f2791 09-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I7b04795c into eclair

* changes:
Make vmallocinfo readable by group log so we can put it in bugreports
14d898e0141287cd9d8991bea5b63650bb8f5145 09-Oct-2009 Rebecca Schultz Zavin <rebecca@android.com> Make vmallocinfo readable by group log so we can put it in bugreports

Change-Id: I7b04795c029c51108132e7a9eaf46b97de06de6f
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
ootdir/init.rc
44a0270c1ed8ec95cb380529c56c58a16889e111 08-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I31dbed7b

* changes:
Add adb's ANDROID_SERIAL to fastboot too.
0261190ebb679f588d5d979ca845bb735134e128 08-Oct-2009 Jason Sams <rjsams@android.com> Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp
8852a612266f2965d9676990d7e1d6af6d586dda 08-Oct-2009 Doug Zongker <dougz@android.com> am bbf4093e: am 46ef2b87: add free space on system and cache to free_storage_left log event

Merge commit 'bbf4093e7a04f6c61c12bc51d07f03c6b58f4142' into eclair-plus-aosp

* commit 'bbf4093e7a04f6c61c12bc51d07f03c6b58f4142':
add free space on system and cache to free_storage_left log event
bbf4093e7a04f6c61c12bc51d07f03c6b58f4142 08-Oct-2009 Doug Zongker <dougz@android.com> am 46ef2b87: add free space on system and cache to free_storage_left log event

Merge commit '46ef2b87d01a2df67074351d0078bf900550f343' into eclair

* commit '46ef2b87d01a2df67074351d0078bf900550f343':
add free space on system and cache to free_storage_left log event
c500be926cf07c43aeb828ae86b04b856c6b7c63 08-Oct-2009 Elliott Hughes <enh@google.com> Fix flashstation breakage.

We need to reset 'writable' each time round the loop (i.e. for each device).
astboot/usb_linux.c
31dbed7b60d8237d6d05dc6bf230167a5854b77a 08-Oct-2009 Elliott Hughes <enh@google.com> Add adb's ANDROID_SERIAL to fastboot too.

We noticed this when trying to script on-device testing for the dalvik
continuous build.

Also fix a typo in adb's help.
db/commandline.c
astboot/fastboot.c
46ef2b87d01a2df67074351d0078bf900550f343 08-Oct-2009 Doug Zongker <dougz@android.com> add free space on system and cache to free_storage_left log event
ogcat/event-log-tags
1f29a94bc40b886494fd7692f84dc13e7f709a0d 07-Oct-2009 Romain Guy <romainguy@android.com> Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp
64e5c1d5d2c59271a0244816465ecaa419db7e0f 07-Oct-2009 Brian Swetland <swetland@google.com> am aa7d9710: init.rc: don\'t mount debugfs

Merge commit 'aa7d97106abf8c390e1aed71f7c175fb77fead38' into eclair-plus-aosp

* commit 'aa7d97106abf8c390e1aed71f7c175fb77fead38':
init.rc: don't mount debugfs
aa7d97106abf8c390e1aed71f7c175fb77fead38 07-Oct-2009 Brian Swetland <swetland@google.com> init.rc: don't mount debugfs

We'll do this in the product-specific init files.
ootdir/init.rc
b0cc66698fde10592638fee13a8db75b2df1ecf5 07-Oct-2009 San Mehat <san@google.com> am 529520e8: Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"

Merge commit '529520e8240e6865aca77ae9abf78dacbaa72e2c' into eclair-plus-aosp

* commit '529520e8240e6865aca77ae9abf78dacbaa72e2c':
Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"
211aca20272c1132c2120fba95db879876acb5e5 07-Oct-2009 Jean-Baptiste Queru <jbq@google.com> am f184b94a: am b084929f: Make AudioPara4 world-readable

Merge commit 'f184b94ad32c50ccf5bb1792a963551b5841e772' into eclair-plus-aosp

* commit 'f184b94ad32c50ccf5bb1792a963551b5841e772':
Make AudioPara4 world-readable
b4add9b74525210478bac702d27fdaf9cf7ab18f 07-Oct-2009 Elliott Hughes <enh@google.com> Make fastboot say "no permissions" for non-writable devices.

Without this patch, "adb devices" will say "no permissions" when it sees
a device it can't write to, but "fastboot devices" will silently ignore it.
This is confusing to n00bs, especially since it doesn't seem to be widely
known that a device's USB id might be different in the bootloader (meaning
two udev rules are needed). It can also be confusing if you're sshed in,
when you can't access the device because you won't be in the "plugdev"
group, but "fastboot devices" won't make this clear.

I'm not sure about the Mac OS and Windows changes. AIUI, devices are always
writable on those platforms, but I don't use either, so I can't test this.
This patch shouldn't alter the behavior on either of those platforms.
astboot/fastboot.c
astboot/usb.h
astboot/usb_linux.c
astboot/usb_osx.c
astboot/usb_windows.c
9bb6c20eb28e26a840d4e67ccc8c70227ce05e96 06-Oct-2009 San Mehat <san@google.com> am 529520e8: Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"

Merge commit '529520e8240e6865aca77ae9abf78dacbaa72e2c' into eclair-mr2-plus-aosp

* commit '529520e8240e6865aca77ae9abf78dacbaa72e2c':
Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"
c0b1c0ac80bdd080dd3b3dfe0a580eae388e27b5 06-Oct-2009 Fred Quintana <fredq@google.com> Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp
529520e8240e6865aca77ae9abf78dacbaa72e2c 06-Oct-2009 San Mehat <san@google.com> Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"

This reverts commit 35ad5f41c39c5f3af7a8f00185a13366f4901e69.
ootdir/init.rc
f184b94ad32c50ccf5bb1792a963551b5841e772 05-Oct-2009 Jean-Baptiste Queru <jbq@google.com> am b084929f: Make AudioPara4 world-readable

Merge commit 'b084929f5dd57b878f6debe6567a6c8888061fa0' into eclair

* commit 'b084929f5dd57b878f6debe6567a6c8888061fa0':
Make AudioPara4 world-readable
04b7f9d42e751c7b96b872075d0fca4f3249254a 03-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I67a2ea3d

* changes:
Now all the callers are gone, remove adb_networking.*.
c936376b747c0c79db32a30212a970a41d93e0f2 03-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Iab9ad144

* changes:
Add back missing libdl in linker command. The executables here contain call to function defined in libdl.so but the library is missing the linker commands. Currently, the library is linked via dependency of another library. While this works, it is not the right thing to do.
67a2ea3deac5c0d2ec9c6f4a6bd154d78ed4d470 02-Oct-2009 Elliott Hughes <enh@google.com> Now all the callers are gone, remove adb_networking.*.

(This is the final patch removing adb networking.)

Bug: 1122968
nclude/cutils/adb_networking.h
ibcutils/Android.mk
ibcutils/adb_networking.c
ab9ad14429c1b21236210d234db5da17ee67cca5 02-Oct-2009 Doug Kwan <dougkwan@google.com> Add back missing libdl in linker command. The executables here contain call
to function defined in libdl.so but the library is missing the linker commands.
Currently, the library is linked via dependency of another library. While this
works, it is not the right thing to do.
ibacc/tests/Android.mk
b084929f5dd57b878f6debe6567a6c8888061fa0 02-Oct-2009 Jean-Baptiste Queru <jbq@google.com> Make AudioPara4 world-readable

This way adb pull can get to it on user builds.

BUG=1869158
nclude/private/android_filesystem_config.h
7c953d04bcc9070a1bce171e979c5201dd39325b 18-Sep-2009 Arve Hjønnevåg <arve@android.com> toolbox: Add nandread command

Extracts a nand image from an mtd partition with page data followed by
64 bytes of extra data.
oolbox/Android.mk
oolbox/nandread.c
cad5c9ad4bbe72ec6f87e6c0077dc007ea7d1776 01-Oct-2009 Tom Zhu <ling.zhu@motorola.com> am 4d0b21f4: am 4833d9f4: init: builtins: trancate target file in do_copy

Merge commit '4d0b21f4ac5908f695c9c0759c3a34511d8fd97b'

* commit '4d0b21f4ac5908f695c9c0759c3a34511d8fd97b':
init: builtins: trancate target file in do_copy
e18ddc50d608ed57c99766982c6608c6c4dcd55a 01-Oct-2009 Dan Egnor <egnor@google.com> am a39840b0: am 04ea5b97: Add backup_initialize event to track initializeDevice() requests

Merge commit 'a39840b0402f9345e037396639223ef2004fa5fd'

* commit 'a39840b0402f9345e037396639223ef2004fa5fd':
Add backup_initialize event to track initializeDevice() requests
6a4cb8924324722c0b8d561fc1fca6ea694fa1d8 01-Oct-2009 Jeff Hamilton <jham@android.com> am e76eacac: am 9e42da45: Add a new event log tag for corrupted database files.

Merge commit 'e76eacac590ab1f9f5a08da0a92b0b1acac5037b'

* commit 'e76eacac590ab1f9f5a08da0a92b0b1acac5037b':
Add a new event log tag for corrupted database files.
4d0b21f4ac5908f695c9c0759c3a34511d8fd97b 30-Sep-2009 Tom Zhu <ling.zhu@motorola.com> am 4833d9f4: init: builtins: trancate target file in do_copy

Merge commit '4833d9f4986d6dafacff841beb3bf93172c84bdc' into eclair-plus-aosp

* commit '4833d9f4986d6dafacff841beb3bf93172c84bdc':
init: builtins: trancate target file in do_copy
4833d9f4986d6dafacff841beb3bf93172c84bdc 29-Sep-2009 Tom Zhu <ling.zhu@motorola.com> init: builtins: trancate target file in do_copy

add O_TRUNC flag in open(), which will truncate the target file,
otherwise, copy will keep the old content of the target file.

Signed-off-by: Tom Zhu <ling.zhu@motorola.com>
Signed-off-by: San Mehat <san@google.com>
nit/builtins.c
a39840b0402f9345e037396639223ef2004fa5fd 30-Sep-2009 Dan Egnor <egnor@google.com> am 04ea5b97: Add backup_initialize event to track initializeDevice() requests

Merge commit '04ea5b974d12753d9ceae280fea0037cae1ba192' into eclair-plus-aosp

* commit '04ea5b974d12753d9ceae280fea0037cae1ba192':
Add backup_initialize event to track initializeDevice() requests
04ea5b974d12753d9ceae280fea0037cae1ba192 30-Sep-2009 Dan Egnor <egnor@google.com> Add backup_initialize event to track initializeDevice() requests
ogcat/event-log-tags
e76eacac590ab1f9f5a08da0a92b0b1acac5037b 29-Sep-2009 Jeff Hamilton <jham@android.com> am 9e42da45: Add a new event log tag for corrupted database files.

Merge commit '9e42da45cf8de612107fb14660763eeca7582b8f' into eclair-plus-aosp

* commit '9e42da45cf8de612107fb14660763eeca7582b8f':
Add a new event log tag for corrupted database files.
9e42da45cf8de612107fb14660763eeca7582b8f 29-Sep-2009 Jeff Hamilton <jham@android.com> Add a new event log tag for corrupted database files.

Change-Id: I6b920de4e7c86257cb56a75e570c01a42fb2d082
ogcat/event-log-tags
fcf7a09babbac05ea9c7e5b4a98f882c8b75b835 28-Sep-2009 Ben Cheng <bccheng@google.com> am 78e7e400: am 09e71378: Print code around PC and LR in the inline log.

Merge commit '78e7e400a8bb49bffaa312c856bd9e948b1a7ba3'

* commit '78e7e400a8bb49bffaa312c856bd9e948b1a7ba3':
Print code around PC and LR in the inline log.
78e7e400a8bb49bffaa312c856bd9e948b1a7ba3 28-Sep-2009 Ben Cheng <bccheng@google.com> am 09e71378: Print code around PC and LR in the inline log.

Merge commit '09e713789e31f640a80af1cddb2fc40cbeb02ad5' into eclair-plus-aosp

* commit '09e713789e31f640a80af1cddb2fc40cbeb02ad5':
Print code around PC and LR in the inline log.
09e713789e31f640a80af1cddb2fc40cbeb02ad5 28-Sep-2009 Ben Cheng <bccheng@google.com> Print code around PC and LR in the inline log.

8 more lines should provide more crucial information in weird cases.
ebuggerd/debuggerd.c
2b2e61bc6398b5e674594945cbb076201254e790 28-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27323

* changes:
Fix up ls -s.
9feee025a09ace19b09dbb41d6ba87198c77cdf1 28-Sep-2009 Andy McFadden <fadden@android.com> Fix up ls -s.

Added the "total" line, which makes it easy to answer questions like,
"how the hell much space am I wasting on /data/dalvik-cache?".

Also fixed the -s filename output, which was showing mostly-full paths
when a simple filename was called for.
oolbox/ls.c
45e8468f60d58fa698577c2fe3551714d1bfd126 25-Sep-2009 Ethan.Du <a7233c@motorola.com> am 9e421c94: am 3afe20b0: vold: Add support for /dev/block/mmcblk1

Merge commit '9e421c9410a1b1ec95db298a23e29fb4dd200ea4'

* commit '9e421c9410a1b1ec95db298a23e29fb4dd200ea4':
vold: Add support for /dev/block/mmcblk1
e7f9411f6220c31f0b3c905442b9386dee51e98f 25-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am 814215f4: am ff7d5835: Merge change 26093 into eclair

Merge commit '814215f44e804e198538b9cf679a4d2f1a69d904'

* commit '814215f44e804e198538b9cf679a4d2f1a69d904':
Add NOTICE file and license tag for adb
1199c43a4499a58a7f03379d1907911c810f4a58 25-Sep-2009 David 'Digit' Turner <digit@google.com> am 6b4e9ebc: am a0c98ef0: Ensure -user builds can run the dex preopt pass in the emulator.

Merge commit '6b4e9ebc4cab1dab3b8769a27868addd202a29b5'

* commit '6b4e9ebc4cab1dab3b8769a27868addd202a29b5':
Ensure -user builds can run the dex preopt pass in the emulator.
9e421c9410a1b1ec95db298a23e29fb4dd200ea4 24-Sep-2009 Ethan.Du <a7233c@motorola.com> am 3afe20b0: vold: Add support for /dev/block/mmcblk1

Merge commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce' into eclair-plus-aosp

* commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce':
vold: Add support for /dev/block/mmcblk1
3afe20b0beb7e274eee195de436211a3e8d1b0ce 02-Sep-2009 Ethan.Du <a7233c@motorola.com> vold: Add support for /dev/block/mmcblk1

Signed-off-by: Ethan.Du <a7233c@motorola.com>
Signed-off-by: San Mehat <san@google.com>
old/blkdev.c
old/media.h
old/uevent.c
old/volmgr.c
814215f44e804e198538b9cf679a4d2f1a69d904 24-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am ff7d5835: Merge change 26093 into eclair

Merge commit 'ff7d5835d91b979836b66dc42fac69adf2c6c3a3' into eclair-plus-aosp

* commit 'ff7d5835d91b979836b66dc42fac69adf2c6c3a3':
Add NOTICE file and license tag for adb
ff7d5835d91b979836b66dc42fac69adf2c6c3a3 24-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26093 into eclair

* changes:
Add NOTICE file and license tag for adb
6b4e9ebc4cab1dab3b8769a27868addd202a29b5 23-Sep-2009 David 'Digit' Turner <digit@google.com> am a0c98ef0: Ensure -user builds can run the dex preopt pass in the emulator.

Merge commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007' into eclair-plus-aosp

* commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007':
Ensure -user builds can run the dex preopt pass in the emulator.
8a0ba1b1e4f5117da63b8e530ef7c6ba3dc8838c 23-Sep-2009 Robert CH Chou <Robert_CH_Chou@acer.com.tw> am 9aaa76a7: am 79aedbee: Merge change 26423 into eclair

Merge commit '9aaa76a7af547a34251c4eb480a4aa3d7485b56d'

* commit '9aaa76a7af547a34251c4eb480a4aa3d7485b56d':
Add support for Acer devices
05c2df2b41e7f02611cf21bff7c8bb2ba04f31ab 23-Sep-2009 Dan Egnor <egnor@google.com> am 5864a8c9: am b92174db: Add event parameter for the restore set (device id) data is being restored from

Merge commit '5864a8c9021240e061ce2e4e76c95e2b3d3daa9e'

* commit '5864a8c9021240e061ce2e4e76c95e2b3d3daa9e':
Add event parameter for the restore set (device id) data is being restored from
a0c98ef01a4c5a859fdde35fed7977b1eb919007 23-Sep-2009 David 'Digit' Turner <digit@google.com> Ensure -user builds can run the dex preopt pass in the emulator.

This is done by ensuring that /init.goldfish.rc and /system/etc/init.goldfish.sh
are part of the system image, even if it lacks other emulator related bits.
ootdir/Android.mk
9aaa76a7af547a34251c4eb480a4aa3d7485b56d 22-Sep-2009 Robert CH Chou <Robert_CH_Chou@acer.com.tw> am 79aedbee: Merge change 26423 into eclair

Merge commit '79aedbee8ff9d9c37ae063fc970632faa3f90227' into eclair-plus-aosp

* commit '79aedbee8ff9d9c37ae063fc970632faa3f90227':
Add support for Acer devices
79aedbee8ff9d9c37ae063fc970632faa3f90227 22-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26423 into eclair

* changes:
Add support for Acer devices
7953b89e8d68565d15791618146a712231683d09 21-Sep-2009 Robert CH Chou <Robert_CH_Chou@acer.com.tw> Add support for Acer devices

Change-Id: I7045249f86e2b628c31c888e95eb5ba6f6c47251
db/usb_vendors.c
5864a8c9021240e061ce2e4e76c95e2b3d3daa9e 22-Sep-2009 Dan Egnor <egnor@google.com> am b92174db: Add event parameter for the restore set (device id) data is being restored from

Merge commit 'b92174db6d93521656893a2c5108950417532c1d' into eclair-plus-aosp

* commit 'b92174db6d93521656893a2c5108950417532c1d':
Add event parameter for the restore set (device id) data is being restored from
b92174db6d93521656893a2c5108950417532c1d 22-Sep-2009 Dan Egnor <egnor@google.com> Add event parameter for the restore set (device id) data is being restored from
ogcat/event-log-tags
6985357875f7f94ed18111e57ea2a438d7e3a0f7 21-Sep-2009 Christopher Tate <ctate@android.com> am 02f31506: am 061b6de7: Add event log tag for server-prompted reset of backup data

Merge commit '02f315068e02aa82bc7846b58c4ae959c4b97a24'

* commit '02f315068e02aa82bc7846b58c4ae959c4b97a24':
Add event log tag for server-prompted reset of backup data
02f315068e02aa82bc7846b58c4ae959c4b97a24 21-Sep-2009 Christopher Tate <ctate@android.com> am 061b6de7: Add event log tag for server-prompted reset of backup data

Merge commit '061b6de7b350a03a969a82b273a4d585ffbd086c' into eclair-plus-aosp

* commit '061b6de7b350a03a969a82b273a4d585ffbd086c':
Add event log tag for server-prompted reset of backup data
061b6de7b350a03a969a82b273a4d585ffbd086c 21-Sep-2009 Christopher Tate <ctate@android.com> Add event log tag for server-prompted reset of backup data
ogcat/event-log-tags
a07e147790331a03b47a3b62248e943b38a1fabd 21-Sep-2009 Doug Zongker <dougz@android.com> am b4da08cd: am 88003b0d: Merge change 26051 into eclair

Merge commit 'b4da08cd7447c98a9f9b5f39e07c3d5a7b5e7ffc'

* commit 'b4da08cd7447c98a9f9b5f39e07c3d5a7b5e7ffc':
add account field to the sync log event
b4da08cd7447c98a9f9b5f39e07c3d5a7b5e7ffc 21-Sep-2009 Doug Zongker <dougz@android.com> am 88003b0d: Merge change 26051 into eclair

Merge commit '88003b0de2d1d9c24ef4542473e6eabca79d0bd7' into eclair-plus-aosp

* commit '88003b0de2d1d9c24ef4542473e6eabca79d0bd7':
add account field to the sync log event
88003b0de2d1d9c24ef4542473e6eabca79d0bd7 21-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26051 into eclair

* changes:
add account field to the sync log event
505f05e490ddff4548629b9a2b9984d5a262ff08 21-Sep-2009 Mike Lockwood <lockwood@android.com> am 8afb03fc: am 6ae92563: adb: Add USB Vendor IDs for LG and Huawei

Merge commit '8afb03fc12c131de8e8e0dae932dcead0a107949'

* commit '8afb03fc12c131de8e8e0dae932dcead0a107949':
adb: Add USB Vendor IDs for LG and Huawei
8afb03fc12c131de8e8e0dae932dcead0a107949 21-Sep-2009 Mike Lockwood <lockwood@android.com> am 6ae92563: adb: Add USB Vendor IDs for LG and Huawei

Merge commit '6ae9256322053354c7d2badccc0ce5c24b37c243' into eclair-plus-aosp

* commit '6ae9256322053354c7d2badccc0ce5c24b37c243':
adb: Add USB Vendor IDs for LG and Huawei
6ae9256322053354c7d2badccc0ce5c24b37c243 21-Sep-2009 Mike Lockwood <lockwood@android.com> adb: Add USB Vendor IDs for LG and Huawei

Change-Id: Ib47e3e39609bac9cf34f2b9334aa95184b3db71d
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_vendors.c
3a5ae8753c5ae5bdfdabc64347fd468a90a4ba29 21-Sep-2009 Chia-chi Yeh <chiachi@android.com> am eed96af1: am 9b4f1ff2: init.rc: specify keystore directory and fix permissions.

Merge commit 'eed96af19d81803d982c8cb91e2a120c8035e980'

* commit 'eed96af19d81803d982c8cb91e2a120c8035e980':
init.rc: specify keystore directory and fix permissions.
eed96af19d81803d982c8cb91e2a120c8035e980 21-Sep-2009 Chia-chi Yeh <chiachi@android.com> am 9b4f1ff2: init.rc: specify keystore directory and fix permissions.

Merge commit '9b4f1ff210c449920890581b191da3568c10fbd1' into eclair-plus-aosp

* commit '9b4f1ff210c449920890581b191da3568c10fbd1':
init.rc: specify keystore directory and fix permissions.
9b4f1ff210c449920890581b191da3568c10fbd1 18-Sep-2009 Chia-chi Yeh <chiachi@android.com> init.rc: specify keystore directory and fix permissions.
ootdir/init.rc
2fcdaf99070e69a73e76ac9b77135343aabb4dc4 21-Sep-2009 Jean-Baptiste Queru <jbq@google.com> Add NOTICE file and license tag for adb

BUG=1716164
db/MODULE_LICENSE_APACHE2
db/NOTICE
6f9d1c21747f2376b2258d88cbb176ad8b6566f5 21-Sep-2009 Doug Zongker <dougz@android.com> add account field to the sync log event
ogcat/event-log-tags
f3f76b6a6041c99832fff64c5b6a48bdc9696f18 20-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> am dea31b41: am 1320687b: Remove logwrapper for Bluetoothd.

Merge commit 'dea31b41331b87bf825e796c6a1bec6a39bfbb04'

* commit 'dea31b41331b87bf825e796c6a1bec6a39bfbb04':
Remove logwrapper for Bluetoothd.
dea31b41331b87bf825e796c6a1bec6a39bfbb04 20-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> am 1320687b: Remove logwrapper for Bluetoothd.

Merge commit '1320687bdb6df2de1c27fb03c827b69384d26f87' into eclair-plus-aosp

* commit '1320687bdb6df2de1c27fb03c827b69384d26f87':
Remove logwrapper for Bluetoothd.
1320687bdb6df2de1c27fb03c827b69384d26f87 19-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Remove logwrapper for Bluetoothd.

Change-Id: I6d16bc0dbdf9f3aff2080f8c7968ff3cb592811e
ootdir/init.rc
e8ce0027031035c9b3972eb6dd65924f0790988d 20-Sep-2009 Mike Lockwood <lockwood@android.com> am a85a5ba9: am b6b40079: adb: Clean up argument passing for create_service_thread()

Merge commit 'a85a5ba9fdfb7f31f8580a71c4f95313d9236884'

* commit 'a85a5ba9fdfb7f31f8580a71c4f95313d9236884':
adb: Clean up argument passing for create_service_thread()
a85a5ba9fdfb7f31f8580a71c4f95313d9236884 20-Sep-2009 Mike Lockwood <lockwood@android.com> am b6b40079: adb: Clean up argument passing for create_service_thread()

Merge commit 'b6b40079e6d5b32026cc2abfcb71adfd49e8d954' into eclair-plus-aosp

* commit 'b6b40079e6d5b32026cc2abfcb71adfd49e8d954':
adb: Clean up argument passing for create_service_thread()
b6b40079e6d5b32026cc2abfcb71adfd49e8d954 19-Sep-2009 Mike Lockwood <lockwood@android.com> adb: Clean up argument passing for create_service_thread()

Change-Id: Id68b312e76215e8e217b42ca0301713dbddfee9e
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/services.c
63fa2fa3258215063cc5460e0895d81fed2e7c58 19-Sep-2009 Jack Palevich <jackpal@google.com> am 08c586a5: am 119dcd84: Merge change 25859 into eclair

Merge commit '08c586a507b6b165be164821beea925e730aca99'

* commit '08c586a507b6b165be164821beea925e730aca99':
Improve error-handling when an expected token is missing.
0af358c2bde1e63f3664a8799f39a59736063842 19-Sep-2009 Brian Swetland <swetland@google.com> am 65694424: am bb6f68c6: init.rc: mount debugfs for debugging

Merge commit '656944243786dc4e7569f4ae22b5943aeba9e919'

* commit '656944243786dc4e7569f4ae22b5943aeba9e919':
init.rc: mount debugfs for debugging
583013192b84848aa3aa5e4b18edb313720f0699 19-Sep-2009 Jack Palevich <jackpal@google.com> am fc9c83e9: am 1c60e46e: Produce error rather than assert when encountering a nested function.

Merge commit 'fc9c83e9cc48f1dcd32b672d12bc3c9819eaca26'

* commit 'fc9c83e9cc48f1dcd32b672d12bc3c9819eaca26':
Produce error rather than assert when encountering a nested function.
08c586a507b6b165be164821beea925e730aca99 19-Sep-2009 Jack Palevich <jackpal@google.com> am 119dcd84: Merge change 25859 into eclair

Merge commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7' into eclair-plus-aosp

* commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7':
Improve error-handling when an expected token is missing.
119dcd8400b33241a6081b2f4ba4e3a8764896d7 19-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25859 into eclair

* changes:
Improve error-handling when an expected token is missing.
b13d4e857a761d42ebbaece2bafd7799c875686e 19-Sep-2009 Jack Palevich <jackpal@google.com> Improve error-handling when an expected token is missing.

We had been arbitrarily swallowing the next token, even if it wasn't
the one we were expecting. Now we only swallow it if it _is_ the one
we were expecting.
ibacc/acc.cpp
656944243786dc4e7569f4ae22b5943aeba9e919 19-Sep-2009 Brian Swetland <swetland@google.com> am bb6f68c6: init.rc: mount debugfs for debugging

Merge commit 'bb6f68c63d79bf58bd53f463de1bd23d49e5b8a4' into eclair-plus-aosp

* commit 'bb6f68c63d79bf58bd53f463de1bd23d49e5b8a4':
init.rc: mount debugfs for debugging
bb6f68c63d79bf58bd53f463de1bd23d49e5b8a4 19-Sep-2009 Brian Swetland <swetland@google.com> init.rc: mount debugfs for debugging

- put it at /sys/kernel/debug so Arve will be happy
- symlink /d to /sys/kernel/debug so Brian will be happy.
ootdir/init.rc
fc9c83e9cc48f1dcd32b672d12bc3c9819eaca26 19-Sep-2009 Jack Palevich <jackpal@google.com> am 1c60e46e: Produce error rather than assert when encountering a nested function.

Merge commit '1c60e46e0e5a20426e235eaede8f1cf7395f4cc0' into eclair-plus-aosp

* commit '1c60e46e0e5a20426e235eaede8f1cf7395f4cc0':
Produce error rather than assert when encountering a nested function.
1c60e46e0e5a20426e235eaede8f1cf7395f4cc0 19-Sep-2009 Jack Palevich <jackpal@google.com> Produce error rather than assert when encountering a nested function.

Remove extra '\n' characters from error messages.

Dynamically allocate error message buffer.
ibacc/acc.cpp
ibacc/tests/main.cpp
808c89e1207fe3a60b6f8c3b03d3c65fcc7defbe 17-Sep-2009 Android Code Review <code-review@android.com> Merge change 10445

* changes:
added SuperH atomic support to libcutils
55de332b4c7893c0f412a8094d09ff345d904851 17-Sep-2009 Raphael <raphael@google.com> am 554c0f35: am 05647c89: Merge change 25170 into eclair

Merge commit '554c0f351b2d02abbbc443a7bb209f800be6f399'

* commit '554c0f351b2d02abbbc443a7bb209f800be6f399':
Disable sched_policy under Windows.
3ba415d77a4327499eac2681e524ee55d8447238 17-Sep-2009 Rebecca Schultz Zavin <rebecca@android.com> am 0779a177: am 6388fe80: Merge change 25383 into eclair

Merge commit '0779a177a5f464d936ffa6e092f6c7cd34bfe559'

* commit '0779a177a5f464d936ffa6e092f6c7cd34bfe559':
Add bitfields to header for screen shots. This will allow ddms to distinguish
6b13368ea1b4914557a261c91a90326a46a601c2 17-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am 75479553: merge from open-source master

Merge commit '754795537596f5a4b8be2205c5bdba63282b3403'

* commit '754795537596f5a4b8be2205c5bdba63282b3403':
Set permissions properly for any ALSA device under /dev/snd
a57559001dfea7bed69f697d2240f8c122c6dcd4 17-Sep-2009 repo sync <san@google.com> am da17dee0: resolved conflicts for merge of 35ad5f41 to eclair-plus-aosp

Merge commit 'da17dee0332375abfc1da6d74de851f906c0357b'

* commit 'da17dee0332375abfc1da6d74de851f906c0357b':
rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support
2a6a43c69bf24d0e18edec2ff7d9d0baf64955e2 17-Sep-2009 San Mehat <san@google.com> am b183eb18: am 7baff71b: rootdir: init.rc: tweak cfs scheduler - disable child_runs_first

Merge commit 'b183eb18917a099a1a9238003a5bd9c8fa9b1c10'

* commit 'b183eb18917a099a1a9238003a5bd9c8fa9b1c10':
rootdir: init.rc: tweak cfs scheduler - disable child_runs_first
554c0f351b2d02abbbc443a7bb209f800be6f399 17-Sep-2009 Raphael <raphael@google.com> am 05647c89: Merge change 25170 into eclair

Merge commit '05647c89ef330c8d3fbc3504ecb5f29db89c84fd' into eclair-plus-aosp

* commit '05647c89ef330c8d3fbc3504ecb5f29db89c84fd':
Disable sched_policy under Windows.
0779a177a5f464d936ffa6e092f6c7cd34bfe559 17-Sep-2009 Rebecca Schultz Zavin <rebecca@android.com> am 6388fe80: Merge change 25383 into eclair

Merge commit '6388fe801cf187f78dafba18bec334d23c0ba5e2' into eclair-plus-aosp

* commit '6388fe801cf187f78dafba18bec334d23c0ba5e2':
Add bitfields to header for screen shots. This will allow ddms to distinguish
e84d72a0baf148712f9d31e501b8a39fa5b774f2 17-Sep-2009 David Ding <david.j.ding@motorola.com> am 1575202b: am 7a013f96: Fix vold coredump when enable_ums cmd comes without media inserted.

Merge commit '1575202b80942fbbdf770853e775bdad1e8bf87a'

* commit '1575202b80942fbbdf770853e775bdad1e8bf87a':
Fix vold coredump when enable_ums cmd comes without media inserted.
5163b4acb9650ea22d11a3ae878ba5956b9ec357 17-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am 3e425728: merge from open-source master

Merge commit '3e42572835a7d424545d63c04aff5b80ea18a045'

* commit '3e42572835a7d424545d63c04aff5b80ea18a045':
ARM architecture reference manuals for ARMv6 & ARMv7 state that the use of 'swp' instruction is deprecated
Fix uninitialized variable loop
0fa1b7d38b7674150d7f152a95aa44dcaf7be83a 17-Sep-2009 San Mehat <san@google.com> am f647a3c8: am 3cd5b66b: libcutils: Dont include kernel header + add defines

Merge commit 'f647a3c8aa99073c1da882b22c08b7b2a17c318b'

* commit 'f647a3c8aa99073c1da882b22c08b7b2a17c318b':
libcutils: Dont include kernel header + add defines
db0d48e00c789459835eef72eedb95b7b1ab0c3d 17-Sep-2009 San Mehat <san@google.com> am 07a554bf: am 493dad96: libcutils: Add abstracted support for setting scheduler policies Also changes the background policy to use SCHED_BATCH. IDLEPRIO can cause 100% starvation.

Merge commit '07a554bf1855471f62ece238191bdf7a51f9d589'

* commit '07a554bf1855471f62ece238191bdf7a51f9d589':
libcutils: Add abstracted support for setting scheduler policies
05647c89ef330c8d3fbc3504ecb5f29db89c84fd 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25170 into eclair

* changes:
Disable sched_policy under Windows.
754795537596f5a4b8be2205c5bdba63282b3403 17-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
6388fe801cf187f78dafba18bec334d23c0ba5e2 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25383 into eclair

* changes:
Add bitfields to header for screen shots. This will allow ddms to distinguish between various 32 bit pixel formats. Also adds new version number for future expansion.
da17dee0332375abfc1da6d74de851f906c0357b 17-Sep-2009 repo sync <san@google.com> resolved conflicts for merge of 35ad5f41 to eclair-plus-aosp
b183eb18917a099a1a9238003a5bd9c8fa9b1c10 16-Sep-2009 San Mehat <san@google.com> am 7baff71b: rootdir: init.rc: tweak cfs scheduler - disable child_runs_first

Merge commit '7baff71b0d8fe320df9143b2fa59db0af1b7aa96' into eclair-plus-aosp

* commit '7baff71b0d8fe320df9143b2fa59db0af1b7aa96':
rootdir: init.rc: tweak cfs scheduler - disable child_runs_first
35ad5f41c39c5f3af7a8f00185a13366f4901e69 16-Sep-2009 San Mehat <san@google.com> rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
7baff71b0d8fe320df9143b2fa59db0af1b7aa96 16-Sep-2009 San Mehat <san@google.com> rootdir: init.rc: tweak cfs scheduler - disable child_runs_first

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
154b7d7de4071ed73cde81eef3af47d1a24d7c6b 16-Sep-2009 Rebecca Schultz Zavin <rebecca@android.com> Add bitfields to header for screen shots. This will allow ddms to distinguish
between various 32 bit pixel formats. Also adds new version number for
future expansion.

Change-Id: Ia1d7d7485614e961a47ebb65493b19f4a16ded05
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
db/framebuffer_service.c
0384a98d6f61fa47ffde01c15e552f738e88fb94 16-Sep-2009 Raphael <raphael@google.com> Disable sched_policy under Windows.

This introduces a new HAVE_SCHED_H arch define, which is used
to prevent from building sched_policy.c during the Windows SDK.

Change-Id: I3667857a4ae7d6baaf1efd1cd187a5baf91419d8
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
ibcutils/sched_policy.c
1575202b80942fbbdf770853e775bdad1e8bf87a 16-Sep-2009 David Ding <david.j.ding@motorola.com> am 7a013f96: Fix vold coredump when enable_ums cmd comes without media inserted.

Merge commit '7a013f967e6b6fdb3e7e2d46455cdf235ab4472e' into eclair-plus-aosp

* commit '7a013f967e6b6fdb3e7e2d46455cdf235ab4472e':
Fix vold coredump when enable_ums cmd comes without media inserted.
7a013f967e6b6fdb3e7e2d46455cdf235ab4472e 03-Sep-2009 David Ding <david.j.ding@motorola.com> Fix vold coredump when enable_ums cmd comes without media inserted.

Signed-off-by: Ethan.Du <a7233c@motorola.com>
Signed-off-by: David Ding <david.j.ding@motorola.com>
old/volmgr.c
73ad75041535a21b236f799732b09c31478377cb 15-Sep-2009 Mike Lockwood <lockwood@android.com> am 6088a9ad: am 25f1a5aa: init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root

Merge commit '6088a9ad876314b14d24fc75cb9321f7b34bb5e7'

* commit '6088a9ad876314b14d24fc75cb9321f7b34bb5e7':
init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root
102f6d2c64bbf55e1ec47061a0bc0bcd24991127 10-Jun-2009 Sean McNeil <sean.mcneil@windriver.com> Set permissions properly for any ALSA device under /dev/snd
nit/devices.c
3e42572835a7d424545d63c04aff5b80ea18a045 15-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
f647a3c8aa99073c1da882b22c08b7b2a17c318b 15-Sep-2009 San Mehat <san@google.com> am 3cd5b66b: libcutils: Dont include kernel header + add defines

Merge commit '3cd5b66ba05cffe38bfa4e2da9b93292ba0b073a' into eclair-plus-aosp

* commit '3cd5b66ba05cffe38bfa4e2da9b93292ba0b073a':
libcutils: Dont include kernel header + add defines
3cd5b66ba05cffe38bfa4e2da9b93292ba0b073a 15-Sep-2009 San Mehat <san@google.com> libcutils: Dont include kernel header + add defines

Signed-off-by: San Mehat <san@google.com>
ibcutils/sched_policy.c
07a554bf1855471f62ece238191bdf7a51f9d589 15-Sep-2009 San Mehat <san@google.com> am 493dad96: libcutils: Add abstracted support for setting scheduler policies Also changes the background policy to use SCHED_BATCH. IDLEPRIO can cause 100% starvation.

Merge commit '493dad966305a7fb555addd367532dd2af275a27' into eclair-plus-aosp

* commit '493dad966305a7fb555addd367532dd2af275a27':
libcutils: Add abstracted support for setting scheduler policies
2f1013e6e41b3525119b846f395c0041427ad560 14-Sep-2009 Android Code Review <code-review@android.com> Merge change 9779

* changes:
Fix uninitialized variable loop
493dad966305a7fb555addd367532dd2af275a27 12-Sep-2009 San Mehat <san@google.com> libcutils: Add abstracted support for setting scheduler policies
Also changes the background policy to use SCHED_BATCH. IDLEPRIO
can cause 100% starvation.

Signed-off-by: San Mehat <san@google.com>
nclude/cutils/sched_policy.h
ibcutils/Android.mk
ibcutils/sched_policy.c
6088a9ad876314b14d24fc75cb9321f7b34bb5e7 11-Sep-2009 Mike Lockwood <lockwood@android.com> am 25f1a5aa: init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root

Merge commit '25f1a5aaffd1ef6e87d53d4fd3c14ea1b6c5b940' into eclair-plus-aosp

* commit '25f1a5aaffd1ef6e87d53d4fd3c14ea1b6c5b940':
init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root
25f1a5aaffd1ef6e87d53d4fd3c14ea1b6c5b940 11-Sep-2009 Mike Lockwood <lockwood@android.com> init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root

Change-Id: Iff83310f9411c39e1833b3d710b029b12f702993
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/init.rc
c7b62e61edcfc5ced462bc975051ce62929ec50a 11-Sep-2009 Rebecca Schultz Zavin <rebecca@android.com> am 8c02bec8: am 8880093f: Merge change 24493 into eclair

Merge commit '8c02bec8e1f8877dc78a27837ef6f368bd2b7be7'

* commit '8c02bec8e1f8877dc78a27837ef6f368bd2b7be7':
Fix several issues in framebuffer_service
8c02bec8e1f8877dc78a27837ef6f368bd2b7be7 11-Sep-2009 Rebecca Schultz Zavin <rebecca@android.com> am 8880093f: Merge change 24493 into eclair

Merge commit '8880093fe386ab0dcefec9ce41f8ce6f4e068b0e' into eclair-plus-aosp

* commit '8880093fe386ab0dcefec9ce41f8ce6f4e068b0e':
Fix several issues in framebuffer_service
8880093fe386ab0dcefec9ce41f8ce6f4e068b0e 11-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24493 into eclair

* changes:
Fix several issues in framebuffer_service
04bee29ad979ca770677338e343869a0d5662cfb 10-Sep-2009 Rebecca Schultz Zavin <rebecca@android.com> Fix several issues in framebuffer_service

-supports fb's with x and y offsets
-dumps the front buffer (instead of just the low end of the buffer)
-switch from mmap to read/write, for fb's with very large offsets

Change-Id: Id560790c9661f7cc3b4350a44cc29f0104831e85
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
db/framebuffer_service.c
2ecbf8f3fd6960f424e9be35d46cd192fe4542f2 10-Sep-2009 Dima Zavin <dima@android.com> am 27b8b3a1: am e67eff1c: Merge change 24564 into eclair

Merge commit '27b8b3a1aab015ed8673ffd03bbf57f63adb85f0'

* commit '27b8b3a1aab015ed8673ffd03bbf57f63adb85f0':
init: Make /dev/pmem_gpu* be writable by all
27b8b3a1aab015ed8673ffd03bbf57f63adb85f0 10-Sep-2009 Dima Zavin <dima@android.com> am e67eff1c: Merge change 24564 into eclair

Merge commit 'e67eff1c615c98bf9ad51be9e474ef9ee82b6565' into eclair-plus-aosp

* commit 'e67eff1c615c98bf9ad51be9e474ef9ee82b6565':
init: Make /dev/pmem_gpu* be writable by all
e67eff1c615c98bf9ad51be9e474ef9ee82b6565 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24564 into eclair

* changes:
init: Make /dev/pmem_gpu* be writable by all
a95ca3888f17d5cc0b95bf33840630ac3392b36c 10-Sep-2009 Jack Palevich <jackpal@google.com> am 0b5830e8: am 374ad789: Merge change 24577 into eclair

Merge commit '0b5830e8f1d8b18afa238e5c3ac154c326bd4fb1'

* commit '0b5830e8f1d8b18afa238e5c3ac154c326bd4fb1':
Update peephole optimizer
1357a2f96810005065add69bf100789a8de87e6d 10-Sep-2009 Jack Palevich <jackpal@google.com> am 3cf1f5b3: am e7aa1497: Merge change 24576 into eclair

Merge commit '3cf1f5b34ec85a8cd8ca0c67f4ec80e600258539'

* commit '3cf1f5b34ec85a8cd8ca0c67f4ec80e600258539':
Add a script "accarm" for ad-hoc testing of the ARM acc compiler.
0b5830e8f1d8b18afa238e5c3ac154c326bd4fb1 10-Sep-2009 Jack Palevich <jackpal@google.com> am 374ad789: Merge change 24577 into eclair

Merge commit '374ad789df7e8376ccc7cdfac9e4414547550c53' into eclair-plus-aosp

* commit '374ad789df7e8376ccc7cdfac9e4414547550c53':
Update peephole optimizer
3cf1f5b34ec85a8cd8ca0c67f4ec80e600258539 10-Sep-2009 Jack Palevich <jackpal@google.com> am e7aa1497: Merge change 24576 into eclair

Merge commit 'e7aa14978ffc7042c257fb1bd837490ec4ec1abd' into eclair-plus-aosp

* commit 'e7aa14978ffc7042c257fb1bd837490ec4ec1abd':
Add a script "accarm" for ad-hoc testing of the ARM acc compiler.
374ad789df7e8376ccc7cdfac9e4414547550c53 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24577 into eclair

* changes:
Update peephole optimizer
e7aa14978ffc7042c257fb1bd837490ec4ec1abd 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24576 into eclair

* changes:
Add a script "accarm" for ad-hoc testing of the ARM acc compiler.
53f06587929ab22c6d7abaf9a9bc0c65303c151b 10-Sep-2009 Jack Palevich <jackpal@google.com> Update peephole optimizer

+ Save one instruction for loads of local byte or float values.
+ Save two instructions for pointer arithmetic with a stride that
is a power of two.
ibacc/acc.cpp
bb3e9c181480537fed32c6bba83fd1807de70e16 10-Sep-2009 Jack Palevich <jackpal@google.com> Add a script "accarm" for ad-hoc testing of the ARM acc compiler.

This script copies the test file over to the ARM, runs the acc compiler
on ARM, and then prints out the results.

It also syncs the acc compiler binary over to the ARM.
ibacc/tests/accarm
c2d8e0e701dc460b1ff8f664210644a0f5ca7515 10-Sep-2009 Dima Zavin <dima@android.com> init: Make /dev/pmem_gpu* be writable by all

STOPSHIP: The actual device entry needs to be removed once the products
that use this switch on the mmu.

Change-Id: I10afea36c8731d845382665ed3db7647f68d1276
Signed-off-by: Dima Zavin <dima@android.com>
nit/devices.c
23e7f66c7c9ef11fd6ce2e42a27e1036a591ff78 10-Sep-2009 David 'Digit' Turner <digit@google.com> am 87c57d89: am 8b213f1a: Merge change 24474 into eclair

Merge commit '87c57d892996f666497644e205521168611a1210'

* commit '87c57d892996f666497644e205521168611a1210':
Fix an infinite loop in time2sub.
87c57d892996f666497644e205521168611a1210 10-Sep-2009 David 'Digit' Turner <digit@google.com> am 8b213f1a: Merge change 24474 into eclair

Merge commit '8b213f1ad950c0d115a8d5a3016a267432b3c980' into eclair-plus-aosp

* commit '8b213f1ad950c0d115a8d5a3016a267432b3c980':
Fix an infinite loop in time2sub.
8b213f1ad950c0d115a8d5a3016a267432b3c980 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24474 into eclair

* changes:
Fix an infinite loop in time2sub.
74ee389ae6d4878ff0d9e8716d224bc9d2a3d2a3 10-Sep-2009 Jack Palevich <jackpal@google.com> am b4323adc: am ae0aa69f: Merge change 24479 into eclair

Merge commit 'b4323adc6a040f3aca6149b636dbf75d364f897b'

* commit 'b4323adc6a040f3aca6149b636dbf75d364f897b':
Implement a simple peephole optimization framework for ARM.
b4323adc6a040f3aca6149b636dbf75d364f897b 10-Sep-2009 Jack Palevich <jackpal@google.com> am ae0aa69f: Merge change 24479 into eclair

Merge commit 'ae0aa69f9c7461dc13cbf91e9abf2bb8c4a96111' into eclair-plus-aosp

* commit 'ae0aa69f9c7461dc13cbf91e9abf2bb8c4a96111':
Implement a simple peephole optimization framework for ARM.
ae0aa69f9c7461dc13cbf91e9abf2bb8c4a96111 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24479 into eclair

* changes:
Implement a simple peephole optimization framework for ARM.
d30a2ce2440f1eaf495c04c3b184959310a8da0a 10-Sep-2009 Jack Palevich <jackpal@google.com> Implement a simple peephole optimization framework for ARM.

Implement some optimizations:

+ performing arithmetic by a small constant is 3 instructions shorter.
+ reading a local variables is 1 instruction shorter.
+ constant array indexing (e.g. p[5]) is 5 instructions shorter.
ibacc/acc.cpp
833ea8d50280c2e30b246b82d631f193c2644d5e 10-Sep-2009 David 'Digit' Turner <digit@google.com> Fix an infinite loop in time2sub.

The problem is that time_t is signed, and the original code relied on the
fact that (X + c < X) in case of overflow for c >= 0. Unfortunately, this
condition is only guaranteed by the standard for unsigned arithmetic, and
the gcc 4.4.0 optimizer did completely remove the corresponding test from
the code. This resulted in a missing boundary check, and an infinite loop.

The problem is solved by testing explicitely for TIME_T_MIN and TIME_T_MAX
in the loop that uses this.

Also fix increment_overflow and long_increment_overflow which were buggy
for exactly the same reasons.

Also remove some compiler warnings.

Note: a similar fix was performed in bionic/libc
ibcutils/tztime.c
ec539ead01b89a39626df5c43eea536d987df08f 10-Sep-2009 David 'Digit' Turner <digit@google.com> am 3ebc52eb: am 2f21659d: Merge change 24213 into eclair

Merge commit '3ebc52eb710c75a1ef51dca7c767701bab74a9ee'

* commit '3ebc52eb710c75a1ef51dca7c767701bab74a9ee':
Fix a bug that prevented the "generic" product builds from working in the emulator.
3ebc52eb710c75a1ef51dca7c767701bab74a9ee 10-Sep-2009 David 'Digit' Turner <digit@google.com> am 2f21659d: Merge change 24213 into eclair

Merge commit '2f21659d4565afd65da1be07c28317a3cb4287a1' into eclair-plus-aosp

* commit '2f21659d4565afd65da1be07c28317a3cb4287a1':
Fix a bug that prevented the "generic" product builds from working in the emulator.
2f21659d4565afd65da1be07c28317a3cb4287a1 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24213 into eclair

* changes:
Fix a bug that prevented the "generic" product builds from working in the emulator.
a39751754d6271b863199da3ac693990331c8c4e 10-Sep-2009 Jack Palevich <jackpal@google.com> am 24e78ecf: am 0e1f612d: Merge change 24415 into eclair

Merge commit '24e78ecfb93bceea39c2d58af5eae2aa6467d395'

* commit '24e78ecfb93bceea39c2d58af5eae2aa6467d395':
Move ARM disassembler out of libacc and into the acc command-line tool.
1e5d3b65082e1e11c91d6e0a200938faea92ffc5 10-Sep-2009 Elliott Hughes <enh@google.com> am 983b8bb0: am d9a16d6e: Merge change 23852 into eclair

Merge commit '983b8bb01c3abc8e338f7779ee62fd6aab2f56a0'

* commit '983b8bb01c3abc8e338f7779ee62fd6aab2f56a0':
Fix a call to memset(3) with reversed arguments.
2e755e96ab24a7458763cb001a49095c8a893224 09-Sep-2009 Bob Lee <crazybob@crazybob.org> am b97d616d: am d62ae8f1: Merge change 24061 into eclair

Merge commit 'b97d616d028f801b6e914c9a29d9177de2177020'

* commit 'b97d616d028f801b6e914c9a29d9177de2177020':
Added a hack that makes the SD card world-writable when the sampling
3ae1aa06e770ca0629d164fca1e3a1d4e0cb57a2 09-Sep-2009 Mike Lockwood <lockwood@android.com> am aae43f9e: am 9332482e: init.rc: Make /data/dontpanic files readable only by the system process.

Merge commit 'aae43f9e7582a403b8c4f20d59e26c36bbde5219'

* commit 'aae43f9e7582a403b8c4f20d59e26c36bbde5219':
init.rc: Make /data/dontpanic files readable only by the system process.
24e78ecfb93bceea39c2d58af5eae2aa6467d395 09-Sep-2009 Jack Palevich <jackpal@google.com> am 0e1f612d: Merge change 24415 into eclair

Merge commit '0e1f612d5d5caca3f8c8d7f1689a96148a24afd2' into eclair-plus-aosp

* commit '0e1f612d5d5caca3f8c8d7f1689a96148a24afd2':
Move ARM disassembler out of libacc and into the acc command-line tool.
0e1f612d5d5caca3f8c8d7f1689a96148a24afd2 09-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24415 into eclair

* changes:
Move ARM disassembler out of libacc and into the acc command-line tool.
d5315573d792c8441482b1cbe9ac7e93d3f730d1 09-Sep-2009 Jack Palevich <jackpal@google.com> Move ARM disassembler out of libacc and into the acc command-line tool.
nclude/acc/acc.h
ibacc/Android.mk
ibacc/acc.cpp
ibacc/armreg.h
ibacc/disassem.cpp
ibacc/disassem.h
ibacc/tests/Android.mk
ibacc/tests/armreg.h
ibacc/tests/disassem.cpp
ibacc/tests/disassem.h
ibacc/tests/main.cpp
02608475edd7c42303c9c515aae270fb8b32032a 09-Sep-2009 Vinay HARUGOP <vinay.harugop@stericsson.com> ARM architecture reference manuals for ARMv6 & ARMv7 state that the use of 'swp' instruction is deprecated
ARMv6 onwards. These architectures provide the load-linked, store-conditional pair of ldrex/strex whose use
is recommended in place of 'swp'. Also, the description of the 'swp' instruction in the ARMv6 reference
manual states that the swap operation does not include any memory barrier guarantees.This fix attempts to
address these issues by providing an atomic swap implementation using ldrex/strex under _ARM_HAVE_LDREX_STREX
macro. _ARM_HAVE_LDREX_STREX macro is defined in cpu-features.h file and patch is submitted under change ID 11088.
This Fix is verified on ST Ericsson's U8500 platform and Submitted on behalf of a third-party:
Surinder-pal SINGH from STMicroelectronics.
ibcutils/atomic-android-arm.S
983b8bb01c3abc8e338f7779ee62fd6aab2f56a0 09-Sep-2009 Elliott Hughes <enh@google.com> am d9a16d6e: Merge change 23852 into eclair

Merge commit 'd9a16d6e7daf8e58ebc7760530d9b015dbe4678d' into eclair-plus-aosp

* commit 'd9a16d6e7daf8e58ebc7760530d9b015dbe4678d':
Fix a call to memset(3) with reversed arguments.
d9a16d6e7daf8e58ebc7760530d9b015dbe4678d 09-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23852 into eclair

* changes:
Fix a call to memset(3) with reversed arguments.
b97d616d028f801b6e914c9a29d9177de2177020 09-Sep-2009 Bob Lee <crazybob@crazybob.org> am d62ae8f1: Merge change 24061 into eclair

Merge commit 'd62ae8f12f7b6b7fa13366a064ad4d483a3312e5' into eclair-plus-aosp

* commit 'd62ae8f12f7b6b7fa13366a064ad4d483a3312e5':
Added a hack that makes the SD card world-writable when the sampling
d62ae8f12f7b6b7fa13366a064ad4d483a3312e5 09-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24061 into eclair

* changes:
Added a hack that makes the SD card world-writable when the sampling profiler is turned out. I'll remove this once egnor has the drop box in system_server working.
aae43f9e7582a403b8c4f20d59e26c36bbde5219 09-Sep-2009 Mike Lockwood <lockwood@android.com> am 9332482e: init.rc: Make /data/dontpanic files readable only by the system process.

Merge commit '9332482ed2945174d94615f0720f88702cb92667' into eclair-plus-aosp

* commit '9332482ed2945174d94615f0720f88702cb92667':
init.rc: Make /data/dontpanic files readable only by the system process.
9332482ed2945174d94615f0720f88702cb92667 09-Sep-2009 Mike Lockwood <lockwood@android.com> init.rc: Make /data/dontpanic files readable only by the system process.

Change-Id: If87470b7bcbb1c0774d10296ac82605db3dd9bf0
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/init.rc
ca8177d81443bb93b522c1ab7ff11c0bbc2e0014 09-Sep-2009 David 'Digit' Turner <digit@google.com> Fix a bug that prevented the "generic" product builds from working in the emulator.

This also ensures that emulator-specific files /init.goldfish.rc and
/system/etc/init.goldfish.sh are never part of -user builds, which
correspond to production devices.
ootdir/Android.mk
18fbabc2b0c52ed11d41191260002a87b679fb1b 08-Sep-2009 Jack Palevich <jackpal@google.com> am ef41d238: am c0b74902: Merge change 24171 into eclair

Merge commit 'ef41d2381ddf5cf6a1ad2cfd531cac8b943d20fc'

* commit 'ef41d2381ddf5cf6a1ad2cfd531cac8b943d20fc':
Turn an assert into an error to handle bad struct members more gracefully.
f937d759c7cafa5dfcca11e2596b66dab946c98f 08-Sep-2009 Jack Palevich <jackpal@google.com> am 82145320: am 6b89efab: Merge change 24168 into eclair

Merge commit '8214532088d90dcd2451a0f18a856182fdd85d39'

* commit '8214532088d90dcd2451a0f18a856182fdd85d39':
Improved DEBUG_SAVE_INPUT_TO_FILE logic.
57580063cb03ad6f39e2e63d12f7ab6cb372f5a4 08-Sep-2009 Jack Palevich <jackpal@google.com> am 45a35237: am 5f324384: Merge change 24167 into eclair

Merge commit '45a35237f34c92f8e51eb42eb01e3a054d20aa23'

* commit '45a35237f34c92f8e51eb42eb01e3a054d20aa23':
Generate an error for the use of an undeclared struct.
ef41d2381ddf5cf6a1ad2cfd531cac8b943d20fc 08-Sep-2009 Jack Palevich <jackpal@google.com> am c0b74902: Merge change 24171 into eclair

Merge commit 'c0b74902b85c538c9dac549aa5b213a3fb3edc57' into eclair-plus-aosp

* commit 'c0b74902b85c538c9dac549aa5b213a3fb3edc57':
Turn an assert into an error to handle bad struct members more gracefully.
8214532088d90dcd2451a0f18a856182fdd85d39 08-Sep-2009 Jack Palevich <jackpal@google.com> am 6b89efab: Merge change 24168 into eclair

Merge commit '6b89efab5ac6b1d5d59891ee4746347957de5c05' into eclair-plus-aosp

* commit '6b89efab5ac6b1d5d59891ee4746347957de5c05':
Improved DEBUG_SAVE_INPUT_TO_FILE logic.
45a35237f34c92f8e51eb42eb01e3a054d20aa23 08-Sep-2009 Jack Palevich <jackpal@google.com> am 5f324384: Merge change 24167 into eclair

Merge commit '5f324384027f1d753eeaada3e05ece236a095384' into eclair-plus-aosp

* commit '5f324384027f1d753eeaada3e05ece236a095384':
Generate an error for the use of an undeclared struct.
c0b74902b85c538c9dac549aa5b213a3fb3edc57 08-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24171 into eclair

* changes:
Turn an assert into an error to handle bad struct members more gracefully.
c408bbf4a76e52a87b15b7b01a484f91c98925f8 08-Sep-2009 Jack Palevich <jackpal@google.com> Turn an assert into an error to handle bad struct members more gracefully.
ibacc/acc.cpp
6b89efab5ac6b1d5d59891ee4746347957de5c05 08-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24168 into eclair

* changes:
Improved DEBUG_SAVE_INPUT_TO_FILE logic.
5f324384027f1d753eeaada3e05ece236a095384 08-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24167 into eclair

* changes:
Generate an error for the use of an undeclared struct.
9116bc4c184334dc2ad90473fdd8529c335938e3 08-Sep-2009 Jack Palevich <jackpal@google.com> Improved DEBUG_SAVE_INPUT_TO_FILE logic.
ibacc/acc.cpp
61de31feff2c2507531064a3f330cf97dea4df6c 08-Sep-2009 Jack Palevich <jackpal@google.com> Generate an error for the use of an undeclared struct.
ibacc/acc.cpp
f8b6f78979d9cd8427e9ca7f0a34c4dd0966b3ad 06-Sep-2009 San Mehat <san@google.com> am f914c821: am 82a6014d: rootdir: init.rc: Allow all processes access to /data/dontpanic

Merge commit 'f914c821e15c815cca65fd837d9ee45170bced3d'

* commit 'f914c821e15c815cca65fd837d9ee45170bced3d':
rootdir: init.rc: Allow all processes access to /data/dontpanic
f914c821e15c815cca65fd837d9ee45170bced3d 06-Sep-2009 San Mehat <san@google.com> am 82a6014d: rootdir: init.rc: Allow all processes access to /data/dontpanic

Merge commit '82a6014d90c94a2032e014901917e1d503475d5e' into eclair-plus-aosp

* commit '82a6014d90c94a2032e014901917e1d503475d5e':
rootdir: init.rc: Allow all processes access to /data/dontpanic
82a6014d90c94a2032e014901917e1d503475d5e 06-Sep-2009 San Mehat <san@google.com> rootdir: init.rc: Allow all processes access to /data/dontpanic

***STOPSHIP***

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
bdb005acbc510ac122e053a78ca35c19212540d7 05-Sep-2009 Bob Lee <crazybob@crazybob.org> Added a hack that makes the SD card world-writable when the sampling
profiler is turned out. I'll remove this once egnor has the drop
box in system_server working.
old/volmgr_vfat.c
9b243e152b8b1bc48ac240540efd6721c3912aa2 05-Sep-2009 Mathias Agopian <mathias@google.com> am bb59b7a5: am 4599c1ff: Merge change 23892 into eclair

Merge commit 'bb59b7a5c9444c4fccae10d5a4b00165d47007eb'

* commit 'bb59b7a5c9444c4fccae10d5a4b00165d47007eb':
android_atomic_write() implementation was using cmpxchg which was useless
bb59b7a5c9444c4fccae10d5a4b00165d47007eb 05-Sep-2009 Mathias Agopian <mathias@google.com> am 4599c1ff: Merge change 23892 into eclair

Merge commit '4599c1ff56b1962eecfe647da26e922c0fe2fa13' into eclair-plus-aosp

* commit '4599c1ff56b1962eecfe647da26e922c0fe2fa13':
android_atomic_write() implementation was using cmpxchg which was useless
4599c1ff56b1962eecfe647da26e922c0fe2fa13 05-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23892 into eclair

* changes:
android_atomic_write() implementation was using cmpxchg which was useless
8342e885e139ba81d424d39a8ce944fedb860af0 05-Sep-2009 Jack Palevich <jackpal@google.com> am 0a33f2df: am dfd31ee8: Merge change 24034 into eclair

Merge commit '0a33f2df9b4accc9856003f23acaf927ec57da9b'

* commit '0a33f2df9b4accc9856003f23acaf927ec57da9b':
Improve error message for unknown struct members
0a33f2df9b4accc9856003f23acaf927ec57da9b 05-Sep-2009 Jack Palevich <jackpal@google.com> am dfd31ee8: Merge change 24034 into eclair

Merge commit 'dfd31ee89975a3307c088f7a69a63b93381e2758' into eclair-plus-aosp

* commit 'dfd31ee89975a3307c088f7a69a63b93381e2758':
Improve error message for unknown struct members
dfd31ee89975a3307c088f7a69a63b93381e2758 05-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24034 into eclair

* changes:
Improve error message for unknown struct members
8fe5dcac3447447bd81501a045560abf1bb9cf98 05-Sep-2009 Jack Palevich <jackpal@google.com> Improve error message for unknown struct members

We now customize the error message to correctly refer to the '.' or
'->' operator , whichever one is actually being used when the error
occurs.
ibacc/acc.cpp
a0a42dff0a7fe632df77dea49f6f97194ce2f698 05-Sep-2009 Jack Palevich <jackpal@google.com> am 08f2c140: am 9b7ed8a3: Merge change 24030 into eclair

Merge commit '08f2c1404ffa0bb4604960e71de20bc8b2a56a54'

* commit '08f2c1404ffa0bb4604960e71de20bc8b2a56a54':
Improve address operator (unary &).
08f2c1404ffa0bb4604960e71de20bc8b2a56a54 05-Sep-2009 Jack Palevich <jackpal@google.com> am 9b7ed8a3: Merge change 24030 into eclair

Merge commit '9b7ed8a377b2e0abfb0d802fc1211ace194d33ad' into eclair-plus-aosp

* commit '9b7ed8a377b2e0abfb0d802fc1211ace194d33ad':
Improve address operator (unary &).
9b7ed8a377b2e0abfb0d802fc1211ace194d33ad 05-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24030 into eclair

* changes:
Improve address operator (unary &).
5fd66ae01e3b4a75307a65d839e4679327f10471 05-Sep-2009 Jack Palevich <jackpal@google.com> Improve address operator (unary &).

Until now the address operator only worked with simple variables.
Now it works with arbitrary expressions (that are lvalues or function
names). So for example this now works:

struct S { int a[10]};

int f(struct S* p) {
return &p->a[3];
}
ibacc/acc.cpp
ibacc/tests/data/addressOf.c
ibacc/tests/test.py
ae126e91dd9786b3d5171ab9f207867715529d1e 04-Sep-2009 Ken Shirriff <kens@google.com> am 4b81ad12: am c62592bb: Merge change 23911 into eclair

Merge commit '4b81ad1287c5aaea9a2961247db3b977226670b9'

* commit '4b81ad1287c5aaea9a2961247db3b977226670b9':
Add contacts aggregation event to the log.
4b81ad1287c5aaea9a2961247db3b977226670b9 04-Sep-2009 Ken Shirriff <kens@google.com> am c62592bb: Merge change 23911 into eclair

Merge commit 'c62592bb46dc0dc112fb5211d97799ffd3e2dcde' into eclair-plus-aosp

* commit 'c62592bb46dc0dc112fb5211d97799ffd3e2dcde':
Add contacts aggregation event to the log.
c62592bb46dc0dc112fb5211d97799ffd3e2dcde 04-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23911 into eclair

* changes:
Add contacts aggregation event to the log.
892ea34183e5f7c15e7f36d97155c0fb73e64492 04-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am c31ebf5f: merge from open-source master

Merge commit 'c31ebf5ff3cbeb992e0cbe61205f424040f1028b'

* commit 'c31ebf5ff3cbeb992e0cbe61205f424040f1028b':
55ba0461d39691941f621d8cfc46d8f7ee80dfc5 04-Sep-2009 Joe Onorato <joeo@android.com> am 0c428e4d: am 91acb148: Revert "adb: Another attempted workaround for the adb disconnect problem."

Merge commit '0c428e4d4f1cec0aa61f897b8466185c9e06de10'

* commit '0c428e4d4f1cec0aa61f897b8466185c9e06de10':
Revert "adb: Another attempted workaround for the adb disconnect problem."
c31ebf5ff3cbeb992e0cbe61205f424040f1028b 04-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
0c428e4d4f1cec0aa61f897b8466185c9e06de10 04-Sep-2009 Joe Onorato <joeo@android.com> am 91acb148: Revert "adb: Another attempted workaround for the adb disconnect problem."

Merge commit '91acb14877e7138879057f794a61ee2fd424a41d' into eclair-plus-aosp

* commit '91acb14877e7138879057f794a61ee2fd424a41d':
Revert "adb: Another attempted workaround for the adb disconnect problem."
91acb14877e7138879057f794a61ee2fd424a41d 04-Sep-2009 Joe Onorato <joeo@android.com> Revert "adb: Another attempted workaround for the adb disconnect problem."

This reverts commit cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad.

lockwood says to take this out.
db/services.c
ca5e0bc3fe98f23e9606fdecae5c55976459ff22 03-Sep-2009 Mathias Agopian <mathias@google.com> android_atomic_write() implementation was using cmpxchg which was useless
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-armv6.S
f602030b352e4cf1a6de250be06523803dcf834a 04-Sep-2009 Ken Shirriff <kens@google.com> Add contacts aggregation event to the log.
ogcat/event-log-tags
965144fe481e00bc602f5e93e4f68dba92a1d8ea 03-Sep-2009 Mike Lockwood <lockwood@android.com> am d6e3307d: am f56d1b5a: Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."

Merge commit 'd6e3307d02abfd8dc0206a416308fb62f2eb32ee'

* commit 'd6e3307d02abfd8dc0206a416308fb62f2eb32ee':
Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."
b1421c06fe5f3435d395cb0ff4b9cc8974a9c096 03-Sep-2009 Mike Lockwood <lockwood@android.com> am 410776e1: am e991decf: Merge changes 23694,23695,23696 into eclair

Merge commit '410776e1cf896f152272e71900d2d022846f756f'

* commit '410776e1cf896f152272e71900d2d022846f756f':
init.rc: Add dumpstate service
init: Add support for enforcing setprop by caller's group.
adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell.
d6e3307d02abfd8dc0206a416308fb62f2eb32ee 03-Sep-2009 Mike Lockwood <lockwood@android.com> am f56d1b5a: Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."

Merge commit 'f56d1b5a76c6cb282a7689fc93f85de63bd205f6' into eclair-plus-aosp

* commit 'f56d1b5a76c6cb282a7689fc93f85de63bd205f6':
Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."
410776e1cf896f152272e71900d2d022846f756f 03-Sep-2009 Mike Lockwood <lockwood@android.com> am e991decf: Merge changes 23694,23695,23696 into eclair

Merge commit 'e991decf340e24203ed63f87d9313598cd09a46c' into eclair-plus-aosp

* commit 'e991decf340e24203ed63f87d9313598cd09a46c':
init.rc: Add dumpstate service
init: Add support for enforcing setprop by caller's group.
adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell.
a145741e1c2f3b5a347a5aebaa5853186b663471 03-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from master
f56d1b5a76c6cb282a7689fc93f85de63bd205f6 03-Sep-2009 Mike Lockwood <lockwood@android.com> Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."

This reverts commit be0045aafdbc2ec2ee448be86952082361f5d672.
This change broke compatibility with previous versions of adbd, so I will be implementing this
by modifying the bugreport command on the device instead.
db/commandline.c
db/services.c
90764cfc76d65ae67755a375eb8ef429e44b9822 03-Sep-2009 Elliott Hughes <enh@google.com> Fix a call to memset(3) with reversed arguments.

Bug: 1999244
ibzipfile/centraldir.c
e991decf340e24203ed63f87d9313598cd09a46c 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge changes 23694,23695,23696 into eclair

* changes:
init.rc: Add dumpstate service
init: Add support for enforcing setprop by caller's group.
adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell.
abe3a9c30595846b7e3d705dd4b0aca37fb2f748 03-Sep-2009 Mike Lockwood <lockwood@android.com> init.rc: Add dumpstate service

Change-Id: Iaf7094dd4693c47566c1acf860b750b762af840c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/init.rc
c5e7ef24308f5a993ecfd5ac438d347e786f5e42 03-Sep-2009 Mike Lockwood <lockwood@android.com> init: Add support for enforcing setprop by caller's group.

Change-Id: Ic96e139c4c596882adb38b8863ac6157e0ac17b5
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/property_service.c
be0045aafdbc2ec2ee448be86952082361f5d672 03-Sep-2009 Mike Lockwood <lockwood@android.com> adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell.

This allows dumpstate to run as root even if adbd is not.

Change-Id: I04bda1ee0c8de91677149a2a9eda713c85067aa4
Signed-off-by: Mike Lockwood <lockwood@android.com>
db/commandline.c
db/services.c
7cf1f9d28e83123795d82e3f826324e6bb579829 03-Sep-2009 Brian Swetland <swetland@google.com> am 2552402f: am 69551d85: Merge change 23557 into eclair

Merge commit '2552402f9a4d1a58a95c021a814cc146221df687'

* commit '2552402f9a4d1a58a95c021a814cc146221df687':
init: add some more audio devices
2552402f9a4d1a58a95c021a814cc146221df687 03-Sep-2009 Brian Swetland <swetland@google.com> am 69551d85: Merge change 23557 into eclair

Merge commit '69551d85e95d2ba712f083b39f3ff0b32f865e34' into eclair-plus-aosp

* commit '69551d85e95d2ba712f083b39f3ff0b32f865e34':
init: add some more audio devices
69551d85e95d2ba712f083b39f3ff0b32f865e34 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23557 into eclair

* changes:
init: add some more audio devices
c822213603107b72bca90bd2984f4781dfcf22c4 02-Sep-2009 Brian Swetland <swetland@google.com> init: add some more audio devices

Signed-off-by: Brian Swetland <swetland@google.com>
nit/devices.c
a99f1399352da9aa78c6130c4e3b1e9bd83ea523 02-Sep-2009 San Mehat <san@google.com> am 991e9189: am 020f35f2: rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.

Merge commit '991e9189a4897fd29bb7a5e4e2fb0b6e0d541e09'

* commit '991e9189a4897fd29bb7a5e4e2fb0b6e0d541e09':
rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.
b4a87d6f0ebaf6928ba2a543bc3db84adef1eb56 02-Sep-2009 San Mehat <san@google.com> am c6a81332: am f26d6cea: rootdir: init.rc: Clean up dump collection

Merge commit 'c6a81332c91e55bedc378534163bb8cab444d3a5'

* commit 'c6a81332c91e55bedc378534163bb8cab444d3a5':
rootdir: init.rc: Clean up dump collection
991e9189a4897fd29bb7a5e4e2fb0b6e0d541e09 02-Sep-2009 San Mehat <san@google.com> am 020f35f2: rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.

Merge commit '020f35f274594f55eec956fdcfec90ad3d7a5c65' into eclair-plus-aosp

* commit '020f35f274594f55eec956fdcfec90ad3d7a5c65':
rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.
020f35f274594f55eec956fdcfec90ad3d7a5c65 02-Sep-2009 San Mehat <san@google.com> rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.

This is a temporary measure until bugreports are taken as root.

*****STOPSHIP*****
Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
c6a81332c91e55bedc378534163bb8cab444d3a5 02-Sep-2009 San Mehat <san@google.com> am f26d6cea: rootdir: init.rc: Clean up dump collection

Merge commit 'f26d6cea4cda7b959491f26ab5f67b8ca99ea7fa' into eclair-plus-aosp

* commit 'f26d6cea4cda7b959491f26ab5f67b8ca99ea7fa':
rootdir: init.rc: Clean up dump collection
f26d6cea4cda7b959491f26ab5f67b8ca99ea7fa 01-Sep-2009 San Mehat <san@google.com> rootdir: init.rc: Clean up dump collection

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
3073ad70579be5d23d27633760120c6a735de4b0 01-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am 8c92ba19: merge from open-source master

Merge commit '8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67'

* commit '8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67': (21 commits)
BUGFIX - ro.kernel.android.{qemud | ril} and ro.android.noril
Allow an onrestart command to stop the current service
added chdir/chroot commands to init for mount switching/pivoting
Trivial implementation of init's import command.
adb: Fix emulator support.
Fix broken 'adb root' command.
adb: Improved support for running adb over TCP/IP
BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
adb: Fix infinite loop in Linux host device discovery.
adb: print better error message when there are insufficient permissions for a device.
adb: update call to register_usb_transport in Mac and Windows builds.
adb: On Linux, detect USB devices for which adb does not have permissions to communicate with.
adb: Use correct language ID when retrieving USB serial number.
adb: Remove adbd from simulator build.
adb: add "adb reboot" command.
get rid of utils/executablepath.h, which now lives in the simulator
Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
Fix incorrect check for LOG_UEVENTS
init.rc: Fixes typo: sytem -> system.
completed implementation of "trigger" for init
...
8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67 01-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
0645a5b788026ab9417acd69bab9bbb9a70a7b93 01-Sep-2009 Dima Zavin <dima@android.com> am bdb9831c: am c8401677: init: add vdec device node

Merge commit 'bdb9831ce9195c15ab6f2c01d809fb7946dd2f34'

* commit 'bdb9831ce9195c15ab6f2c01d809fb7946dd2f34':
init: add vdec device node
ad6084e7c8d951a685c4d59ca1868225e4167c04 01-Sep-2009 San Mehat <san@google.com> am c9050c59: am 2dfe490f: system: vold: Ensure a default vold.conf exists for generic target

Merge commit 'c9050c59ea582c74f70ef2f1c87616c6919b0714'

* commit 'c9050c59ea582c74f70ef2f1c87616c6919b0714':
system: vold: Ensure a default vold.conf exists for generic target
bdb9831ce9195c15ab6f2c01d809fb7946dd2f34 31-Aug-2009 Dima Zavin <dima@android.com> am c8401677: init: add vdec device node

Merge commit 'c84016778f9efd0d15f3c5ad7b7109833fb45c9a' into eclair-plus-aosp

* commit 'c84016778f9efd0d15f3c5ad7b7109833fb45c9a':
init: add vdec device node
c84016778f9efd0d15f3c5ad7b7109833fb45c9a 31-Aug-2009 Dima Zavin <dima@android.com> init: add vdec device node

Change-Id: I7e83b99111adfb2b10ee91b78f922864999d4b9d
Signed-off-by: Dima Zavin <dima@android.com>
nit/devices.c
c9050c59ea582c74f70ef2f1c87616c6919b0714 31-Aug-2009 San Mehat <san@google.com> am 2dfe490f: system: vold: Ensure a default vold.conf exists for generic target

Merge commit '2dfe490f439e126119055e1888703cc3745f5389' into eclair-plus-aosp

* commit '2dfe490f439e126119055e1888703cc3745f5389':
system: vold: Ensure a default vold.conf exists for generic target
2dfe490f439e126119055e1888703cc3745f5389 31-Aug-2009 San Mehat <san@google.com> system: vold: Ensure a default vold.conf exists for generic target

Signed-off-by: San Mehat <san@google.com>
ootdir/Android.mk
ootdir/etc/vold.conf
c624d0e5ec8892c457e226dc399c4cb964d99db9 31-Aug-2009 Tammo Spalink <tammo@google.com> am 7d53c697: am d42ab257: Merge change 23045 into eclair

Merge commit '7d53c697caea3259dbc9212044a5ed9dd87a08be'

* commit '7d53c697caea3259dbc9212044a5ed9dd87a08be':
Add persistent radio prop perms ; cleanup ws and typos.
7d53c697caea3259dbc9212044a5ed9dd87a08be 31-Aug-2009 Tammo Spalink <tammo@google.com> am d42ab257: Merge change 23045 into eclair

Merge commit 'd42ab257604f5fd9e039c843ede477da29f6f3cf' into eclair-plus-aosp

* commit 'd42ab257604f5fd9e039c843ede477da29f6f3cf':
Add persistent radio prop perms ; cleanup ws and typos.
d42ab257604f5fd9e039c843ede477da29f6f3cf 31-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23045 into eclair

* changes:
Add persistent radio prop perms ; cleanup ws and typos.
3dfe6c66646865a78449a435239145deeaeab3ba 26-Aug-2009 Tammo Spalink <tammo@google.com> Add persistent radio prop perms ; cleanup ws and typos.

Change-Id: I7d6b51bbb8a9658179bd01c4ff3b5356ec8b4b6c
nit/property_service.c
4e5c1c267a1d09c57570043d34cdad4e71c12c40 29-Aug-2009 Kenny Root <kenny@the-b.org> Fix use of memset function

memset was called with is second and third arguments reversed resulting
in a virtual no-op.
ibzipfile/centraldir.c
7ea232e5c1f35dc9f79c69989d209d2f0eae69f3 28-Aug-2009 San Mehat <san@google.com> am a360f292: am 4ad30d28: Merge change 23106 into eclair

Merge commit 'a360f29264fe9c63963e4b789b56b94a5eb8af27'

* commit 'a360f29264fe9c63963e4b789b56b94a5eb8af27':
vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter
a360f29264fe9c63963e4b789b56b94a5eb8af27 28-Aug-2009 San Mehat <san@google.com> am 4ad30d28: Merge change 23106 into eclair

Merge commit '4ad30d2885a801ee23fb44c1edcda051905868c9' into eclair-plus-aosp

* commit '4ad30d2885a801ee23fb44c1edcda051905868c9':
vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter
4ad30d2885a801ee23fb44c1edcda051905868c9 28-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23106 into eclair

* changes:
vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter choose the cluster-size
ea478b82ca521591b773dcacb216ebb52f58c919 28-Aug-2009 Joe Onorato <joeo@android.com> am cc61802b: am ecfd8e73: acc error tweaks

Merge commit 'cc61802bb201f30566dbb05f7386543da173a827'

* commit 'cc61802bb201f30566dbb05f7386543da173a827':
acc error tweaks
cc61802bb201f30566dbb05f7386543da173a827 28-Aug-2009 Joe Onorato <joeo@android.com> am ecfd8e73: acc error tweaks

Merge commit 'ecfd8e73e4d0102ba01139f9b7ea1e97ce7b79d5' into eclair-plus-aosp

* commit 'ecfd8e73e4d0102ba01139f9b7ea1e97ce7b79d5':
acc error tweaks
ecfd8e73e4d0102ba01139f9b7ea1e97ce7b79d5 28-Aug-2009 Joe Onorato <joeo@android.com> acc error tweaks
ibacc/acc.cpp
f68a5cdeb78fed7762943354f9291682b1d625a9 28-Aug-2009 San Mehat <san@google.com> vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter
choose the cluster-size

Signed-off-by: San Mehat <san@google.com>
old/format.c
e86a2c7ceb767bce5c9a6706d7f36289d3e5de49 28-Aug-2009 Android Code Review <code-review@android.com> Merge change 7315

* changes:
Allow an onrestart command to stop the current service
15681df3563dbea684b7cd27c85af5bde7cd153e 28-Nov-2008 Simon Braunschmidt <simon.braunschmidt@gmail.com> BUGFIX - ro.kernel.android.{qemud | ril} and ro.android.noril

This fixes both a typo and the fact that sh seems not to have
test or [.
(see also sh/builtins.def: ##testcmd commented out)

The handling of these properties was broken, having the effect
that the Modem in ... internal/telephony/test/Simulated*.java
was never run, even if it would have been the users/developers
intention.

See also issue #1380
http://code.google.com/p/android/issues/detail?id=1380

Signed-off-by: Simon.Braunschmidt@gmail.com>
ootdir/etc/init.goldfish.sh
dc816d5dcd87a3578e47eade55db80b99b802c62 14-Jan-2009 Ben Gruver <JesusFreke@JesusFreke.com> Allow an onrestart command to stop the current service

For example,

service recovery /sbin/recovery
onrestart start loadkeys
onrestart class_start con
onrestart stop recovery

Previously, if you had a service like the above, the "onrestart stop
recovery" clause would not have any effect, because the restart flag
would be re-set after the stop command had executed.

This is similar to a service with the "oneshot" keyword, with the critical
difference being that it executes the other onrestart commands when the
service dies.
nit/init.c
e7cb137f32fbc7caf97b80fac152b4bd3ac242cd 17-Nov-2008 Jay Freeman (saurik) <saurik@saurik.com> added chdir/chroot commands to init for mount switching/pivoting
nit/builtins.c
nit/keywords.h
nit/parser.c
nit/readme.txt
9f28bde9eb37e7d00df5c2a7c51d88dcd57cef7b 01-Dec-2008 Jay Freeman (saurik) <saurik@saurik.com> Trivial implementation of init's import command.
nit/builtins.c
12a5b8804c987a714a2a289d95e36ff84e967a7a 27-Aug-2009 Android Code Review <code-review@android.com> Merge change 2903

* changes:
completed implementation of "trigger" for init
87a9fe176668c1ee124351bb2c114cedc81d9a5f 27-Aug-2009 San Mehat <san@google.com> am 9b158910: am bd3f7ded: Merge change 22836 into eclair

Merge commit '9b1589102cc1f543d172417510b21d0108200c72'

* commit '9b1589102cc1f543d172417510b21d0108200c72':
rootdir: init.rc: Copy kernel crash dumps to /data and free kernel resources
2d534e4d841642d1d2d114b6138cd1fbd87987df 27-Aug-2009 San Mehat <san@google.com> am 5be5da9a: am fc279227: Merge change 22835 into eclair

Merge commit '5be5da9a1176fe2e648070375683b4b412e1cb17'

* commit '5be5da9a1176fe2e648070375683b4b412e1cb17':
init: builtins: Add 'copy' command to init.rc parser
9b1589102cc1f543d172417510b21d0108200c72 27-Aug-2009 San Mehat <san@google.com> am bd3f7ded: Merge change 22836 into eclair

Merge commit 'bd3f7dedeb0f15bcf5e5b527732b54e45647e78b' into eclair-plus-aosp

* commit 'bd3f7dedeb0f15bcf5e5b527732b54e45647e78b':
rootdir: init.rc: Copy kernel crash dumps to /data and free kernel resources
5be5da9a1176fe2e648070375683b4b412e1cb17 27-Aug-2009 San Mehat <san@google.com> am fc279227: Merge change 22835 into eclair

Merge commit 'fc279227ec9af8b49d3b3ec63096e4839f099411' into eclair-plus-aosp

* commit 'fc279227ec9af8b49d3b3ec63096e4839f099411':
init: builtins: Add 'copy' command to init.rc parser
bd3f7dedeb0f15bcf5e5b527732b54e45647e78b 27-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22836 into eclair

* changes:
rootdir: init.rc: Copy kernel crash dumps to /data and free kernel resources
fc279227ec9af8b49d3b3ec63096e4839f099411 27-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22835 into eclair

* changes:
init: builtins: Add 'copy' command to init.rc parser
21541872c3cdc93e60e18ba496715f8307f990b2 27-Aug-2009 San Mehat <san@google.com> rootdir: init.rc: Copy kernel crash dumps to /data and free kernel resources

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
7c44fe5925b6dd51166f73d30de0a2f22d66373e 27-Aug-2009 San Mehat <san@google.com> init: builtins: Add 'copy' command to init.rc parser

Signed-off-by: San Mehat <san@google.com>
nit/builtins.c
nit/keywords.h
nit/parser.c
a4944fb38012c3cce8e2d3c3d2867983e89c4be4 27-Aug-2009 Jack Palevich <jackpal@google.com> am 973246de: am c158427e: Merge change 22828 into eclair

Merge commit '973246de432427fbfaf79635a1199ad811e17886'

* commit '973246de432427fbfaf79635a1199ad811e17886':
Preliminary struct and union support.
973246de432427fbfaf79635a1199ad811e17886 27-Aug-2009 Jack Palevich <jackpal@google.com> am c158427e: Merge change 22828 into eclair

Merge commit 'c158427e5edbac3ef180d1e35f99e445b11e3672' into eclair-plus-aosp

* commit 'c158427e5edbac3ef180d1e35f99e445b11e3672':
Preliminary struct and union support.
c158427e5edbac3ef180d1e35f99e445b11e3672 27-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22828 into eclair

* changes:
Preliminary struct and union support.
9221bcccb39a53c8cddf338e53d0cfa2201b52dd 27-Aug-2009 Jack Palevich <jackpal@google.com> Preliminary struct and union support.

Working features:
- struct
- union
- nested structs
- anonymous structs
- forward declarations
- '.' and '->'
- copying structs using '='

Missing features:
- passing structs by value
- returning structs by value
- typedef
- sizeof

Example:

struct v {float x, y, z, w; };

void add(struct v* result, struct v* a, struct v* b) {
result->x = a->x + b->x;
result->y = a->y + b->y;
result->z = a->z + b->z;
result->w = a->w + b->w;
}

Reworked size-of and alignment logic to support structs.

Improved encoding of ARM immediate constants.
ibacc/acc.cpp
ibacc/tests/data/structs.c
ibacc/tests/test.py
cef31a02544d91b85481a5fa032b6126dbb32365 26-Aug-2009 Mike Lockwood <lockwood@android.com> adb: Fix emulator support.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
f71c71148cb65e61ab483b1b0351922c11d862d8 26-Aug-2009 Xavier Ducrohet <xav@android.com> Fix broken 'adb root' command.

Change-Id: I75bf01863e82967a7214d3e31b8db792690716c1
db/commandline.c
2f38b699713dc2587a771bd5d4c6a47329728f5e 25-Aug-2009 Mike Lockwood <lockwood@android.com> adb: Improved support for running adb over TCP/IP

Added new commands:

adb connect <host>:<port> (to connect to a device via TCP/IP)
adb tcpip <port> (to restart adbd on the device to listen on TCP/IP)
adb usb (to restart adbd on the device to listen USB)

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/services.c
db/transport.c
db/transport_local.c
26f3de6738c3e07e581e2f9c112a8b3086f88abb 11-Aug-2009 Raphael <raphael@google.com> BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
db/Android.mk
ecfb75d9e43116133aca5cf7adba36783de89817 11-Aug-2009 Mike Lockwood <lockwood@android.com> adb: Fix infinite loop in Linux host device discovery.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
668cc771014380687936e79917e5e559262ad221 08-Aug-2009 Mike Lockwood <lockwood@android.com> adb: print better error message when there are insufficient permissions for a device.

Now, a command like "adb shell" will print "insufficient permissions for device"
instead of "device not found" if adb does not have permissions to communicate with the device.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/transport.c
a8be72f6538676543448a7a6adfd0a3664b59484 08-Aug-2009 Mike Lockwood <lockwood@android.com> adb: update call to register_usb_transport in Mac and Windows builds.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_osx.c
db/usb_windows.c
95b837d38b730353af79f8669b5166007e038ac3 08-Aug-2009 Mike Lockwood <lockwood@android.com> adb: On Linux, detect USB devices for which adb does not have permissions to communicate with.

adb devices will now list devices without adequate file system permissions in /dev/bus/usb as:

List of devices attached
???????????? no permissions

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.h
db/transport.c
db/transport_usb.c
db/usb_linux.c
db/usb_linux_client.c
e64004d327c086eeb7a6ca32258d25bcbe7acb04 07-Aug-2009 Guang Zhu <guangzhu@google.com> adb: Use correct language ID when retrieving USB serial number.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_osx.c
63e61527481c679a75cda358825ed71b156ad778 06-Aug-2009 Mike Lockwood <lockwood@android.com> adb: Remove adbd from simulator build.

It no longer compiles without recent kernel headers.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/Android.mk
5f4b051235c3e9e9e5b34b4af885e42a1c711fc4 05-Aug-2009 Mike Lockwood <lockwood@android.com> adb: add "adb reboot" command.

This will allow rebooting the device via adb on any build, including user builds.
An optional argument can be provided
(for example, "adb reboot bootloader" or adb reboot recovery")

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/services.c
3969080e232beed7c68a65cde7fdafc79ce55b0e 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of utils/executablepath.h, which now lives in the simulator
db/get_my_path_darwin.c
astboot/util_osx.c
22048ef3257719a4e03e6a81a989b071abe7655c 07-May-2009 Nick Pelly <npelly@google.com> Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.

Overridden by -s.
db/commandline.c
c1f46267fa4fb21f7881eaaf8d9c924d0041237d 26-Aug-2009 Mike Lockwood <lockwood@android.com> am 0f832535: am a3e8a6ad: adb: Fix emulator support.

Merge commit '0f83253596e7c23c98c141224238841a3102e5f6'

* commit '0f83253596e7c23c98c141224238841a3102e5f6':
adb: Fix emulator support.
0f83253596e7c23c98c141224238841a3102e5f6 26-Aug-2009 Mike Lockwood <lockwood@android.com> am a3e8a6ad: adb: Fix emulator support.

Merge commit 'a3e8a6ad56d60d2ad6c580004f86920d73acc62c' into eclair-plus-aosp

* commit 'a3e8a6ad56d60d2ad6c580004f86920d73acc62c':
adb: Fix emulator support.
a3e8a6ad56d60d2ad6c580004f86920d73acc62c 26-Aug-2009 Mike Lockwood <lockwood@android.com> adb: Fix emulator support.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
1e070846f8908dff15086efa12fbba01ab7eae15 15-Dec-2008 Chuck Tuffli <ctuffli@gmail.com> Fix incorrect check for LOG_UEVENTS

LOG_UEVENTS is a boolean value as defined in system/core/init/init.h.
Therefore, code should use an #if check and not an #ifdef check as the
macro will always be defined.
nit/devices.c
7acf3386cca6dcfc22cfe45113cc5839502ad811 26-Aug-2009 Hiroshi Takekawa <sian@big.or.jp> init.rc: Fixes typo: sytem -> system.
ootdir/init.rc
43492e4ff439e9e6761517e9e20918ee71652c23 26-Aug-2009 Xavier Ducrohet <xav@android.com> am 15e37df0: am 1bba53f7: Fix broken \'adb root\' command.

Merge commit '15e37df00d4480a51500f7cdc26181db08238c7f'

* commit '15e37df00d4480a51500f7cdc26181db08238c7f':
Fix broken 'adb root' command.
15e37df00d4480a51500f7cdc26181db08238c7f 26-Aug-2009 Xavier Ducrohet <xav@android.com> am 1bba53f7: Fix broken \'adb root\' command.

Merge commit '1bba53f7c851068c127d16ba160cd3074d6027db' into eclair-plus-aosp

* commit '1bba53f7c851068c127d16ba160cd3074d6027db':
Fix broken 'adb root' command.
1bba53f7c851068c127d16ba160cd3074d6027db 26-Aug-2009 Xavier Ducrohet <xav@android.com> Fix broken 'adb root' command.

Change-Id: I75bf01863e82967a7214d3e31b8db792690716c1
db/commandline.c
9534696a43158045f7e5d29bef2958ddbf2bef2d 26-Aug-2009 Mike Lockwood <lockwood@android.com> am 5f642969: am 968c8f07: Merge change 22503 into eclair

Merge commit '5f64296995844981fdfebebdd4b5d84044df3c28'

* commit '5f64296995844981fdfebebdd4b5d84044df3c28':
adb: Improved support for running adb over TCP/IP
5f64296995844981fdfebebdd4b5d84044df3c28 26-Aug-2009 Mike Lockwood <lockwood@android.com> am 968c8f07: Merge change 22503 into eclair

Merge commit '968c8f07031c881dbb2e27b308d88f76e2917121' into eclair-plus-aosp

* commit '968c8f07031c881dbb2e27b308d88f76e2917121':
adb: Improved support for running adb over TCP/IP
968c8f07031c881dbb2e27b308d88f76e2917121 26-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22503 into eclair

* changes:
adb: Improved support for running adb over TCP/IP
bcb9b1f9b1ddfa30fc5f1d77421e2e0d67e27f9b 26-Aug-2009 Robert Greenwalt <robdroid@android.com> am ba298801: am e2e89382: Merge change 22636 into eclair

Merge commit 'ba2988015fd34b3f51c7a11bc65ef4548045f9ad'

* commit 'ba2988015fd34b3f51c7a11bc65ef4548045f9ad':
Allow radio to modify net.ppp* properties for dns
ba2988015fd34b3f51c7a11bc65ef4548045f9ad 26-Aug-2009 Robert Greenwalt <robdroid@android.com> am e2e89382: Merge change 22636 into eclair

Merge commit 'e2e89382d675dee0b3dc2db981064c3d14fa8ac7' into eclair-plus-aosp

* commit 'e2e89382d675dee0b3dc2db981064c3d14fa8ac7':
Allow radio to modify net.ppp* properties for dns
e2e89382d675dee0b3dc2db981064c3d14fa8ac7 26-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22636 into eclair

* changes:
Allow radio to modify net.ppp* properties for dns
0ab3a93abaac2d44d1db064c91c275f0e38925de 25-Aug-2009 Robert Greenwalt <robdroid@android.com> Allow radio to modify net.ppp* properties for dns

The radio bringup script was changed from operating as root to operating as radio. This is
preventing it from adding the "net.ppp0.dns0" and "net.ppp0.dns1" properties that
ConnectivityService needs to correctly set dns.

bug: 2077628
nit/property_service.c
11e1c42df69b15c938aa1b7570e4370e6ab15a86 17-Nov-2008 Jay Freeman (saurik) <saurik@saurik.com> completed implementation of "trigger" for init
nit/builtins.c
nit/init.c
nit/init.h
79dce8722e728d19b9109856b893a875a0a210bf 25-Aug-2009 Jack Palevich <jackpal@google.com> am 87d8ccb0: am c0f25335: Make pointer casting work.

Merge commit '87d8ccb07ed0aa4ee55dd473c36191892cbcdd6e'

* commit '87d8ccb07ed0aa4ee55dd473c36191892cbcdd6e':
Make pointer casting work.
87d8ccb07ed0aa4ee55dd473c36191892cbcdd6e 25-Aug-2009 Jack Palevich <jackpal@google.com> am c0f25335: Make pointer casting work.

Merge commit 'c0f253359f11c087a3ffc92b46755c6c96f57899' into eclair-plus-aosp

* commit 'c0f253359f11c087a3ffc92b46755c6c96f57899':
Make pointer casting work.
c0f253359f11c087a3ffc92b46755c6c96f57899 25-Aug-2009 Jack Palevich <jackpal@google.com> Make pointer casting work.
ibacc/acc.cpp
ibacc/tests/data/b2071670.c
ibacc/tests/test.py
4d03dd0f1cb0285edd24d040c6575f216518da5c 25-Aug-2009 Jack Palevich <jackpal@google.com> am 67132d9d: am 0f400c59: Add runtime check for whether or not the OTCC-output tests can be run.

Merge commit '67132d9d27dcf892fe8113c567f2ae75350b2db1'

* commit '67132d9d27dcf892fe8113c567f2ae75350b2db1':
Add runtime check for whether or not the OTCC-output tests can be run.
67132d9d27dcf892fe8113c567f2ae75350b2db1 25-Aug-2009 Jack Palevich <jackpal@google.com> am 0f400c59: Add runtime check for whether or not the OTCC-output tests can be run.

Merge commit '0f400c59b815c94cd925a843e8529240e6ca7535' into eclair-plus-aosp

* commit '0f400c59b815c94cd925a843e8529240e6ca7535':
Add runtime check for whether or not the OTCC-output tests can be run.
0f400c59b815c94cd925a843e8529240e6ca7535 25-Aug-2009 Jack Palevich <jackpal@google.com> Add runtime check for whether or not the OTCC-output tests can be run.

This means we don't have to manually specify the --norunotcc flag.
ibacc/tests/test.py
ff19670d485fd5ee296e23b00b035ac22975c647 25-Aug-2009 Mike Lockwood <lockwood@android.com> adb: Improved support for running adb over TCP/IP

Added new commands:

adb connect <host>:<port> (to connect to a device via TCP/IP)
adb tcpip <port> (to restart adbd on the device to listen on TCP/IP)
adb usb (to restart adbd on the device to listen USB)

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/services.c
db/transport.c
db/transport_local.c
41ced0261c32705922da318408332372fb1255bc 21-Aug-2009 Android Code Review <code-review@android.com> Merge change 11205

* changes:
Fix bug of mmc.c not checking read_file result. This bug causes segment fault when reading name node of SDIO mmc device's /sys file, which is not existed at all.
884a1d75831ad6fcbc83951c11662470f27d0380 21-Aug-2009 Doug Zongker <dougz@android.com> am b8ebbcc8: am 90b06ac7: only use faster SHA-1 code on machines with good libc

Merge commit 'b8ebbcc88cdab8b0c8d96feca4507dcae11607f4'

* commit 'b8ebbcc88cdab8b0c8d96feca4507dcae11607f4':
only use faster SHA-1 code on machines with good libc
b8ebbcc88cdab8b0c8d96feca4507dcae11607f4 21-Aug-2009 Doug Zongker <dougz@android.com> am 90b06ac7: only use faster SHA-1 code on machines with good libc

Merge commit '90b06ac786f859895ac503cf42759c2706205700' into eclair-plus-aosp

* commit '90b06ac786f859895ac503cf42759c2706205700':
only use faster SHA-1 code on machines with good libc
90b06ac786f859895ac503cf42759c2706205700 21-Aug-2009 Doug Zongker <dougz@android.com> only use faster SHA-1 code on machines with good libc

Macs don't have byteswap.h or endian.h. Change conditionals to only
use the faster SHA-1 code on little-endian machines with byteswap.h.
nclude/mincrypt/sha.h
ibmincrypt/sha.c
deb37725452f5662948665dd6f0f428190a12680 21-Aug-2009 Doug Zongker <dougz@android.com> am 70670ff0: am a2f441b8: Merge change 21613 into eclair

Merge commit '70670ff0d8e089ebd7d08482672671f5b16723ba'

* commit '70670ff0d8e089ebd7d08482672671f5b16723ba':
add optimized SHA1 algorithm
70670ff0d8e089ebd7d08482672671f5b16723ba 21-Aug-2009 Doug Zongker <dougz@android.com> am a2f441b8: Merge change 21613 into eclair

Merge commit 'a2f441b8c6781472deb5da0b27c3b5c81114299a' into eclair-plus-aosp

* commit 'a2f441b8c6781472deb5da0b27c3b5c81114299a':
add optimized SHA1 algorithm
a2f441b8c6781472deb5da0b27c3b5c81114299a 21-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21613 into eclair

* changes:
add optimized SHA1 algorithm
4a568cbee27cfb07b8488a64e2aa72084dd15c76 21-Aug-2009 Jean-Baptiste Queru <jbq@google.com> am 50717d3c: merge from open-source master

Merge commit '50717d3ca874d13f802e402e43dd9cbd5b19539a'

* commit '50717d3ca874d13f802e402e43dd9cbd5b19539a':
system/core: vold: Change permission of external storage device nodes
vold: Check partitions 1-4 instead of 0-3
50717d3ca874d13f802e402e43dd9cbd5b19539a 21-Aug-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
e36c153e25ceb2640967b8fc2ad9864b2b430b48 21-Aug-2009 San Mehat <san@google.com> system/core: vold: Change permission of external storage device nodes

Signed-off-by: San Mehat <san@google.com>
old/blkdev.c
7fe0fe9393c297c3648740eb7181073a7e7753a7 21-Aug-2009 San Mehat <san@google.com> am 444acdd4: am 85b3fcc5: system/core: vold: Change permission of external storage device nodes

Merge commit '444acdd4366dbe7ca4b277a6e5532ea02cc1fbbb'

* commit '444acdd4366dbe7ca4b277a6e5532ea02cc1fbbb':
system/core: vold: Change permission of external storage device nodes
92b21d59743a29c0f283bb7a904d51e170363f23 21-Aug-2009 San Mehat <san@google.com> am 6d51d9ca: system/core: vold: Change permission of external storage device nodes

Merge commit '6d51d9ca81ac2c406f4e20be40a9cddad8362e1a'

* commit '6d51d9ca81ac2c406f4e20be40a9cddad8362e1a':
system/core: vold: Change permission of external storage device nodes
444acdd4366dbe7ca4b277a6e5532ea02cc1fbbb 21-Aug-2009 San Mehat <san@google.com> am 85b3fcc5: system/core: vold: Change permission of external storage device nodes

Merge commit '85b3fcc5de004999756c1e90bcf845480217b3f6' into eclair

* commit '85b3fcc5de004999756c1e90bcf845480217b3f6':
system/core: vold: Change permission of external storage device nodes
85b3fcc5de004999756c1e90bcf845480217b3f6 21-Aug-2009 San Mehat <san@google.com> system/core: vold: Change permission of external storage device nodes

Signed-off-by: San Mehat <san@google.com>
old/blkdev.c
6d51d9ca81ac2c406f4e20be40a9cddad8362e1a 21-Aug-2009 San Mehat <san@google.com> system/core: vold: Change permission of external storage device nodes

Signed-off-by: San Mehat <san@google.com>
old/blkdev.c
ffc211102fb9815c847eece64eb8c85ac8f33dc3 21-Aug-2009 Andy McFadden <fadden@android.com> am 1fd8a8ed: Merge change 21737 into eclair

Merge commit '1fd8a8ed0aa641d909e6157ea685ee3d97a81398'

* commit '1fd8a8ed0aa641d909e6157ea685ee3d97a81398':
Added -s flag to ls.
1fd8a8ed0aa641d909e6157ea685ee3d97a81398 21-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21737 into eclair

* changes:
Added -s flag to ls.
a38181d4f752b52402361de34ab8090b90e6dfde 21-Aug-2009 Iliyan Malchev <malchev@google.com> am e37c724b: Merge change 22155 into eclair

Merge commit 'e37c724bfc60cca4e9bd262c25c58af72abbac13'

* commit 'e37c724bfc60cca4e9bd262c25c58af72abbac13':
devices: set permissions for lightsensor
e37c724bfc60cca4e9bd262c25c58af72abbac13 21-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22155 into eclair

* changes:
devices: set permissions for lightsensor
423c05c48c78647e7ee8e7bf31e153efa124d57c 21-Aug-2009 Jack Palevich <jackpal@google.com> am fb62cf96: Merge change 22143 into eclair

Merge commit 'fb62cf969013a67e1cd7712cd978f54dce27733b'

* commit 'fb62cf969013a67e1cd7712cd978f54dce27733b':
Add ARM hardware floating point support.
fb62cf969013a67e1cd7712cd978f54dce27733b 21-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22143 into eclair

* changes:
Add ARM hardware floating point support.
30321cb3f3a14bad54a0a792be6346109eb043eb 21-Aug-2009 Jack Palevich <jackpal@google.com> Add ARM hardware floating point support.
ibacc/acc.cpp
80c5953bb51f3ee351d8671524e89748c3bcad40 20-Aug-2009 John Michelau <w14107@motorola.com> am 46fdd267: Merge change 21956 into eclair

Merge commit '46fdd2676ea0dd4ca46493440bb4e6eaecf8795d'

* commit '46fdd2676ea0dd4ca46493440bb4e6eaecf8795d':
Route all log tags with "RIL" prefix to radio buffer.
46fdd2676ea0dd4ca46493440bb4e6eaecf8795d 20-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21956 into eclair

* changes:
Route all log tags with "RIL" prefix to radio buffer.
3bc1e9cd7b2832d51c442c0342054e0235a383f6 13-Aug-2009 Iliyan Malchev <malchev@google.com> devices: set permissions for lightsensor

Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
4430f0c121044264e7a9e8d9d0c95593a5bec555 19-Aug-2009 Dan Murphy <D.Murphy@motorola.com> am 5f1b3393: Merge change 21921 into eclair

Merge commit '5f1b3393ab580d7f85916ddd2d6b2dbd1077366b'

* commit '5f1b3393ab580d7f85916ddd2d6b2dbd1077366b':
fastboot: Add retry to USB read call.
5f1b3393ab580d7f85916ddd2d6b2dbd1077366b 19-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21921 into eclair

* changes:
fastboot: Add retry to USB read call.
b2de4db941f5329f9f19e70feff5786b2d5acbb6 18-Aug-2009 Dan Murphy <D.Murphy@motorola.com> fastboot: Add retry to USB read call.

If the USB connection to the device is reset but is still there
the code should retry to re-connect the device and continue.

This is a short term fix for a bootloader issue.
We should revisit and look for a better solution.

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
astboot/usb_linux.c
70a9519db7aab22aa1de4052ecaf3ca4b6eaf8ca 19-Aug-2009 Jack Palevich <jackpal@google.com> am d3abe3c4: Add a --nox86 flag to allow disabling x86 tests

Merge commit 'd3abe3c40de5709f2614aee49451d2d7e28150c3'

* commit 'd3abe3c40de5709f2614aee49451d2d7e28150c3':
Add a --nox86 flag to allow disabling x86 tests
337b972f93242e0a2bc3fad8b8a786e9f5e008ce 19-Aug-2009 Jack Palevich <jackpal@google.com> am 0a01a5db: Handle functions with anonymous arguments

Merge commit '0a01a5db5672b65f81732eaed6fb9fcccea16d06'

* commit '0a01a5db5672b65f81732eaed6fb9fcccea16d06':
Handle functions with anonymous arguments
d3abe3c40de5709f2614aee49451d2d7e28150c3 19-Aug-2009 Jack Palevich <jackpal@google.com> Add a --nox86 flag to allow disabling x86 tests

The x86 tests don't work on non-Linux systems.
ibacc/tests/test.py
0a01a5db5672b65f81732eaed6fb9fcccea16d06 19-Aug-2009 Jack Palevich <jackpal@google.com> Handle functions with anonymous arguments

Example:

int f(int a, int, int c) {
return a + c;
}
ibacc/acc.cpp
ibacc/tests/data/funcargs.c
ibacc/tests/test.py
ed7ccae2968a75e09c22a3da90a9762170f96477 19-Aug-2009 John Michelau <w14107@motorola.com> Route all log tags with "RIL" prefix to radio buffer.
iblog/logd_write.c
9be4634a7566e4274e03de91f2f3cc7f1f66fa89 19-Aug-2009 Jack Palevich <jackpal@google.com> am 761aeb43: Merge change 21845 into eclair

Merge commit '761aeb431e6d1482754a98bba2b683ba8111ef88'

* commit '761aeb431e6d1482754a98bba2b683ba8111ef88':
Allow redefinition of macros.
761aeb431e6d1482754a98bba2b683ba8111ef88 19-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21845 into eclair

* changes:
Allow redefinition of macros.
815d8b8fdbd86bb2f7e5f11dc9ace9cb62212d59 19-Aug-2009 Jack Palevich <jackpal@google.com> Allow redefinition of macros.

Example:

#define A 3
#define A 4

This used to do strange things, but now works as it should.
ibacc/acc.cpp
ibacc/tests/data/defines.c
3888c019eff17a622226505c378470db8d711d62 19-Aug-2009 Jack Palevich <jackpal@google.com> am 9d129689: Merge change 21834 into eclair

Merge commit '9d1296898a93293e64529d548189bfc8185ffd08'

* commit '9d1296898a93293e64529d548189bfc8185ffd08':
Allow '//'-style comments in #defines.
9d1296898a93293e64529d548189bfc8185ffd08 19-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21834 into eclair

* changes:
Allow '//'-style comments in #defines.
0b1827a5b23a78da5ed88c4158c73b822b92f7a9 19-Aug-2009 Jack Palevich <jackpal@google.com> Allow '//'-style comments in #defines.
ibacc/acc.cpp
ibacc/tests/data/defines.c
bf2d557b0a2a780967e68f4bf978ab35cd37564f 19-Aug-2009 Jack Palevich <jackpal@google.com> am 29f34260: Merge change 21812 into eclair

Merge commit '29f3426016116678c122b37cf6d5d40bdfec7749'

* commit '29f3426016116678c122b37cf6d5d40bdfec7749':
Allow parenthesized expressions as the value of defines
29f3426016116678c122b37cf6d5d40bdfec7749 19-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21812 into eclair

* changes:
Allow parenthesized expressions as the value of defines
0b2de0de64666854c3621ddd69f580898776708e 19-Aug-2009 Jack Palevich <jackpal@google.com> Allow parenthesized expressions as the value of defines

For example, this now works:

#define A (1 + 2)

Note that we still don't support defines with argument lists, so this is
still illegal:

#define A(X) (X + 2)

Also in this change: The compiler test script allows command-line
arguments to disable testing on ARM and to disable testing the output
of the old OTCC compiler.

Disabling testing on ARM is handy for developing front-end code when no
device or emulator is available.

Disabling testing OTCC output is handy for some 64-bit Linux environments,
because the original OTCC needs some tweaking to be fully compatible, and
I don't have time to investigate this problem right now.
ibacc/acc.cpp
ibacc/tests/data/defines.c
ibacc/tests/test
ibacc/tests/test.py
a89d4d02361766273586712fdea565e30797724f 18-Aug-2009 Mathias Agopian <mathias@google.com> am 9d881764: fix part of [2017702] OpenGL bugs with alpha values of 1.0 in the source during blending into 8888 buffers

Merge commit '9d881764173ce16badb6f1098ba5cf44b36f9aec'

* commit '9d881764173ce16badb6f1098ba5cf44b36f9aec':
fix part of [2017702] OpenGL bugs with alpha values of 1.0 in the source during blending into 8888 buffers
9d881764173ce16badb6f1098ba5cf44b36f9aec 18-Aug-2009 Mathias Agopian <mathias@google.com> fix part of [2017702] OpenGL bugs with alpha values of 1.0 in the source during blending into 8888 buffers

when ONE / ONE_MINUS_SRC_ALPHA blending mode was used, the code wasn't saturating the color component.
the reason was that this mode is used for premltiplied alpha blending, however, if used with a non
premultiplied source, the color component would wrap.

unfortunately, this costs 6 extra cycles per pixels, however... "correctness" prevails.

this should not impact the UI since it's using h/w acceleration most of the time it also doesn't
impact games which should be using h/w GL. This change will slow the emulator down a bit.
ibpixelflinger/t32cb16blend.S
327e696808910f8e49370079f8d7f4db8cbe3820 18-Aug-2009 Andy McFadden <fadden@android.com> Added -s flag to ls.

This may not be useful, and may actually be misleading since yaffs2
doesn't track the blocks used for each file (it just divides the length
down by 512). I'm submitting it because yaffs2 isn't the only
filesystem we'll ever use.

I also changed some sprintf to snprintf, mostly out of paranoid habit.
oolbox/ls.c
f777df8b855f688959792ec45f0da4a872ca4de4 18-Aug-2009 Jack Palevich <jackpal@google.com> am 7f5b1a2b: (-s ours) do not merge: cherry-picked ecd23c09e87d7088285f8b7c2eeb98815c2e69e0 from master branch

Merge commit '7f5b1a2b317874a9009d20ed4d3789a7cb508ca4'

* commit '7f5b1a2b317874a9009d20ed4d3789a7cb508ca4':
do not merge: cherry-picked ecd23c09e87d7088285f8b7c2eeb98815c2e69e0 from master branch
7f5b1a2b317874a9009d20ed4d3789a7cb508ca4 18-Aug-2009 Jack Palevich <jackpal@google.com> do not merge: cherry-picked ecd23c09e87d7088285f8b7c2eeb98815c2e69e0 from master branch
ibacc/acc.cpp
a6de77de1727d5c40fdfdf841f3e8d13e0fc0140 18-Aug-2009 Doug Zongker <dougz@android.com> add optimized SHA1 algorithm

This optimized implementation of the SHA1 algorithm is about 28%
faster than the old one (on sapphire hardware) but assumes
little-endianness. Add it, but continue using the old implementation
on big-endian hardware.
nclude/mincrypt/sha.h
ibmincrypt/sha.c
cf47841fe94587c758338a93be8e1f410ce5accb 17-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20547

* changes:
Try not to crash with no error message.
e3530471bf69c2326baed3a6865e396822522c7b 16-Aug-2009 Xinyu Chen <xinyu.chen@freescale.com> Fix bug of mmc.c not checking read_file result.
This bug causes segment fault when reading name node of
SDIO mmc device's /sys file, which is not existed at all.

Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
old/mmc.c
227c74af84f6612559bfb3dceeac324c8ef30870 15-Aug-2009 Ben Winslow <rain@bluecherry.net> vold: Check partitions 1-4 instead of 0-3

In mmc_bootstrap_mmcblk, bootstrap partitions 1-4 instead of 0-3, since
that's how the kernel labels them. Additionally, use the NDOSPART constant
from diskmbr.h instead of hardcoding 4 when scanning partitions.
old/blkdev.c
old/mmc.c
818806ad59ac09d5ee7de52891fa113ef614dbe0 12-Aug-2009 Raphael <raphael@google.com> am e3baafd8: BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK

Merge commit 'e3baafd85a5fecd1714441455e3f75f26b5c381e'

* commit 'e3baafd85a5fecd1714441455e3f75f26b5c381e':
BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
665ad087aedf57ba45cad5472d1adb9948cbe6ae 12-Aug-2009 Mike Lockwood <lockwood@android.com> am c52c6021: (-s ours) DO NOT MERGE adb: Remove adbd from simulator build.

Merge commit 'c52c602171cb29c4a4c38005f321cf95d50d3418'

* commit 'c52c602171cb29c4a4c38005f321cf95d50d3418':
DO NOT MERGE adb: Remove adbd from simulator build.
1ca67119057d31da00bd2e998c6fa8ccb651b948 12-Aug-2009 Mike Lockwood <lockwood@android.com> am 704aa833: (-s ours) DO NOT MERGE cherry-pick "adb reboot" from master:

Merge commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd'

* commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd':
DO NOT MERGE cherry-pick "adb reboot" from master:
37b210f56036cda41b0407e841fe79fb4db310fc 11-Aug-2009 Dima Zavin <dima@android.com> init: set the correct kgsl device node permissions
nit/devices.c
e3baafd85a5fecd1714441455e3f75f26b5c381e 11-Aug-2009 Raphael <raphael@google.com> BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
db/Android.mk
d70dc73d8d17a24a2a6dcdaa38f31dce47dd92aa 11-Aug-2009 Mike Lockwood <lockwood@android.com> adb: Fix infinite loop in Linux host device discovery.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
c52c602171cb29c4a4c38005f321cf95d50d3418 06-Aug-2009 Mike Lockwood <lockwood@android.com> DO NOT MERGE adb: Remove adbd from simulator build.

It no longer compiles without recent kernel headers.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/Android.mk
704aa833382a73f8e02d49b7e9c2aef9a49c65bd 05-Aug-2009 Mike Lockwood <lockwood@android.com> DO NOT MERGE cherry-pick "adb reboot" from master:

adb: add "adb reboot" command.

This will allow rebooting the device via adb on any build, including user builds.
An optional argument can be provided
(for example, "adb reboot bootloader" or adb reboot recovery")

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/services.c
ecd23c09e87d7088285f8b7c2eeb98815c2e69e0 08-Aug-2009 Joe Onorato <joeo@android.com> Try not to crash with no error message.
ibacc/acc.cpp
37d3111b1c1ce61c3d9b10ed3ccaed9e5fad1e06 08-Aug-2009 Mike Lockwood <lockwood@android.com> adb: print better error message when there are insufficient permissions for a device.

Now, a command like "adb shell" will print "insufficient permissions for device"
instead of "device not found" if adb does not have permissions to communicate with the device.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/transport.c
5c93dba771f11bb2228e69d1585c9fe8339c9275 08-Aug-2009 Mike Lockwood <lockwood@android.com> adb: update call to register_usb_transport in Mac and Windows builds.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_osx.c
db/usb_windows.c
0927bf9690127bc45cf8837a1467759e9720399a 08-Aug-2009 Mike Lockwood <lockwood@android.com> adb: On Linux, detect USB devices for which adb does not have permissions to communicate with.

adb devices will now list devices without adequate file system permissions in /dev/bus/usb as:

List of devices attached
???????????? no permissions

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.h
db/transport.c
db/transport_usb.c
db/usb_linux.c
db/usb_linux_client.c
4e3fb8615639934fe2522c643c855ae1050c5e8e 08-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20502

* changes:
we actually have to saturate when doing premultilied blending with opengl
665a2227e5212c6a7452f080d87f377b8471a8b0 07-Aug-2009 Mathias Agopian <mathias@google.com> we actually have to saturate when doing premultilied blending with opengl
ibpixelflinger/codeflinger/blending.cpp
6753c2bc238fe474b1052af6573b51bd8a121bc5 07-Aug-2009 Doug Zongker <dougz@android.com> am c5ceeeed: Merge change 20354 into donut

Merge commit 'c5ceeeedeeb1cc3ba3d8b54b04f983ae666755a2'

* commit 'c5ceeeedeeb1cc3ba3d8b54b04f983ae666755a2':
strip comments from event-log-tags on device
c5ceeeedeeb1cc3ba3d8b54b04f983ae666755a2 07-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20354 into donut

* changes:
strip comments from event-log-tags on device
1a1f8189866196c5bd1ace378cf6b0ca69bff267 07-Aug-2009 Guang Zhu <guangzhu@google.com> adb: Use correct language ID when retrieving USB serial number.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_osx.c
0e5e7ef1fecfefdd96f04d16c4a743259d66514d 07-Aug-2009 Doug Zongker <dougz@android.com> strip comments from event-log-tags on device

This saves about 8k from the system image.

Bug: 2036961
ogcat/Android.mk
6bc6794f97aa4368237f23c3d3f7cafd6a796bf3 07-Aug-2009 San Mehat <san@google.com> am ee40fc4e: rootdir: init.rc: Bump up background cpu shares to 5.0%

Merge commit 'ee40fc4e64e1656a16603778bee895ea389ec7d5'

* commit 'ee40fc4e64e1656a16603778bee895ea389ec7d5':
rootdir: init.rc: Bump up background cpu shares to 5.0%
ee40fc4e64e1656a16603778bee895ea389ec7d5 06-Aug-2009 San Mehat <san@google.com> rootdir: init.rc: Bump up background cpu shares to 5.0%

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
781d041892d488b8e20fb66cdc367f894f5f8e15 06-Aug-2009 Mike Lockwood <lockwood@android.com> adb: Remove adbd from simulator build.

It no longer compiles without recent kernel headers.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/Android.mk
161de4e32142e101e4e1f6188a7b70264687913e 06-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20039

* changes:
adb: add "adb reboot" command.
ee15662140632672a6878787a1ff26f5ebdc1e68 05-Aug-2009 Mike Lockwood <lockwood@android.com> adb: add "adb reboot" command.

This will allow rebooting the device via adb on any build, including user builds.
An optional argument can be provided
(for example, "adb reboot bootloader" or adb reboot recovery")

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
db/commandline.c
db/services.c
b230e4265740c70656f76b2702988dc45fdfa9fb 05-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20154

* changes:
Added defines for <stdint.h> and <stdbool.h>.
656a8162983ee8165f4bbcb6c76d8560a7957c35 05-Aug-2009 Andy McFadden <fadden@android.com> Added defines for <stdint.h> and <stdbool.h>.

This adds HAVE_STDINT_H and HAVE_STDBOOL_H to the configuration. We've
been using HAVE_STDINT_H for a while but just never bothered to define
it, and we're about to start using HAVE_STDBOOL_H.

I enabled them for the linux and darwin targets, and left it undefined
for freebsd/windows.
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/freebsd-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
c91cf8be46529e86c4e21bed47a61be7bf63a756 05-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20109

* changes:
init: /dev/diag, /dev/diag_arm9 now owned by AID_RADIO
09070d9e8685645f4ca8ecca62ae489472aed646 05-Aug-2009 Mike Lockwood <lockwood@android.com> fastboot: Add support for Motorola USB vendor ID.

Signed-off-by: Mike Lockwood <lockwood@android.com>
astboot/fastboot.c
6ed11ebecd3eaffd84d79706a4a3a74d39f19715 05-Aug-2009 Iliyan Malchev <malchev@google.com> init: /dev/diag, /dev/diag_arm9 now owned by AID_RADIO

Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
c98c2b89706aeadb170472c3af9b381c58346d92 05-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20021

* changes:
Support 2D arrays.
80e4972625b60d799db67021af18194567aed3e7 05-Aug-2009 Jack Palevich <jackpal@google.com> Support 2D arrays.
ibacc/acc.cpp
ibacc/tests/data/array.c
ibacc/tests/test.py
304176c90984efc0bda9d01ad07ea0c92af822bb 04-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20014

* changes:
Implement arrays.
b61545096d2f55f76b22b7ef734e7cdb0c5eaf97 04-Aug-2009 Jack Palevich <jackpal@google.com> Implement arrays.

Added check to see that pointer types are compatible when passing function
arguments.
ibacc/acc.cpp
ibacc/tests/data/array.c
ibacc/tests/test.py
2b9a6ce08e765874c8114884a680103453d78091 04-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9647

* changes:
init: Add hw3d master/client nodes to device list.
aa027b46684896e40e9bd6b6d0a8b27f84ce8066 04-Aug-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
c6af9114fc63accef839c2a413e18ab058f0beff 04-Aug-2009 Shin-ichiro KAWASAKI <shinichiro.kawasaki.mg@hitachi.com> added SuperH atomic support to libcutils
nclude/arch/linux-sh/AndroidConfig.h
ibcutils/Android.mk
ibcutils/atomic-android-sh.c
ibcutils/atomic.c
46e8863d77912ad6d76ed7d258dfc554a5cdb36d 04-Aug-2009 Dima Zavin <dima@android.com> init: Add hw3d master/client nodes to device list.

Signed-off-by: Dima Zavin <dima@android.com>
nit/devices.c
9af41c4dacbb4443fb4b64bb97e8db301e29c0f5 04-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9594

* changes:
init: add permissions for /dev/diag and /dev/diag_arm9
ce62102feb9106d1142efafacfa253c52ca34ac2 04-Aug-2009 Iliyan Malchev <malchev@google.com> init: add permissions for /dev/diag and /dev/diag_arm9

Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
c9b8ffc3897952deef9e23949ce42fdc09f14a24 03-Aug-2009 Jack Palevich <jackpal@google.com> Add support for "short" data type.
ibacc/FEATURES
ibacc/acc.cpp
ibacc/tests/data/short.c
ibacc/tests/runtimeTest.cpp
ibacc/tests/test.py
1f7aceb2229e76678f9878d4682f2a7c7048ea6f 03-Aug-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
029c7f81a9a445b57a9f6b791a32eebc7b581e2a 01-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9407

* changes:
Fix parsing of function declarations that return pointers.
96138992ac98f8962dc2345d9ba3e99006af80b2 01-Aug-2009 Jack Palevich <jackpal@google.com> Fix parsing of function declarations that return pointers.

Check that <op>= only evaluates the left-hand-side once.
ibacc/acc.cpp
ibacc/tests/data/assignmentop.c
ibacc/tests/test.py
84c7966eed355e9e577b59b974154939c8c6d1bc 01-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9402

* changes:
Support brackets for accessing array values.
6342dbd4cddd3f6a8bbdd83a131b803a99603bab 01-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9401

* changes:
Clean up the way we handle postfix operators.
61c00b82038ee8e55e7f853907c8bbb7fb98f71e 01-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9400

* changes:
Implement pre-increment / pre-decrement
e62b6ea3e0094f244ea9756da0d094f2dbe50955 01-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9399

* changes:
Support the comma operator.
47cbea9c696c8fbeb67c66387b85f59b73d32e6d 01-Aug-2009 Jack Palevich <jackpal@google.com> Support brackets for accessing array values.

Don't yet support allocating arrays.
ibacc/acc.cpp
ibacc/tests/data/brackets.c
ibacc/tests/test.py
5b65909f93f7c35fc1e7aaf7dccc2198e30d17d1 31-Jul-2009 Jack Palevich <jackpal@google.com> Clean up the way we handle postfix operators.

Function names are now treated just like any other variable.
ibacc/acc.cpp
aaac9284b407d236981cbe9be9b167c67cc905ba 31-Jul-2009 Jack Palevich <jackpal@google.com> Implement pre-increment / pre-decrement
ibacc/acc.cpp
ibacc/tests/data/inc.c
ibacc/tests/test.py
43aaee31b9cedc059213396f1e7aa420ace0c797 31-Jul-2009 Jack Palevich <jackpal@google.com> Support the comma operator.
ibacc/acc.cpp
ibacc/tests/data/comma.c
ibacc/tests/test.py
95f2af6d232b192ffeaef2c0b5fe5678c348a7aa 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9366

* changes:
Implement op=.
18f275a901cc78b45563e7eaa711b04c16929b01 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9365

* changes:
Test multiple levels of pointer indirection.
460675eb9174a75d3325fbf57b289e4059a1b379 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9364

* changes:
Assignment in ordinary expressions is now handled using lvals and rvals.
bb75dcc1e6151e53d0edc48a70a558ba081ccadb 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9363

* changes:
Start using lvals and rvals.
b10177ad48553713fcbad1ea4fe1650bd489de5c 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9362

* changes:
Change assignment code gen to use leaR0 .. storeR0ToTOS.
0c01774816245e59aac7f2109c28523eeb6492ac 31-Jul-2009 Jack Palevich <jackpal@google.com> Implement op=.
ibacc/acc.cpp
ibacc/tests/data/assignmentop.c
ibacc/tests/test.py
beb4fe95a05e54e99f5fe90d5c64dae2f8aaa5af 31-Jul-2009 Jack Palevich <jackpal@google.com> Test multiple levels of pointer indirection.
ibacc/tests/data/pointers2.c
ibacc/tests/test.py
29daf577a110ab19ad333993f178483e747278f1 31-Jul-2009 Jack Palevich <jackpal@google.com> Assignment in ordinary expressions is now handled using lvals and rvals.
ibacc/acc.cpp
b5e33311593e8b6d52ccb1eb5d5453a6cdd2d9e0 31-Jul-2009 Jack Palevich <jackpal@google.com> Start using lvals and rvals.
ibacc/acc.cpp
8968e8e1158deda0ad035852791d5be8dcdc1632 31-Jul-2009 Jack Palevich <jackpal@google.com> Change assignment code gen to use leaR0 .. storeR0ToTOS.

This is another step towards being able to handle lval / rvals.

Improved storeR0ToTOS to convert R0 to the proper type to store into
*TOS. (This is something that storeR0 was already doing.)

Removed storeR0 as it is no longer being used.
ibacc/acc.cpp
1f4ff53517dc597e5cc902146558a613d9b339db 31-Jul-2009 Mike Lockwood <lockwood@android.com> am cc1de48d: adb: Another attempted workaround for the adb disconnect problem.

Merge commit 'cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad'

* commit 'cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad':
adb: Another attempted workaround for the adb disconnect problem.
cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad 31-Jul-2009 Mike Lockwood <lockwood@android.com> adb: Another attempted workaround for the adb disconnect problem.

For adb shell commands (as well as shell based commands like logcat and bugreport) we now
batch USB writes into 4K chunks instead of sending small packets of data as they come in.
A timeout prevents us from blocking for more than 100ms when our 4K buffer is partially full.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/services.c
8f361faffc93f89d1025d9ca729d76cd7850ad99 31-Jul-2009 Jack Palevich <jackpal@google.com> Fix bad ARM code generation for '||' and '&&' operators.

Add tests of '&', '&&', '|' and '||' operators.
ibacc/acc.cpp
ibacc/tests/data/film.c
ibacc/tests/test.py
9f51a2696126c6db40d00c8183b26e89fb7e443e 30-Jul-2009 Jack Palevich <jackpal@google.com> Load function symbols using lea syntax.

Use a common code path for ordinary, forward, and indirect calls.
ibacc/acc.cpp
ibacc/tests/test.py
a86835965ed546985a51f9589491baa582f74ecf 29-Jul-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
a7813bda4a4101baad47f11ef4ff9ff5e33d242f 29-Jul-2009 Jack Palevich <jackpal@google.com> Remove loadR0 in favor of lea + loadR0FromR0.

(This is another small step towards lval/rval.)

+ Use strd to store local doubles.
+ loadR0FromR0 now handles pointers.
ibacc/acc.cpp
ddf7c9c14184acffe5ac33d06389cf733cfe11da 29-Jul-2009 Jack Palevich <jackpal@google.com> Implement inc/dec in a more lval-friendly way.
ibacc/acc.cpp
ibacc/tests/data/inc.c
ibacc/tests/test.py
7fcdf1c5f8f25228bf348be9360594679329616f 24-Jul-2009 Jack Palevich <jackpal@google.com> Adjust stack alignment for local variables to work more like arguments.

This makes it easier to generate frame-pointer-relative addresses for ARM.

Prior to this we had stored char sized local variables in the highest
address of the 4-byte stack allocation. Now we store "char"s in the
lowest address of the 4-byte stack allocation, just like chars are
passed as arguments.

We now store global chars on byte boundaries.
ibacc/acc.cpp
894c5cd214ed633ff8024f71c37c036b3cd668d3 27-Jul-2009 Dan Egnor <egnor@google.com> add log tags for backup/restore events
ogcat/event-log-tags
630f5f049b53c8586cca5a1acb928f83332baef5 24-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Add Bluetooth PBAP service.
ootdir/init.rc
9c3744bb7378f5ce4a7c2bbb4637bb6c6c5737bc 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> reconcile korg/master into goog/master
96d58f4f521ee4c1fef58efe5c009f1ea523d67c 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge korg/donut into korg/master
1fde31c8fbe746473e01238be652a9c29ebf37d9 25-Jul-2009 Xavier Ducrohet <xav@android.com> am de6f62a6: Add support for Samsung and Motorola devices.

Merge commit 'de6f62a609120c3d9e4e53689c3b309842ec874b'

* commit 'de6f62a609120c3d9e4e53689c3b309842ec874b':
Add support for Samsung and Motorola devices.
de6f62a609120c3d9e4e53689c3b309842ec874b 24-Jul-2009 Xavier Ducrohet <xav@android.com> Add support for Samsung and Motorola devices.

Also update the linux code. Some devices have more complex USB descriptors
which can't be parsed with the simple assumption of just skipping the
endpoint descriptors.
db/usb_linux.c
db/usb_vendors.c
d39e972831d45d4f8f8effd11691fd2c52d235c6 24-Jul-2009 Doug Zongker <dougz@android.com> am d52f54c4: install recovery image using patch mechanism

Merge commit 'd52f54c4552d2f35b3c2c2ac60350ac83760222f'

* commit 'd52f54c4552d2f35b3c2c2ac60350ac83760222f':
install recovery image using patch mechanism
d52f54c4552d2f35b3c2c2ac60350ac83760222f 24-Jul-2009 Doug Zongker <dougz@android.com> install recovery image using patch mechanism

With the corresponding change in build/tools, the recovery image is
installed via a shell script that is emitted by the OTA builder.
ootdir/init.rc
2ff5c22e9658cc69f7831830808f96d5913cfdba 24-Jul-2009 Jack Palevich <jackpal@google.com> Keep track of the current arena.

This means we don't have to pass it around as an argument.

This change was made because I'm about to start creating pointer types
during expression evaluation, and I didn't want to add an arena
argument to all the expression functions.
ibacc/acc.cpp
89baa2083fbc71d3a9fb50ddd59c1b58347bf2f3 23-Jul-2009 Jack Palevich <jackpal@google.com> Fix the ARM postdecrement operator.

Add a test for ++ and -- so this bug won't happen again.
ibacc/acc.cpp
ibacc/tests/data/iops.c
ibacc/tests/test.py
c1e49f96f97c9f19f9a87ea93336919fb1a04f26 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7792

* changes:
Code generator cleanup
0761a49cd4b19474b1d1065c5db5559ad2034350 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7791

* changes:
Remove unused logging code.
10b90870a6190df847a7b08d4964793e6d81c23e 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7790

* changes:
Track lvalues vs. rvalues.
58c30eef99aa3d9b5039532c4cf015d476fd815b 18-Jul-2009 Jack Palevich <jackpal@google.com> Code generator cleanup

Factor ARM integer binary operation setup code into a function.

Don't pass redundant pType information into loadR0FromR0, storeR0ToTOS,
gcmp, gUnaryCmp, li

Separate inc/dec from variable loading. Generates worse code, but now
we handle pointer inc/dec and char inc/dec.
ibacc/acc.cpp
b40367bde10f7d55a7309a220dfbab6bd54c761a 17-Jul-2009 Jack Palevich <jackpal@google.com> Remove unused logging code.
ibacc/acc.cpp
ba929a4ffac09becb3ae75facd74dc4f85c2725a 17-Jul-2009 Jack Palevich <jackpal@google.com> Track lvalues vs. rvalues.
ibacc/acc.cpp
6b001d8667dbfa7c19ba273451e97cfb9a425128 17-Jul-2009 San Mehat <san@google.com> am 1f278215: vold: If we\'re bootstrapping, don\'t automatically mount the SD card. Also fixes some error display bugs (our printf doesnt support %m)

Merge commit '1f27821568065715d3235c0e690c42d0d7a413bc'

* commit '1f27821568065715d3235c0e690c42d0d7a413bc':
vold: If we're bootstrapping, don't automatically mount the SD card. Also fixes some
c0334b18c56df0a10450ffeffca3024e5049671c 17-Jul-2009 San Mehat <san@google.com> am d8221d98: vold: vfat: Run up to 3 passes of the disk checker when the checker indicates the FS has been modified. Also create LOST.DIR if it doesn\'t exist on mount.

Merge commit 'd8221d9869f9fe1031219e8f6cbcef0771d767fa'

* commit 'd8221d9869f9fe1031219e8f6cbcef0771d767fa':
vold: vfat: Run up to 3 passes of the disk checker when the checker
a27bd2c768084161b28571836956734b46b4a1da 17-Jul-2009 San Mehat <san@google.com> am b6e70d87: vold: Allow a damaged volume to be re-evaluated for mounting

Merge commit 'b6e70d877886bf363c5789456dcc00bb3f271c95'

* commit 'b6e70d877886bf363c5789456dcc00bb3f271c95':
vold: Allow a damaged volume to be re-evaluated for mounting
3377bfd8451b33877318ddfef657e82fe7ed4c9c 17-Jul-2009 Jack Palevich <jackpal@google.com> Report error (rather than crashing) when a declaration name is missing.

Repo case:

void main()
{
int );
}
ibacc/acc.cpp
8148c5be54f12dcefcb5415adee709f40772589f 17-Jul-2009 Jack Palevich <jackpal@google.com> Coerce R0 to destination type before storing it into a variable.
ibacc/acc.cpp
ibacc/tests/data/floatdouble.c
ibacc/tests/test.py
dc45646238b8c9a0f124d7ae16bc3d14122d6e7c 17-Jul-2009 Jack Palevich <jackpal@google.com> Implement a "#line" directive.
ibacc/acc.cpp
b1544cad421ee8fcdd3dfb349392f21a91e3934f 17-Jul-2009 Jack Palevich <jackpal@google.com> Detect assignments to undeclared variables.

Previously we only detected reading from undefined variables.
ibacc/acc.cpp
ce105a908262c6cee2b0b81e7f212a6bcdbaa876 16-Jul-2009 Jack Palevich <jackpal@google.com> If the compile failed, return NULL from symbol lookups.
ibacc/acc.cpp
1f27821568065715d3235c0e690c42d0d7a413bc 16-Jul-2009 San Mehat <san@google.com> vold: If we're bootstrapping, don't automatically mount the SD card. Also fixes some
error display bugs (our printf doesnt support %m)

Signed-off-by: San Mehat <san@google.com>
old/blkdev.c
old/mmc.c
old/switch.c
old/uevent.c
old/vold.c
old/vold.h
old/volmgr.c
d8221d9869f9fe1031219e8f6cbcef0771d767fa 16-Jul-2009 San Mehat <san@google.com> vold: vfat: Run up to 3 passes of the disk checker when the checker
indicates the FS has been modified. Also create LOST.DIR if it doesn't
exist on mount.

Signed-off-by: San Mehat <san@google.com>
old/volmgr_vfat.c
b6e70d877886bf363c5789456dcc00bb3f271c95 16-Jul-2009 San Mehat <san@google.com> vold: Allow a damaged volume to be re-evaluated for mounting

Signed-off-by: San Mehat <san@google.com>
old/volmgr.c
588d2bdefe0d8a4ff3a5ad45afe1806aee022762 16-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7495

* changes:
Improve error handling
d1f57e689b703faa46d26decb1758a6f0330e9ec 16-Jul-2009 Jack Palevich <jackpal@google.com> Improve error handling

Don't segfault if the right-hand operand of a binary operator is missing.
Don't segfault if a semicolon is missing at the end of a forward
declaration.
ibacc/acc.cpp
6b840e9b61a22ca9644fd9afa90e5a0f4d242b44 16-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7456

* changes:
init: Change owner of /dev/uinput to system
0f0776e27c1d999ba04dd7a5855ba792f711d1eb 16-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7464

* changes:
Improve numerical constant parsing.
2aaf21f1beefeaa91de8f21a96223c739f48cf88 16-Jul-2009 Jack Palevich <jackpal@google.com> Improve numerical constant parsing.
ibacc/acc.cpp
ibacc/tests/data/float.c
ibacc/tests/test.py
be65da47e69c427d6326603e7eccd84957cc34d2 16-Jul-2009 Ken Schultz <kschultz@motorola.com> init: Change owner of /dev/uinput to system

This will allow the the uinput driver to be used by the system process
as well as bluetooth, which is needed for sensors.

Signed-off-by: Ken Schultz <kschultz@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/devices.c
b44aeb7b6ad8799c31d87a6304d20f41387081a7 15-Jul-2009 Nick Pelly <npelly@google.com> Add OPUSH to register obex server.
ootdir/init.rc
8c246a9dc294760f2a981cf5144fe4939d1554e6 15-Jul-2009 Jack Palevich <jackpal@google.com> Add accRegisterSymbolCallback API to control external symbol linkage.

Until now dlsym was used to lookup external symbols. Now you can
register your own function to be called when an undefined symbol is
used.
nclude/acc/acc.h
ibacc/acc.cpp
ibacc/tests/Android.mk
ibacc/tests/main.cpp
ibacc/tests/runtimeTest.cpp
fd3db48e2e066a36371fbd018082c7f5db8e37e5 15-Jul-2009 Jack Palevich <jackpal@google.com> Add test for passing floats and doubles as ints, floats, and doubles.
ibacc/tests/data/flops.c
ibacc/tests/test.py
37c54bd22e2ac5ca8601416701e14b546ce5b6f1 15-Jul-2009 Jack Palevich <jackpal@google.com> Make forward declarations of external symbols really work.

Until now we had always been treating external variables as "int",
and external functions as int (...);
ibacc/acc.cpp
ibacc/tests/data/rollo3.c
ibacc/tests/test.py
7ecc5556aee0145a48f096cb1e015034e59bc67a 15-Jul-2009 Jack Palevich <jackpal@google.com> Remove unused variable.
ibacc/acc.cpp
5e525099afbf5c1ca7d9c8862ab7ae402732a4c0 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7050

* changes:
Implement pointer arithmetic.
dc61060547e3dc15ca51d74167d75b1513da16ac 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7049

* changes:
Implement support for "char" local and global variables.
13ac7f6ceea6dc88467791a7434d911b78b9fbf9 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7048

* changes:
Implement general casts and pointer dereferencing.
c80b0a97989445aa890b519e26f3fa781ae5df5d 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7047

* changes:
Run tests on both ARM and x86
a8f427f60620d766b201c9a84c457fa5dbaf95d4 14-Jul-2009 Jack Palevich <jackpal@google.com> Implement pointer arithmetic.
ibacc/acc.cpp
ibacc/tests/data/pointers.c
ibacc/tests/test.py
25c0ccaed43e8ecd1827248890c57c97d0ce80c7 14-Jul-2009 Jack Palevich <jackpal@google.com> Implement support for "char" local and global variables.
ibacc/acc.cpp
ibacc/tests/data/char.c
ibacc/tests/test.py
45431bc2528246f829383abda8c2cd72c57fcb65 14-Jul-2009 Jack Palevich <jackpal@google.com> Implement general casts and pointer dereferencing.

Prior to this casts and pointer dereferencing were special-cased.
ibacc/acc.cpp
ibacc/tests/data/casts.c
ibacc/tests/test.py
59178c0a3d03294bd37a7e1ece1c6e0ef1570d90 13-Jul-2009 Jack Palevich <jackpal@google.com> Run tests on both ARM and x86
ibacc/tests/test.py
eced01b171d8b1c0c3183b3b54c6e229f94a5d4e 13-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 160d4b05: Merge change 6738 into donut

Merge commit '160d4b0509e4566930ef9af4f2b9d63b33aebee5'

* commit '160d4b0509e4566930ef9af4f2b9d63b33aebee5':
rootdir: Remove ip-up-vpn script, which is replaced by an executable.
160d4b0509e4566930ef9af4f2b9d63b33aebee5 13-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6738 into donut

* changes:
rootdir: Remove ip-up-vpn script, which is replaced by an executable.
4c8dee81eb094ca54ca249de76ce3777fa40ed7d 11-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6822

* changes:
nexus: Rollup update for nexus
feb63e9e6f2d7aed5f0f21347992218ed8acb9f4 10-Jul-2009 Mike Lockwood <lockwood@android.com> libnetutils: Add ifc_enable(), for enabling a network interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ibnetutils/ifc_utils.c
c4a895b7094461c98101924cf096680bfb7856f1 24-Jun-2009 San Mehat <san@google.com> nexus: Rollup update for nexus

nexus: Change field separator from : to ' '

Signed-off-by: San Mehat <san@google.com>

nexus: Add some prototypes for stuff to come

Signed-off-by: San Mehat <san@google.com>

nexus: Add some TODOs

Signed-off-by: San Mehat <san@google.com>

libsysutils: Put a proper token parser into the FrameworkListener which
supports minimal \ escapes and quotes

Signed-off-by: San Mehat <san@google.com>

nexus: Fix a lot of bugs

Signed-off-by: San Mehat <san@google.com>

libsysutils: Remove some debugging
Signed-off-by: San Mehat <san@google.com>

nexus: Send broadcasts for supplicant state changes

Signed-off-by: San Mehat <san@google.com>

nexus: Plumb DHCP listener state changes to NetworkManager

Signed-off-by: San Mehat <san@google.com>

nexus: Make the SupplicantState strings more parsable

Signed-off-by: San Mehat <san@google.com>

nexus: Broadcast a message when dhcp state changes.

Signed-off-by: San Mehat <san@google.com>

nexus: Add a few new response codes

Signed-off-by: San Mehat <san@google.com>

nexus: Rename ErrorCode -> ResponseCode

Signed-off-by: San Mehat <san@google.com>

nexus: Add DHCP event broadcasting. Also adds the framework for
tracking supplicant 'searching-for-AP' state

Signed-off-by: San Mehat <san@google.com>

nexus: REmove WifiScanner

Signed-off-by: San Mehat <san@google.com>

nexus: Change the way scanning works. scanmode can now be selected
independantly of triggering a scan. Also adds rxfilter support

Signed-off-by: San Mehat <san@google.com>

nexus: Add support for configuring bluetooth coexistence scanning and modes

Signed-off-by: San Mehat <san@google.com>

nexus: use case insensitive match for property names

Signed-off-by: San Mehat <san@google.com>

nexus: Rollup of a bunch of stuff:
- 'list' command now takes an argument to match against
- InterfaceConfig has been moved into the Controller base (for now)
- DhcpClient now has some rudimentry locking
- process 'ADDRINFO' messages from dhcpcd
- Drop tertiary dns

Signed-off-by: San Mehat <san@google.com>

nexus: Clean up some of the supplicant variable parsing and add 'wifi.current'

Signed-off-by: San Mehat <san@google.com>

nexus: Add driver-stop/start, initial suspend support

Signed-off-by: San Mehat <san@google.com>

nexus: Add Controller suspend/resume callbacks, as well as locking

Signed-off-by: San Mehat <san@google.com>

nexus: Make ARP probing configurable for DhcpClient

Signed-off-by: San Mehat <san@google.com>

nexus: Add linkspeed / rssi retrieval

Signed-off-by: San Mehat <san@google.com>

nexus: Add WifiStatusPoller to track RSSI/linkspeed when associated

Signed-off-by: San Mehat <san@google.com>

nexus: Disable some debugging and add 'wifi.netcount' property

Signed-off-by: San Mehat <san@google.com>

nexus: Replace the hackish property system with something more flexible with namespaces

Signed-off-by: San Mehat <san@google.com>

libsysutils: Fix a few bugs in SocketListener

Signed-off-by: San Mehat <san@google.com>

nexus: PropertyManager: Add array support

Signed-off-by: San Mehat <san@google.com>

nexus: Clean up properties
Signed-off-by: San Mehat <san@google.com>

nexus: WifiController: Change name of 'CurrentNetwork' property

Signed-off-by: San Mehat <san@google.com>
nclude/sysutils/SocketListener.h
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketListener.cpp
exus/Android.mk
exus/CommandListener.cpp
exus/Controller.cpp
exus/Controller.h
exus/DhcpClient.cpp
exus/DhcpClient.h
exus/DhcpEvent.cpp
exus/DhcpEvent.h
exus/DhcpListener.cpp
exus/DhcpListener.h
exus/DhcpState.cpp
exus/DhcpState.h
exus/ErrorCode.h
exus/IControllerHandler.h
exus/IDhcpEventHandlers.h
exus/IPropertyProvider.h
exus/ISupplicantEventHandler.h
exus/IWifiStatusPollerHandler.h
exus/InterfaceConfig.cpp
exus/InterfaceConfig.h
exus/LoopController.cpp
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/Property.cpp
exus/Property.h
exus/PropertyManager.cpp
exus/PropertyManager.h
exus/ResponseCode.h
exus/Supplicant.cpp
exus/Supplicant.h
exus/SupplicantState.cpp
exus/TiwlanWifiController.cpp
exus/VpnController.cpp
exus/VpnController.h
exus/WifiController.cpp
exus/WifiController.h
exus/WifiNetwork.cpp
exus/WifiNetwork.h
exus/WifiStatusPoller.cpp
exus/WifiStatusPoller.h
1219448dc7c2012edaf8fbb6b03c11d8dc419f89 09-Jul-2009 Chia-chi Yeh <chiachi@android.com> rootdir: Remove ip-up-vpn script, which is replaced by an executable.
ootdir/Android.mk
ootdir/etc/ppp/ip-up-vpn
2974d1fb8b0359c52765247aa2cd783e690e91de 10-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6741

* changes:
Implement floating point for ARM.
c4d1f677d7e1b43df7845b6d3ed7c72dbfe4a64e 10-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6740

* changes:
Add x86 floating point test.
b7718b973cefe74b3bdc221351145f657306e326 10-Jul-2009 Jack Palevich <jackpal@google.com> Implement floating point for ARM.
ibacc/acc.cpp
ibacc/tests/data/float.c
ibacc/tests/data/flops.c
ibacc/tests/test.py
dd8a23b774634880c49fbabd819cdc10397f4e43 10-Jul-2009 Mike Lockwood <lockwood@android.com> am 7bf68842: adb: Increment ADB_SERVER_VERSION

Merge commit '7bf68842d765ad7e6a51426b625d0de6d2331740'

* commit '7bf68842d765ad7e6a51426b625d0de6d2331740':
adb: Increment ADB_SERVER_VERSION
7bf68842d765ad7e6a51426b625d0de6d2331740 10-Jul-2009 Mike Lockwood <lockwood@android.com> adb: Increment ADB_SERVER_VERSION

It was pointed out that we should have done this when we added the "adb root" command.
And doing this will also force people to pick up the recent Linux USB serial number fix.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.h
bab80642035c2fe8565ccbadf18883b7d1df6437 09-Jul-2009 Jack Palevich <jackpal@google.com> Add x86 floating point test.
ibacc/acc.cpp
ibacc/tests/test.py
a0c0d8a89e1cd775d0ecf5a3df744d8ac0ccfc2f 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6658

* changes:
Finish implementing x86 floating point
2a4e1a9f88dd249047da6589a8a6a66b1c870e6d 09-Jul-2009 Jack Palevich <jackpal@google.com> Finish implementing x86 floating point

Support floating-point if/while statements: if(1.0) { ... }
Support reading values from float and double pointers.

And some additional error checking.
Detect malformed "return" statements
Detect passing the results of "void" functions as arguments.
ibacc/acc.cpp
ibacc/tests/data/float.c
ibacc/tests/data/flops.c
5b63399039c9c859c45926f89bc8ae216d914251 09-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge branch 'master' of git://android.git.kernel.org/platform/system/core into merge_korg_master

* 'master' of git://android.git.kernel.org/platform/system/core:
adb: Use correct language ID when retrieving USB serial number.
Fix typo in adb commandline help
Fix bug where ECONNABORTED would have always occured on asocket_write.
Helper to perform abortable blocking operations on a socket:
52dddc6149cde8e4bb2b3cbca53f77fcc4e62e95 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6597

* changes:
Implement x86 floating point operations
a39749f641f49ed1c6380bfaedad98a036a0f4a6 09-Jul-2009 Jack Palevich <jackpal@google.com> Implement x86 floating point operations

+ unary floating point operation -
+ unary floating point compare: !
+ binary floating point operations +-*/
+ binary floating point comparisons: < <= == != >= >
ibacc/acc.cpp
ibacc/tests/data/flops.c
de394b237210f1b9f4bba5fb2f8153a17d91b0cf 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6591

* changes:
set permissions for capella cm3602 proximity sensor
3306e0678c5e68c1b7e8d5c99499b7645e4952f3 08-Jul-2009 Iliyan Malchev <malchev@google.com> set permissions for capella cm3602 proximity sensor

Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
3338e5511402c395d0f771e16f92a7a95c0cab82 09-Jul-2009 Mike Lockwood <lockwood@android.com> am 48d116ed: init.rc: Fix commands for allowing the system_server to access wpa_supplicant.conf

Merge commit '48d116edf9c785ed284626cbe0bbf5c958cf5e67'

* commit '48d116edf9c785ed284626cbe0bbf5c958cf5e67':
init.rc: Fix commands for allowing the system_server to access wpa_supplicant.conf
48d116edf9c785ed284626cbe0bbf5c958cf5e67 09-Jul-2009 Mike Lockwood <lockwood@android.com> init.rc: Fix commands for allowing the system_server to access wpa_supplicant.conf

The touch command does not exist, and the chown commands are unnecessary because
the system_server is in the WIFI group.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ootdir/init.rc
eea5ae9cebf3d2fcdae7cfa669a4b0c7ca014bd3 09-Jul-2009 Marco Nelissen <marcone@google.com> Class with virtual methods should have virtual destructors too.
ibacc/acc.cpp
023931180c6de224154fae3797d178dcaf921336 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6551

* changes:
Implement global, local, and stack based float and double variables.
e86161de1a4f2bba686af7614a907edd3fafa801 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6550

* changes:
Implement x86 int <--> float.
9cbd22696039bce6a4692a7e378f126c6f44c6e4 09-Jul-2009 Jack Palevich <jackpal@google.com> Implement global, local, and stack based float and double variables.
ibacc/acc.cpp
ibacc/tests/data/float.c
128ad2d20497afb6ed1f2f11cfdae020f08f798c 08-Jul-2009 Jack Palevich <jackpal@google.com> Implement x86 int <--> float.
ibacc/acc.cpp
ibacc/tests/data/float.c
d773ff289e994246825449e5a9281bb0ba666406 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6498

* changes:
Some x86 floating point code works.
f0487502b138c140daa0d0ceb8109b78cbc9a91d 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6497

* changes:
Start tracking types in expressions.
1a539db23c90cc4b0e9c43bd37ee873fc34390dd 08-Jul-2009 Jack Palevich <jackpal@google.com> Some x86 floating point code works.

We now check the types and number of arguments to a function.
ibacc/acc.cpp
ibacc/tests/data/float.c
df3fb65e983bcad35e71ff28b70e774fafabbffc 08-Jul-2009 Kenny Root <kenny@the-b.org> am c989199c: Fix typo in adb commandline help

Merge commit 'c989199ccfbe745a7109f57d2aee2577d2f72b8d'

* commit 'c989199ccfbe745a7109f57d2aee2577d2f72b8d':
Fix typo in adb commandline help
dc9d52f35d6d590863b358997bf25605cf72be5f 08-Jul-2009 Mike Lockwood <lockwood@android.com> adb: Use correct language ID when retrieving USB serial number.

Fixes http://code.google.com/p/android/issues/detail?id=2609

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
c989199ccfbe745a7109f57d2aee2577d2f72b8d 08-Jun-2009 Kenny Root <kenny@the-b.org> Fix typo in adb commandline help

Android developers are not expected to have PDP-11s.
db/commandline.c
5089bd0a6e575a9692d9beaab2f0306454a7c701 08-Jul-2009 Mike Lockwood <lockwood@android.com> am 3d9b265b: adb: Use correct language ID when retrieving USB serial number.

Merge commit '3d9b265b7d34d886a2f44e486c25e402d7df791b'

* commit '3d9b265b7d34d886a2f44e486c25e402d7df791b':
adb: Use correct language ID when retrieving USB serial number.
3d9b265b7d34d886a2f44e486c25e402d7df791b 08-Jul-2009 Mike Lockwood <lockwood@android.com> adb: Use correct language ID when retrieving USB serial number.

Fixes http://code.google.com/p/android/issues/detail?id=2609

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/usb_linux.c
b77f6a1e0f662b527c3059755aafeda9351f3fe1 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6004

* changes:
Add aggregator test tag to list
8df4619e09b8944c1aa3b743b556a63a283d8768 07-Jul-2009 Jack Palevich <jackpal@google.com> Start tracking types in expressions.
ibacc/acc.cpp
32db7311bffb1a4921341b51e3df882f0b80d46a 07-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6323

* changes:
Parse floating point (and double) constants.
1816655869824cbb17db01bdcb928cfad95937cc 07-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6322

* changes:
Start teaching the code generator about types.
1aeb87b52b70a7c568713d1a6524645383c54507 07-Jul-2009 Jack Palevich <jackpal@google.com> Parse floating point (and double) constants.
ibacc/acc.cpp
9eed7a2c7b3748f4aa10e1dc60875bf72a18c275 07-Jul-2009 Jack Palevich <jackpal@google.com> Start teaching the code generator about types.

Remove the concept of "R1" from the code generator API, R1 is used
internally as needed.
ibacc/acc.cpp
73aaaac1044fe745158d0d5899bd8c7af8fe6806 07-Jul-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master_gl' into merge_master_gl
01f6d9397cac5314fc792f3e57f1bc28e4f9385d 06-Jul-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
192d1d79f72abb638495f51f8bbfba6ed8b013a8 06-Jul-2009 San Mehat <san@google.com> am b3edd072: vold: Change the disk formatter we use + fix commandline argument creation

Merge commit 'b3edd0720ea26ef02763e7446d1bafb85546b38e'

* commit 'b3edd0720ea26ef02763e7446d1bafb85546b38e':
vold: Change the disk formatter we use + fix commandline argument creation
151047a8003fb69077c8900f2cc4b6b9376ee04b 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6257

* changes:
resolved conflicts for merge of 72eead43 to master
c3109591d4a34d7802112706128db2bd451d853b 06-Jul-2009 San Mehat <san@google.com> resolved conflicts for merge of 72eead43 to master
32a0056ff2a968a8a259dacd5d75fd2c22611e92 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge changes 6249,6250

* changes:
Initial support for float, double.
Implement our hard casts using our type system.
a5c234ef0c83357b9b66d0fdfb31313750d37901 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6248

* changes:
Clean up expression code.
95727a0b057fb6d7117e70cf0e9621892ec781c3 06-Jul-2009 Jack Palevich <jackpal@google.com> Initial support for float, double.
ibacc/acc.cpp
ibacc/tests/data/double.c
b3edd0720ea26ef02763e7446d1bafb85546b38e 06-Jul-2009 San Mehat <san@google.com> vold: Change the disk formatter we use + fix commandline argument creation

Signed-off-by: San Mehat <san@google.com>
old/format.c
72eead43c7711ca97b2d7f578e6b8854a2856ce0 06-Jul-2009 San Mehat <san@google.com> toolbox: mkdosfs: Imported new 'newfs_msdos' updated disk formatter

Signed-off-by: San Mehat <san@google.com>
oolbox/Android.mk
oolbox/mkdosfs.c
oolbox/newfs_msdos.c
3bbaec5a7b7aea8a4e1bb5bde3e0b1d2bbc461c1 06-Jul-2009 Amith Yamasani <yamasani@google.com> am eefef323: Set the permissions of wifi supplicant file so that system can access it.

Merge commit 'eefef3234ae1e3b0f2db71415f134c7ec49899fa'

* commit 'eefef3234ae1e3b0f2db71415f134c7ec49899fa':
Set the permissions of wifi supplicant file so that system can access it.
3f22649d980717aa8bb0160c9a1d436bc813f05d 02-Jul-2009 Jack Palevich <jackpal@google.com> Implement our hard casts using our type system.

Doesn't add any new capabilities, but we now generate error
messages if you attempt casts we don't support,
and we also found and fixed some bugs in declaration parsing.
ibacc/acc.cpp
91217ca5cbbf3ca2a96d596713e79f072da2c491 02-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 5c49135b: Merge change 5852 into donut

Merge commit '5c49135b032235f82560d5e55b0e4c547506516b'

* commit '5c49135b032235f82560d5e55b0e4c547506516b':
rootdir: Modify init.rc to run mtpd/racoon as a non-root user.
eefef3234ae1e3b0f2db71415f134c7ec49899fa 02-Jul-2009 Amith Yamasani <yamasani@google.com> Set the permissions of wifi supplicant file so that system can access it.

Create the required directories and set the correct owner and permissions.
ootdir/init.rc
79258b8b5a74d804f877a03095d553bdd129cd9f 02-Jul-2009 San Mehat <san@google.com> am 9ad18f05: vold: Kill logspam

Merge commit '9ad18f0576f1945419d31b56fea6987210521c35'

* commit '9ad18f0576f1945419d31b56fea6987210521c35':
vold: Kill logspam
bfa833c0b74d922e13f8a7aaadcc091f77d83e45 02-Jul-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
04ac5881fa05fc64303c47a3b51e8ed40dc8f686 02-Jul-2009 Jim Miller <jaggies@google.com> Add aggregator test tag to list
ogcat/event-log-tags
40600de143c3f0f07e03c8f69cd3d32f49c123eb 02-Jul-2009 Jack Palevich <jackpal@google.com> Clean up expression code.

Concatenate adjacent string literals.
ibacc/acc.cpp
ibacc/tests/data/testStringConcat.c
ibacc/tests/test.py
2f0c41ec3c5f83a02a58242e175663bdd89a9467 01-Jul-2009 Dima Zavin <dima@android.com> am 383688b5: toolbox: Fix uninitalized stack variable in mount.

Merge commit '383688b52fb19b9c4d98bb1a660febc880d0e268'

* commit '383688b52fb19b9c4d98bb1a660febc880d0e268':
toolbox: Fix uninitalized stack variable in mount.
53e6808c96aae14d34b3225de22a33155f5c9d38 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 5e924468: Merge change 5662 into donut

Merge commit '5e924468cd80bfadd686515a5b4193594a2811eb'

* commit '5e924468cd80bfadd686515a5b4193594a2811eb':
toolbox: Revise route utility.
5c49135b032235f82560d5e55b0e4c547506516b 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5852 into donut

* changes:
rootdir: Modify init.rc to run mtpd/racoon as a non-root user.
bb1ae45195eb4a74185b0aeebf00ab6537a5e7e5 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5870

* changes:
Add a type system.
9ad18f0576f1945419d31b56fea6987210521c35 01-Jul-2009 San Mehat <san@google.com> vold: Kill logspam

Signed-off-by: San Mehat <san@google.com>
old/uevent.c
8635198c57b8a913f0f9d3b07139f8b2af7cb30f 01-Jul-2009 Jack Palevich <jackpal@google.com> Add a type system.

We now track the declared type of variables and functions.
ibacc/acc.cpp
51afbf583819f3bdfc96f3c66c9c3444803e792a 01-Jul-2009 Chia-chi Yeh <chiachi@android.com> rootdir: Modify init.rc to run mtpd/racoon as a non-root user.

Note that this change requires a new prebuilt kernel for AID_NET_ADMIN.
ootdir/init.rc
acc9a25ef745fce040e2e4e7adfa3d9e200aee99 30-Jun-2009 San Mehat <san@google.com> am 4322f2d7: init: Enable sched_yield() compatability mode on boot.

Merge commit '4322f2d74f625a0e8275ea1d2fa0d78bfc5c3029'

* commit '4322f2d74f625a0e8275ea1d2fa0d78bfc5c3029':
init: Enable sched_yield() compatability mode on boot.
f2a8d0a5223f8b9cb46b7a940aedde9b74e29f0b 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5749

* changes:
init now returns proper error codes in dmesg for write command (init.rc)
4fc5257c8c6812a3ddf8ecbded94883b074f87ec 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5784

* changes:
Implement a token table and an arena allocator.
569f135862b7a00a1ec59d1f000e376cef9648f5 29-Jun-2009 Jack Palevich <jackpal@google.com> Implement a token table and an arena allocator.

+ Tokens are now simple IDs, rather than ids or maybe pointers.
+ We can now allocate data that's freed automatically when
compilation end or when a block goes out of scope.
+ Renamed our Array utility class to Vector, and made its
api work a little more like the STL vector template class.
ibacc/acc.cpp
008abac082f1c098d402f944d9287dce67ffce0a 30-Jun-2009 Mike Chan <mike@android.com> init now returns proper error codes in dmesg for write command (init.rc)

Signed-off-by: Mike Chan <mike@android.com>
nit/builtins.c
3b84e4760b91fc3ccb4cda304f631767f41eed2a 30-Jun-2009 San Mehat <san@google.com> am 9f9c951a: vold: Force formatting of cards to FAT32

Merge commit '9f9c951ad3329a4d8bc84b48a2b125a67ba9979f'

* commit '9f9c951ad3329a4d8bc84b48a2b125a67ba9979f':
vold: Force formatting of cards to FAT32
fff1092b7111e2087e68c6b26061f5a038b5160b 30-Jun-2009 Chia-chi Yeh <chiachi@android.com> am 3860b6e6: rootdir: Obsolete ppp/peers/common and racoon/racoon.conf.

Merge commit '3860b6e67c72afceddf316c0a3282f53496de8af'

* commit '3860b6e67c72afceddf316c0a3282f53496de8af':
rootdir: Obsolete ppp/peers/common and racoon/racoon.conf.
60a4cd5e348ae263d209a7f64510826825848208 30-Jun-2009 repo sync <chiachi@android.com> resolved conflicts for merge of abb08550 to master
24f3a2fe8f4b63497654a774af11615cd70b4c2b 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am bbdab64d: Merge change 4592 into donut

Merge commit 'bbdab64ddd5341bb7f7c923bc86f43bdbc7d89dc'

* commit 'bbdab64ddd5341bb7f7c923bc86f43bdbc7d89dc':
rootdir: Remove gprs/pppd related scripts.
383688b52fb19b9c4d98bb1a660febc880d0e268 30-Jun-2009 Dima Zavin <dima@android.com> toolbox: Fix uninitalized stack variable in mount.

Signed-off-by: Dima Zavin <dima@android.com>
oolbox/mount.c
5e924468cd80bfadd686515a5b4193594a2811eb 29-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5662 into donut

* changes:
toolbox: Revise route utility.
4a1465fefff747bebcf95b61ad4598e2c5417de5 29-Jun-2009 Chia-chi Yeh <chiachi@android.com> toolbox: Revise route utility.

Add copyright header.
Returns errno when something goes wrong. Otherwise returns 0.
When the route entry exists, treat it as a success.
oolbox/route.c
4322f2d74f625a0e8275ea1d2fa0d78bfc5c3029 29-Jun-2009 San Mehat <san@google.com> init: Enable sched_yield() compatability mode on boot.

In CFS, the (somewhat undefined) behavior of sched_yield() changed.

See: http://kerneltrap.org/Linux/CFS_and_sched_yield

This change enables 'compat' mode for sched_yield()

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
9f9c951ad3329a4d8bc84b48a2b125a67ba9979f 27-Jun-2009 San Mehat <san@google.com> vold: Force formatting of cards to FAT32

Signed-off-by: San Mehat <san@google.com>
old/format.c
3860b6e67c72afceddf316c0a3282f53496de8af 27-Jun-2009 Chia-chi Yeh <chiachi@android.com> rootdir: Obsolete ppp/peers/common and racoon/racoon.conf.
ootdir/Android.mk
ootdir/etc/ppp/peers/common
ootdir/etc/racoon/racoon.conf
abb0855010a918747a199367d99b5ca5ade105e2 27-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4728 into donut

* changes:
Add device, property, directory, and file permissions for VPN.
bbdab64ddd5341bb7f7c923bc86f43bdbc7d89dc 27-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4592 into donut

* changes:
rootdir: Remove gprs/pppd related scripts.
a65044fad8d668fad71769555486254eee7b8dc3 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am a1140ad4: Merge change 5455 into donut

Merge commit 'a1140ad45dc90e6f51944a12d0a690e757c9bd0b'

* commit 'a1140ad45dc90e6f51944a12d0a690e757c9bd0b':
Add new PPP IPCP script for VPN.
a1140ad45dc90e6f51944a12d0a690e757c9bd0b 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5455 into donut

* changes:
Add new PPP IPCP script for VPN.
0e6146c0725b992e7cb90c5e6e4c9ccd2d853055 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5449

* changes:
init: set permissions for akm8973 and bma150 drivers
34ccf656e23038ca89dcacf29045c3e1a50639a0 26-Jun-2009 Hung-ying Tyan <tyanh@google.com> Add new PPP IPCP script for VPN.
ootdir/etc/ppp/ip-up-vpn
9a52eda8c5dd9df763a63f9b71cd24847f014737 26-Jun-2009 Iliyan Malchev <malchev@google.com> init: set permissions for akm8973 and bma150 drivers

akm8973 is the compass
bma150 is the accelerometer

Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
112ad560380cae228c6a41028d75721442235351 25-Jun-2009 San Mehat <san@google.com> am c3115b9e: vold: Logging to catch when the disk checker crashes (could happen due to a really messed up card)

Merge commit 'c3115b9ec2f9bc07e6ffd7d7bb7338415822c338'

* commit 'c3115b9ec2f9bc07e6ffd7d7bb7338415822c338':
vold: Logging to catch when the disk checker crashes
156f9c5e6bf59dfbea74e8e79e5f4a6eaad7b2ed 25-Jun-2009 San Mehat <san@google.com> am 1537d480: vold: Fix bug where logwrapper would pass data to LOG() in the format field, which caused vsprintf to process format characters in the string.

Merge commit '1537d4805ef98a385c61c659f0e778b7074bbbfe'

* commit '1537d4805ef98a385c61c659f0e778b7074bbbfe':
vold: Fix bug where logwrapper would pass data to LOG() in the format field,
760229900159104053fb433c243361c44b324072 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5408

* changes:
Rewrite compiler test using python.
609c994f7bd5bc78808cde0672baf2461d2d94f8 25-Jun-2009 Jack Palevich <jackpal@google.com> Rewrite compiler test using python.

Nice because we're now checking the output for success/failure
automatically rather than by eye.
ibacc/tests/test
ibacc/tests/test.py
ibacc/tests/testarm
ibacc/tests/testlocal
c3115b9ec2f9bc07e6ffd7d7bb7338415822c338 25-Jun-2009 San Mehat <san@google.com> vold: Logging to catch when the disk checker crashes
(could happen due to a really messed up card)

Signed-off-by: San Mehat <san@google.com>
old/volmgr_vfat.c
1537d4805ef98a385c61c659f0e778b7074bbbfe 25-Jun-2009 San Mehat <san@google.com> vold: Fix bug where logwrapper would pass data to LOG() in the format field,
which caused vsprintf to process format characters in the string.

Signed-off-by: San Mehat <san@google.com>
old/logwrapper.c
64e1c16cc58f1aa492c96a7078ee50220b00fece 25-Jun-2009 San Mehat <san@google.com> am e7f444f3: vold: Switch vfat fsck tools

Merge commit 'e7f444f32986f975b788ecf3962cb2cce27828e8'

* commit 'e7f444f32986f975b788ecf3962cb2cce27828e8':
vold: Switch vfat fsck tools
e7f444f32986f975b788ecf3962cb2cce27828e8 25-Jun-2009 San Mehat <san@google.com> vold: Switch vfat fsck tools

Signed-off-by: San Mehat <san@google.com>
old/volmgr_vfat.c
75530b509b4047fe33fd6d564d7fc82895dc9fe8 25-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
715c03a10b825dc7cae78f8a6da7a8956beefb8d 22-Jun-2009 San Mehat <san@google.com> am d6c67966: nexus: Rename onInterfaceStarted -> onInterfaceConnected and add Dhcp start/stop control

Merge commit 'd6c6796670a5e566977b13d542020fb8cc88e6cf'

* commit 'd6c6796670a5e566977b13d542020fb8cc88e6cf':
nexus: Rename onInterfaceStarted -> onInterfaceConnected and add Dhcp start/stop control
e61e50f42b8553d27a4cf41d3b45ade7db113631 22-Jun-2009 San Mehat <san@google.com> am 54962e0f: nexus: Add skeleton for DhcpClient

Merge commit '54962e0fd647f5f390269994c573f80c92f537d4'

* commit '54962e0fd647f5f390269994c573f80c92f537d4':
nexus: Add skeleton for DhcpClient
d6c6796670a5e566977b13d542020fb8cc88e6cf 22-Jun-2009 San Mehat <san@google.com> nexus: Rename onInterfaceStarted -> onInterfaceConnected and add Dhcp start/stop control

Signed-off-by: San Mehat <san@google.com>
exus/IControllerHandler.h
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/WifiController.cpp
54962e0fd647f5f390269994c573f80c92f537d4 22-Jun-2009 San Mehat <san@google.com> nexus: Add skeleton for DhcpClient

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
exus/DhcpClient.cpp
exus/DhcpClient.h
exus/DhcpListener.cpp
exus/DhcpListener.h
exus/DhcpState.h
exus/IDhcpEventHandlers.h
fda03b75629ab7d43d45fd38580f4e860046a85a 20-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
1ccef18e69acdc4276a6c4a0c449ced6be395fc3 30-May-2009 Masaki Sato <masaki.sato@motorola.com> Change permissions on sound devices.
nit/devices.c
9d0d888179e9d896e5b9ef0378b89143964025d7 17-Jun-2009 Wei Huang <weih@google.com> add kernel event logging tags for more gtalk/mcs logging (heartbeat resets and connection closed events)
ogcat/event-log-tags
88dc657d50cb3289a9011828c497eee996ed958c 19-Jun-2009 Chia-chi Yeh <chiachi@android.com> Add device, property, directory, and file permissions for VPN.
nclude/private/android_filesystem_config.h
nit/devices.c
nit/property_service.c
abd54c1b78983ce425250dba137e203b7020637e 18-Jun-2009 Chia-chi Yeh <chiachi@android.com> rootdir: Remove gprs/pppd related scripts.

vpn related scripts will be updated in the next change.
ootdir/Android.mk
ootdir/etc/init.gprs-pppd
ootdir/etc/ppp/chap-secrets
ootdir/etc/ppp/ip-down
ootdir/etc/ppp/ip-up
0af3e7fbc8ac66ff1d8bccbcdc759e80e4af2150 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4564

* changes:
Align ARM stack pointer to an 8-byte boundary when calling functions.
422972cb127c229a38e79bb5d2d8df44aebeeeea 18-Jun-2009 -b master <jackpal@google.com> Align ARM stack pointer to an 8-byte boundary when calling functions.

This is required by the ARM EABI standard.
ibacc/acc.cpp
ibacc/tests/main.cpp
f1d63f3751ca787b2ebe76b6680342aa1ff3ca49 18-Jun-2009 San Mehat <san@google.com> am bfa2f8e9: init: Bump up the max cpu bandwidth shares ratio for background.

Merge commit 'bfa2f8e9b506a4b710ebcefa7c1e324609b8ca34'

* commit 'bfa2f8e9b506a4b710ebcefa7c1e324609b8ca34':
init: Bump up the max cpu bandwidth shares ratio for background.
bfa2f8e9b506a4b710ebcefa7c1e324609b8ca34 17-Jun-2009 San Mehat <san@google.com> init: Bump up the max cpu bandwidth shares ratio for background.

New ratio is 1024/16 (1.5625% for background when cpu is under load)

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
d7166ede3bb2b04449da89078a7b19c29a964089 17-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4424

* changes:
fix decompression bug in fastboot
287c71ca84533da008e9cc240224910a9d05139e 17-Jun-2009 Doug Zongker <dougz@android.com> fix decompression bug in fastboot

fastboot passes the *uncompressed* length of the file as the length of
the input to the inflate() call, which happens to work unless the
compressed data is actually larger than the uncompressed data (which
it can be for very small files). Fix this to pass the correct
compressed length down to the inflate call.
ibzipfile/centraldir.c
ibzipfile/zipfile.c
1f80880124e10e9ab165d6a8634889b9823f3226 17-Jun-2009 San Mehat <san@google.com> am d0290ead: nexus: Fix SupplicantStatus decoding

Merge commit 'd0290eadc563f5a34fc1969f91621860d8756eff'

* commit 'd0290eadc563f5a34fc1969f91621860d8756eff':
nexus: Fix SupplicantStatus decoding
nexus: Less verbosity in TiwlanEventListener for now
f9764da0d9ad50196559714fbe767532f4501c42 17-Jun-2009 San Mehat <san@google.com> am 891cb2c1: nexus: Add TiwlanEventListener to makefile

Merge commit '891cb2c13505985532acb81d759841d86df15004'

* commit '891cb2c13505985532acb81d759841d86df15004':
nexus: Add TiwlanEventListener to makefile
nexus: Initialize frequency in SupplicantAssociatingEvent constructor
nexus: Add some logging output to WifiController
nexus: Add TiwlanEventListener for reading driver events directly
a10fd8df952885be8b24609d6847c343d50cebb7 16-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
d0290eadc563f5a34fc1969f91621860d8756eff 16-Jun-2009 San Mehat <san@google.com> nexus: Fix SupplicantStatus decoding

Signed-off-by: San Mehat <san@google.com>
exus/SupplicantStatus.cpp
052403ebbe0c5ee37bd31c882325238f92110baa 16-Jun-2009 San Mehat <san@google.com> nexus: Less verbosity in TiwlanEventListener for now

Signed-off-by: San Mehat <san@google.com>
exus/TiwlanEventListener.cpp
891cb2c13505985532acb81d759841d86df15004 16-Jun-2009 San Mehat <san@google.com> nexus: Add TiwlanEventListener to makefile

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
bbe92c370a614316d6320e8030b266f20b4fee0e 16-Jun-2009 San Mehat <san@google.com> nexus: Initialize frequency in SupplicantAssociatingEvent constructor

Signed-off-by: San Mehat <san@google.com>
exus/SupplicantAssociatingEvent.cpp
0f48658d2052560141448dc8f90adbbb0879bc0d 16-Jun-2009 San Mehat <san@google.com> nexus: Add some logging output to WifiController

Signed-off-by: San Mehat <san@google.com>
exus/WifiController.cpp
5fc4129fcb9609790e2d1d3a93c7d9de8dd94ccb 16-Jun-2009 San Mehat <san@google.com> nexus: Add TiwlanEventListener for reading driver events directly

Signed-off-by: San Mehat <san@google.com>
exus/TiwlanEventListener.cpp
exus/TiwlanEventListener.h
exus/TiwlanWifiController.cpp
exus/TiwlanWifiController.h
f8b8288c165166adcd09c4c28b099d583715a569 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 43c16197: Merge change 4228 into donut

Merge commit '43c16197b2a6da3a3125b4a4a9fa6b70f447043e'

* commit '43c16197b2a6da3a3125b4a4a9fa6b70f447043e':
Nexus: Clean up supplicant events, protocol, and continue plumbing
338df9da548644ee6d70c5da3af9be1a028d8a58 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 2d0a6ca2: Merge change 4227 into donut

Merge commit '2d0a6ca27c6f75eb0ec881fe4ad0b4f478d941c0'

* commit '2d0a6ca27c6f75eb0ec881fe4ad0b4f478d941c0':
nexctl: Refactor so Nexus can be tested from scripts easily.
libsysutils: Move to a null terminated string protocol using space as a field separator.
43c16197b2a6da3a3125b4a4a9fa6b70f447043e 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4228 into donut

* changes:
Nexus: Clean up supplicant events, protocol, and continue plumbing
2d0a6ca27c6f75eb0ec881fe4ad0b4f478d941c0 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4227 into donut

* changes:
nexctl: Refactor so Nexus can be tested from scripts easily.
12a26e310be16dd88422fb139ee4b27f8c8aecf5 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4226 into donut

* changes:
libsysutils: Move to a null terminated string protocol using space as a field separator.
3aff2d1de59972684bf2ab798351be5544158239 15-Jun-2009 San Mehat <san@google.com> Nexus: Clean up supplicant events, protocol, and continue plumbing

- Create SupplicantEvent classes for events
- New SupplicantEventFactory for creating events
- Extract Controller -> NetworkManager callbacks into IControllerHandler
- Move ScanResult handling from Supplicant -> WifiController
- Plumb more 'onConnected()' code
- Instead of re-creating NetworkList every-time, merge in
new entries
- Extract SupplicantListener -> Supplicant callbacks into
ISupplicantEventHandler
- Move SupplicantListener callback handling to WifiController
- Add unlocked version of lookupNetwork()
- Save supplicant config after setting a WifiNetwork variable
- Move property registration from WifiNetwork -> Supplicant
- Change wifi enable broadcast messages
- Add 3 new events: 'onAssociating', 'onAssociated', 'onConnectionTimeout'
- Add support for handling KeyManagement

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
exus/CommandListener.cpp
exus/CommandListener.h
exus/Controller.cpp
exus/Controller.h
exus/IControllerHandler.h
exus/ISupplicantEventHandler.h
exus/LoopController.cpp
exus/LoopController.h
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/OpenVpnController.cpp
exus/OpenVpnController.h
exus/PropertyManager.cpp
exus/Supplicant.cpp
exus/Supplicant.h
exus/SupplicantAssociatedEvent.cpp
exus/SupplicantAssociatedEvent.h
exus/SupplicantAssociatingEvent.cpp
exus/SupplicantAssociatingEvent.h
exus/SupplicantConnectedEvent.cpp
exus/SupplicantConnectedEvent.h
exus/SupplicantConnectionTimeoutEvent.cpp
exus/SupplicantConnectionTimeoutEvent.h
exus/SupplicantDisconnectedEvent.cpp
exus/SupplicantDisconnectedEvent.h
exus/SupplicantEvent.cpp
exus/SupplicantEvent.h
exus/SupplicantEventFactory.cpp
exus/SupplicantEventFactory.h
exus/SupplicantListener.cpp
exus/SupplicantListener.h
exus/SupplicantScanResultsEvent.cpp
exus/SupplicantScanResultsEvent.h
exus/SupplicantStateChangeEvent.cpp
exus/SupplicantStateChangeEvent.h
exus/SupplicantStatus.cpp
exus/SupplicantStatus.h
exus/TiwlanWifiController.cpp
exus/TiwlanWifiController.h
exus/VpnController.cpp
exus/VpnController.h
exus/WifiController.cpp
exus/WifiController.h
exus/WifiNetwork.cpp
exus/WifiNetwork.h
exus/main.cpp
669a7011e7e23c0594242465caa15b46b92aa340 15-Jun-2009 San Mehat <san@google.com> nexctl: Refactor so Nexus can be tested from scripts easily.

Also adds 'monitor' mode for monitoring broadcasts

Signed-off-by: San Mehat <san@google.com>
exus/nexctl.c
c73a3a5771a2d29d1bae666bfde12f751d66fc96 15-Jun-2009 San Mehat <san@google.com> libsysutils: Move to a null terminated string protocol using space as a field separator.

Also removes some debugging

Signed-off-by: San Mehat <san@google.com>
nclude/sysutils/FrameworkCommand.h
nclude/sysutils/FrameworkListener.h
ibsysutils/src/FrameworkCommand.cpp
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
6df2e9fc2e04fc1e908935190837675d6f7599a6 15-Jun-2009 Mike Chan <mike@android.com> am d709b582: remove 3G timeout values from init.rc, this should be device specific

Merge commit 'd709b582604e7f9d53b97f9ae13c5e12b2466c56'

* commit 'd709b582604e7f9d53b97f9ae13c5e12b2466c56':
remove 3G timeout values from init.rc, this should be device specific
ba4dea81206afddfcebcb26728dbe4be35e4453a 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge changes 4101,4102

* changes:
Allow local variables to be declared anywhere in a block.
Support variable initialization.
a1804ddebaf8f54f922716dcfe83d9726dd18493 12-Jun-2009 Jack Palevich <jackpal@google.com> Allow local variables to be declared anywhere in a block.
ibacc/acc.cpp
d7461a7342e706bece657172799ea8db9a104237 12-Jun-2009 Jack Palevich <jackpal@google.com> Support variable initialization.

Global variables can only be initialized to integer constants.

Local variables can be initialized to arbitrary expressions.
ibacc/acc.cpp
b96ebd7ef928b82e9c4cf1d943cc002c25c3ca7e 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4092

* changes:
Reserve all C99 keywords.
d709b582604e7f9d53b97f9ae13c5e12b2466c56 12-Jun-2009 Mike Chan <mike@android.com> remove 3G timeout values from init.rc, this should be device specific

Signed-off-by: Mike Chan <mike@android.com>
ootdir/init.rc
f1728bec74f952763a02a4c7d38c33b20d700870 12-Jun-2009 Jack Palevich <jackpal@google.com> Reserve all C99 keywords.

And improve checks/error messages around using non-symbols where a
symbol is expected.
ibacc/acc.cpp
5a5b16cf7f3eb6845815be60f7bdc4c2bcf896a3 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4084

* changes:
Handle end-of-file inside of comments, local declarations.
22e3e8e1a63ba947cae52e143f650df679fd46ba 12-Jun-2009 Jack Palevich <jackpal@google.com> Handle end-of-file inside of comments, local declarations.
ibacc/acc.cpp
befe95bfed544ee698911e4cd410674732f1a7ee 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4081

* changes:
Implement string and character backslash constants.
b4758ff1defaf01f381bce1630607ad1763f72ec 12-Jun-2009 Jack Palevich <jackpal@google.com> Implement string and character backslash constants.

Until now we only supported '\n'. Now we support everything, including
octal ('\033') and hex '\x27' constants.
ibacc/acc.cpp
ibacc/tests/data/constants.c
7829ec0b773b62c0ac65c7946ac21d12cfbfe649 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4072

* changes:
Make #define work again. (Had accidentally omitted the keyword.)
2ccc40d096ef18ca595f95c6c52532400be34807 12-Jun-2009 Jack Palevich <jackpal@google.com> Make #define work again. (Had accidentally omitted the keyword.)
ibacc/acc.cpp
01fa704538c255f497b4af861a8330eed0262de2 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 47c1d734: Merge change 4051 into donut

Merge commit '47c1d7344ab183f5440843f6b594d1b74a2335b0'

* commit '47c1d7344ab183f5440843f6b594d1b74a2335b0':
vold: Give logwrapper the ability to put jobs into the background sched group.
9862028d79f8cd29dc69d87f3f5dbd393476bafc 12-Jun-2009 Chung-yih Wang <cywang@google.com> am 0bd9a9f5: Add the ipcp scripts for pppd and racoon configuration for ipsec-tools.

Merge commit '0bd9a9f5bcaefda8d7d37c9383b004b516009b85'

* commit '0bd9a9f5bcaefda8d7d37c9383b004b516009b85':
Add the ipcp scripts for pppd and racoon configuration for ipsec-tools.
3b7daf60fcd5e47dbd0b08784645c5bdf80c1b62 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4067

* changes:
Improve symbol-related error checking
4da9e183bceab60928b62f26b938f7af0f7509e5 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4066

* changes:
Improve nested variable test.
a6baa23f0831f98e84ee4afbfb6cdb3ac5c1f5ea 12-Jun-2009 Jack Palevich <jackpal@google.com> Improve symbol-related error checking

+ Duplicate symbols.
+ Undefined variables;
+ Forward-referenced functions that were never defined.
ibacc/acc.cpp
ibacc/tests/data/locals.c
38e264915c97c6bbb9f04b3250bc26e4c6294002 12-Jun-2009 The Android Open Source Project <initial-contribution@android.com> merged 2cf6cff71f36b76e816a7a90c66f4b04c71e8278 w/minor conflict
47c1d7344ab183f5440843f6b594d1b74a2335b0 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4051 into donut

* changes:
vold: Give logwrapper the ability to put jobs into the background sched group.
825c27d239e5bcf3c8b2cb99c320f0b1836ef338 12-Jun-2009 San Mehat <san@google.com> vold: Give logwrapper the ability to put jobs into the background sched group.

Also set disk check/format execution to background.

Signed-off-by: San Mehat <san@google.com>
old/format.c
old/logwrapper.c
old/logwrapper.h
old/volmgr_ext3.c
old/volmgr_vfat.c
0bd9a9f5bcaefda8d7d37c9383b004b516009b85 12-Jun-2009 Chung-yih Wang <cywang@google.com> Add the ipcp scripts for pppd and racoon configuration for ipsec-tools.

1. add ip-up/ip-down script
2. add /etc/ppp/peers/common
3. add /etc/racoon/racoon.conf
ootdir/Android.mk
ootdir/etc/ppp/ip-down
ootdir/etc/ppp/ip-up
ootdir/etc/ppp/peers/common
ootdir/etc/racoon/racoon.conf
7490e4b170c7ca98146771ba72aab94131c33844 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 34c34267: Merge change 3951 into donut

Merge commit '34c342677e4ffb57584d571d8996822bf4d879ef'

* commit '34c342677e4ffb57584d571d8996822bf4d879ef':
Revert "adb: Workaround for adb disconnect problem."
61d22dc763af7c1528ddf8a30054015a9b299e73 12-Jun-2009 Jack Palevich <jackpal@google.com> Improve nested variable test.

Test that we can have two levels of local variables.
ibacc/tests/data/locals.c
b67b18f7c2217ae83e9ffc808cb9a58b233ec5bc 12-Jun-2009 Jack Palevich <jackpal@google.com> Add code generator tracer.
ibacc/acc.cpp
303d8ffca9c508a6b25408fc3b2e80ead252e1ed 12-Jun-2009 Jack Palevich <jackpal@google.com> Improve local variable scoping.

Until now we faked local variables -- they only worked correctly if
there was no overlap between local variables and global variables.

Use a symbol table stack instead of a string list.

Fix bug with looking up undefined symbols.
ibacc/Android.mk
ibacc/acc.cpp
ibacc/tests/Android.mk
ibacc/tests/data/expr-ansi.c
ibacc/tests/data/expr2.c
ibacc/tests/data/locals.c
ibacc/tests/data/otcc-ansi.c
ibacc/tests/testlocal
2cf6cff71f36b76e816a7a90c66f4b04c71e8278 12-Jun-2009 Dan Egnor <egnor@google.com> Add a note to event-log-tags listing the log tag range
reserved for partner use, etc..
ogcat/event-log-tags
34c342677e4ffb57584d571d8996822bf4d879ef 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3951 into donut

* changes:
Revert "adb: Workaround for adb disconnect problem."
02d40b51c6d9f9dfc91f7d3b17a1f4f6db1ea972 11-Jun-2009 Mike Lockwood <lockwood@android.com> Revert "adb: Workaround for adb disconnect problem."

This reverts commit e38a31e305b0944c0cd1ae782e47e3145d731f0f.

This change had the unfortunate side effect of breaking ctrl-C
when executing "adb shell <command>"

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/services.c
2db168f12feb0e25209b4aee385af074ef87157a 11-Jun-2009 Jack Palevich <jackpal@google.com> Use a separate table for keywords.
ibacc/acc.cpp
ibacc/tests/main.cpp
0a280a0dde38444398da102c17f260270a0a4c4e 11-Jun-2009 Jack Palevich <jackpal@google.com> Remove use of setjmp/longjmp from libacc compiler.

It makes it harder to deal with memory allocation.

Also fix bug in the otcc-ansi.c test, where the wrong part of the
code buffer was being mprotected, so that if the code buffer happened
to be allocated across a page boundary, some code would no receive
execute permission.
ibacc/acc.cpp
ibacc/tests/data/otcc-ansi.c
6f5fb6fda101cac4208e4caecee0f70680e2d996 10-Jun-2009 San Mehat <san@google.com> am 3d6f16e5: init.rc: Set default cpu shares for background scheduler group to < 1%

Merge commit '3d6f16e5edc9834b13a0bcc8a33c98e25518d919'

* commit '3d6f16e5edc9834b13a0bcc8a33c98e25518d919':
init.rc: Set default cpu shares for background scheduler group to < 1%
3d6f16e5edc9834b13a0bcc8a33c98e25518d919 10-Jun-2009 San Mehat <san@google.com> init.rc: Set default cpu shares for background scheduler group to < 1%

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
1d36696821cd81ed7b668bb9d2b0b8a43540ccd2 06-May-2009 Jaikumar Ganesh <jaikumar@google.com> Bluez4 changes

Rename hcid to bluetoothd and change permissions.
nclude/private/android_filesystem_config.h
ootdir/init.rc
61cd81dd8d7075f79b482315cd465991c08da68d 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3537

* changes:
Add tag for AggregationService.
607e5dd69baab84e8d9d297ba5b7b1414c088a92 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3645

* changes:
Make otcc code work in x64 based system with 32-bit chroot.
5b533bea522c31d281d4644b63c86ad01fb0e26d 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3499

* changes:
Make a host version of acc for testing.
268eec1e5e256fbeb232dc7c236549c92095d9a8 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3498

* changes:
Move macros into their own table.
8dc662efe9e0c820eb001d66315bc32b2358fc57 10-Jun-2009 Jack Palevich <jackpal@google.com> Make otcc code work in x64 based system with 32-bit chroot.

Set execute permission on code before running it.
Handle negative relative offsets for global variables.
Add printfs to report the progress of nested compiles.
Change way we detect whether we can run the host compiler
or not. We used to check if we were running on a 32-bit
Linux. Now we check if the executable is a 32-bit Linux
executable.
ibacc/acc.cpp
ibacc/tests/data/otcc-ansi.c
ibacc/tests/data/otcc.c
ibacc/tests/data/returnval-ansi.c
ibacc/tests/data/returnval.c
ibacc/tests/testlocal
720f08f3ffb27084f2a9c98d661dae53d7191ebf 09-Jun-2009 Dmitry Shmidt <dimitrysh@google.com> Add /config mounting point

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ootdir/init.rc
50900772ed37826e2320716a4fa0aa92e903a9b1 09-Jun-2009 Chung-yih Wang <cywang@google.com> am 1f75d709: Add VPN and Keystore services and data directories.

Merge commit '1f75d709c10f49d2e2390b888e766bcfd17da860'

* commit '1f75d709c10f49d2e2390b888e766bcfd17da860':
Add VPN and Keystore services and data directories.
1f75d709c10f49d2e2390b888e766bcfd17da860 01-Jun-2009 Chung-yih Wang <cywang@google.com> Add VPN and Keystore services and data directories.

-- changed the default mode to 0770 for keystore with the new user 'keystore'.
-- add the keystore service providing the basic key lookup/install/remove, but
only keystore user can access the key content.
nclude/private/android_filesystem_config.h
ootdir/init.rc
cae5f6aa21f86b3253d44f5d95ea4067726753b3 09-Jun-2009 Jim Miller <jaggies@google.com> Add tag for AggregationService.
ogcat/event-log-tags
36d9414f72b629dacc2c972e93d16cec08ef44b6 09-Jun-2009 Jack Palevich <jackpal@google.com> Make a host version of acc for testing.

Don't run the code we've compiled unless the -R option is present.
ibacc/Android.mk
ibacc/acc.cpp
ibacc/tests/Android.mk
ibacc/tests/data/returnval-ansi.c
ibacc/tests/main.cpp
ibacc/tests/testarm
ibacc/tests/testlocal
2d11dfba277b2f9d98f00a32510d612e779ba757 08-Jun-2009 Jack Palevich <jackpal@google.com> Move macros into their own table.

Catch attempts to define macros with parens (not supported.)
ibacc/Android.mk
ibacc/acc.cpp
417a3235350b2bb016625f40ffb22c356a51f046 08-Jun-2009 Kenny Root <kenny@the-b.org> Fix typo in adb commandline help

Android developers are not expected to have PDP-11s.
db/commandline.c
ce51b3b55f3facfce5dccebc73bd1903e163103e 07-Jun-2009 Mathias Agopian <mathias@google.com> break dependency on utils/Endian.h
nclude/private/pixelflinger/ggl_context.h
65adbbb3d86f4725c2a6efe1bf9b5fa878b4593f 06-Jun-2009 Christopher Tate <ctate@google.com> am 17df71e0: Add an OOM adjustment category for apps undergoing backup

Merge commit '17df71e0b277372de1d915c168c07c8877e82395'

* commit '17df71e0b277372de1d915c168c07c8877e82395':
Add an OOM adjustment category for apps undergoing backup
17df71e0b277372de1d915c168c07c8877e82395 06-Jun-2009 Christopher Tate <ctate@google.com> Add an OOM adjustment category for apps undergoing backup

In this initial commit, apps undergoing backup are treated equivalently
to apps hosting services: more important than anything other than the
foreground app.
ootdir/init.rc
af20325a459c7446e3c41da243621bae111db001 06-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
b7c81e99522fbc5256f20e826eae18f2a33ea76a 05-Jun-2009 Jack Palevich <jackpal@google.com> Switch to ANSI C style C function declarations.

main(argc, argv) --> int main(int argc, char** argv)

Although we accept int, void, and char types, and pointers to same,
we actually still treat everything as an int.
ibacc/acc.cpp
ibacc/tests/data/otcc-ansi.c
ibacc/tests/data/returnval-ansi.c
ibacc/tests/main.cpp
ibacc/tests/testarm
ibacc/tests/testlocal
eedf9d20832f1af3a4bd362819be6eace54240b5 05-Jun-2009 Jack Palevich <jackpal@google.com> Add support for #pragma foo(bar)

Report unsupported/unknown preprocessor directives.
Report line number of error rather than character offset.
nclude/acc/acc.h
ibacc/acc.cpp
ibacc/tests/data/otcc-noinclude.c
ibacc/tests/data/returnval.c
ibacc/tests/main.cpp
ibacc/tests/testlocal
f4c94943a902550143027e0002bb569f9855c7b2 03-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 87657782: Merge change 3008 into donut

Merge commit '876577823d7679fa18f175405ce77e5257161e3a'

* commit '876577823d7679fa18f175405ce77e5257161e3a':
adb: Workaround for adb disconnect problem.
876577823d7679fa18f175405ce77e5257161e3a 03-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3008 into donut

* changes:
adb: Workaround for adb disconnect problem.
e38a31e305b0944c0cd1ae782e47e3145d731f0f 03-Jun-2009 Mike Lockwood <lockwood@android.com> adb: Workaround for adb disconnect problem.

For non-interactive adb shell commands, batch USB writes into 4K chunks
instead of sending small packets of data as they come in.
Add a timeout so we do not block for more than 200ms when our 4K buffer is partially full.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/services.c
49ef8664e4fe02faf43965a06137617abd8c3169 03-Jun-2009 The Android Open Source Project <initial-contribution@android.com> am 47e234fa: Merge commit \'66e4691ad097cfc37bdb7d3b1705ee9132f3234e\' into donut

Merge commit '47e234fa73116937855eaaaed4bc0ee27f87c971'

* commit '47e234fa73116937855eaaaed4bc0ee27f87c971':
AI 149490: Add support for 3rd party USB Vendor.
47e234fa73116937855eaaaed4bc0ee27f87c971 03-Jun-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit '66e4691ad097cfc37bdb7d3b1705ee9132f3234e' into donut
66e4691ad097cfc37bdb7d3b1705ee9132f3234e 02-Jun-2009 Xavier Ducrohet <nobody@android.com> AI 149490: Add support for 3rd party USB Vendor.
BUG=1890147

Automated import of CL 149490
db/Android.mk
db/adb.c
db/adb.h
db/adb_client.c
db/transport_usb.c
db/usb_osx.c
db/usb_vendors.c
db/usb_vendors.h
efc0c13b522ce33252bff02048c2bff9cd95658f 02-Jun-2009 San Mehat <san@google.com> am f754f740: Revert "Mount SD card synchronous. This is an experimental change intended to"

Merge commit 'f754f740a3e06212836f7465001edb0fe5157ba8'

* commit 'f754f740a3e06212836f7465001edb0fe5157ba8':
Revert "Mount SD card synchronous. This is an experimental change intended to"
c4c8d0ec3fcfbd9cf69152fba12ce248db989aa5 02-Jun-2009 San Mehat <san@google.com> am 21e90f0e: nexus: Validate that priority and KeyManagement are set before enabling a network

Merge commit '21e90f0e10b5a75e583b10799c0084ddab3433d6'

* commit '21e90f0e10b5a75e583b10799c0084ddab3433d6':
nexus: Validate that priority and KeyManagement are set before enabling a network
e0853557352c7c380a4d0fd1e3d9ba12618f93bc 02-Jun-2009 San Mehat <san@google.com> am 78828ff4: nexus: Use interface for handling Supplicant events

Merge commit '78828ff4f5f959fcf8066ecb6a6b689d2a3c5985'

* commit '78828ff4f5f959fcf8066ecb6a6b689d2a3c5985':
nexus: Use interface for handling Supplicant events
nexus: Remove dependancy on libutil
f754f740a3e06212836f7465001edb0fe5157ba8 02-Jun-2009 San Mehat <san@google.com> Revert "Mount SD card synchronous. This is an experimental change intended to"

This reverts commit 23eaecf02dedf0a5a25e1cdbfdfc7b8c70c17a56.
old/volmgr_vfat.c
21e90f0e10b5a75e583b10799c0084ddab3433d6 01-Jun-2009 San Mehat <san@google.com> nexus: Validate that priority and KeyManagement are set before enabling a network

Signed-off-by: San Mehat <san@google.com>
exus/WifiNetwork.cpp
exus/WifiNetwork.h
78828ff4f5f959fcf8066ecb6a6b689d2a3c5985 01-Jun-2009 San Mehat <san@google.com> nexus: Use interface for handling Supplicant events

Signed-off-by: San Mehat <san@google.com>
exus/ISupplicantEventHandler.h
exus/Supplicant.h
exus/SupplicantListener.cpp
exus/SupplicantListener.h
37629255e95c0800ee0555042a0b6dea38efc5fe 01-Jun-2009 San Mehat <san@google.com> nexus: Remove dependancy on libutil

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
baf83e0250353031bc6c32ddebee0fa1502a470a 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 3f627205: Merge change 2875 into donut

Merge commit '3f6272056275a00c30c07394d63bbe81cc9c5eba'

* commit '3f6272056275a00c30c07394d63bbe81cc9c5eba':
Added ashmem_get_size_region() function.
3f6272056275a00c30c07394d63bbe81cc9c5eba 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2875 into donut

* changes:
Added ashmem_get_size_region() function.
f6243df747ad4c5ad823c23a756bbfac90504df9 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 8b48cf61: Merge change 2897 into donut

Merge commit '8b48cf61704bbd1cd6e672fe73d8491f8984b484'

* commit '8b48cf61704bbd1cd6e672fe73d8491f8984b484':
fix 1650170 pixelflinger depends on KeyedVector.h, etc
8b48cf61704bbd1cd6e672fe73d8491f8984b484 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2897 into donut

* changes:
fix 1650170 pixelflinger depends on KeyedVector.h, etc
7be52b1a0e052635b361f9d8c186adbbcc981b7e 02-Jun-2009 Bjorn Bringert <bringert@android.com> Added ashmem_get_size_region() function.

This is needed by the MemoryFile changes in
https://android-git.corp.google.com/g/2714
where it is used to find out whether a file descriptor
refers to an ashmem region.
nclude/cutils/ashmem.h
ibcutils/ashmem-dev.c
ibcutils/ashmem-host.c
006ba85e981d66ecf262a0ba0b2a6160b1923f24 02-Jun-2009 Mathias Agopian <mathias@google.com> fix 1650170 pixelflinger depends on KeyedVector.h, etc
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/CodeCache.h
ibpixelflinger/tinyutils/Errors.h
ibpixelflinger/tinyutils/SortedVector.h
ibpixelflinger/tinyutils/Vector.h
7c5e61394069f6351cb518fbfd6a89e8c2eda1bf 01-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
cbc92d014b39b01d767571c631f564658c6356ec 01-Jun-2009 San Mehat <san@google.com> am 3c5a6f0b: nexus: Refactor some of the create/remove network path and add code for retrieving network lists from supplicant nexus: Rework properties nexus: Implement wifi network enable/disable and add some error checking nexus: Add some TODOs nexus: Whitespace cleanup nexus: Add bindings between controllers and network interfaces nexus: Add properties for InterfaceConfig nexus: Fix a few conversion bugs in InterfaceConfig

Merge commit '3c5a6f0bc8aefc4dacab8e95ba9017a7ac7d91f5'

* commit '3c5a6f0bc8aefc4dacab8e95ba9017a7ac7d91f5':
nexus: Refactor some of the create/remove network path and add code for
9b8c28ab443feb706a88811cd95963f01ed57488 01-Jun-2009 San Mehat <san@google.com> am 192331d9: nexus: Add ListCmd to CommandListener

Merge commit '192331d9060763b92f7989124bedbd136689d735'

* commit '192331d9060763b92f7989124bedbd136689d735':
nexus: Add ListCmd to CommandListener
ae41f613b88b9e09b69fc16334747e5faf99bc17 01-Jun-2009 San Mehat <san@google.com> am 03f0d27f: libsysutils: Fix command argument passing bug + whitespace cleanup

Merge commit '03f0d27f6c49530a91402ed42f8ca4b2fda04b9f'

* commit '03f0d27f6c49530a91402ed42f8ca4b2fda04b9f':
libsysutils: Fix command argument passing bug + whitespace cleanup
89ac364c54cca39892a342150f4f82c0636f959f 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of utils/executablepath.h, which now lives in the simulator
db/get_my_path_darwin.c
astboot/util_osx.c
e26cbeacaf69cb1698b4353d72adf057b2d6bcc8 31-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
f1f39cca305f6f3d2d91b88736b7b2b520d59e2e 30-May-2009 Jack Palevich <jackpal@google.com> Make sure we don't overflow various internal compiler buffers.

We may replace some of these tables with dynamically growing data
structures, but in the meantime we will not trash memory.
ibacc/acc.cpp
fa5bf90831dbf7a650eb318e2171a25731743104 22-May-2009 Nick Pelly <npelly@google.com> Fix bug where ECONNABORTED would have always occured on asocket_write.

Use POLLOUT for writes. Duh.
ibcutils/abort_socket.c
260f48a917c9ff439fc2db2e3492be643d189d22 20-May-2009 Nick Pelly <npelly@google.com> Helper to perform abortable blocking operations on a socket:
asocket_connect()
asocket_accept()
asocket_read()
asocket_write()
These calls are similar to the regular syscalls, but can be aborted with:
asocket_abort()

Calling close() on a regular POSIX socket does not abort blocked syscalls on
that socket in other threads.

After calling asocket_abort() the socket cannot be reused.

Call asocket_destory() *after* all threads have finished with the socket to
finish closing the socket and free the asocket structure.

The helper is implemented by setting the socket non-blocking to initiate
syscalls connect(), accept(), read(), write(), then using a blocking poll()
on both the primary socket and a local pipe. This makes the poll() abortable
by writing a byte to the local pipe in asocket_abort().

asocket_create() sets the fd to non-blocking mode. It must not be changed to
blocking mode.

Using asocket will triple the number of file descriptors required per
socket, due to the local pipe. It may be possible to use a global pipe per
process rather than per socket, but we have not been able to come up with a
race-free implementation yet.

All functions except asocket_init() and asocket_destroy() are thread safe.
nclude/cutils/abort_socket.h
ibcutils/Android.mk
ibcutils/abort_socket.c
3c5a6f0bc8aefc4dacab8e95ba9017a7ac7d91f5 23-May-2009 San Mehat <san@google.com> nexus: Refactor some of the create/remove network path and add code for
retrieving network lists from supplicant
nexus: Rework properties
nexus: Implement wifi network enable/disable and add some error checking
nexus: Add some TODOs
nexus: Whitespace cleanup
nexus: Add bindings between controllers and network interfaces
nexus: Add properties for InterfaceConfig
nexus: Fix a few conversion bugs in InterfaceConfig

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
exus/CommandListener.cpp
exus/CommandListener.h
exus/Controller.cpp
exus/Controller.h
exus/ErrorCode.h
exus/IPropertyProvider.h
exus/InterfaceConfig.cpp
exus/InterfaceConfig.h
exus/LoopController.cpp
exus/LoopController.h
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/NexusCommand.cpp
exus/NexusCommand.h
exus/OpenVpnController.cpp
exus/OpenVpnController.h
exus/Property.h
exus/PropertyCollection.h
exus/PropertyManager.cpp
exus/PropertyManager.h
exus/ScanResult.cpp
exus/ScanResult.h
exus/Supplicant.cpp
exus/Supplicant.h
exus/SupplicantEvent.cpp
exus/SupplicantEvent.h
exus/SupplicantListener.cpp
exus/SupplicantListener.h
exus/SupplicantState.cpp
exus/SupplicantState.h
exus/TiwlanWifiController.cpp
exus/TiwlanWifiController.h
exus/VpnController.cpp
exus/VpnController.h
exus/WifiController.cpp
exus/WifiController.h
exus/WifiNetwork.cpp
exus/WifiNetwork.h
exus/WifiScanner.cpp
exus/WifiScanner.h
exus/main.cpp
exus/nexctl.c
192331d9060763b92f7989124bedbd136689d735 22-May-2009 San Mehat <san@google.com> nexus: Add ListCmd to CommandListener

Signed-off-by: San Mehat <san@google.com>

nexus: Add InterfaceConfig and flesh out some more flow

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
exus/CommandListener.cpp
exus/CommandListener.h
exus/InterfaceConfig.cpp
exus/InterfaceConfig.h
exus/NetworkManager.cpp
exus/NetworkManager.h
03f0d27f6c49530a91402ed42f8ca4b2fda04b9f 27-May-2009 San Mehat <san@google.com> libsysutils: Fix command argument passing bug + whitespace cleanup

Signed-off-by: San Mehat <san@google.com>
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
ac0e95eb60fc8f8ef3281f9183630d1515bd12a7 29-May-2009 Jack Palevich <jackpal@google.com> Improve ACC error reporting.

Now return an error code and an error message, rather than just
printing to stderr or calling exit().

Check to see we don't exceed our code size.
ibacc/acc.cpp
ibacc/tests/data/error.c
ibacc/tests/main.cpp
653f42da9249a2f576d1ff50ee22bf6a67ff90b1 29-May-2009 Jack Palevich <jackpal@google.com> Pointer-ize the acc front end.

The ACC compiler used to be able to compile itself. This was a neat
feature, but because ACC only supports ints, pointers are stored as
ints, and cast to pointers when used.

This checkin turns many ints that are really pointers back into
pointers, so that the code is clearer.

int ch;
char* glo;
char* sym_stack;
char* dstk;
char* dptr;
int dch;
char* last_id;
ibacc/acc.cpp
730c8d7c03bbe384a1bc66aac357e97c06c7d64e 29-May-2009 David 'Digit' Turner <digit@google.com> am ebefc48e: Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>

Merge commit 'ebefc48e61a7d5cf2a3228e6c8729feeeb42d1b4'

* commit 'ebefc48e61a7d5cf2a3228e6c8729feeeb42d1b4':
Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>
ebefc48e61a7d5cf2a3228e6c8729feeeb42d1b4 29-May-2009 David 'Digit' Turner <digit@google.com> Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>

This is in order to expose the correponding functions in the 1.5 Native Development Kit, to allow
applicative native code to send messages to the log.
nclude/android/log.h
nclude/cutils/logd.h
1edfd382ba69ff96ebd0220b05b134a90b910ea7 27-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
09555c7a18342390556132f7d050a410d02206ef 27-May-2009 Jack Palevich <jackpal@google.com> Fix symbol lookup logic, squelch LOG output.
ibacc/acc.cpp
0675ba5bd408b763cede360f945b01c15370d4c2 27-May-2009 Iliyan Malchev <malchev@google.com> am fc0182eb: add support and proper permissions for /dev/msm_camera/

Merge commit 'fc0182eb1db0620eb71fb6ca219b15a17dcd912f'

* commit 'fc0182eb1db0620eb71fb6ca219b15a17dcd912f':
add support and proper permissions for /dev/msm_camera/
fc0182eb1db0620eb71fb6ca219b15a17dcd912f 01-May-2009 Iliyan Malchev <malchev@google.com> add support and proper permissions for /dev/msm_camera/

Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
f3cdf37276576295e8998fabc735ab07898389d8 26-May-2009 Raphael <raphael@google.com> Don't compile abort_socket.c for host targets. It is only intended to run on Linux targets.
gitignore
ibcutils/Android.mk
cd95bf3ea31bbe87dd6ac91c8b41f688095caec4 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> am a4aace71: Merge change 2437 into donut

Merge commit 'a4aace716e76e8e2c2e6e1a807b402256d9924dc'

* commit 'a4aace716e76e8e2c2e6e1a807b402256d9924dc':
Modify init.goldfish.sh to launch the 'qemu-props' program when the emulator boots up.
a4aace716e76e8e2c2e6e1a807b402256d9924dc 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2437 into donut

* changes:
Modify init.goldfish.sh to launch the 'qemu-props' program when the emulator boots up. Its purpose is to receive a list of system property (name,value) pairs and set them on launch.
653164b6a0febe3c6b8dcdf0c5367ad0fefc313f 26-May-2009 David 'Digit' Turner <digit@google.com> Modify init.goldfish.sh to launch the 'qemu-props' program when the emulator boots up.
Its purpose is to receive a list of system property (name,value) pairs and set them on launch.
ootdir/etc/init.goldfish.sh
5b043d6182fef81adbd2858ea2fde649862cb3f7 26-May-2009 Mike Lockwood <lockwood@android.com> am 1f546e6d: adb: Allow enabling of device side adbd logging with a persistent system property.

Merge commit '1f546e6d1f6ccd1964336ddf0d8e8b3b11b1e945'

* commit '1f546e6d1f6ccd1964336ddf0d8e8b3b11b1e945':
adb: Allow enabling of device side adbd logging with a persistent system property.
1f546e6d1f6ccd1964336ddf0d8e8b3b11b1e945 26-May-2009 Mike Lockwood <lockwood@android.com> adb: Allow enabling of device side adbd logging with a persistent system property.

To enable logging, set the property persist.adb.trace_mask to a hex value
containing the bitmask for adb_trace_mask (see the TRACE_* enum values in adb.h).
This will result in adb writing log output to a file in /data/adb/
No logging will occur if persist.adb.trace_mask is not set or has a value
that cannot be parsed as a hex integer.
The property is read once only at startup, so you must reboot or restart adbd
for changes in the property to take effect.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/adb.h
64c6397b56a4290d5030694fb5134199066a6aa7 25-May-2009 Mike Lockwood <lockwood@android.com> am 6a3075c7: adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.

Merge commit '6a3075c78287ea5a7ee7a3c85cde58e894350822'

* commit '6a3075c78287ea5a7ee7a3c85cde58e894350822':
adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.
6a3075c78287ea5a7ee7a3c85cde58e894350822 25-May-2009 Mike Lockwood <lockwood@android.com> adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
fc8e241871921584518bcfe75c3ed502164688e6 23-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 0469d2c3: Merge change 2282 into donut

Merge commit '0469d2c37adddcb30cb0d88772bef33ac26c6500'

* commit '0469d2c37adddcb30cb0d88772bef33ac26c6500':
Support for 3rd party USB Vendor IDs in adb.
0469d2c37adddcb30cb0d88772bef33ac26c6500 23-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2282 into donut

* changes:
Support for 3rd party USB Vendor IDs in adb.
a481d096feba7cf6e61d54e416a68e2d46498df1 22-May-2009 Xavier Ducrohet <xav@android.com> Support for 3rd party USB Vendor IDs in adb.

Vendor IDs are read from ~/.android/adb_usb.ini. The format is very simple:
1 number per line. First number is ID count, followed by the ID themselves.
Lines starting with # are considered comments.

Other misc changes: moved VENDOR_ID_* to usb_vendors.c to prevent direct
access. Made transport_usb.c reuse the USB constant introduced in usb_osx
(moved them to adb.h)
db/adb.c
db/adb.h
db/adb_client.c
db/transport_usb.c
db/usb_osx.c
db/usb_vendors.c
db/usb_vendors.h
121f3b48d6abcbd70b7dea4af9d366ed52f29421 22-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2341

* changes:
Convert libacc into a shared library.
1cdef20774b2cd30f1a509227c86845337f63f11 22-May-2009 Jack Palevich <jackpal@google.com> Convert libacc into a shared library.

Document internal CodeGenerator interface

Move license to a separate license file.

Define a public API for calling libacc.

Update the "acc" test program to use the public API.
Move "main.cpp" and test scripts into the tests subdirectory.
Move test data from tests to tests/data
Remove stale test data.
nclude/acc/acc.h
ibacc/Android.mk
ibacc/LICENSE
ibacc/acc.cpp
ibacc/test
ibacc/testarm
ibacc/tests/.gitignore
ibacc/tests/Android.mk
ibacc/tests/bellard.otccex.c
ibacc/tests/data/bellard.otccex.c
ibacc/tests/data/expr.c
ibacc/tests/data/hello.c
ibacc/tests/data/missing-main.c
ibacc/tests/data/otcc.c
ibacc/tests/data/returnval.c
ibacc/tests/data/simplest.c
ibacc/tests/expr.c
ibacc/tests/hello.c
ibacc/tests/hello.out-orig
ibacc/tests/main.cpp
ibacc/tests/missing-main.c
ibacc/tests/otcc.c
ibacc/tests/otcc.out-orig
ibacc/tests/returnval.c
ibacc/tests/simplest.c
ibacc/tests/testarm
ibacc/tests/testlocal
940f7cc5be291a7c22e3aab478ab375b36734d48 22-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 4919d556: Merge change 2135 into donut

Merge commit '4919d556f5473e9b2b6db2b057f0a88d627fb77f'

* commit '4919d556f5473e9b2b6db2b057f0a88d627fb77f':
nexus: Switch controllers to use abstracted properties and refactor command protocol
4cd6e915e5722e32b304992b9c74924452519986 22-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2329

* changes:
Fix bug where ECONNABORTED would have always occured on asocket_write.
111bfcefc3cf0f14ad607a56fcf5d076131833a9 22-May-2009 Nick Pelly <npelly@google.com> Fix bug where ECONNABORTED would have always occured on asocket_write.

Use POLLOUT for writes. Duh.
ibcutils/abort_socket.c
4919d556f5473e9b2b6db2b057f0a88d627fb77f 22-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2135 into donut

* changes:
nexus: Switch controllers to use abstracted properties and refactor command protocol
4876567cb9c6a69ce21fd2b1c5bcce5a6f274276 21-May-2009 San Mehat <san@google.com> nexus: Switch controllers to use abstracted properties and refactor command protocol

Also fixes a select() bug and removes debugging

Signed-off-by: San Mehat <san@google.com>

nexus: fix whitespace
exus/CommandListener.cpp
exus/CommandListener.h
exus/Controller.cpp
exus/Controller.h
exus/LoopController.cpp
exus/LoopController.h
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/OpenVpnController.cpp
exus/OpenVpnController.h
exus/PropertyCollection.h
exus/VpnController.cpp
exus/VpnController.h
exus/WifiController.cpp
exus/WifiController.h
exus/WifiScanner.cpp
67667115c51693ac27338be2aa7004789b15ff81 22-May-2009 Mathias Agopian <mathias@google.com> merge master to master_gl
ad3f0d74b4d0c52a819b0b4b242f26bd4ce07bc9 22-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 47c73898: Merge change 2166 into donut

Merge commit '47c73898b871143708c6d952481ee3063a59246a'

* commit '47c73898b871143708c6d952481ee3063a59246a':
add bootanimation service to init.rc
47c73898b871143708c6d952481ee3063a59246a 22-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2166 into donut

* changes:
add bootanimation service to init.rc
8b2cf9f04b924f299d2d250ae4d6826627847842 21-May-2009 Mathias Agopian <mathias@google.com> add bootanimation service to init.rc
ootdir/init.rc
d2362c2b20debe3844508b55de7f9b8dc2f5de33 21-May-2009 Mathias Agopian <mathias@google.com> am fee77ec0: don\'t use cdefs.h as it breaks the windows build.

Merge commit 'fee77ec093f78c1bb0ce85aa16d7ee8e8fa06f8a'

* commit 'fee77ec093f78c1bb0ce85aa16d7ee8e8fa06f8a':
don't use cdefs.h as it breaks the windows build.
fee77ec093f78c1bb0ce85aa16d7ee8e8fa06f8a 21-May-2009 Mathias Agopian <mathias@google.com> don't use cdefs.h as it breaks the windows build.
nclude/cutils/native_handle.h
8a88939d6473e513cb3c38e74a53c0c5dbdfdded 21-May-2009 Xavier Ducrohet <xav@android.com> am a09fbd16: Preparation work for adb to support USB vendor Ids provided by SDK add-ons.

Merge commit 'a09fbd164d2e088bc5433d310e25640ae048d47d'

* commit 'a09fbd164d2e088bc5433d310e25640ae048d47d':
Preparation work for adb to support USB vendor Ids provided by SDK add-ons.
a09fbd164d2e088bc5433d310e25640ae048d47d 21-May-2009 Xavier Ducrohet <xav@android.com> Preparation work for adb to support USB vendor Ids provided by SDK add-ons.

Added usb_vendors.* which handles creating (and deleting) a list of vendor ids.
This list is meant to be used everywhere the built-in lists (usb_osx), or the
built-in vendor IDs (transport_usb) were used.

For now the list is only built with the built-in VENDOR_ID_*. Next step
is to read a small file created from all the SDK add-on.

Other misc changes: made is_adb_interface present only if ADB_HOST is true
to prevent accessing a list that doesn't exist (usb_vendors is only
compiled for the host version of adb).
db/Android.mk
db/adb.c
db/adb.h
db/transport_usb.c
db/usb_osx.c
db/usb_vendors.c
db/usb_vendors.h
144a6d9bbf1188d6c577c73b7ed51e12d5188347 21-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 463de48f: Merge change 2162 into donut

Merge commit '463de48fb05cb29388e7763f75f6cfa56a2f5cb1'

* commit '463de48fb05cb29388e7763f75f6cfa56a2f5cb1':
Mount SD card synchronous. This is an experimental change intended to
463de48fb05cb29388e7763f75f6cfa56a2f5cb1 21-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2162 into donut

* changes:
Mount SD card synchronous. This is an experimental change intended to give us another data point on the system performance regressions that seem to revolved around SD card access.
23eaecf02dedf0a5a25e1cdbfdfc7b8c70c17a56 21-May-2009 Dave Sparks <davidsparks@android.com> Mount SD card synchronous. This is an experimental change intended to
give us another data point on the system performance regressions that
seem to revolved around SD card access.
old/volmgr_vfat.c
e7ada793925148cbc2f034d353c4d414bc4a082c 21-May-2009 San Mehat <san@google.com> am db017545: libsysutils: const correctness fixes + remove some debugging

Merge commit 'db017545796747115b8797f03e662b0f398a7c7b'

* commit 'db017545796747115b8797f03e662b0f398a7c7b':
libsysutils: const correctness fixes + remove some debugging
13dee24501962f41c7d73ea6d6f34d1609f5967f 21-May-2009 San Mehat <san@google.com> am 2fd9c589: nexus: OpenVPN: Instead of creating / using a configfile, use the new dynamic service argument support so we don\'t need one :)

Merge commit '2fd9c5897aba37847879033dd1cffd345ced93fc'

* commit '2fd9c5897aba37847879033dd1cffd345ced93fc':
nexus: OpenVPN: Instead of creating / using a configfile, use the new
df849ca5f8cad85a86e586c878ce8782bbca8df3 21-May-2009 Android (Google) Code Review <android-gerrit@google.com> am a61755e5: Merge change 2077 into donut

Merge commit 'a61755e5fca065dfc89c7639bb672c20a4f9854e'

* commit 'a61755e5fca065dfc89c7639bb672c20a4f9854e':
move native_handle stuff from master_gl
adb: adbd no longer disables OOM and now sets children's OOM adjustment to zero
3fc51ba17d33c38d327d875d973e787b4dd076b6 20-May-2009 Mathias Agopian <mathias@google.com> move native_handle stuff from master_gl
nclude/cutils/native_handle.h
ibcutils/Android.mk
ibcutils/native_handle.c
db017545796747115b8797f03e662b0f398a7c7b 21-May-2009 San Mehat <san@google.com> libsysutils: const correctness fixes + remove some debugging

Signed-off-by: San Mehat <san@google.com>
nclude/sysutils/FrameworkClient.h
nclude/sysutils/SocketClient.h
nclude/sysutils/SocketListener.h
ibsysutils/src/FrameworkClient.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
2fd9c5897aba37847879033dd1cffd345ced93fc 20-May-2009 San Mehat <san@google.com> nexus: OpenVPN: Instead of creating / using a configfile, use the new
dynamic service argument support so we don't need one :)

Signed-off-by: San Mehat <san@google.com>

nexus: fix property max
exus/OpenVpnController.cpp
exus/OpenVpnController.h
a61755e5fca065dfc89c7639bb672c20a4f9854e 21-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2077 into donut

* changes:
adb: adbd no longer disables OOM and now sets children's OOM adjustment to zero
92a7541bce0f8ed7649dcbadd83b27d71e4f391f 20-May-2009 Nick Pelly <npelly@google.com> Helper to perform abortable blocking operations on a socket:
asocket_connect()
asocket_accept()
asocket_read()
asocket_write()
These calls are similar to the regular syscalls, but can be aborted with:
asocket_abort()

Calling close() on a regular POSIX socket does not abort blocked syscalls on
that socket in other threads.

After calling asocket_abort() the socket cannot be reused.

Call asocket_destory() *after* all threads have finished with the socket to
finish closing the socket and free the asocket structure.

The helper is implemented by setting the socket non-blocking to initiate
syscalls connect(), accept(), read(), write(), then using a blocking poll()
on both the primary socket and a local pipe. This makes the poll() abortable
by writing a byte to the local pipe in asocket_abort().

asocket_create() sets the fd to non-blocking mode. It must not be changed to
blocking mode.

Using asocket will triple the number of file descriptors required per
socket, due to the local pipe. It may be possible to use a global pipe per
process rather than per socket, but we have not been able to come up with a
race-free implementation yet.

All functions except asocket_init() and asocket_destroy() are thread safe.
nclude/cutils/abort_socket.h
ibcutils/Android.mk
ibcutils/abort_socket.c
8f13782e7b4a705484d7f97f07513781b82be0dc 20-May-2009 Mathias Agopian <mathias@google.com> move native_handle stuff from master_gl
nclude/cutils/native_handle.h
ibcutils/Android.mk
ibcutils/native_handle.c
8b0624c3d30e7b8b0d748301c0c2175bbb01acd6 20-May-2009 Jack Palevich <jackpal@google.com> Fix x64 int / pointer warnings.
ibacc/acc.cpp
0b5cb96fa46a892fb3662ddf341fdc095dabcd82 20-May-2009 San Mehat <san@google.com> am d4cdd13f: init: Clean up dynamic argument handling for services

Merge commit 'd4cdd13f6f56f3fe8d8511b609e823925fdd83f9'

* commit 'd4cdd13f6f56f3fe8d8511b609e823925fdd83f9':
init: Clean up dynamic argument handling for services
2ca20190af3582ebb683977386a9188aba3c65df 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2096

* changes:
Implement architecture-dependent defaults.
e7b590666dba83c72b7f7bf210dad7239ab04b4f 20-May-2009 Jack Palevich <jackpal@google.com> Implement architecture-dependent defaults.

If libacc is built on x86, then x86 is the default code generator.
If libacc is built on arm. then ARM is the default code generator
And so on for future architectures.

The 64-bit x64 machine has no working code generator currently.
We may add one to support the simulator builds.

Improved the test program so we don't try to run tests if the
compile failed. Also avoid running tests that don't work on
a given platform.
ibacc/acc.cpp
ibacc/test
d4cdd13f6f56f3fe8d8511b609e823925fdd83f9 20-May-2009 San Mehat <san@google.com> init: Clean up dynamic argument handling for services

Signed-off-by: San Mehat <san@google.com>
nit/init.c
d4f2fabff06ce651a3e53b0187f3c027349c34a9 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> am e6be8706: Merge change 1950 into donut

Merge commit 'e6be870641d6db12493342c53344d68f464cc0a8'

* commit 'e6be870641d6db12493342c53344d68f464cc0a8':
new cdma event log tags
8ad15685e6d3d2251ceac4ac7135397cf6140e1a 20-May-2009 San Mehat <san@google.com> resolved conflicts w/ f24e252903ca0f71c7fbfb135cf17e83e0c2ea90 merge...
249ad57a887680538d1dc0195e746b1d877ebd6a 20-May-2009 Mike Lockwood <lockwood@android.com> adb: adbd no longer disables OOM and now sets children's OOM adjustment to zero

Signed-off-by: Mike Lockwood <lockwood@android.com>
db/adb.c
db/services.c
e6be870641d6db12493342c53344d68f464cc0a8 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1950 into donut

* changes:
new cdma event log tags
274663bf677d56bc212f354e8d50b8f58239252c 19-May-2009 Jack Palevich <jackpal@google.com> Add a test script for testing the libacc compiler on ARM.
ibacc/testarm
f24e252903ca0f71c7fbfb135cf17e83e0c2ea90 19-May-2009 San Mehat <san@google.com> init: Add the ability to start services with dynamic arguments.

To add arguments dynamically to a service, start the service like so:

setprop ctl.start service_to_run:arg1 arg2 arg3...

To start a service with *no* dynamic arguments, start the service normally:

setprop ctl.start service_to_run

Dynamic arguments are only supported on 'oneshot' services

Signed-off-by: San Mehat <san@google.com>
nit/builtins.c
nit/init.c
nit/init.h
nit/parser.c
342520f2ed0f06deaff4d9c227121c98581dd4a4 19-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 1b154930: Merge change 1867 into donut

Merge commit '1b154930b2c2634dce9c04d5d5cec7acb229ccb0'

* commit '1b154930b2c2634dce9c04d5d5cec7acb229ccb0':
Cleaning up whitespace in adb sources. Nothing more, nothing less.
1b154930b2c2634dce9c04d5d5cec7acb229ccb0 19-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1867 into donut

* changes:
Cleaning up whitespace in adb sources. Nothing more, nothing less.
473b9b21ad012ffe3ef8a7f276ca50b50e31f959 19-May-2009 Tammo Spalink <tammo@google.com> new cdma event log tags
ogcat/event-log-tags
85246fee8547e1db3d1019c1e66ffee236bcf206 19-May-2009 Android (Google) Code Review <android-gerrit@google.com> am b48acb0e: Merge change 1795 into donut

Merge commit 'b48acb0ebdc64d2f44cf869ac69aebbba2de192d'

* commit 'b48acb0ebdc64d2f44cf869ac69aebbba2de192d':
Make /system/xbin/tcpdump setuid root.
b48acb0ebdc64d2f44cf869ac69aebbba2de192d 19-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1795 into donut

* changes:
Make /system/xbin/tcpdump setuid root.
e78bd6a00d0be0df66c4a7ea068c8d33c756b037 18-May-2009 San Mehat <san@google.com> am b76a63b7: vold: Change VFAT mount options to enable sdcard write restrictions

Merge commit 'b76a63b7bbdf8f51c4e689e241fca6d3a0bc1b1c'

* commit 'b76a63b7bbdf8f51c4e689e241fca6d3a0bc1b1c':
vold: Change VFAT mount options to enable sdcard write restrictions
b76a63b7bbdf8f51c4e689e241fca6d3a0bc1b1c 18-May-2009 San Mehat <san@google.com> vold: Change VFAT mount options to enable sdcard write restrictions

Signed-off-by: San Mehat <san@google.com>
old/volmgr_vfat.c
735b60ebc2c293688d89bd311494ce8f61ba6475 18-May-2009 San Mehat <san@google.com> am 7edc4f94: vold: If a filesystem is read/only then restart the fscheck but don\'t make any changes

Merge commit '7edc4f9454f1665b73faf0c02543cf350b741a53'

* commit '7edc4f9454f1665b73faf0c02543cf350b741a53':
vold: If a filesystem is read/only then restart the fscheck but don't make any changes
7edc4f9454f1665b73faf0c02543cf350b741a53 18-May-2009 San Mehat <san@google.com> vold: If a filesystem is read/only then restart the fscheck but don't make any changes

Signed-off-by: San Mehat <san@google.com>
old/volmgr_vfat.c
34c22c5ba951e4df7cc72d8d10da78064d5cfbe4 18-May-2009 David 'Digit' Turner <digit@google.com> am 414ff7d9: Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.

Merge commit '414ff7d98ac8d7610a26206335954ad15f43f3ac'

* commit '414ff7d98ac8d7610a26206335954ad15f43f3ac':
Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.
f6330a2eeb78c0971f33feee7fd1ee06472a7dba 18-May-2009 David 'Digit' Turner <digit@google.com> Cleaning up whitespace in adb sources. Nothing more, nothing less.
db/fdevent.c
db/fdevent.h
db/file_sync_client.c
db/protocol.txt
db/sysdeps.h
db/sysdeps_win32.c
db/usb_windows.c
414ff7d98ac8d7610a26206335954ad15f43f3ac 18-May-2009 David 'Digit' Turner <digit@google.com> Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.
db/Android.mk
db/fdevent.c
db/fdevent.h
db/framebuffer_service.c
db/sysdeps.h
nclude/cutils/fdevent.h
ibcutils/Android.mk
ibcutils/fdevent.c
8537cc56bb10b8c62dc82cf7e494566c0d942c49 16-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1821

* changes:
ACC ARM codegen: implement /, %
986145c5235ee9088960cee4883ac73cd05667ec 16-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1820

* changes:
ACC ARM codegen: Implement calling indirect functions.
b79c06a9bd1201f170c926a2b696f3c52cc1a38a 16-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1819

* changes:
ACC ARM code gen: Implement global variables.
fd59668c9662acef0d7f001e174784e7d73cfd12 16-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1818

* changes:
Add license, document language changes.
3d474a74a7aad537f596d3978be7ec0cb79d4e64 16-May-2009 Jack Palevich <jackpal@google.com> ACC ARM codegen: implement /, %
ibacc/acc.cpp
7810bc9abd7c2c415d87b62dea1ff75d5fdc7397 15-May-2009 Jack Palevich <jackpal@google.com> ACC ARM codegen: Implement calling indirect functions.
ibacc/acc.cpp
4d93f30befb6e3adf37198c6c7f6727d1e570b94 15-May-2009 Jack Palevich <jackpal@google.com> ACC ARM code gen: Implement global variables.

Collapsed the inc/dec codegen into the loadEAX function, because it
allows us to generate better code for inc/dec'ing a global variable
on ARM, because we don't have to load the variable's address twice.
ibacc/acc.cpp
d99d1445fdf344b72d20a7689f4c85e35762748b 15-May-2009 San Mehat <san@google.com> resolved conflicts w/ b415390e74deae0f4c3eb43330c9f8708281acc5 merge
328a4fb5354318783a41d78f2a6201d0d4912761 15-May-2009 Dan Egnor <egnor@google.com> Make /system/xbin/tcpdump setuid root.
nclude/private/android_filesystem_config.h
408bf61b94c0d24c69665a9ec855f75e8ff1e257 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> am e398151e: Merge change 1694 into donut

Merge commit 'e398151e7830510f27305cc1cb8f9a0510106f9a'

* commit 'e398151e7830510f27305cc1cb8f9a0510106f9a':
nexus: Flesh out VPN support a bit more, cleanup service handling
fc1ceb63d5a84e3b5f96275a9f20d50ab6e3ffd7 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> am dee68663: Merge change 1693 into donut

Merge commit 'dee68663724c7117a51eb3af3d9390e00af832f5'

* commit 'dee68663724c7117a51eb3af3d9390e00af832f5':
libsysutils: Introduce 'ServiceManager', for starting/stopping init services
9918d0a2ee146e9bcd15b2f2eccf6f5445f8e17e 15-May-2009 Jack Palevich <jackpal@google.com> Add license, document language changes.
ibacc/FEATURES
ibacc/MODULE_LICENSE_BSD_LIKE
b415390e74deae0f4c3eb43330c9f8708281acc5 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1778 into donut

* changes:
init: Create new 'vpn' user/group and set owner of '/dev/tun' to it.
e398151e7830510f27305cc1cb8f9a0510106f9a 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1694 into donut

* changes:
nexus: Flesh out VPN support a bit more, cleanup service handling
dee68663724c7117a51eb3af3d9390e00af832f5 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1693 into donut

* changes:
libsysutils: Introduce 'ServiceManager', for starting/stopping init services
4a6f2321e76685b9489d020980dffb1d9ac73fc0 15-May-2009 San Mehat <san@google.com> init: Create new 'vpn' user/group and set owner of '/dev/tun' to it.

Signed-off-by: San Mehat <san@google.com>
nclude/private/android_filesystem_config.h
nit/devices.c
5d6d417972f8d946c223c4efb9636b1ba4280543 15-May-2009 San Mehat <san@google.com> nexus: Flesh out VPN support a bit more, cleanup service handling

Signed-off-by: San Mehat <san@google.com>
exus/CommandListener.cpp
exus/CommandListener.h
exus/ErrorCode.h
exus/OpenVpnController.cpp
exus/OpenVpnController.h
exus/Supplicant.cpp
exus/Supplicant.h
exus/VpnController.cpp
exus/VpnController.h
c41d1c8074ed02acc9d1e749d81e0aafb5efbbfa 14-May-2009 San Mehat <san@google.com> libsysutils: Introduce 'ServiceManager', for starting/stopping init services

Signed-off-by: San Mehat <san@google.com>
nclude/sysutils/ServiceManager.h
ibsysutils/Android.mk
ibsysutils/src/ServiceManager.cpp
035b427c703e24d583be7aef9923a85327d8b546 15-May-2009 Eric Fischer <enf@google.com> am 722a5c04: Add support for "standalone months" to tztime\'s strftime().

Merge commit '722a5c0462f38827f4097065bfc3826b9e0e9fb4'

* commit '722a5c0462f38827f4097065bfc3826b9e0e9fb4':
Add support for "standalone months" to tztime's strftime().
b862ab74c95e4f76c7081ea5756c7ba719833f8c 15-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
9ded6bb1e1fbdecb47cee03529ebc9f0adfa40ee 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1741

* changes:
ACC: Arm code gen improvements ++/--, &, odds and ends
243fb9ff0fb9fad9d242d9c10cfecb31aa0210f8 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1740

* changes:
Implement <, >, ==, !=, >= <=, &&, and ||.
bd894904f70827a131b24bb2e8f8a32707e586df 15-May-2009 Jack Palevich <jackpal@google.com> ACC: Arm code gen improvements ++/--, &, odds and ends

Added C++-style "//..end-of-line" comments, since I kept trying to use them when writing
test programs.

The biggest known missing piece is global variables.
ibacc/acc.cpp
722a5c0462f38827f4097065bfc3826b9e0e9fb4 13-May-2009 Eric Fischer <enf@google.com> Add support for "standalone months" to tztime's strftime().

The idea here is that some languages need a different form of the month
name in constructions like "January 2" than in "January 2009", since the
one in the "January 2" case really means "of January." So with this change,
a format string of "%-B" will use the standalone month, while "%B" will
continue to use the format month.
nclude/cutils/tztime.h
ibcutils/tzstrftime.c
8de461dc9e400daac883477fcab0d6d07ac1918a 15-May-2009 Jack Palevich <jackpal@google.com> Implement <, >, ==, !=, >= <=, &&, and ||.
ibacc/acc.cpp
60e300f6f3860c3dd315a1d10e246be91487a2ad 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1714

* changes:
ACC ARM code gen: Implement local variables, function args
69796b6c847dd15bdbc1d0a563e421562c2c56f3 15-May-2009 Jack Palevich <jackpal@google.com> ACC ARM code gen: Implement local variables, function args

+ Fix prolog and epilog code.
ibacc/acc.cpp
a47c2fdd4aa27ddffcca61b2f7f3139d2ed73622 15-May-2009 San Mehat <san@google.com> am c83cd879: init: Fix heap corruption for services with arguments

Merge commit 'c83cd879d45e667fbb4763f18c908928ee9d67d8'

* commit 'c83cd879d45e667fbb4763f18c908928ee9d67d8':
init: Fix heap corruption for services with arguments
toolbox: ifconfig: Implement mtu setting, plus setting interface addr should
toolbox: route: Reflow some of the mess, fix route add parameter names to
c83cd879d45e667fbb4763f18c908928ee9d67d8 14-May-2009 San Mehat <san@google.com> init: Fix heap corruption for services with arguments

The 'args' array *must* be the last entry in the structure.

This fixes a longstanding issue (apparently since tc3) where
a service with an argument would corrupt the heap. The more
arguments, the more corruption :|. This will probably also end up
making key-code bound services more reliable (ie: bugreports triggered
via the keyboard)

Signed-off-by: San Mehat <san@google.com>
nit/init.h
cb1c9ef38c9db11db927096a45b10cda52786481 14-May-2009 Jack Palevich <jackpal@google.com> ACC ARM code gen improvements. printf("Hello, world\n"); works!

+ Improved li to handle all 32-bit values.
+ Implemented push/pop of temp registers during evaluation
+ Implemented the unary and binary easy math operators (+,-,*,<<,>>,|,&,^,~)
+ Implemented global function calling.
ibacc/acc.cpp
54a1eb7677a10c1591ba48562ae480cd71721bf6 14-May-2009 San Mehat <san@google.com> toolbox: ifconfig: Implement mtu setting, plus setting interface addr should
implicitly 'up' the iface just like normal ifconfig does.

Also convert tabs -> spaces
oolbox/ifconfig.c
83ec181dc74d5dab4110e1895e62f1bdbf6d7d7a 14-May-2009 San Mehat <san@google.com> toolbox: route: Reflow some of the mess, fix route add parameter names to
match standard route

Signed-off-by: San Mehat <san@google.com>
oolbox/route.c
11f6b92818ff252dc339ca307641bd6fecdcd915 14-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1629

* changes:
ARM codegen: Add disassembler, implement return
2ae648f0126c6dcb775c2a84c067c349761809b6 14-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1628

* changes:
Begin filling in ARM code generator.
a6986aa8e8345f86c0c2511e9598025fc9195904 14-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1627

* changes:
Add stub Arm code generator.
a65356109772b04283d18d21dd5455e825ba8c25 14-May-2009 Jack Palevich <jackpal@google.com> ARM codegen: Add disassembler, implement return

This program works:

main() { return 42; }

The disassembler was borrowed from codeflinger, and just modified enough to compile
under C++ without warnings.

Implemented gsym
Implemented a hack verison of li, only works for -256..255
Implemented gjmp
ibacc/Android.mk
ibacc/acc.cpp
ibacc/armreg.h
ibacc/disassem.cpp
ibacc/disassem.h
ibacc/test
ibacc/tests/otcc.out-orig
ibacc/tests/returnval.c
546b2249eff4d95622c4bab0698ebf290c9ed836 14-May-2009 Jack Palevich <jackpal@google.com> Begin filling in ARM code generator.

We can now call functions that have no arguments (and return from them too!)
ibacc/Android.mk
ibacc/acc.cpp
ibacc/test
ibacc/tests/otcc.out-orig
e00d31aeb13fcf9919fd5e6598fdc6c5f178b602 13-May-2009 San Mehat <san@google.com> am 0389a12: toolbox: Make that \'pointopoint\' instead of \'pointtopoint\'

Merge commit '0389a1297d65321a882ea0dcc69f4de4e3bcb169'

* commit '0389a1297d65321a882ea0dcc69f4de4e3bcb169':
toolbox: Make that 'pointopoint' instead of 'pointtopoint'
80c3b189d7e81a895524ad627841222b9c17da04 13-May-2009 San Mehat <san@google.com> am 94447ca: nexus: Introduce skelaton OpenVpnController class + remove s

Merge commit '94447ca34b2abf9b0d9d9cb52a18bf8ba0f01b61'

* commit '94447ca34b2abf9b0d9d9cb52a18bf8ba0f01b61':
nexus: Introduce skelaton OpenVpnController class + remove some debug messages
4676aacd5e0d2916a093cf407c406b83de3146ee 13-May-2009 San Mehat <san@google.com> am fa49e28: toolbox: Add \'pointopoint\' support to ifconfig

Merge commit 'fa49e2860bebe6bb2a26194c58992e5d5aed0b0d'

* commit 'fa49e2860bebe6bb2a26194c58992e5d5aed0b0d':
toolbox: Add 'pointopoint' support to ifconfig
06683a0564b2c96a710151070e9a7283bbf8f2e8 13-May-2009 San Mehat <san@google.com> am 82a2116: nexus: Initial support for manipulating wifi networks + chan

Merge commit '82a2116e6b67db910bba22c4874e6ca5efd3eec0'

* commit '82a2116e6b67db910bba22c4874e6ca5efd3eec0':
nexus: Initial support for manipulating wifi networks + change wifi scan notification msgs
c6f0a25d917522dd5a39b7972fc2244b7b885eb2 13-May-2009 San Mehat <san@google.com> am df6c1b9: libsysutils: General clean up + disable build in simulator b

Merge commit 'df6c1b91e3813886070f35929583c30cfaead918'

* commit 'df6c1b91e3813886070f35929583c30cfaead918':
libsysutils: General clean up + disable build in simulator builds
ef94ff4ddf40c832032b39f835615352c93a9b4e 13-May-2009 Andy McFadden <fadden@android.com> am 6fc287b: Fix sim build (need explicit -lpthread).

Merge commit '6fc287b6f6df62c73e1057e26475fec2837296cc'

* commit '6fc287b6f6df62c73e1057e26475fec2837296cc':
Fix sim build (need explicit -lpthread).
0389a1297d65321a882ea0dcc69f4de4e3bcb169 13-May-2009 San Mehat <san@google.com> toolbox: Make that 'pointopoint' instead of 'pointtopoint'

Signed-off-by: San Mehat <san@google.com>
oolbox/ifconfig.c
94447ca34b2abf9b0d9d9cb52a18bf8ba0f01b61 13-May-2009 San Mehat <san@google.com> nexus: Introduce skelaton OpenVpnController class + remove some debug messages

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
exus/OpenVpnController.cpp
exus/OpenVpnController.h
exus/TiwlanWifiController.cpp
exus/VpnController.cpp
exus/VpnController.h
exus/main.cpp
2230513fc0ba455c6de39525dded4274dfb0146b 13-May-2009 Jack Palevich <jackpal@google.com> Add stub Arm code generator.
ibacc/acc.cpp
ibacc/test
ibacc/tests/simplest.c
fa49e2860bebe6bb2a26194c58992e5d5aed0b0d 13-May-2009 San Mehat <san@google.com> toolbox: Add 'pointopoint' support to ifconfig

Signed-off-by: San Mehat <san@google.com>
oolbox/ifconfig.c
82a2116e6b67db910bba22c4874e6ca5efd3eec0 13-May-2009 San Mehat <san@google.com> nexus: Initial support for manipulating wifi networks + change wifi scan notification msgs

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
exus/CommandListener.cpp
exus/CommandListener.h
exus/ErrorCode.h
exus/Supplicant.cpp
exus/Supplicant.h
exus/WifiController.cpp
exus/WifiController.h
exus/WifiNetwork.cpp
exus/WifiNetwork.h
df6c1b91e3813886070f35929583c30cfaead918 13-May-2009 San Mehat <san@google.com> libsysutils: General clean up + disable build in simulator builds

Signed-off-by: San Mehat <san@google.com>
ibsysutils/Android.mk
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
6fc287b6f6df62c73e1057e26475fec2837296cc 13-May-2009 Andy McFadden <fadden@android.com> Fix sim build (need explicit -lpthread).
ibsysutils/Android.mk
2ac16b7e46753238312475cf16aa910c1897c5d0 13-May-2009 San Mehat <san@google.com> am e67651c: nexus: Cleanup the scanner and plug it all in so it works

Merge commit 'e67651c89d0cbb759219412d49cbc5680c17df06'

* commit 'e67651c89d0cbb759219412d49cbc5680c17df06':
nexus: Cleanup the scanner and plug it all in so it works
8cdd90163ec7103e3cec95c0f402cfc068b8de03 13-May-2009 San Mehat <san@google.com> am dbdb0db: libsysutils: Fix bug where we\'d leak our control pipes when

Merge commit 'dbdb0db516fa4935ff7b5c05914932099237d808'

* commit 'dbdb0db516fa4935ff7b5c05914932099237d808':
libsysutils: Fix bug where we'd leak our control pipes when closing down a listener
62b68731eb859d1498144f6f834ff54b164a9be0 13-May-2009 San Mehat <san@google.com> am 8d3fc3f: nexus: Use constants for errorcodes

Merge commit '8d3fc3fde308fbda1b04759b26bb4fc29d41339f'

* commit '8d3fc3fde308fbda1b04759b26bb4fc29d41339f':
nexus: Use constants for errorcodes
9c150d82b84b1cc17488fd148092d22d8659998b 13-May-2009 San Mehat <san@google.com> am d530592: libsysutils: Send command arguments to the command, not the

Merge commit 'd530592848985ba4edeafeb413eb5ff58c138eab'

* commit 'd530592848985ba4edeafeb413eb5ff58c138eab':
libsysutils: Send command arguments to the command, not the command again :P
e67651c89d0cbb759219412d49cbc5680c17df06 13-May-2009 San Mehat <san@google.com> nexus: Cleanup the scanner and plug it all in so it works

Signed-off-by: San Mehat <san@google.com>
exus/Supplicant.cpp
exus/Supplicant.h
exus/WifiController.cpp
exus/WifiScanner.cpp
exus/WifiScanner.h
dbdb0db516fa4935ff7b5c05914932099237d808 13-May-2009 San Mehat <san@google.com> libsysutils: Fix bug where we'd leak our control pipes when closing down a listener

Signed-off-by: San Mehat <san@google.com>
ibsysutils/src/SocketListener.cpp
8d3fc3fde308fbda1b04759b26bb4fc29d41339f 12-May-2009 San Mehat <san@google.com> nexus: Use constants for errorcodes

Signed-off-by: San Mehat <san@google.com>
exus/CommandListener.cpp
exus/ErrorCode.h
exus/Supplicant.cpp
exus/WifiController.cpp
d530592848985ba4edeafeb413eb5ff58c138eab 12-May-2009 San Mehat <san@google.com> libsysutils: Send command arguments to the command, not the command again :P

Signed-off-by: San Mehat <san@google.com>
ibsysutils/src/FrameworkListener.cpp
55e2c9de30f1606ea4d1c415b5a2a9a5251cc099 12-May-2009 San Mehat <san@google.com> am 69772dc: nexus: Move to a line based protocol (similar to FTP) + fix

Merge commit '69772dc644e1ccc12b6394267f010100470f3c95'

* commit '69772dc644e1ccc12b6394267f010100470f3c95':
nexus: Move to a line based protocol (similar to FTP) + fix bugs
294449dd6e45a9adadc98ac9afaaa91c74fb3b00 12-May-2009 San Mehat <san@google.com> am d768066: libsysutils: Tweak SocketListener and friends

Merge commit 'd768066ef54270a0d3ccfccd50ae8238db5a2cdd'

* commit 'd768066ef54270a0d3ccfccd50ae8238db5a2cdd':
libsysutils: Tweak SocketListener and friends
69772dc644e1ccc12b6394267f010100470f3c95 10-May-2009 San Mehat <san@google.com> nexus: Move to a line based protocol (similar to FTP) + fix bugs

Signed-off-by: San Mehat <san@google.com>
exus/CommandListener.cpp
exus/ScanResult.cpp
exus/Supplicant.cpp
exus/Supplicant.h
exus/TiwlanWifiController.cpp
exus/WifiController.cpp
exus/WifiController.h
exus/main.cpp
exus/nexctl.c
d768066ef54270a0d3ccfccd50ae8238db5a2cdd 12-May-2009 San Mehat <san@google.com> libsysutils: Tweak SocketListener and friends

Signed-off-by: San Mehat <san@google.com>
nclude/sysutils/SocketClient.h
nclude/sysutils/SocketListener.h
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
bf42c9c163cfd63a2895a0bbb38013c8a0024c2e 12-May-2009 Jack Palevich <jackpal@google.com> Move all x86-specific knowlege into the X86CodeGenerator.
ibacc/acc.cpp
ibacc/tests/expr.c
21a15a2416b4b138bf509186106525944e78ad08 11-May-2009 Jack Palevich <jackpal@google.com> Various C++ improvements

+ Changed indentation, causes the stats to say there's a lot of lines changed.
+ Should be able to compile multiple times with the same compiler object.
+ Create a CodeBuffer class to hold the code.
+ Create a CodeGenerator class to encapsulate knowlege of the CPU instruction set.
+ Started filling in the code generator.
ibacc/acc.cpp
ibacc/tests/bellard.otccex.c
ibacc/tests/missing-main.c
ibacc/tests/otcc.out-orig
a96930572c3ef440065a87985ed5f01724bf159b 11-May-2009 Frabrice Bellard <fabrice@bellard.org> Document acc language features.

Original text from http://www.ioccc.org/2001/bellard.hint
ibacc/FEATURES
bbf8ab504a68f7e971b7fa47b0bee3c3e022a480 11-May-2009 Jack Palevich <jackpal@google.com> Added command-line option "-t" to allow run-time switching between running and dumping.

Fixed some C++ warnings reported by g++ .
Verified that the compiler actually works when run on 32-bit Linux.
ibacc/acc.cpp
ibacc/test
aad2046b4d80e22ce1d1952cf700a4fe5379441f 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1366

* changes:
converted to C++
7c2b8fb27a33513fad75da2cca7292cfb37ea253 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1365

* changes:
Remove all gcc warnings.
bdb4d40e48fd56be84a9b93271a3443a0e10c22a 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1364

* changes:
Replace acc.c with the contents of otccn.c, update tests.
ca5feb26171a03fdf700d39d9c0a5e511c5cef87 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1363

* changes:
Original version of otccn.c from http://bellard.org/otcc/otccn.c
e1156972e157e969fa9a9efd7c04d02061f090a2 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> am c73d9e4: Merge changes 1341,1342 into donut

Merge commit 'c73d9e43a0c98a87222ef0c8749d6abba06c7778'

* commit 'c73d9e43a0c98a87222ef0c8749d6abba06c7778':
libsysutils: Add multiple client support and fix some bugs
nexus: Implement wifi scanner and fix a lot of bugs
c73d9e43a0c98a87222ef0c8749d6abba06c7778 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge changes 1341,1342 into donut

* changes:
libsysutils: Add multiple client support and fix some bugs
nexus: Implement wifi scanner and fix a lot of bugs
77ae76eea9df695b66834b8df2a1060c7dad3eca 11-May-2009 Jack Palevich <jackpal@google.com> converted to C++

Base address of constant table changed, so had to update the "-orig" files.
ibacc/acc.c
ibacc/acc.cpp
ibacc/test
ibacc/tests/hello.out-orig
ibacc/tests/otcc.out-orig
f6b5a531d80f1d1e0ecd7751c6695be3c3a556ec 11-May-2009 Jack Palevich <jackpal@google.com> Remove all gcc warnings.
ibacc/acc.c
e27bf3eb290c75704549b4a5eedda56079bac86e 10-May-2009 Jack Palevich <jackpal@google.com> Replace acc.c with the contents of otccn.c, update tests.

We are no longer checking if the constant data is the same, just the
generated code.
ibacc/acc.c
ibacc/otccn.c
ibacc/test
ibacc/tests/hello.out-orig
ibacc/tests/otcc.out-orig
16134598fba53a3a74c74a6a7f8da477d7033521 10-May-2009 Fabrice Bellard <fabrice@bellard.org> Original version of otccn.c from http://bellard.org/otcc/otccn.c
ibacc/otccn.c
16b5d6e75c554905eedd822f6dde6928b7fdf782 10-May-2009 Dima Zavin <dima@android.com> am 3fd82b8: adb: osx: Match devices based on interface subclass and prot

Merge commit '3fd82b8861aa410fab7785074941b459d92220c1'

* commit '3fd82b8861aa410fab7785074941b459d92220c1':
adb: osx: Match devices based on interface subclass and protocol
fa644ffe944c01a9b00f8d7676d58394fabee285 08-May-2009 San Mehat <san@google.com> libsysutils: Add multiple client support and fix some bugs
nclude/sysutils/FrameworkClient.h
nclude/sysutils/FrameworkCommand.h
nclude/sysutils/FrameworkListener.h
nclude/sysutils/FrameworkManager.h
nclude/sysutils/NetlinkListener.h
nclude/sysutils/SocketClient.h
nclude/sysutils/SocketListener.h
ibsysutils/Android.mk
ibsysutils/src/FrameworkClient.cpp
ibsysutils/src/FrameworkCommand.cpp
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/FrameworkManager.cpp
ibsysutils/src/NetlinkListener.cpp
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
3fd82b8861aa410fab7785074941b459d92220c1 09-May-2009 Dima Zavin <dima@android.com> adb: osx: Match devices based on interface subclass and protocol

Enumerating all vendor+product id combinations is not practical.
This modifies the matching algorithm to use the adb interface
subclass/protocol instead (0x42/0x1).

Signed-off-by: Dima Zavin <dima@android.com>
db/adb.h
db/usb_osx.c
1441e769b2767e212a3d905bee2fd3535b484ff2 07-May-2009 San Mehat <san@google.com> nexus: Implement wifi scanner and fix a lot of bugs

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
exus/CommandListener.cpp
exus/CommandListener.h
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/NexusCommand.cpp
exus/NexusCommand.h
exus/ScanResult.h
exus/Supplicant.cpp
exus/Supplicant.h
exus/SupplicantListener.cpp
exus/SupplicantListener.h
exus/SupplicantState.h
exus/TiwlanWifiController.cpp
exus/TiwlanWifiController.h
exus/WifiController.cpp
exus/WifiController.h
exus/WifiScanner.cpp
exus/WifiScanner.h
exus/main.cpp
exus/nexctl.c
431055cc9bc2cab128f35cf4a4e776994e1ec38d 09-May-2009 Jack Palevich <jackpal@google.com> More deobfuscation.
ibacc/acc.c
7448a2ebb7ecf45cd1a5a5d6d61b14d0239cd258 09-May-2009 Jack Palevich <jackpal@google.com> Converted code constants from decimal to hexidecimal.
ibacc/acc.c
f0cbc92fc0ae19a7ce958807936152f8859b41b7 09-May-2009 Jack Palevich <jackpal@google.com> More unobfuscation.
ibacc/acc.c
50791f546674826303d0b6abaf6ccd700307c4e8 09-May-2009 Jack Palevich <jackpal@google.com> Make our global variables static.
ibacc/acc.c
d160530a586558c4e85422808ef488052e275fa0 09-May-2009 Jack Palevich <jackpal@google.com> Got rid of all warnings. (Yeah, right.)
ibacc/acc.c
f54db02e5d298de73ff5884e9dd183e517da4220 09-May-2009 Jack Palevich <jackpal@google.com> Add a simple regression test framework.
ibacc/test
ibacc/tests/.gitignore
ibacc/tests/hello.c
ibacc/tests/hello.out-orig
ibacc/tests/otcc.c
ibacc/tests/otcc.out-orig
ae54f1fba842ddd55b65a428333f0cec62a66fc0 08-May-2009 Jack Palevich <jackpal@google.com> Continue deobfuscation.

Add a license.

Indent the code.
Add includes for external functions.
Improve function prototypes.
Start adding the correct type to things that are pointers.
Start fixing compiler warnings.

Instead of directly executing the compiled code (which only works on x86 Linux),
write the internal compiler state to stdout. This makes it easier to test whether
or not our refactoring is breaking anything.

Return a zero status on success.

Add error checking for a missing input file.
ibacc/acc.c
883114867a8c8039227da6992b3be38ab43263a7 08-May-2009 Jack Palevich <jackpal@google.com> Start de-obfuscation process.
ibacc/acc.c
ibacc/otcc.c
38aa39a200d48f34097051d46a74a3e16a73e48c 08-May-2009 Fabrice Bellard <fabrice@bellard.org> Original freeware Obfuscated Tiny C Compiler.

From http://bellard.org/otcc/otcc.c

License from http://bellard.org/otcc:

The obfuscated OTCC and OTCCELF are freeware.
ibacc/otcc.c
e910ea596240d355a1e25b66f76fd8d8fdfbbba6 09-May-2009 Erik Gilling <konkers@android.com> CDMA: add cdma tsmux device permissions

Signed-off-by: Erik Gilling <konkers@android.com>
nit/devices.c
d6b819166c414bd86e609ac530f2754c4b8a83f5 08-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
6e1683f5a770a18d58a5dbfa2347b7ad2b01a3da 08-May-2009 Mike Lockwood <lockwood@android.com> am b377955: init: Fix some broken code that did not cause problems until

Merge commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672'

* commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672':
init: Fix some broken code that did not cause problems until switching to gcc 4.4
b3779558dcfbe99f0b9c1ef796e3728edad25672 08-May-2009 Mike Lockwood <lockwood@android.com> init: Fix some broken code that did not cause problems until switching to gcc 4.4

Signed-off-by: Mike Lockwood <lockwood@android.com>
nit/parser.c
nit/property_service.c
46f208e40d226b881736036088317c918cc5d5e7 08-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1171

* changes:
Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
1ecad9a95c1343e0a3f2f43c3bcbe7d7a5894447 08-May-2009 Chih-Wei Huang <cwhuang@linux.org.tw> Fix uninitialized variable loop

The following command will usually just fail

# /system/bin/mount -t proc proc /proc
ioctl LOOP_SET_FD failed: Bad file number

The simple patch fixes the issue.
oolbox/mount.c
ab15ac0881517ef2a72fbcd11a39d634c678878d 08-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
db4492640313be9d3fd65ee5bd7648a9570411bb 07-May-2009 Nick Pelly <npelly@google.com> Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.

Overridden by -s.
db/commandline.c
fec961705b43dfcbff5cd825f81e2fe492df1ec4 07-May-2009 San Mehat <san@google.com> am 3d40729: libsysutils: Add string.h to includes

Merge commit '3d40729054803fae1c4d4bb5ac7554665a132b26'

* commit '3d40729054803fae1c4d4bb5ac7554665a132b26':
libsysutils: Add string.h to includes
3d40729054803fae1c4d4bb5ac7554665a132b26 07-May-2009 San Mehat <san@google.com> libsysutils: Add string.h to includes

Signed-off-by: San Mehat <san@google.com>
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
e17cad55c2178e715389b808e94e958fbdec4cce 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 9029056: Merge changes 1093,1094 into donut

Merge commit '902905682da7247aac3a73a71057e87f9758f0b1'

* commit '902905682da7247aac3a73a71057e87f9758f0b1':
init.rc: Add Nexus to services (disabled for now)
nexus: Initial checkin of Nexus - android native network management daemon.
902905682da7247aac3a73a71057e87f9758f0b1 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge changes 1093,1094 into donut

* changes:
init.rc: Add Nexus to services (disabled for now)
nexus: Initial checkin of Nexus - android native network management daemon.
9399844278c0efb1a4d85ea77ca3c6f47e854855 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 747baad: Merge change 1092 into donut

Merge commit '747baadddb37737b0ecf83f6147a5e3252a34b12'

* commit '747baadddb37737b0ecf83f6147a5e3252a34b12':
libsysutils: New C++ system convenience library
747baadddb37737b0ecf83f6147a5e3252a34b12 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1092 into donut

* changes:
libsysutils: New C++ system convenience library
493726bc8100d227acb09985db1c91e621919c3f 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 2780827: Merge change 1005 into donut

Merge commit '27808271934622e6473d7d664303fa3efb4cd662'

* commit '27808271934622e6473d7d664303fa3efb4cd662':
Make the /dev/qemu_trace device readable and writable by all.
27808271934622e6473d7d664303fa3efb4cd662 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1005 into donut

* changes:
Make the /dev/qemu_trace device readable and writable by all.
269946c09faaff88403289bcfa2519e994f75c21 06-May-2009 San Mehat <san@google.com> init.rc: Add Nexus to services (disabled for now)

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
dc266073e7c3127caedf26671a1c125dc8aadd8d 06-May-2009 San Mehat <san@google.com> nexus: Initial checkin of Nexus - android native network management daemon.

Initial skelaton

Signed-off-by: San Mehat <san@google.com>
exus/Android.mk
exus/CommandListener.cpp
exus/CommandListener.h
exus/Controller.cpp
exus/Controller.h
exus/LoopController.cpp
exus/LoopController.h
exus/NetworkManager.cpp
exus/NetworkManager.h
exus/NexusCommand.cpp
exus/NexusCommand.h
exus/ScanResult.cpp
exus/ScanResult.h
exus/Supplicant.cpp
exus/Supplicant.h
exus/SupplicantEvent.cpp
exus/SupplicantEvent.h
exus/SupplicantListener.cpp
exus/SupplicantListener.h
exus/SupplicantState.h
exus/TiwlanWifiController.cpp
exus/TiwlanWifiController.h
exus/VpnController.cpp
exus/VpnController.h
exus/WifiController.cpp
exus/WifiController.h
exus/main.cpp
exus/nexctl.c
168415b822cae1f8b54ef09c41c11a9b97b87f40 06-May-2009 San Mehat <san@google.com> libsysutils: New C++ system convenience library

This library contains re-usable classes for common
system level daemons. Initial consumers of this library
are 'nexus' and 'vold2'

Signed-off-by: San Mehat <san@google.com>
ndroid.mk
nclude/sysutils/FrameworkCommand.h
nclude/sysutils/FrameworkListener.h
nclude/sysutils/FrameworkManager.h
nclude/sysutils/NetlinkEvent.h
nclude/sysutils/NetlinkListener.h
nclude/sysutils/SocketListener.h
ibsysutils/Android.mk
ibsysutils/src/FrameworkCommand.cpp
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/FrameworkManager.cpp
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
ibsysutils/src/SocketListener.cpp
06c6589b1078a73ce25680f951356b1075418441 06-May-2009 Dima Zavin <dima@android.com> am 770354d: init: Fix segfault when log_write() was missing an arg to fo

Merge commit '770354d7e6cd471daed426fcf04bf7246e7cb18b'

* commit '770354d7e6cd471daed426fcf04bf7246e7cb18b':
init: Fix segfault when log_write() was missing an arg to format.
770354d7e6cd471daed426fcf04bf7246e7cb18b 06-May-2009 Dima Zavin <dima@android.com> init: Fix segfault when log_write() was missing an arg to format.

Also, flag log_write() as a printf-like beast to gcc.

Signed-off-by: Dima Zavin <dima@android.com>
nit/init.c
nit/init.h
4a762357d05fe2152dbe5d4b7085d01a5d4ccbf2 05-May-2009 Jack Veenstra <veenstra@android.com> Make the /dev/qemu_trace device readable and writable by all.

This is needed so that the Dalvik interpreter can add information
about Java method entry/exit to the traces when running in the qemu
emulator.
nit/devices.c
9b3174477d27ec2babb9feb3f5ca7ef92b4f1d9c 04-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 916

* changes:
Fix a potential integer overflow bug that could result in memory overwrites. Also add a check to the result of malloc()
a26c4e049a8fd163ba5f25d0c43c8a3fee86453f 02-May-2009 David 'Digit' Turner <digit@google.com> Fix a potential integer overflow bug that could result in memory overwrites.
Also add a check to the result of malloc()
ibcutils/strdup16to8.c
8cd81ab3f2a446837bd267b6e48ac7231c2f16bb 02-May-2009 Mathias Agopian <mathias@google.com> get rid of native_handle_{dup|copy} since they were not used any longer
nclude/cutils/native_handle.h
ibcutils/native_handle.c
318897a5c2c5b48c2da9c7e6a13f64eec9b4f190 01-May-2009 Android (Google) Code Review <android-gerrit@google.com> am feb3d6d: Merge change 877 into donut

Merge commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d'

* commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d':
adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too.
feb3d6d8db30f51c560e792ef3d9eca01d9cae9d 01-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 877 into donut

* changes:
adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too. While adb is not needed for the simulator, it's handy to have around when you're working with the simulator but need to look at a device.
b9e966f56b217bfd90ac0a0ee0dda11b5425dbbb 01-May-2009 Marco Nelissen <marcone@google.com> adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too.
While adb is not needed for the simulator, it's handy to have around when you're working with the simulator but need to look at a device.
db/Android.mk
b55cf93e2545521e613b4ce1c1f33d3a24f1a4cb 01-May-2009 Dima Zavin <dima@android.com> am 95ec983: fastboot: Update the help message with -b argument

Merge commit '95ec983887867a117f4ef87073495111aff4a506'

* commit '95ec983887867a117f4ef87073495111aff4a506':
fastboot: Update the help message with -b argument
95ec983887867a117f4ef87073495111aff4a506 01-May-2009 Dima Zavin <dima@android.com> fastboot: Update the help message with -b argument

Signed-off-by: Dima Zavin <dima@android.com>
astboot/fastboot.c
f31371145037fc1e8c794370bdcaab331214176e 30-Apr-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
7e3424b9c17ad94f14fe71cecca3d7cc33c0e7a9 30-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 8634c6c: Merge change 685 into donut

Merge commit '8634c6cf602efae71326fa7b3910d9034378287a'

* commit '8634c6cf602efae71326fa7b3910d9034378287a':
fastboot, mkbootimg: support alternate base addresses
e4da6a1a79ef2d6193ead9070f8663d2e3fa752d 30-Apr-2009 San Mehat <san@google.com> am cb9ae42: system/core: Remove old mountd code

Merge commit 'cb9ae42cd22cca46744bb964a2c412b145225748'

* commit 'cb9ae42cd22cca46744bb964a2c412b145225748':
system/core: Remove old mountd code
9fe0f0d14d30677ab4f728b7c64df8f27fc0c3bd 30-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 6181f70: Merge change 484 into donut

Merge commit '6181f70bd40fd020661841923e725df75a3a2793'

* commit '6181f70bd40fd020661841923e725df75a3a2793':
filesystem: Add new group 'sdcard_rw' for restricting sd card write access
8634c6cf602efae71326fa7b3910d9034378287a 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 685 into donut

* changes:
fastboot, mkbootimg: support alternate base addresses
2a63bb7abf1b27a7a2e8fd5951d77f71a2f290d4 29-Apr-2009 Brian Swetland <swetland@google.com> fastboot, mkbootimg: support alternate base addresses

Add the --base flag to mkbootimg and -b flag to fastboot, to allow
the default kernel base address (0x10000000) to be changed.

Signed-off-by: Brian Swetland <swetland@google.com>
astboot/bootimg.c
astboot/fastboot.c
kbootimg/mkbootimg.c
e9fcaf04f2bca5655f43bcdbcca14f72821adc6e 29-Apr-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
cb9ae42cd22cca46744bb964a2c412b145225748 27-Apr-2009 San Mehat <san@google.com> system/core: Remove old mountd code

Signed-off-by: San Mehat <san@google.com>
ountd/ASEC.c
ountd/ASEC.h
ountd/Android.mk
ountd/AutoMount.c
ountd/MODULE_LICENSE_APACHE2
ountd/NOTICE
ountd/ProcessKiller.c
ountd/Server.c
ountd/logwrapper.c
ountd/mountd.c
ountd/mountd.h
6181f70bd40fd020661841923e725df75a3a2793 23-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 484 into donut

* changes:
filesystem: Add new group 'sdcard_rw' for restricting sd card write access
6e1f21584f43311f35ae7f6a4737c6a7e846083a 23-Apr-2009 San Mehat <san@google.com> filesystem: Add new group 'sdcard_rw' for restricting sd card write access

Signed-off-by: San Mehat <san@google.com>
nclude/private/android_filesystem_config.h
63d5ac6157f5a46653bf6bfc2b9cde273290f59b 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
ca983f98badd6b19c1a4475642cd3b370d953767 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> merge cupcake into donut
f6c95712c43dc37b5cd50aeae9c9c03a1484fc36 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
4933098e22747a9066b5352273c38856b0203931 21-Apr-2009 San Mehat <san@google.com> cgroups: Initialize cgroups at startup.

Signed-off-by: San Mehat <san@google.com>
ootdir/init.rc
41e3a2c5e8d5f23f3c280dbba10f464570622e39 19-Apr-2009 Chung-yih Wang <> Merge branch 'readonly-p4-master'
f309f77adcd7e4eda63b9bdeed9df31ab77770b4 19-Apr-2009 Chung-yih Wang <> AI 146558: am: CL 146260 Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10
Original author: cywang

Automated import of CL 146558
oolbox/route.c
cccf42773a54b972301a0a62f314269acd252e3e 18-Apr-2009 Mathias Agopian <mathias@google.com> fix copyright notice
nclude/cutils/compiler.h
b5fbd75f6c58558a430ce15d077eed0a5ae97d9d 17-Apr-2009 Mathias Agopian <mathias@google.com> add a compiler.h to libcutils. it's intended to define compiler-dependent macros.

currently, it defines CC_LIKELY and CC_UNLIKELY.
nclude/cutils/compiler.h
8b0fb371c1402902a8fa56ee77af785d2e60d747 15-Apr-2009 Chung-yih Wang <> Merge branch 'readonly-p4-donut' into donut
98c297f2448fd8194cae16d213dfc9194180fa3f 15-Apr-2009 Chung-yih Wang <> AI 146260: Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10

Automated import of CL 146260
oolbox/route.c
61d8e487e65cba39a4ba98a8157e730f6db1a421 10-Apr-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into master_gl
1d3faaf72f28c9d71dde067b74b1351cdbc9a758 10-Apr-2009 Mathias Agopian <mathias@google.com> Integrate from //sandbox/mathias/donut/...@145728

SurfaceFlinger rework for new EGL driver model support.
nclude/cutils/ashmem.h
nclude/cutils/native_handle.h
ibcutils/Android.mk
ibcutils/native_handle.c
33d50dc785b9985031f025802e4b0f3ee39d5743 09-Apr-2009 Andy McFadden <> Merge branch 'readonly-p4-master'
b33d3415b6c63f7b22e0863a2ac594feab9171cf 09-Apr-2009 Andy McFadden <> AI 145220: Added "-d" flag to ls.
Now you can "ls -l -d <directory>" to see directory perms.

Automated import of CL 145220
oolbox/ls.c
477b4307004f853bb89c62f562fc9dc90a5ae71a 09-Apr-2009 Dianne Hackborn <hackbod@google.com> Improvements to get events: -p, better output.

Add new -p option to easily get the output showing which events are reported by the devices.

Improve the reported events output a bit by including a name for each event type.

Extend help text to include a description of each options, so I don't have to look in the source code next time. :)
oolbox/getevent.c
83eb023a09d2f5782bf9153d761cbdda4ce45b22 02-Apr-2009 Wink Saville <> Merge branch 'readonly-p4-master'
89efdc9c7f4005032dad86dd6dd220c23a7ff4d7 02-Apr-2009 Wink Saville <> AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Automated import of CL 144245
iblog/logd_write.c
7bdfb165ad84986b82dce1a3fcfecf51f9f06528 02-Apr-2009 Wink Saville <> AI 144185: Integrate cdma into the main code base.

Automated import of CL 144185
iblog/logd_write.c
455a6dffd4db929f46b9c5a1e1f5b541b9721bfe 29-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'open_source' into google_internal
0b022b894215ce8c14da1a6ce236ed9c694ef78a 27-Mar-2009 Nick Pelly <> AI 143248: am: CL 142809 am: CL 142808 Don't run hcid through logwrapper.
Original author: npelly
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143248
ootdir/init.rc
7be77b5ba8ae21dad91019a02bc2c5d38dba081f 27-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
e49f9c923868fd7a62356ab1864444ade4a2cab6 26-Mar-2009 Doug Kwan <> Automated import from //branches/master/...@142981,142981
oolbox/mkdosfs.c
oolbox/smd.c
old/mmc.c
01161168aa87ea9f1513d2b7b1232521c84e1ea4 26-Mar-2009 Nick Pelly <> Automated import from //branches/donutburger/...@142809,142809
ootdir/init.rc
8fbedcf73c0bfd2ecdbb4d4c93edd3d39dc28fd4 26-Mar-2009 Nick Pelly <> Automated import from //branches/cupcake/...@142808,142808
ootdir/init.rc
f441e1e9c42f4692be61927a74f4980d0bc7320d 25-Mar-2009 Dianne Hackborn <> Automated import from //branches/donutburger/...@140818,140818
ibctest/NOTICE
iblog/NOTICE
ibmincrypt/NOTICE
ibnetutils/NOTICE
ogwrapper/NOTICE
161b03c7ecf28b360f76007462d852574692e2dc 25-Mar-2009 Dianne Hackborn <> Automated import from //branches/master/...@140824,140824
ibctest/NOTICE
iblog/NOTICE
ibmincrypt/NOTICE
ibnetutils/NOTICE
ogwrapper/NOTICE
3207e480716889c4fdc6937b54a229e87bb2a5f3 20-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@141571
ibctest/NOTICE
iblog/NOTICE
ibmincrypt/NOTICE
ibnetutils/NOTICE
ogwrapper/NOTICE
b1487e4c587ce1184e3d0036ac5e6bd90405688d 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import //branches/master/...@140412
nclude/cutils/tztime.h
ibcutils/Android.mk
f614d64d4b4dfcd20c77ac3ccf2d9c9090a49303 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
astboot/fastboot.c
ootdir/etc/init.goldfish.rc
ootdir/init.rc
old/blkdev.c
old/format.c
old/logwrapper.c
old/misc.c
old/uevent.c
old/vold.h
old/volmgr.c
83b65486beffc7c86f24c428fbb7b50bbbe189f9 18-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
init/devices.c
libpixelflinger/Android.mk
e037fd7e193ecccbb5c0888e49f6d58c224bc11d 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
db/adb.c
db/commandline.c
db/services.c
nit/property_service.c
ibcutils/array.c
ibcutils/strdup8to16.c
ootdir/init.rc
old/blkdev.c
old/media.c
old/uevent.c
old/vold.c
old/volmgr.c
old/volmgr_vfat.c
2015549667fb77706a9879e974a3875ebccd8198 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
db/adb.c
ootdir/init.rc
old/volmgr_vfat.c
e4749f30e5bd8cec727a6d7504b10fc80426316a 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
ogcat/Android.mk
ootdir/init.rc
dd7bc3319deb2b77c5d07a51b7d6cd7e11b5beb0 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
EADME
db/Android.mk
db/OVERVIEW.TXT
db/SERVICES.TXT
db/adb.c
db/adb.h
db/adb_client.c
db/adb_client.h
db/commandline.c
db/console.c
db/file_sync_client.c
db/file_sync_service.c
db/file_sync_service.h
db/framebuffer_service.c
db/get_my_path_darwin.c
db/get_my_path_linux.c
db/get_my_path_windows.c
db/history.h
db/jdwp_service.c
db/log_service.c
db/mutex_list.h
db/protocol.txt
db/remount_service.c
db/services.c
db/shlist.c
db/shlist.h
db/sockets.c
db/sockets.dia
db/sysdeps.h
db/sysdeps_win32.c
db/test_track_devices.c
db/test_track_jdwp.c
db/transport.c
db/transport_local.c
db/transport_usb.c
db/usb_linux.c
db/usb_linux_client.c
db/usb_osx.c
db/usb_windows.c
db/utils.c
db/utils.h
pio/Android.mk
pio/mkbootfs.c
ebuggerd/Android.mk
ebuggerd/MODULE_LICENSE_APACHE2
ebuggerd/NOTICE
ebuggerd/crasher.c
ebuggerd/crashglue.S
ebuggerd/debuggerd.c
ebuggerd/getevent.c
ebuggerd/pr-support.c
ebuggerd/unwind-arm.c
ebuggerd/utility.c
ebuggerd/utility.h
astboot/Android.mk
astboot/bootimg.c
astboot/engine.c
astboot/engineering_key.p12
astboot/fastboot.c
astboot/fastboot.h
astboot/genkey.sh
astboot/p12topem.sh
astboot/protocol.c
astboot/signfile.sh
astboot/usb.h
astboot/usb_linux.c
astboot/usb_osx.c
astboot/usb_windows.c
astboot/usbtest.c
astboot/util_linux.c
astboot/util_osx.c
astboot/util_windows.c
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
nclude/ctest/ctest.h
nclude/cutils/adb_networking.h
nclude/cutils/array.h
nclude/cutils/ashmem.h
nclude/cutils/atomic.h
nclude/cutils/config_utils.h
nclude/cutils/cpu_info.h
nclude/cutils/dir_hash.h
nclude/cutils/event_tag_map.h
nclude/cutils/fdevent.h
nclude/cutils/hashmap.h
nclude/cutils/jstring.h
nclude/cutils/log.h
nclude/cutils/logd.h
nclude/cutils/logger.h
nclude/cutils/logprint.h
nclude/cutils/memory.h
nclude/cutils/misc.h
nclude/cutils/mq.h
nclude/cutils/mspace.h
nclude/cutils/native_handle.h
nclude/cutils/process_name.h
nclude/cutils/properties.h
nclude/cutils/record_stream.h
nclude/cutils/selector.h
nclude/cutils/sockets.h
nclude/cutils/threads.h
nclude/cutils/tztime.h
nclude/cutils/uio.h
nclude/cutils/zygote.h
nclude/mincrypt/rsa.h
nclude/mincrypt/sha.h
nclude/pixelflinger/format.h
nclude/pixelflinger/pixelflinger.h
nclude/private/android_filesystem_config.h
nclude/private/pixelflinger/ggl_context.h
nclude/private/pixelflinger/ggl_fixed.h
nclude/zipfile/zipfile.h
nit/Android.mk
nit/MODULE_LICENSE_APACHE2
nit/NOTICE
nit/README.BOOTCHART
nit/bootchart.c
nit/bootchart.h
nit/builtins.c
nit/devices.c
nit/devices.h
nit/grab-bootchart.sh
nit/init.c
nit/init.h
nit/keywords.h
nit/logo.c
nit/parser.c
nit/property_service.c
nit/property_service.h
nit/readme.txt
nit/util.c
ibctest/Android.mk
ibctest/ctest.c
ibcutils/Android.mk
ibcutils/MODULE_LICENSE_APACHE2
ibcutils/NOTICE
ibcutils/adb_networking.c
ibcutils/array.c
ibcutils/ashmem-dev.c
ibcutils/ashmem-host.c
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-armv6.S
ibcutils/atomic.c
ibcutils/buffer.c
ibcutils/buffer.h
ibcutils/config_utils.c
ibcutils/cpu_info.c
ibcutils/dir_hash.c
ibcutils/dlmalloc_stubs.c
ibcutils/fdevent.c
ibcutils/hashmap.c
ibcutils/load_file.c
ibcutils/loghack.h
ibcutils/memory.c
ibcutils/memset32.S
ibcutils/mq.c
ibcutils/mspace.c
ibcutils/private.h
ibcutils/process_name.c
ibcutils/properties.c
ibcutils/record_stream.c
ibcutils/selector.c
ibcutils/socket_inaddr_any_server.c
ibcutils/socket_local.h
ibcutils/socket_local_client.c
ibcutils/socket_local_server.c
ibcutils/socket_loopback_client.c
ibcutils/socket_loopback_server.c
ibcutils/socket_network_client.c
ibcutils/strdup16to8.c
ibcutils/strdup8to16.c
ibcutils/threads.c
ibcutils/tzfile.h
ibcutils/tzstrftime.c
ibcutils/tztime.c
ibcutils/uio.c
ibcutils/zygote.c
iblog/Android.mk
iblog/event_tag_map.c
iblog/fake_log_device.c
iblog/logd_write.c
iblog/logprint.c
ibmincrypt/Android.mk
ibmincrypt/rsa.c
ibmincrypt/sha.c
ibmincrypt/tools/Android.mk
ibmincrypt/tools/DumpPublicKey.java
ibmincrypt/tools/DumpPublicKey.mf
ibnetutils/Android.mk
ibnetutils/dhcp_utils.c
ibnetutils/dhcpclient.c
ibnetutils/dhcpmsg.c
ibnetutils/dhcpmsg.h
ibnetutils/ifc_utils.c
ibnetutils/ifc_utils.h
ibnetutils/packet.c
ibnetutils/packet.h
ibpixelflinger/Android.mk
ibpixelflinger/MODULE_LICENSE_APACHE2
ibpixelflinger/NOTICE
ibpixelflinger/buffer.cpp
ibpixelflinger/buffer.h
ibpixelflinger/clear.cpp
ibpixelflinger/clear.h
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/ARMAssemblerInterface.cpp
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/ARMAssemblerProxy.cpp
ibpixelflinger/codeflinger/ARMAssemblerProxy.h
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/CodeCache.h
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/GGLAssembler.h
ibpixelflinger/codeflinger/armreg.h
ibpixelflinger/codeflinger/blending.cpp
ibpixelflinger/codeflinger/disassem.c
ibpixelflinger/codeflinger/disassem.h
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/fixed.cpp
ibpixelflinger/format.cpp
ibpixelflinger/picker.cpp
ibpixelflinger/picker.h
ibpixelflinger/pixelflinger.cpp
ibpixelflinger/raster.cpp
ibpixelflinger/raster.h
ibpixelflinger/rotate90CW_4x4_16v6.S
ibpixelflinger/scanline.cpp
ibpixelflinger/scanline.h
ibpixelflinger/t32cb16blend.S
ibpixelflinger/tests/Android.mk
ibpixelflinger/tests/codegen/Android.mk
ibpixelflinger/tests/codegen/codegen.cpp
ibpixelflinger/tinyutils/KeyedVector.h
ibpixelflinger/tinyutils/SharedBuffer.cpp
ibpixelflinger/tinyutils/SharedBuffer.h
ibpixelflinger/tinyutils/TypeHelpers.h
ibpixelflinger/tinyutils/Vector.h
ibpixelflinger/tinyutils/VectorImpl.cpp
ibpixelflinger/tinyutils/VectorImpl.h
ibpixelflinger/tinyutils/smartpointer.h
ibpixelflinger/trap.cpp
ibpixelflinger/trap.h
ibzipfile/Android.mk
ibzipfile/MODULE_LICENSE_APACHE2
ibzipfile/NOTICE
ibzipfile/centraldir.c
ibzipfile/private.h
ibzipfile/test_zipfile.c
ibzipfile/zipfile.c
ogcat/Android.mk
ogcat/MODULE_LICENSE_APACHE2
ogcat/NOTICE
ogcat/event-log-tags
ogcat/logcat.cpp
ogwrapper/Android.mk
ogwrapper/logwrapper.c
kbootimg/Android.mk
kbootimg/bootimg.h
kbootimg/mkbootimg.c
ountd/ASEC.c
ountd/ASEC.h
ountd/Android.mk
ountd/AutoMount.c
ountd/MODULE_LICENSE_APACHE2
ountd/NOTICE
ountd/ProcessKiller.c
ountd/Server.c
ountd/logwrapper.c
ountd/mountd.c
ountd/mountd.h
etcfg/Android.mk
etcfg/MODULE_LICENSE_APACHE2
etcfg/NOTICE
etcfg/netcfg.c
ootdir/Android.mk
ootdir/etc/dbus.conf
ootdir/etc/hosts
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
ootdir/etc/init.gprs-pppd
ootdir/etc/init.testmenu
ootdir/etc/mountd.conf
ootdir/etc/ppp/chap-secrets
ootdir/etc/ppp/ip-down
ootdir/etc/ppp/ip-up
ootdir/init.rc
h/Android.mk
h/MODULE_LICENSE_BSD
h/NOTICE
h/TOUR
h/alias.c
h/alias.h
h/arith.c
h/arith.h
h/arith.y
h/arith_lex.c
h/arith_lex.l
h/bltin/bltin.h
h/bltin/echo.1
h/bltin/echo.c
h/builtins.c
h/builtins.def
h/builtins.h
h/cd.c
h/cd.h
h/error.c
h/error.h
h/eval.c
h/eval.h
h/exec.c
h/exec.h
h/expand.c
h/expand.h
h/funcs/cmv
h/funcs/dirs
h/funcs/kill
h/funcs/login
h/funcs/newgrp
h/funcs/popd
h/funcs/pushd
h/funcs/suspend
h/histedit.c
h/init.c
h/init.h
h/input.c
h/input.h
h/jobs.c
h/jobs.h
h/machdep.h
h/main.c
h/main.h
h/memalloc.c
h/memalloc.h
h/miscbltin.c
h/miscbltin.h
h/mkbuiltins
h/mkinit.sh
h/mknodes.sh
h/mktokens
h/myhistedit.h
h/mystring.c
h/mystring.h
h/nodes.c
h/nodes.c.pat
h/nodes.h
h/nodetypes
h/options.c
h/options.h
h/output.c
h/output.h
h/parser.c
h/parser.h
h/redir.c
h/redir.h
h/sh.1
h/shell.h
h/show.c
h/show.h
h/syntax.c
h/syntax.h
h/token.h
h/trap.c
h/trap.h
h/var.c
h/var.h
oolbox/Android.mk
oolbox/MODULE_LICENSE_BSD
oolbox/NOTICE
oolbox/alarm.c
oolbox/cat.c
oolbox/chmod.c
oolbox/chown.c
oolbox/cmp.c
oolbox/date.c
oolbox/dd.c
oolbox/dd.h
oolbox/df.c
oolbox/dmesg.c
oolbox/exists.c
oolbox/getevent.c
oolbox/getprop.c
oolbox/hd.c
oolbox/id.c
oolbox/ifconfig.c
oolbox/iftop.c
oolbox/insmod.c
oolbox/ioctl.c
oolbox/kill.c
oolbox/ln.c
oolbox/log.c
oolbox/ls.c
oolbox/lsmod.c
oolbox/mkdir.c
oolbox/mkdosfs.c
oolbox/mount.c
oolbox/mv.c
oolbox/netstat.c
oolbox/notify.c
oolbox/powerd.c
oolbox/printenv.c
oolbox/ps.c
oolbox/r.c
oolbox/readtty.c
oolbox/reboot.c
oolbox/renice.c
oolbox/rm.c
oolbox/rmdir.c
oolbox/rmmod.c
oolbox/rotatefb.c
oolbox/route.c
oolbox/schedtop.c
oolbox/sendevent.c
oolbox/setconsole.c
oolbox/setkey.c
oolbox/setprop.c
oolbox/sleep.c
oolbox/smd.c
oolbox/start.c
oolbox/stop.c
oolbox/sync.c
oolbox/syren.c
oolbox/toolbox.c
oolbox/top.c
oolbox/umount.c
oolbox/vmstat.c
oolbox/watchprops.c
oolbox/wipe.c
old/Android.mk
old/ProcessKiller.c
old/blkdev.c
old/blkdev.h
old/cmd_dispatch.c
old/cmd_dispatch.h
old/devmapper.c
old/devmapper.h
old/diskmbr.h
old/format.c
old/format.h
old/geom_mbr_enc.c
old/logwrapper.c
old/logwrapper.h
old/media.c
old/media.h
old/misc.c
old/mmc.c
old/mmc.h
old/switch.c
old/switch.h
old/uevent.c
old/uevent.h
old/ums.c
old/ums.h
old/vold.c
old/vold.h
old/volmgr.c
old/volmgr.h
old/volmgr_ext3.c
old/volmgr_ext3.h
old/volmgr_vfat.c
old/volmgr_vfat.h
e54eebbf1a908d65ee8cf80bab62821c05666d70 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
EADME
db/Android.mk
db/OVERVIEW.TXT
db/SERVICES.TXT
db/adb.c
db/adb.h
db/adb_client.c
db/adb_client.h
db/commandline.c
db/console.c
db/file_sync_client.c
db/file_sync_service.c
db/file_sync_service.h
db/framebuffer_service.c
db/get_my_path_darwin.c
db/get_my_path_linux.c
db/get_my_path_windows.c
db/history.h
db/jdwp_service.c
db/log_service.c
db/mutex_list.h
db/protocol.txt
db/remount_service.c
db/services.c
db/shlist.c
db/shlist.h
db/sockets.c
db/sockets.dia
db/sysdeps.h
db/sysdeps_win32.c
db/test_track_devices.c
db/test_track_jdwp.c
db/transport.c
db/transport_local.c
db/transport_usb.c
db/usb_linux.c
db/usb_linux_client.c
db/usb_osx.c
db/usb_windows.c
db/utils.c
db/utils.h
pio/Android.mk
pio/mkbootfs.c
ebuggerd/Android.mk
ebuggerd/MODULE_LICENSE_APACHE2
ebuggerd/NOTICE
ebuggerd/crasher.c
ebuggerd/crashglue.S
ebuggerd/debuggerd.c
ebuggerd/getevent.c
ebuggerd/pr-support.c
ebuggerd/unwind-arm.c
ebuggerd/utility.c
ebuggerd/utility.h
astboot/Android.mk
astboot/bootimg.c
astboot/engine.c
astboot/engineering_key.p12
astboot/fastboot.c
astboot/fastboot.h
astboot/genkey.sh
astboot/p12topem.sh
astboot/protocol.c
astboot/signfile.sh
astboot/usb.h
astboot/usb_linux.c
astboot/usb_osx.c
astboot/usb_windows.c
astboot/usbtest.c
astboot/util_linux.c
astboot/util_osx.c
astboot/util_windows.c
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
nclude/ctest/ctest.h
nclude/cutils/adb_networking.h
nclude/cutils/array.h
nclude/cutils/ashmem.h
nclude/cutils/atomic.h
nclude/cutils/config_utils.h
nclude/cutils/cpu_info.h
nclude/cutils/dir_hash.h
nclude/cutils/event_tag_map.h
nclude/cutils/fdevent.h
nclude/cutils/hashmap.h
nclude/cutils/jstring.h
nclude/cutils/log.h
nclude/cutils/logd.h
nclude/cutils/logger.h
nclude/cutils/logprint.h
nclude/cutils/memory.h
nclude/cutils/misc.h
nclude/cutils/mq.h
nclude/cutils/mspace.h
nclude/cutils/native_handle.h
nclude/cutils/process_name.h
nclude/cutils/properties.h
nclude/cutils/record_stream.h
nclude/cutils/selector.h
nclude/cutils/sockets.h
nclude/cutils/threads.h
nclude/cutils/tztime.h
nclude/cutils/uio.h
nclude/cutils/zygote.h
nclude/mincrypt/rsa.h
nclude/mincrypt/sha.h
nclude/pixelflinger/format.h
nclude/pixelflinger/pixelflinger.h
nclude/private/android_filesystem_config.h
nclude/private/pixelflinger/ggl_context.h
nclude/private/pixelflinger/ggl_fixed.h
nclude/zipfile/zipfile.h
nit/Android.mk
nit/MODULE_LICENSE_APACHE2
nit/NOTICE
nit/README.BOOTCHART
nit/bootchart.c
nit/bootchart.h
nit/builtins.c
nit/devices.c
nit/devices.h
nit/grab-bootchart.sh
nit/init.c
nit/init.h
nit/keywords.h
nit/logo.c
nit/parser.c
nit/property_service.c
nit/property_service.h
nit/readme.txt
nit/util.c
ibctest/Android.mk
ibctest/ctest.c
ibcutils/Android.mk
ibcutils/MODULE_LICENSE_APACHE2
ibcutils/NOTICE
ibcutils/adb_networking.c
ibcutils/array.c
ibcutils/ashmem-dev.c
ibcutils/ashmem-host.c
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-armv6.S
ibcutils/atomic.c
ibcutils/buffer.c
ibcutils/buffer.h
ibcutils/config_utils.c
ibcutils/cpu_info.c
ibcutils/dir_hash.c
ibcutils/dlmalloc_stubs.c
ibcutils/fdevent.c
ibcutils/hashmap.c
ibcutils/load_file.c
ibcutils/loghack.h
ibcutils/memory.c
ibcutils/memset32.S
ibcutils/mq.c
ibcutils/mspace.c
ibcutils/private.h
ibcutils/process_name.c
ibcutils/properties.c
ibcutils/record_stream.c
ibcutils/selector.c
ibcutils/socket_inaddr_any_server.c
ibcutils/socket_local.h
ibcutils/socket_local_client.c
ibcutils/socket_local_server.c
ibcutils/socket_loopback_client.c
ibcutils/socket_loopback_server.c
ibcutils/socket_network_client.c
ibcutils/strdup16to8.c
ibcutils/strdup8to16.c
ibcutils/threads.c
ibcutils/tzfile.h
ibcutils/tzstrftime.c
ibcutils/tztime.c
ibcutils/uio.c
ibcutils/zygote.c
iblog/Android.mk
iblog/event_tag_map.c
iblog/fake_log_device.c
iblog/logd_write.c
iblog/logprint.c
ibmincrypt/Android.mk
ibmincrypt/rsa.c
ibmincrypt/sha.c
ibmincrypt/tools/Android.mk
ibmincrypt/tools/DumpPublicKey.java
ibmincrypt/tools/DumpPublicKey.mf
ibnetutils/Android.mk
ibnetutils/dhcp_utils.c
ibnetutils/dhcpclient.c
ibnetutils/dhcpmsg.c
ibnetutils/dhcpmsg.h
ibnetutils/ifc_utils.c
ibnetutils/ifc_utils.h
ibnetutils/packet.c
ibnetutils/packet.h
ibpixelflinger/Android.mk
ibpixelflinger/MODULE_LICENSE_APACHE2
ibpixelflinger/NOTICE
ibpixelflinger/buffer.cpp
ibpixelflinger/buffer.h
ibpixelflinger/clear.cpp
ibpixelflinger/clear.h
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/ARMAssemblerInterface.cpp
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/ARMAssemblerProxy.cpp
ibpixelflinger/codeflinger/ARMAssemblerProxy.h
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/CodeCache.h
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/GGLAssembler.h
ibpixelflinger/codeflinger/armreg.h
ibpixelflinger/codeflinger/blending.cpp
ibpixelflinger/codeflinger/disassem.c
ibpixelflinger/codeflinger/disassem.h
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/fixed.cpp
ibpixelflinger/format.cpp
ibpixelflinger/picker.cpp
ibpixelflinger/picker.h
ibpixelflinger/pixelflinger.cpp
ibpixelflinger/raster.cpp
ibpixelflinger/raster.h
ibpixelflinger/rotate90CW_4x4_16v6.S
ibpixelflinger/scanline.cpp
ibpixelflinger/scanline.h
ibpixelflinger/t32cb16blend.S
ibpixelflinger/tests/Android.mk
ibpixelflinger/tests/codegen/Android.mk
ibpixelflinger/tests/codegen/codegen.cpp
ibpixelflinger/tinyutils/KeyedVector.h
ibpixelflinger/tinyutils/SharedBuffer.cpp
ibpixelflinger/tinyutils/SharedBuffer.h
ibpixelflinger/tinyutils/TypeHelpers.h
ibpixelflinger/tinyutils/Vector.h
ibpixelflinger/tinyutils/VectorImpl.cpp
ibpixelflinger/tinyutils/VectorImpl.h
ibpixelflinger/tinyutils/smartpointer.h
ibpixelflinger/trap.cpp
ibpixelflinger/trap.h
ibzipfile/Android.mk
ibzipfile/MODULE_LICENSE_APACHE2
ibzipfile/NOTICE
ibzipfile/centraldir.c
ibzipfile/private.h
ibzipfile/test_zipfile.c
ibzipfile/zipfile.c
ogcat/Android.mk
ogcat/MODULE_LICENSE_APACHE2
ogcat/NOTICE
ogcat/event-log-tags
ogcat/logcat.cpp
ogwrapper/Android.mk
ogwrapper/logwrapper.c
kbootimg/Android.mk
kbootimg/bootimg.h
kbootimg/mkbootimg.c
ountd/ASEC.c
ountd/ASEC.h
ountd/Android.mk
ountd/AutoMount.c
ountd/MODULE_LICENSE_APACHE2
ountd/NOTICE
ountd/ProcessKiller.c
ountd/Server.c
ountd/logwrapper.c
ountd/mountd.c
ountd/mountd.h
etcfg/Android.mk
etcfg/MODULE_LICENSE_APACHE2
etcfg/NOTICE
etcfg/netcfg.c
ootdir/Android.mk
ootdir/etc/dbus.conf
ootdir/etc/hosts
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
ootdir/etc/init.gprs-pppd
ootdir/etc/init.testmenu
ootdir/etc/mountd.conf
ootdir/etc/ppp/chap-secrets
ootdir/etc/ppp/ip-down
ootdir/etc/ppp/ip-up
ootdir/init.rc
h/Android.mk
h/MODULE_LICENSE_BSD
h/NOTICE
h/TOUR
h/alias.c
h/alias.h
h/arith.c
h/arith.h
h/arith.y
h/arith_lex.c
h/arith_lex.l
h/bltin/bltin.h
h/bltin/echo.1
h/bltin/echo.c
h/builtins.c
h/builtins.def
h/builtins.h
h/cd.c
h/cd.h
h/error.c
h/error.h
h/eval.c
h/eval.h
h/exec.c
h/exec.h
h/expand.c
h/expand.h
h/funcs/cmv
h/funcs/dirs
h/funcs/kill
h/funcs/login
h/funcs/newgrp
h/funcs/popd
h/funcs/pushd
h/funcs/suspend
h/histedit.c
h/init.c
h/init.h
h/input.c
h/input.h
h/jobs.c
h/jobs.h
h/machdep.h
h/main.c
h/main.h
h/memalloc.c
h/memalloc.h
h/miscbltin.c
h/miscbltin.h
h/mkbuiltins
h/mkinit.sh
h/mknodes.sh
h/mktokens
h/myhistedit.h
h/mystring.c
h/mystring.h
h/nodes.c
h/nodes.c.pat
h/nodes.h
h/nodetypes
h/options.c
h/options.h
h/output.c
h/output.h
h/parser.c
h/parser.h
h/redir.c
h/redir.h
h/sh.1
h/shell.h
h/show.c
h/show.h
h/syntax.c
h/syntax.h
h/token.h
h/trap.c
h/trap.h
h/var.c
h/var.h
oolbox/Android.mk
oolbox/MODULE_LICENSE_BSD
oolbox/NOTICE
oolbox/alarm.c
oolbox/cat.c
oolbox/chmod.c
oolbox/chown.c
oolbox/cmp.c
oolbox/date.c
oolbox/dd.c
oolbox/dd.h
oolbox/df.c
oolbox/dmesg.c
oolbox/exists.c
oolbox/getevent.c
oolbox/getprop.c
oolbox/hd.c
oolbox/id.c
oolbox/ifconfig.c
oolbox/iftop.c
oolbox/insmod.c
oolbox/ioctl.c
oolbox/kill.c
oolbox/ln.c
oolbox/log.c
oolbox/ls.c
oolbox/lsmod.c
oolbox/mkdir.c
oolbox/mkdosfs.c
oolbox/mount.c
oolbox/mv.c
oolbox/netstat.c
oolbox/notify.c
oolbox/powerd.c
oolbox/printenv.c
oolbox/ps.c
oolbox/r.c
oolbox/readtty.c
oolbox/reboot.c
oolbox/renice.c
oolbox/rm.c
oolbox/rmdir.c
oolbox/rmmod.c
oolbox/rotatefb.c
oolbox/route.c
oolbox/schedtop.c
oolbox/sendevent.c
oolbox/setconsole.c
oolbox/setkey.c
oolbox/setprop.c
oolbox/sleep.c
oolbox/smd.c
oolbox/start.c
oolbox/stop.c
oolbox/sync.c
oolbox/syren.c
oolbox/toolbox.c
oolbox/top.c
oolbox/umount.c
oolbox/vmstat.c
oolbox/watchprops.c
oolbox/wipe.c
old/Android.mk
old/ProcessKiller.c
old/blkdev.c
old/blkdev.h
old/cmd_dispatch.c
old/cmd_dispatch.h
old/devmapper.c
old/devmapper.h
old/diskmbr.h
old/format.c
old/format.h
old/geom_mbr_enc.c
old/logwrapper.c
old/logwrapper.h
old/media.c
old/media.h
old/misc.c
old/mmc.c
old/mmc.h
old/switch.c
old/switch.h
old/uevent.c
old/uevent.h
old/ums.c
old/ums.h
old/vold.c
old/vold.h
old/volmgr.c
old/volmgr.h
old/volmgr_ext3.c
old/volmgr_ext3.h
old/volmgr_vfat.c
old/volmgr_vfat.h
a1e1c1b106423de09bc918502e7a51d4ffe5a4ae 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
ogcat/event-log-tags
oolbox/mkdosfs.c
old/blkdev.c
c2d26a164fc19a6ce7cf6d0c691626bf4b5176f6 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
ogcat/event-log-tags
oolbox/mkdosfs.c
old/blkdev.c
3e292b9716072cae37bff5b99c1d2660555a265e 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
ibpixelflinger/scanline.cpp
ogcat/event-log-tags
old/misc.c
261ed7551e3234aa437658796afdc4eb372da9d7 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
nit/devices.c
ibpixelflinger/Android.mk
oolbox/top.c
old/misc.c
old/uevent.c
old/volmgr.c
1b8e5a6b14ca850920e19b3dfae41e6494475c1a 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
db/log_service.c
nclude/cutils/logger.h
nclude/cutils/logprint.h
iblog/logd_write.c
ibnetutils/dhcp_utils.c
ogcat/event-log-tags
ogcat/logcat.cpp
old/ProcessKiller.c
old/blkdev.c
old/cmd_dispatch.c
old/devmapper.c
old/devmapper.h
old/format.c
old/format.h
old/logwrapper.c
old/media.c
old/mmc.c
old/switch.c
old/uevent.c
old/ums.c
old/vold.c
old/volmgr.c
old/volmgr.h
old/volmgr_ext3.c
old/volmgr_vfat.c
13f797da7f190e9ea52f2f3d235210b8a4963b21 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
db/usb_linux.c
astboot/fastboot.c
nclude/pixelflinger/format.h
ibpixelflinger/format.cpp
ogcat/event-log-tags
ountd/Android.mk
ootdir/Android.mk
oolbox/Android.mk
oolbox/chown.c
oolbox/insmod.c
old/Android.mk
old/blkdev.c
old/blkdev.h
old/cmd_dispatch.c
old/cmd_dispatch.h
old/devmapper.c
old/devmapper.h
old/format.c
old/format.h
old/geom_mbr_enc.c
old/inotify.c
old/inotify.h
old/media.c
old/media.h
old/mmc.c
old/switch.c
old/switch.h
old/uevent.c
old/ums.c
old/vold.c
old/vold.h
old/volmgr.c
old/volmgr.h
old/volmgr_ext3.c
old/volmgr_ext3.h
old/volmgr_vfat.c
old/volmgr_vfat.h
4a4c9f6f98055918f1ebff06b3cc1ed622c058fe 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'cupcake'
dcf3ce247e13fe0a982ed2ada35cdee1f0ac626a 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127436
nit/devices.c
old/volmgr.c
1b6345894ee746905e6fa7807bfc64e5ab6834ba 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'cupcake'
8ac3a138168f79b47356fb5aea2f6d95fc3147c6 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
pio/mkbootfs.c
nclude/cutils/native_handle.h
ibmincrypt/Android.mk
kbootimg/Android.mk
kbootimg/mkbootimg.c
ountd/AutoMount.c
old/Android.mk
old/ProcessKiller.c
old/blkdev.c
old/blkdev.h
old/cmd_dispatch.c
old/cmd_dispatch.h
old/diskmbr.h
old/geom_mbr_enc.c
old/inotify.c
old/inotify.h
old/logwrapper.c
old/logwrapper.h
old/media.c
old/media.h
old/misc.c
old/mmc.c
old/mmc.h
old/uevent.c
old/uevent.h
old/ums.c
old/ums.h
old/vold.c
old/vold.h
old/volmgr.c
old/volmgr.h
old/volmgr_ext3.c
old/volmgr_ext3.h
old/volmgr_vfat.c
old/volmgr_vfat.h
439f6ca123bbc69c33dfb38e591641886bbabb57 16-Jan-2009 android-build SharedAccount <android-build@undroid16.corp.google.com> auto import from //branches/cupcake/...@126645
2eef60297a0ca1433d0824d6d662efd402709cfd 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
iblog/logd_write.c
ibpixelflinger/Android.mk
ibpixelflinger/codeflinger/ARMAssembler.cpp
038862e152b98d0c0f355c6802beaa1ed59cefbe 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'cupcake'
5ae090ed949cea9d1e7ab1552b455a229f8f9757 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
db/Android.mk
db/SERVICES.TXT
db/adb.c
db/commandline.c
db/kdbg.c
db/services.c
nclude/arch/linux-arm/AndroidConfig.h
nit/devices.c
nit/init.c
nit/init.h
nit/keywords.h
nit/parser.c
ountd/ASEC.c
ountd/Android.mk
ountd/AutoMount.c
ountd/dm-ioctl.h
ountd/logwrapper.c
ountd/mountd.h
5a326952d72e7d4242a0664a6d9f27f4126beaa9 24-Dec-2008 Brian Swetland <swetland@google.com> fix TINY ANDROID build

A better fix would be to banish this qemu tracing stuff from libhardware
and also banish it from non-emulator builds, but this at least gets the
minimal build building again.
ibpixelflinger/Android.mk
77d0c65b950570edd5241a8f2ebecfc3acbc5135 19-Dec-2008 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake'

Conflicts:
init/devices.c
logwrapper/logwrapper.c
mountd/AutoMount.c
35237d135807af84bf9b0e5b8d7f8633e58db6f5 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ndroid.mk
db/Android.mk
db/OVERVIEW.TXT
db/SERVICES.TXT
db/adb.c
db/adb.h
db/adb_client.c
db/commandline.c
db/file_sync_client.c
db/file_sync_service.c
db/framebuffer_service.c
db/get_my_path_windows.c
db/jdwp_service.c
db/sockets.c
db/sysdeps_win32.c
db/transport_local.c
db/transport_usb.c
db/usb_linux_client.c
db/usb_osx.c
db/usb_windows.c
db/utils.c
db/utils.h
pio/Android.mk
ebuggerd/Android.mk
ebuggerd/unwind-arm.c
ebuggerd/utility.c
ebuggerd/utility.h
astboot/Android.mk
astboot/fastboot.c
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/target_linux-x86/AndroidConfig.h
nclude/cutils/tztime.h
nclude/pixelflinger/format.h
nclude/private/android_filesystem_config.h
nclude/private/pixelflinger/ggl_context.h
nit/README.BOOTCHART
nit/bootchart.c
nit/bootchart.h
nit/builtins.c
nit/devices.c
nit/grab-bootchart.sh
nit/init.c
nit/keywords.h
nit/parser.c
nit/property_service.c
nit/readme.txt
ibcutils/Android.mk
ibcutils/atomic-android-arm.S
ibcutils/tzstrftime.c
ibnetutils/dhcp_utils.c
ibpixelflinger/Android.mk
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/GGLAssembler.h
ibpixelflinger/codeflinger/blending.cpp
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/format.cpp
ibpixelflinger/scanline.cpp
ibpixelflinger/tests/Android.mk
ibpixelflinger/tests/codegen/Android.mk
ibpixelflinger/tests/codegen/codegen.cpp
ogcat/event-log-tags
ogwrapper/logwrapper.c
kbootimg/Android.mk
ountd/ASEC.c
ountd/ASEC.h
ountd/Android.mk
ountd/AutoMount.c
ountd/ProcessKiller.c
ountd/Server.c
ountd/dm-ioctl.h
ountd/mountd.c
ountd/mountd.h
ootdir/Android.mk
ootdir/etc/dbus.conf
ootdir/etc/hcid.conf
ootdir/etc/init.goldfish.rc
ootdir/etc/mountd.conf
ootdir/init.rc
oolbox/Android.mk
829dd45fe9556dac5996969c30b90f1be6c47c47 04-Dec-2008 Jean-Baptiste Queru <jbq@google.com> Build for ARMv4T

Modify a few files in the system to use the macros introduced in
<machine/cpu-features.h> in order to build for ARMv4T.
ibcutils/atomic-android-arm.S
165de92bf1bca1648b4df3047a8f274e0aff4ca9 23-Nov-2008 Ivan Djelic <ivan.djelic@parrot.com> show error message when exec fails during service startup
nit/init.c
5bb44c8ea2bc513fefc526918980ab3d17494ecc 26-Nov-2008 Xiaopeng Yang <xiaopeng.yang@windriver.com> Create sound device nodes in /dev/snd/.
nit/devices.c
7186a800c0d804560863f0e89702ee90101a574b 03-Dec-2008 Android Code Review <code-review@android.com> Merge
2f688cf94d2a34204e707359ef98953c1b6b192f 26-Nov-2008 Android Code Review <code-review@android.com> Merge
e520d036165b36cf5c4cb305f9cec7d183977b61 20-Nov-2008 Jay Freeman (saurik) <saurik@saurik.com> Added support for loop@/path/to/filename to init's mount.

In keeping with the pattern of mtd@partition, I have added loop@path as a way to specify a loopback device. This way you can do things like mount directories in /system using cramfs from a file otherwise on /system (just one example oof how I'm using it). I specifically went with loop@ rather than adding this feature as a flag as the flags system is designed to set bits in the flags argument to mount: using loop@ fit the model in a much simpler manner and actually feels "correct".

This is a better version of the previously submitted 4045 that also refactors the mtd@ case. The reason for this is that I received comments that I should check for errors and return errors rather that do work in the case of success and fall through, but the mtd@ case wasn't doing that either and it became awkward to design the function so that it was half in one style of error handling and half in another. I also made certain to use inequality comparisons for Unix's -1 error returns rather than checking for -1, refactored my large if statement so as not to have danling parentheses, and disassocited the loop device on mount failure.
nit/builtins.c
1964942af0f194287bbdd5dc7ce97399b19f97b7 19-Nov-2008 Jay Freeman (saurik) <saurik@saurik.com> Removed special consideration of EBUSY from mountd's auto-mounter.

If the SD card is partitioned and one attempts to use a partition of the SD card for another purpose (maybe even booting off of it), then mmcblk0 is considered "busy" when mountd tries to mount it (as specified by /etc/mountd.conf). Normally, it would then attempt to mount partitions of the device, but as "busy" is specially treated in the code it does not consider this to be an error condition.

The argment for this check is that "the device is likely already mounted", but that is obviously not something that should be assumed (and is not true in this example situation). Even if the device were already mounted, from the auto-mounter's viewpoint this should be considered an error anyway, as it failed to mount it as it was told. I therefore believe this check to not only be causing the above problem but also to be incorrect. This change removes it.

For more information, see this thread:
http://groups.google.com/group/android-porting/browse_thread/thread/a67cbe36603d429a
ountd/AutoMount.c
bc7b0cbe156da639f0cbe17bf89725d87e86512a 16-Nov-2008 Jay Freeman (saurik) <saurik@saurik.com> Open file and loop device with O_RDONLY when -o loop,ro.
Otherwise: ioctl LOOP_SET_FD failed: Bad file number.
oolbox/mount.c
abb9638e3696e393d6dc45439feda91073e52103 04-Nov-2008 Alexey Tarasov <tarasov@dodologics.com> 1. added macro definitions to AndroidConfig.h
2. removed unnecessary include of <alloca.h>
nclude/arch/freebsd-x86/AndroidConfig.h
iblog/logprint.c
57401dc849db11f38133796c01d982de0391318d 02-Nov-2008 Alexey Tarasov <tarasov@dodologics.com> Added AndroidConfig.h for FreeBSD
nclude/arch/freebsd-x86/AndroidConfig.h
011a60c9ecc5a375431d3c34a70050892e28810f 01-Nov-2008 Mike Lockwood <lockwood@android.com> logwrapper: switch from root to user/group "log" after forking child.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ogwrapper/logwrapper.c
3088ff8d395cea07819d84d46af04f17419ae542 30-Oct-2008 Iliyan Malchev <malchev@google.com> Set permissions for /dev/msm_snd.

Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/devices.c
4f6e8d7a00cbeda1e70cc15be9c4af1018bdad53 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ndroid.mk
EADME
db/Android.mk
db/adb.c
db/adb.h
db/adb_client.c
db/adb_client.h
db/commandline.c
db/console.c
db/file_sync_client.c
db/file_sync_service.c
db/file_sync_service.h
db/framebuffer_service.c
db/get_my_path_darwin.c
db/get_my_path_linux.c
db/get_my_path_windows.c
db/history.h
db/jdwp_service.c
db/kdbg.c
db/log_service.c
db/mutex_list.h
db/protocol.txt
db/remount_service.c
db/services.c
db/shlist.c
db/shlist.h
db/sockets.c
db/sockets.dia
db/sysdeps.h
db/sysdeps_win32.c
db/test_track_devices.c
db/test_track_jdwp.c
db/transport.c
db/transport_local.c
db/transport_usb.c
db/usb_linux.c
db/usb_linux_client.c
db/usb_osx.c
db/usb_windows.c
pio/Android.mk
pio/mkbootfs.c
ebuggerd/Android.mk
ebuggerd/MODULE_LICENSE_APACHE2
ebuggerd/NOTICE
ebuggerd/crasher.c
ebuggerd/crashglue.S
ebuggerd/debuggerd.c
ebuggerd/getevent.c
ebuggerd/pr-support.c
ebuggerd/unwind-arm.c
ebuggerd/utility.c
ebuggerd/utility.h
astboot/Android.mk
astboot/bootimg.c
astboot/engine.c
astboot/engineering_key.p12
astboot/fastboot.c
astboot/fastboot.h
astboot/genkey.sh
astboot/p12topem.sh
astboot/protocol.c
astboot/signfile.sh
astboot/usb.h
astboot/usb_linux.c
astboot/usb_osx.c
astboot/usb_windows.c
astboot/usbtest.c
astboot/util_linux.c
astboot/util_osx.c
astboot/util_windows.c
nclude/arch/darwin-x86/AndroidConfig.h
nclude/arch/linux-arm/AndroidConfig.h
nclude/arch/linux-x86/AndroidConfig.h
nclude/arch/windows/AndroidConfig.h
nclude/ctest/ctest.h
nclude/cutils/adb_networking.h
nclude/cutils/array.h
nclude/cutils/ashmem.h
nclude/cutils/atomic.h
nclude/cutils/config_utils.h
nclude/cutils/cpu_info.h
nclude/cutils/dir_hash.h
nclude/cutils/event_tag_map.h
nclude/cutils/fdevent.h
nclude/cutils/hashmap.h
nclude/cutils/jstring.h
nclude/cutils/log.h
nclude/cutils/logd.h
nclude/cutils/logprint.h
nclude/cutils/memory.h
nclude/cutils/misc.h
nclude/cutils/mq.h
nclude/cutils/mspace.h
nclude/cutils/process_name.h
nclude/cutils/properties.h
nclude/cutils/record_stream.h
nclude/cutils/selector.h
nclude/cutils/sockets.h
nclude/cutils/threads.h
nclude/cutils/tztime.h
nclude/cutils/uio.h
nclude/cutils/zygote.h
nclude/mincrypt/rsa.h
nclude/mincrypt/sha.h
nclude/pixelflinger/format.h
nclude/pixelflinger/pixelflinger.h
nclude/private/android_filesystem_config.h
nclude/private/pixelflinger/ggl_context.h
nclude/private/pixelflinger/ggl_fixed.h
nclude/zipfile/zipfile.h
nit/Android.mk
nit/MODULE_LICENSE_APACHE2
nit/NOTICE
nit/README.BOOTCHART
nit/bootchart.c
nit/builtins.c
nit/devices.c
nit/devices.h
nit/grab-bootchart.sh
nit/init.c
nit/init.h
nit/keywords.h
nit/logo.c
nit/parser.c
nit/property_service.c
nit/property_service.h
nit/readme.txt
nit/util.c
ibctest/Android.mk
ibctest/ctest.c
ibcutils/Android.mk
ibcutils/MODULE_LICENSE_APACHE2
ibcutils/NOTICE
ibcutils/adb_networking.c
ibcutils/array.c
ibcutils/ashmem-dev.c
ibcutils/ashmem-host.c
ibcutils/atomic-android-arm.S
ibcutils/atomic-android-armv6.S
ibcutils/atomic.c
ibcutils/buffer.c
ibcutils/buffer.h
ibcutils/config_utils.c
ibcutils/cpu_info.c
ibcutils/dir_hash.c
ibcutils/dlmalloc_stubs.c
ibcutils/fdevent.c
ibcutils/hashmap.c
ibcutils/load_file.c
ibcutils/loghack.h
ibcutils/memory.c
ibcutils/memset32.S
ibcutils/mq.c
ibcutils/mspace.c
ibcutils/private.h
ibcutils/process_name.c
ibcutils/properties.c
ibcutils/record_stream.c
ibcutils/selector.c
ibcutils/socket_inaddr_any_server.c
ibcutils/socket_local.h
ibcutils/socket_local_client.c
ibcutils/socket_local_server.c
ibcutils/socket_loopback_client.c
ibcutils/socket_loopback_server.c
ibcutils/socket_network_client.c
ibcutils/strdup16to8.c
ibcutils/strdup8to16.c
ibcutils/threads.c
ibcutils/tzfile.h
ibcutils/tztime.c
ibcutils/uio.c
ibcutils/zygote.c
iblog/Android.mk
iblog/event_tag_map.c
iblog/fake_log_device.c
iblog/logd_write.c
iblog/logprint.c
ibmincrypt/Android.mk
ibmincrypt/rsa.c
ibmincrypt/sha.c
ibmincrypt/tools/Android.mk
ibmincrypt/tools/DumpPublicKey.java
ibmincrypt/tools/DumpPublicKey.mf
ibnetutils/Android.mk
ibnetutils/dhcp_utils.c
ibnetutils/dhcpclient.c
ibnetutils/dhcpmsg.c
ibnetutils/dhcpmsg.h
ibnetutils/ifc_utils.c
ibnetutils/ifc_utils.h
ibnetutils/packet.c
ibnetutils/packet.h
ibpixelflinger/Android.mk
ibpixelflinger/MODULE_LICENSE_APACHE2
ibpixelflinger/NOTICE
ibpixelflinger/buffer.cpp
ibpixelflinger/buffer.h
ibpixelflinger/clear.cpp
ibpixelflinger/clear.h
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/ARMAssemblerInterface.cpp
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/ARMAssemblerProxy.cpp
ibpixelflinger/codeflinger/ARMAssemblerProxy.h
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/CodeCache.h
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/GGLAssembler.h
ibpixelflinger/codeflinger/armreg.h
ibpixelflinger/codeflinger/blending.cpp
ibpixelflinger/codeflinger/disassem.c
ibpixelflinger/codeflinger/disassem.h
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/fixed.cpp
ibpixelflinger/format.cpp
ibpixelflinger/picker.cpp
ibpixelflinger/picker.h
ibpixelflinger/pixelflinger.cpp
ibpixelflinger/raster.cpp
ibpixelflinger/raster.h
ibpixelflinger/rotate90CW_4x4_16v6.S
ibpixelflinger/scanline.cpp
ibpixelflinger/scanline.h
ibpixelflinger/t32cb16blend.S
ibpixelflinger/tinyutils/KeyedVector.h
ibpixelflinger/tinyutils/SharedBuffer.cpp
ibpixelflinger/tinyutils/SharedBuffer.h
ibpixelflinger/tinyutils/TypeHelpers.h
ibpixelflinger/tinyutils/Vector.h
ibpixelflinger/tinyutils/VectorImpl.cpp
ibpixelflinger/tinyutils/VectorImpl.h
ibpixelflinger/tinyutils/smartpointer.h
ibpixelflinger/trap.cpp
ibpixelflinger/trap.h
ibzipfile/Android.mk
ibzipfile/MODULE_LICENSE_APACHE2
ibzipfile/NOTICE
ibzipfile/centraldir.c
ibzipfile/private.h
ibzipfile/test_zipfile.c
ibzipfile/zipfile.c
ogcat/Android.mk
ogcat/MODULE_LICENSE_APACHE2
ogcat/NOTICE
ogcat/event-log-tags
ogcat/logcat.cpp
ogwrapper/Android.mk
ogwrapper/logwrapper.c
kbootimg/Android.mk
kbootimg/bootimg.h
kbootimg/mkbootimg.c
ountd/Android.mk
ountd/AutoMount.c
ountd/MODULE_LICENSE_APACHE2
ountd/NOTICE
ountd/ProcessKiller.c
ountd/Server.c
ountd/mountd.c
ountd/mountd.h
etcfg/Android.mk
etcfg/MODULE_LICENSE_APACHE2
etcfg/NOTICE
etcfg/netcfg.c
ootdir/Android.mk
ootdir/etc/dbus.conf
ootdir/etc/hcid.conf
ootdir/etc/hosts
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
ootdir/etc/init.gprs-pppd
ootdir/etc/init.testmenu
ootdir/etc/mountd.conf
ootdir/etc/ppp/chap-secrets
ootdir/etc/ppp/ip-down
ootdir/etc/ppp/ip-up
ootdir/init.rc
h/Android.mk
h/MODULE_LICENSE_BSD
h/NOTICE
h/TOUR
h/alias.c
h/alias.h
h/arith.c
h/arith.h
h/arith.y
h/arith_lex.c
h/arith_lex.l
h/bltin/bltin.h
h/bltin/echo.1
h/bltin/echo.c
h/builtins.c
h/builtins.def
h/builtins.h
h/cd.c
h/cd.h
h/error.c
h/error.h
h/eval.c
h/eval.h
h/exec.c
h/exec.h
h/expand.c
h/expand.h
h/funcs/cmv
h/funcs/dirs
h/funcs/kill
h/funcs/login
h/funcs/newgrp
h/funcs/popd
h/funcs/pushd
h/funcs/suspend
h/histedit.c
h/init.c
h/init.h
h/input.c
h/input.h
h/jobs.c
h/jobs.h
h/machdep.h
h/main.c
h/main.h
h/memalloc.c
h/memalloc.h
h/miscbltin.c
h/miscbltin.h
h/mkbuiltins
h/mkinit.sh
h/mknodes.sh
h/mktokens
h/myhistedit.h
h/mystring.c
h/mystring.h
h/nodes.c
h/nodes.c.pat
h/nodes.h
h/nodetypes
h/options.c
h/options.h
h/output.c
h/output.h
h/parser.c
h/parser.h
h/redir.c
h/redir.h
h/sh.1
h/shell.h
h/show.c
h/show.h
h/syntax.c
h/syntax.h
h/token.h
h/trap.c
h/trap.h
h/var.c
h/var.h
oolbox/Android.mk
oolbox/MODULE_LICENSE_BSD
oolbox/NOTICE
oolbox/alarm.c
oolbox/cat.c
oolbox/chmod.c
oolbox/cmp.c
oolbox/date.c
oolbox/dd.c
oolbox/dd.h
oolbox/df.c
oolbox/dmesg.c
oolbox/exists.c
oolbox/getevent.c
oolbox/getprop.c
oolbox/hd.c
oolbox/id.c
oolbox/ifconfig.c
oolbox/iftop.c
oolbox/insmod.c
oolbox/ioctl.c
oolbox/kill.c
oolbox/ln.c
oolbox/log.c
oolbox/ls.c
oolbox/lsmod.c
oolbox/mkdir.c
oolbox/mkdosfs.c
oolbox/mount.c
oolbox/mv.c
oolbox/netstat.c
oolbox/notify.c
oolbox/powerd.c
oolbox/printenv.c
oolbox/ps.c
oolbox/r.c
oolbox/readtty.c
oolbox/reboot.c
oolbox/renice.c
oolbox/rm.c
oolbox/rmdir.c
oolbox/rmmod.c
oolbox/rotatefb.c
oolbox/route.c
oolbox/schedtop.c
oolbox/sendevent.c
oolbox/setconsole.c
oolbox/setkey.c
oolbox/setprop.c
oolbox/sleep.c
oolbox/smd.c
oolbox/start.c
oolbox/stop.c
oolbox/sync.c
oolbox/syren.c
oolbox/toolbox.c
oolbox/top.c
oolbox/umount.c
oolbox/vmstat.c
oolbox/watchprops.c
oolbox/wipe.c