History log of /system/core/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
eb255708970f4723afa45ebc842de25ac9488235 09-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
317b4024a2a46b8c57abfa08f2a649df13572bd3 06-Feb-2015 Paul Lawrence <paullawrence@google.com> Revert "Make encryption configurable"

This reverts commit bda6272446454886339841a62daaa1b66c07ad60.

The original fix seems to have led to boot failures in QA. Rather than
risk shipping, revert the change. Bug 18764230 reopened.

Requires change
https://googleplex-android-review.git.corp.google.com/#/c/629764/

Bug: 19278390
Bug: 19199624

Change-Id: I8b6ab585666f2b0f585ffb2a5f61ac2e3462e06e
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/include/fs_mgr.h
ootdir/init.rc
64e78fab36eaec2d0affcc8364aa49acbe45f109 27-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
bda6272446454886339841a62daaa1b66c07ad60 21-Jan-2015 Paul Lawrence <paullawrence@google.com> Make encryption configurable

Delay mounting encryptable but unencrypted volumes until we can
check the ro.vold.forceencrypt flag, then optionally encrypt.

Requires matching vold change from
https://googleplex-android-review.git.corp.google.com/#/c/615309/

Bug: 18764230
Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/include/fs_mgr.h
ootdir/init.rc
200e6f24249957b38714bdfa8ddda69b8d640e26 19-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
c5a4b317264217964f154afe0b3c45b5aa3d6f65 15-Jan-2015 Dmitry Shmidt <dimitrysh@google.com> android_filesystem: Remove setuid bits from tcpdump

Bug: 18669116

Change-Id: I25486f2fe0e994f569b788fc9f03ef6d383f54d4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
nclude/private/android_filesystem_config.h
70f6dea9d06876bc65181c40ee9e623be196fb4c 15-Jan-2015 Dmitry Shmidt <dimitrysh@google.com> Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev
33e4f4d81a23fa501fe9f8cd22f657097fa3fe55 15-Jan-2015 Dmitry Shmidt <dimitrysh@google.com> android_filesystem: Remove setuid bits from tcpdump

Bug: 18669116

Change-Id: I25486f2fe0e994f569b788fc9f03ef6d383f54d4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
nclude/private/android_filesystem_config.h
c6c3c7d44508dc8a80be794cbb97ed416b0eb539 15-Jan-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Remove explict use of ASCII encoding" into lmp-mr1-dev
6c555ea3058d957795c40bc07b264701427453a2 15-Jan-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Return path including executable instead of without" into lmp-mr1-dev
1a65d5b3516ba5750e17b3cb5bc64a585b17f69a 15-Jan-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-dev
2ef38efbac1dffe684704cb9777cb96f6e8483b1 15-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
0f86444b3912cadb4227755f3b80d2ff74841575 15-Jan-2015 Narayan Kamath <narayan@google.com> Merge "sdcard : inode numbers must be fully representable as uint32_t." into lmp-mr1-dev
5f2ff6a9106083e2a79b8600a0bf6a5341c6ca38 14-Jan-2015 Christopher Ferris <cferris@google.com> Add timed versions of stack dumping functions.

Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
nclude/cutils/debugger.h
ibcutils/debugger.c
77262e7db26a244ef013fcafc561ccd93c047a52 21-Nov-2014 Al Sutton <al@funkyandroid.com> Remove explict use of ASCII encoding

Replace the use of CFStringGetCString with kCFStringEncodingASCII specified
with CFStringGetFileSystemRepresentation which will ensure the correct
character encoding is used to conver the CFString into a NULL terminated
char array suitable for use with POSIX APIs.

(cherry picked from commit 2a4b5f9e804f019c0d565c86579f07963989ed1b)

Change-Id: Ie6e2027e59b49ca634c7308bcda7bb492d372f46
db/get_my_path_darwin.c
astboot/util_osx.c
d5b41767886de71e570edea98fd80228bb1211af 20-Nov-2014 Al Sutton <al@funkyandroid.com> Return path including executable instead of without

The previous implementation returned the path the executable was in instead
of returning the path including the executable (i.e. it returned ...bin
instead of ...bin/executable). This is not what the original methods did
and caused the process forking of adb to fail.

This patch corrects the implementation.

(cherry picked from commit 26b53bb75e6bdf9aa7820a3343845dae145625cc)

Change-Id: Icad6870bbb0a88f611ca71d90fff30f7b576c367
db/get_my_path_darwin.c
astboot/util_osx.c
017c97a5b1a55d402da1a793c91fc37f11b05747 19-Nov-2014 Al Sutton <al@funkyandroid.com> Fix building on modern versions of Xcode and OS X.

Recent versions of XCode fail to compile the adb and fastboot binaries due to
two functions being deprecated in 10.9 (GetCurrentProcess and
ProcessInformationCopyDictionary), and the use of -Werrror.

This patch replaces the method implementations which use calls to methods
deprecated in the 10.9 SDK with versions which only call non-deprecated methods.

(cherry picked from commit f456d47c506d87265ce0ff6080cba5374dced011)

Change-Id: Ibd80dda73ccdd7c561b50b4065581e645d9855d6
db/get_my_path_darwin.c
astboot/util_osx.c
faa0935ffb772759f795d6b29c6db6f83e8531c4 13-Jan-2015 Narayan Kamath <narayan@google.com> sdcard : inode numbers must be fully representable as uint32_t.

This works around a bug on on 64 bit kernels + sdcard daemons
where we were using memory addresses as inode numbers.

bug: 19012244

Change-Id: Ia63c5b33b4212bf03ff92fa2faff0bb76e48791c
dcard/sdcard.c
d810ea60d2a1ddee666a8dfbc46bd476795106de 12-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
f2bd3fdd190fc1234913febfe254f8bcc4e675da 09-Jan-2015 Leo Wang <leozwang@google.com> Merge "Provide a way to select force encryption from vendor partition" into lmp-mr1-dev
c81fccc86954afcfa978cb124d5698072a90a9a6 08-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
ba95be58c596aa7b5034b1bce8f3fde97ae08780 22-Sep-2014 Christopher R. Palmer <crpalmer@gmail.com> init: Fix memory corruption when sanitizing platform paths

This commit fixes code that incorrectly increments s when it
hits the terminator character of the string being sanitized.
This means it will randomly start trashing memory beyond the
end of the string being sanitized until it happens to hit two
NULs (\0\0) which will break it out of the loop.

(cherry picked from commit 07f3fee164bd7ba14ce9b2dd3818006f07162845)

Bug: 18885357
Change-Id: If6b01fe2b9bd5985f08f1278deb03b311d0170dc
nit/util.c
703b87de5b84e24ea119556dcc3683cb4ce941cf 07-Jan-2015 Paul Lawrence <paullawrence@google.com> Provide a way to select force encryption from vendor partition

This allows a vendor to force encryption on devices via a vendor
partition flag:

ro.vold.forceencryption 1

Bug: 18764230
Change-Id: Id0049ce64e34e4f6f96e593aadd70c277ac131c8
s_mgr/fs_mgr.c
49271e9e110f5a84b725f8125b910c672a2c9096 10-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
4fca59181c838b91572d1b57cb74b26d0a70528f 09-Dec-2014 Eric Laurent <elaurent@google.com> audio: add usage "virtual source" to audio attributes.

Bug: 16006090.
Change-Id: I2d22b52e97095b57a6508b82bd11e27f860bb2e7
nclude/system/audio.h
651e331c27d8549e65656018fed35f6436f0456c 27-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
47f52f247d6d895878b831de448f19b98225515d 11-Nov-2014 Eric Laurent <elaurent@google.com> audio: new stream types

Added stream types for internal use by audio policy
and audio flinger.

Bug: 18067208.
Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
nclude/system/audio.h
a5a4e9e0cad383f0c14dbe92a60b7d8150ae6b1f 24-Nov-2014 Daisuke Okitsu <daisuke.x.okitsu@sonyericsson.com> sdcard: mount sdcard with the noexec option

Vold mounts the sdcard with noexec, but the fuse deamon
mounts with exec, so it is still possible to execute
binaries:

/dev/fuse /storage/sdcard1 fuse rw,nosuid,nodev,relatime,
user_id=1023,group_id=1023,default_permissions,allow_other 0 0

/dev/block/vold/179:65 /mnt/media_rw/sdcard1 vfat rw,dirsync,
nosuid,nodev,noexec,relatime,uid=1023,gid=1023,fmask=0007,
dmask=0007,allow_utime=0020,codepage=cp437,iocharset=iso8859-1,
shortname=mixed,utf8,errors=remount-ro 0 0

With this change both vold and fuse mounts with noexec.

(cherry picked from commit f777d6694eecf6e61d9859df2090199863050017)

Change-Id: I66cbfc3a3a89a26958f83577f5e7a5e27f99184e
dcard/sdcard.c
2ef07eeec2ebc1158472981e30aaee07b1cdcdac 20-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
83d85563c51fa39cb61b836302a8c26fe0e2ace6 19-Nov-2014 Nick Kralevich <nnk@google.com> logd: throttle SELinux denials to 20/sec

Impose a limit of 20 selinux denials per second. Denials beyond
that point don't add any value, and have the potential to cause
crashes or denial of service attacks.

Do some other misc cleanup while I'm here.

Bug: 18341932

(cherry picked from commit c234a1b879d9c9d8e1a797c5dcf3098249945748)

Change-Id: Ic5c96003db82e504baf301e87be5c8c539c73c2a
ogd/LogAudit.cpp
ogd/libaudit.c
ogd/libaudit.h
54de21d2e4d2042333f3dd8248a6a989869b818f 18-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
7455681c20f02cd51c01b7f948a9b7d204bd8c82 17-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
86c9e5f7e20a3f1712038ce642628c2e1e866434 14-Nov-2014 Nick Kralevich <nnk@google.com> Introduce "adb keygen"

Introduce the "adb keygen" command.

Usage: adb keygen <filename>

This command creates an adb public/private key pair in a user
specified file. This can be used to create new adb keys, or rotate
existing keys.

Modify adb's key generation routines to use the HOSTNAME/LOGNAME
environment variables if available. This allows someone to override
the username/hostname embedded within the adb public key file if
desired. Fallback to the old mechanisms if those environment
variables aren't available.

Bug: 18342715
Change-Id: Ibccee6088d4609aa05ad6687d3a1d8a8689d3e8a

(cherry picked from commit af782b9f2ac4fb817ded80d4317a45345bb3f992)

Change-Id: Ic76ffc9412171dddc879af0bbf6e20fbe1a8f057
db/adb_auth.h
db/adb_auth_host.c
db/commandline.c
bc137cf4a32e94ca60a8f453884bedf95fdd62dd 14-Nov-2014 Christopher Ferris <cferris@google.com> Merge "Convert futex to cond wait." into lmp-mr1-dev
db44538387b08f367fc2419653639866f4c2fbd6 09-Nov-2014 Christopher Ferris <cferris@google.com> Convert futex to cond wait.

Switch to the better supported pthread_cond to handle the Wait/Wake
functions.

Also, increase the number of simultaneous threads in the thread tests.

Bug: 18381207
Change-Id: I63240208e8b7f641b3f35a3fc0bb1acf80dc796e
ibbacktrace/Android.mk
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
ibbacktrace/backtrace_test.cpp
323df093c842e17b69d2be02462053697ef4d92e 14-Nov-2014 Daniel Rosenberg <drosen@google.com> Merge "property_service: Added vendor build properties to load_all_props" into lmp-mr1-dev
72f0d92c722447e0c87cfe765516a7352db3d51a 07-Nov-2014 Sami Tolvanen <samitolvanen@google.com> DO NOT MERGE: Do not mount devices with invalid verity metadata

The return value of read_verity_metadata is propagated to caller
even if the verity metadata is invalid, provided that it can be
read from the device. This results in devices with invalid verity
metadata signatures to be mounted normally, which is not desirable.
This change fixes the bug by changing the return value in case of
verification failure to FS_MGR_SETUP_VERITY_FAIL.

Bug: 15984840
Bug: 18120110
Change-Id: Ic29f37a23cb417c2538d60fb05de9dd310d50f4a
(cherry picked from commit c95e9da39660f278ace4b14d688dc6818d1a38bf)
s_mgr/fs_mgr_verity.c
9573a13bbc015c555adff1e4e0fbef2a18963111 07-Nov-2014 Sami Tolvanen <samitolvanen@google.com> DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1

Verity metadata signatures will be switched to SHA-256. Switch
fs_mgr signature verification to use the correct algorithm.

Needs matching changes from
https://googleplex-android-review.git.corp.google.com/#/c/579905/
https://googleplex-android-review.git.corp.google.com/#/c/583213/
https://googleplex-android-review.git.corp.google.com/#/c/583214/
https://googleplex-android-review.git.corp.google.com/#/c/583233/

Bug: 15984840
Bug: 18120110
Bug: 17917515
Change-Id: I8f90519bffa105a0eb7abeaad3aea1ffceb851e2
(cherry picked from commit a3465e250cfc3c00931735711e11ad61cf84d8b2)
s_mgr/fs_mgr_verity.c
4cf5297cc8eb18e521f9491c7d973798dcae48ca 11-Nov-2014 Daniel Rosenberg <drosen@google.com> property_service: Added vendor build properties to load_all_props

Signed-off-by: Daniel Rosenberg <drosen@google.com>

(cherry picked from commit b95122205dba535215ff6b011ef8009933c55d3b)

Bug: 18281574
Change-Id: Id1f1c4e9e0d1bfbcae3995fb7966d18bf7d6e06d
nit/property_service.c
66b6b450bde2a422f315b0ba68411cbb4293c6c2 12-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
80d3083bc967992799d5db8304e91ecf90f17f91 10-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
e10566c11679294bc7af51a3590e3c559fdd3900 09-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
bfe2d7470cd3d6b8ab54165c1a6b48c66b432cd7 08-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 0eabf64ce0c649e4ef691ae1b70cb20d599dd429
eb6036ac6be82dcc6e110de22574972631c8f83e 08-Nov-2014 JP Abgrall <jpa@google.com> fs_mgr: let fsck.f2fs actually attempt a fix

The newer fsck.f2fs (1.4.0++) has better fix support, so invoke it.

Requires http://ag/583949 f2fs-tools update.

Bug: 17640053
Bug: 18292088
Change-Id: I42370d92b232e0bdbf28cccf7035a15dbffeb268
Signed-off-by: JP Abgrall <jpa@google.com>
s_mgr/fs_mgr.c
0eabf64ce0c649e4ef691ae1b70cb20d599dd429 06-Nov-2014 Christopher Ferris <cferris@google.com> Fix adb/fastboot windows compilations.

Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.

Bug: 18283958
(cherry picked from commit ae7bf0959bd3f79afbf365e41f015ed1c304afdc)

Change-Id: Iebc09cc314fa8f0ba6c6cd45ba26135052f156dd
db/adb_auth_host.c
db/sysdeps_win32.c
db/usb_vendors.c
db/usb_windows.c
astboot/usb_windows.c
db73303ce0ab027ed92f4f3efbef3fc605fbbcae 06-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ac12f25004d728fe117c058446fccb0ca0a397c9
ac12f25004d728fe117c058446fccb0ca0a397c9 05-Nov-2014 Nick Kralevich <nnk@google.com> Ensure /data/adb exists
automerge: 6672300

* commit '667230074b6e4e306a50d84a88a57bf4f1ec0291':
Ensure /data/adb exists
667230074b6e4e306a50d84a88a57bf4f1ec0291 21-Oct-2014 Nick Kralevich <nnk@google.com> Ensure /data/adb exists

Ensure that /data/adb always exists. This directory is used
for writing adb debugging information when persist.adb.trace_mask
is set.

Bug: https://code.google.com/p/android/issues/detail?id=72895

(cherry picked from commit 89252ce31aacb27248e708b6487f730d3a024943)

Change-Id: I44e01bee50125f4e6e5fff6e74c53bb2022ce355
ootdir/init.rc
8ac05701be686ea56537fa27f171925a4403b604 05-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to b5422854361be038b812f1c0272c66cdb4618a4b
9a62b15b8586db0b8649b3d192fdae22d0fde989 04-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to b5422854361be038b812f1c0272c66cdb4618a4b
b5422854361be038b812f1c0272c66cdb4618a4b 03-Nov-2014 Michael Lentine <mlentine@google.com> Merge "Fix native_handle_create to check if malloc fails" into lmp-mr1-dev
2b8852dececd0ff681e08fe2127d3defb4f73578 31-Oct-2014 Michael Lentine <mlentine@google.com> Fix native_handle_create to check if malloc fails

Bug: 18076253
Change-Id: I8dbe3af88f52f18f74a3ab857fea53ae7585e2f7
ibcutils/native_handle.c
56bf9d8e6028f9466e5fee5c709e783a3dd5a97c 03-Nov-2014 Christopher Ferris <cferris@google.com> am 4b970895: am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s ours automerge: d7c8db1 -s ours

* commit '4b970895848ff114ac1011a293663eb6d43e8fd7':
a228c63288142ca157ae28f63e0d3e0013ae62cb 03-Nov-2014 Christopher Ferris <cferris@google.com> am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313

* commit 'a18bcfa45e9d37650bca158577d02f5059453935':
4b970895848ff114ac1011a293663eb6d43e8fd7 03-Nov-2014 Christopher Ferris <cferris@google.com> am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s ours automerge: d7c8db1 -s ours

* commit '5bd963117aa121d1fdfd5def4379cd363cf60ece':
a18bcfa45e9d37650bca158577d02f5059453935 03-Nov-2014 Christopher Ferris <cferris@google.com> am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313

* commit '91ce3576337b0541912da7ec4b1efd802568dfce':
5bd963117aa121d1fdfd5def4379cd363cf60ece 03-Nov-2014 Christopher Ferris <cferris@google.com> DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s ours
automerge: d7c8db1 -s ours

* commit 'd7c8db124c1b4b13d7f55f7c338913ec6d0cd3d1':
91ce3576337b0541912da7ec4b1efd802568dfce 03-Nov-2014 Christopher Ferris <cferris@google.com> resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.
automerge: e916313

* commit 'e916313defbd09479dc29d38f3aa467f3b296f7c':
b87e8276a5f59f39865536885486a364f60ec91e 03-Nov-2014 Christopher Ferris <cferris@google.com> Merge "Fix debuggerd issues." into lmp-mr1-dev
3e0531402601b473bca94c36242990f7c52b4b9c 02-Nov-2014 Nick Kralevich <nnk@google.com> Fix mac build

"errno.h" doesn't get included on mac so we need to do it explicitely.

system/core/libnativebridge/tests/CodeCacheExists_test.cpp:30:15: error:
use of undeclared identifier 'ENOENT'
ASSERT_EQ(ENOENT, errno);

(cherry picked from commit bcd1a834d4a979ae650ac8677b0647cfb3ec4766)

Change-Id: Ib894e3a3912a943c61787461f127e4b11aacf212
ibnativebridge/tests/CodeCacheCreate_test.cpp
ibnativebridge/tests/CodeCacheExists_test.cpp
2a1d916431f28e8c80bd4e7439fc4a8d9fc3c1ce 03-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4cafe2ff89b49329e0e880900195d8e061bd3750
84ddb34a3af77dbe490aaa07b738bbfd7109d5ba 01-Nov-2014 Christopher Ferris <cferris@google.com> Fix debuggerd issues.

- Fix a problem where a tid exits before the attach completes, and it
causes debuggerd to self terminate.
- Fix a problem where sibling tid dumps do not properly wait for the tid
to get signalled.

Bug: 17800180
Bug: 12567315
Change-Id: Ic3cd619cc2c72402f9a45f14abeed4721b50d64d
ebuggerd/backtrace.cpp
ebuggerd/debuggerd.cpp
ebuggerd/tombstone.cpp
ebuggerd/utility.cpp
ebuggerd/utility.h
6993dc1f070014568add364c37dc4c00b18fd2d6 02-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4cafe2ff89b49329e0e880900195d8e061bd3750
754aecba37f92acf0c56547a829fabd36e8ed9a0 01-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4cafe2ff89b49329e0e880900195d8e061bd3750
e0fa3551786ae50eedb1392fd7514875224e72dd 30-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 47a919c6fb1cb3f4d372758ed9a02b02bbac911c
4cafe2ff89b49329e0e880900195d8e061bd3750 25-Oct-2014 Sami Tolvanen <samitolvanen@google.com> Fix verity on system partitions larger than 2G

If the system partition is larger than 2G, the device fails to read
verity metadata, because fseek accepts only a 32-bit signed offset.
Switch from fseek to lseek64 to allow seeking using a 64-bit offset,
which solves the problem. At the same time, move away from stdio in
the function.

Bug: 17705619
Change-Id: I226320498dcb750ec6cde84411c7fe0774c9cab7
s_mgr/fs_mgr_verity.c
66ee58df62e2f772ffcad5cf99b749d515c0ee7e 29-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 47a919c6fb1cb3f4d372758ed9a02b02bbac911c
47a919c6fb1cb3f4d372758ed9a02b02bbac911c 28-Oct-2014 Calin Juravle <calin@google.com> Merge "Add code cache tests to libnativebridge." into lmp-mr1-dev
9c094da83112bbcad37eaffecfee96ff169d84a8 28-Oct-2014 Calin Juravle <calin@google.com> Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-dev
9ef4fa4c2c4f6bece351a855f53b2270f218389c 28-Oct-2014 Calin Juravle <calin@google.com> Add code cache tests to libnativebridge.

Bug: 18027433

(cherry picked from commit 59a719c466d33479265a3e9c204c8dc9a8f435f1)

Change-Id: I32bcf3ae0d4569d4d8b88168e6c36ddff70b8f7d
ibnativebridge/tests/Android.mk
ibnativebridge/tests/CodeCacheCreate_test.cpp
ibnativebridge/tests/CodeCacheExists_test.cpp
ibnativebridge/tests/CompleteFlow_test.cpp
ibnativebridge/tests/NativeBridgeTest.h
3cc5b907486a20424cc59ff6d841293f0721ab66 28-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 3dbcc8b9332cdbaa0dae47a6cae3a043f96262fe
3dbcc8b9332cdbaa0dae47a6cae3a043f96262fe 27-Oct-2014 Paul Lawrence <paullawrence@google.com> Merge "adb warns on remount when verity is enabled" into lmp-mr1-dev
5b244cd4141d7e42bf9382e39c669e1ccf96266c 25-Oct-2014 Iliyan Malchev <malchev@google.com> toolbox: add prlimit command

adb shell prlimit <pid> <cur> <max>

prlimit uses prlimit internally to allow you to set the limits on an arbitrary
process, if you have the privileges to.

Change-Id: Ie9a5dc510c7c695debd8f948361d4c51befa5604
Signed-off-by: Iliyan Malchev <malchev@google.com>
oolbox/Android.mk
oolbox/prlimit.c
f643beced1d154726dca7115014d2d1fdfcca993 27-Oct-2014 Paul Lawrence <paullawrence@google.com> adb warns on remount when verity is enabled

Bug: 18119147
Change-Id: I75e5edf83fa01dbf2495e24df4597dce41f13654
db/remount_service.c
1402fbb13523fed9d96217e801df5678e3c01a6b 17-Oct-2014 Calin Juravle <calin@google.com> Handle code_cache dir creation in libnativebridge

Also:

- add kPreInitiliazed state to native bridge with check transition:
kOpened->kPreInitialized->kInitialized
- made sure we free the memory for the code_cache_path
- tidy up some error messages
- tidy up tests
- add a dummy native bridge to test with

Bug: 18027433
Bug: 18097480

(cherry picked from commit f9d9e2a2d96559c3165405d572b08e260156074a)

Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
nclude/nativebridge/native_bridge.h
ibnativebridge/Android.mk
ibnativebridge/native_bridge.cc
ibnativebridge/tests/Android.mk
ibnativebridge/tests/Android.nativebridge-dummy.mk
ibnativebridge/tests/CompleteFlow_test.cpp
ibnativebridge/tests/DummyNativeBridge.cpp
ibnativebridge/tests/NativeBridgeTest.h
ibnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp
ibnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp
ibnativebridge/tests/PreInitializeNativeBridge_test.cpp
ef88ace18b97e6cec68a1f13554753f6ac1b8432 27-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 6e93b246d41275ff55dfab2d747cf0d5c60b3652
908ab0ebda6b263dfca5fd40ce82671fc19e11ae 26-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 6e93b246d41275ff55dfab2d747cf0d5c60b3652
464883738ae516c2d6b7d2fa82a7ef7a8cdf968f 25-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 6e93b246d41275ff55dfab2d747cf0d5c60b3652
d7c8db124c1b4b13d7f55f7c338913ec6d0cd3d1 24-Oct-2014 Christopher Ferris <cferris@google.com> DO NOT MERGE Restore libcorkscrew unwinding.
automerge: 5a69c1d -s ours

* commit '5a69c1db365323f984c6a8afd1fc035551e96d99':
DO NOT MERGE Restore libcorkscrew unwinding.
e916313defbd09479dc29d38f3aa467f3b296f7c 24-Oct-2014 Christopher Ferris <cferris@google.com> resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.

Change-Id: Ic6b18eeae43c2ef2256a0508ac60c1724385d3b0
15f0847e0213fbc50000c54fee54f78bfb3fed5c 23-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 6e93b246d41275ff55dfab2d747cf0d5c60b3652
6e93b246d41275ff55dfab2d747cf0d5c60b3652 22-Oct-2014 Narayan Kamath <narayan@google.com> am 80f227c1: am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set by the native bridge.

* commit '80f227c1f75d753396a6efd6fccfc0c76c93bae4':
Don't allow SUPPORTED_ABIs to be set by the native bridge.
7d18a834f9b013fb8fe84aaee93e9bb81b31ac29 22-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to b50d0cd53f94b0c654e007464ec32396b0cb1aef
80f227c1f75d753396a6efd6fccfc0c76c93bae4 21-Oct-2014 Narayan Kamath <narayan@google.com> am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set by the native bridge.

* commit '66f0d93c265657e17c7a1ddd74beb61070a8df69':
Don't allow SUPPORTED_ABIs to be set by the native bridge.
66f0d93c265657e17c7a1ddd74beb61070a8df69 21-Oct-2014 Narayan Kamath <narayan@google.com> Don't allow SUPPORTED_ABIs to be set by the native bridge.

SUPPORTED_ABIs is a prioritized list of all ABIs a device
support, and must not vary depending on whether or not an app
is emulated.

bug: 18061712
Change-Id: I3ec3897d23e37c645b4d9d9e6e32aae9afff952c
ibnativebridge/native_bridge.cc
eedc31249fae05c24f2018cd721ac4103206476d 21-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to b50d0cd53f94b0c654e007464ec32396b0cb1aef
b50d0cd53f94b0c654e007464ec32396b0cb1aef 20-Oct-2014 Arve Hjønnevåg <arve@android.com> Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev
a0a7ac037dd998168fa56d76e9c27bfda1c6a41e 20-Oct-2014 Adam Lesinski <adamlesinski@google.com> am fe963bfd: am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE

* commit 'fe963bfd8cf3a240785892f8194debb4e0ebb92d':
MingW doesn't handle __attribute__((weak)) for Windows PE
fe963bfd8cf3a240785892f8194debb4e0ebb92d 20-Oct-2014 Adam Lesinski <adamlesinski@google.com> am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE

* commit 'a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2':
MingW doesn't handle __attribute__((weak)) for Windows PE
a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2 20-Oct-2014 Adam Lesinski <adamlesinski@google.com> MingW doesn't handle __attribute__((weak)) for Windows PE

Windows PE format doesn't have the same support for weak symbols
as ELF does.

The symbol android_log_id_to_name was strangely omitted from the
resulting Windows executable and the callsite where it was supposed
to be called was relaced with a different symbol, which caused a crash
in AAPT on Windows.

This change works due to a careful set of #ifdefs that ensure only one
definition of android_log_id_to_name is defined, but there are other
uses of __attribute__((weak)) which should be inspected.

Change-Id: I3b58076e31d9b28c5143773a170e9ffda9fa3815
iblog/logd_write.c
37ef356a8e4577b289ade868900e15c82c0ad57f 20-Oct-2014 Dmitriy Ivanov <dimitry@google.com> Merge "Remove libsigchain from LD_PRELOADs" into lmp-mr1-dev
2d9312b3a96e2b2e79f3023558ab9a50d626a5a3 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 81080625a239ae953ef355974e1da7d50389fbb6
80a8758ee1b307e889a498a3ab6c39a9193a1be8 19-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 81080625a239ae953ef355974e1da7d50389fbb6
6dcd612b5dd3d1d730d1f33ecf201cb951bf6fc9 18-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 81080625a239ae953ef355974e1da7d50389fbb6
7770252a84a0981d0e6b3d1b03376ddbecff9654 16-Oct-2014 Arve Hjønnevåg <arve@android.com> rootdir: Make trusty version readable by dumpstate

Change-Id: I761650d286b454f1fe01a585e7cd6ec769bfc527
ootdir/ueventd.rc
81080625a239ae953ef355974e1da7d50389fbb6 16-Oct-2014 Xavier Ducrohet <xav@google.com> am 88b463a1: am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-dev

* commit '88b463a1c12cccc6738baa51642bf639bd9a6e53':
Fix windows specific behavior of FileMap
88b463a1c12cccc6738baa51642bf639bd9a6e53 16-Oct-2014 Xavier Ducrohet <xav@google.com> am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-dev

* commit '1c77bf4ce5059f3a770418cfa8afed39ee41ab24':
Fix windows specific behavior of FileMap
1c77bf4ce5059f3a770418cfa8afed39ee41ab24 16-Oct-2014 Xavier Ducrohet <xav@google.com> Merge "Fix windows specific behavior of FileMap" into lmp-dev
1a55aa5e34f201b060da9a84ec9702401f05be18 16-Oct-2014 Xavier Ducrohet <xav@google.com> Fix windows specific behavior of FileMap

The implementation of the FileMap destructor would
close the file, only on Windows, which did not match
the behavior on mac/linux.

This is because calling munmap does not close the file
descriptor. It must be closed separately, before or after
munmap.

On Windows, the file must also be closed manually,
before or after closing the mappingFile.

The change basically removes the closing file from
the windows-specific part of the destructor, to
make behavior more consistent on all platforms
where the caller to FileMap is responsible for closing
its own file (since FileMap receives an opened file).

Change-Id: I5e3cfffbb870d5f3595802ccac57dbc1dbf1ce6e
ibutils/FileMap.cpp
66fa33a7adf38e513825d36e98b7cdf2c225d2b4 16-Oct-2014 Xavier Ducrohet <xav@google.com> am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build of libziparchive.

* commit 'dc7957d9b782a759a4eaa75832dd18c9943c7d0c':
Fix toolchain issue for windows build of libziparchive.
976e1b64314d5e0f86221fdc2fb62605a9447ca7 07-Oct-2014 Dmitriy Ivanov <dimitry@google.com> Remove libsigchain from LD_PRELOADs

Bug: 15345057
Bug: 15426766

(cherry picked from commit c9f9f35efa43b3ac75b1a7e76fe1071a2e9d52ea)

Change-Id: If54e1aeaa1e2abe061ac19666af4f4e058b81df2
ootdir/init.environ.rc.in
dc7957d9b782a759a4eaa75832dd18c9943c7d0c 16-Oct-2014 Xavier Ducrohet <xav@google.com> am cd1da4e0: Fix toolchain issue for windows build of libziparchive.

* commit 'cd1da4e04f0eb71a92a586c66acd0e34115608e1':
Fix toolchain issue for windows build of libziparchive.
6a29f9271b711286fbb327904b0dcca75f250e2d 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 1a27d6ab328676bf648da74fe78836e7c1ffc8e2
cd1da4e04f0eb71a92a586c66acd0e34115608e1 16-Oct-2014 Xavier Ducrohet <xav@google.com> Fix toolchain issue for windows build of libziparchive.

With mingw 4.8, the new default packed behavior is broken and makes
zip archive fails due to unexpected misalignment in
CentralDirectoryRecord.

This patch uses -mno-ms-bitfields to revert to the old packed
behavior.

Change-Id: Ic977c841e330e19451db1d31ddb22e570a525062
ibziparchive/Android.mk
1a27d6ab328676bf648da74fe78836e7c1ffc8e2 16-Oct-2014 Dianne Hackborn <hackbod@google.com> am 6d343432: am 67f46cb0: Fix issue #18000467: processgroup truncates buffer

* commit '6d34343263d890114410fafc85885501eca8d3d6':
Fix issue #18000467: processgroup truncates buffer
6d34343263d890114410fafc85885501eca8d3d6 16-Oct-2014 Dianne Hackborn <hackbod@google.com> am 67f46cb0: Fix issue #18000467: processgroup truncates buffer

* commit '67f46cb0e137edbf4a6f7014ca8a3a58484016d1':
Fix issue #18000467: processgroup truncates buffer
67f46cb0e137edbf4a6f7014ca8a3a58484016d1 15-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #18000467: processgroup truncates buffer

Change-Id: I3d98a4da9c47d83d25a11ff0ef94cfcab1feabea
ibprocessgroup/processgroup.cpp
db879b9f7e928c9bc24b53bb314ce29ee23d82eb 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 00ffc22cbf1809b730ea0c8e849437db1abf8196
00ffc22cbf1809b730ea0c8e849437db1abf8196 14-Oct-2014 Dianne Hackborn <hackbod@google.com> am e09bfb12: am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram

* commit 'e09bfb1213b9174d4c3d6536b755d924772ce881':
Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram
d316076306118b93d97e7f778d6240422f385480 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 86b4dba9c48841659c566ac71a034230f02ec259
e09bfb1213b9174d4c3d6536b755d924772ce881 14-Oct-2014 Dianne Hackborn <hackbod@google.com> am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram

* commit '2c5e7e102bc2059d22f8457db68c567b64cec963':
Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram
2c5e7e102bc2059d22f8457db68c567b64cec963 14-Oct-2014 Dianne Hackborn <hackbod@google.com> Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram

It looks like there were a couple problems in the code:

- It would not 0-terminate the string it read, to make sure we didn't
see garbage at the end.
- It didn't reduce buf_len as it processes data in the buffer, so if
we need to read more we will increase the buffer length to be longer
than the actual available data.

Also put in some logs about every thing we kill, so we can see what
is going on when debugging. And add a special check for us trying
to kill pid 0 for any reason, since doing so seem to be terminal to
the caller.

Change-Id: I2fe29bfef08938b8a2eb182475c0705c14d8d84f
ibprocessgroup/Android.mk
ibprocessgroup/processgroup.cpp
7f72b6065d7cd1b7478a87b3a229f6b1e9b2b284 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 86b4dba9c48841659c566ac71a034230f02ec259
045ae514125c736955fedd09c43a40fde5e49350 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 97e487311b1cb780dfd3b0994917c72047d6188f
8fdd3706f490b1d7708f6919c99f6c8ab5ce6f84 11-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 97e487311b1cb780dfd3b0994917c72047d6188f
86b4dba9c48841659c566ac71a034230f02ec259 11-Oct-2014 Daniel Rosenberg <drosen@google.com> am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once

* commit 'b63aab58065f5fb2a04c5d7c49f1d61bf7e17179':
newfs_msdos: Set sectors per fat once
b63aab58065f5fb2a04c5d7c49f1d61bf7e17179 11-Oct-2014 Daniel Rosenberg <drosen@google.com> am 8218b6aa: newfs_msdos: Set sectors per fat once

* commit '8218b6aae9cd4a19fa074a8a8203fe9275b35447':
newfs_msdos: Set sectors per fat once
8218b6aae9cd4a19fa074a8a8203fe9275b35447 10-Oct-2014 Daniel Rosenberg <drosen@google.com> newfs_msdos: Set sectors per fat once

There was an issue causing the fat size to shrink too small, causing
a fsck check to fail.

Bug: 17949028
Bug: 17761281
Change-Id: Id0207f2ab44e57ff81f5a53494b45344822a6495
Signed-off-by: Daniel Rosenberg <drosen@google.com>
oolbox/newfs_msdos.c
97e487311b1cb780dfd3b0994917c72047d6188f 09-Oct-2014 Paul Lawrence <paullawrence@google.com> Fix Nick's nits

Change-Id: Ide7925e7ad328f0343d444d63ff72f1a26206d4c
s_mgr/fs_mgr_verity.c
bbb36319119edde9377fb80015235893c30d2bc9 09-Oct-2014 Paul Lawrence <paullawrence@google.com> Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""

This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33.

Fixed build error, and also fixed memory leak spotted from warning.

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
db/Android.mk
db/adb.h
db/commandline.c
db/disable_verity_service.c
db/services.c
s_mgr/Android.mk
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/fs_mgr_priv_verity.h
s_mgr/fs_mgr_verity.c
s_mgr/include/fs_mgr.h
f016c6c24878c9acbdeed95cb4a18a9a02ed6e3f 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 525db43bf5351865a0483eb7f20d171a4895788b
a49bfc0d2620a9ad95ddfa7ec61ce06a77066d97 09-Oct-2014 Nick Kralevich <nnk@google.com> Merge "Revert "Enable verity on userdebug, and add disable-verity to adb"" into lmp-mr1-dev
152d2d4234ba89e0c20c4af13e291b6049a7bc33 09-Oct-2014 Nick Kralevich <nnk@google.com> Revert "Enable verity on userdebug, and add disable-verity to adb"

Build is broken.

system/core/fs_mgr/fs_mgr_verity.c: In function 'fs_mgr_setup_verity':
system/core/fs_mgr/fs_mgr_verity.c:103:20: error: 'verity_table_signature' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (!RSA_verify(key,
^
system/core/fs_mgr/fs_mgr_verity.c:374:11: note: 'verity_table_signature' was declared here
char *verity_table_signature;
^
cc1: all warnings being treated as errors
make: *** [out/target/product/minnow/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr_verity.o] Error 1
make: *** Waiting for unfinished jobs....

This reverts commit d4cea0bc16d1ad96cc6d6177232d7b339785460c.

Change-Id: I6862cc79ef9d944a2472b6fb2e46dae514cea8ce
db/Android.mk
db/adb.h
db/commandline.c
db/disable_verity_service.c
db/services.c
s_mgr/Android.mk
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/fs_mgr_priv_verity.h
s_mgr/fs_mgr_verity.c
s_mgr/include/fs_mgr.h
fd4f05ce058cfff745c1edbe06d0703cc4a2954d 09-Oct-2014 Mark Salyzyn <salyzyn@google.com> Merge changes I74796043,I7d0b85b5,I74796043,I74796043,Ie325e1b5, ... into lmp-mr1-dev

* changes:
logd: kill(0,0) issue
logd: LogStatistics leak
logd: Add control statistics enable/disable.
logd: cleanup
logd: auditd: report facility LOG_AUTH
logd: auditd: kmsg priority
ae413a71cb7201a08d7e9a8b051b8d2ea61207ed 09-Oct-2014 Paul Lawrence <paullawrence@google.com> Merge "Enable verity on userdebug, and add disable-verity to adb" into lmp-mr1-dev
d4cea0bc16d1ad96cc6d6177232d7b339785460c 07-Oct-2014 Paul Lawrence <paullawrence@google.com> Enable verity on userdebug, and add disable-verity to adb

Bug: 17691572

Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
db/Android.mk
db/adb.h
db/commandline.c
db/disable_verity_service.c
db/services.c
s_mgr/Android.mk
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/fs_mgr_priv_verity.h
s_mgr/fs_mgr_verity.c
s_mgr/include/fs_mgr.h
260f3be3123e13b95b1f4e06f9404cac50c81e35 21-Sep-2014 Mark Salyzyn <salyzyn@google.com> logd: kill(0,0) issue

- Recognize pid=0 as special case (kernel or pre-init sourced)
and refrain from treating it in the general case.

(cherry pick from commit df5aa61f05ccbef441cf8b024d4bbc1b717451f9)

Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e012
ogd/LogStatistics.cpp
1e1d71e26c83cb1fb5ffbf2f809a9f000dfbdd50 22-Sep-2014 Mark Salyzyn <salyzyn@google.com> logd: LogStatistics leak

- uid = -1 in subtract operation to match add

(cherry pick from commit f48ea7c8dcfbf2220ececccb1f4fb2f42df9048c)

Bug: 15986335
Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261
ogd/LogStatistics.cpp
a0e53540daa67142abd93756fad38a69eab8fbce 21-Sep-2014 Mark Salyzyn <salyzyn@google.com> logd: Add control statistics enable/disable.

- ro.build.type=user turn off statistics
- ro.config.low_ram=true turn off statistics
- logd.statistics override

(cherry pick from commit f5fc50958978fc039bc3207cbfcb140a277442eb)

Bug: 17526159
Bug: 17526187
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e00f
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
ogd/README.property
ogd/main.cpp
987f1e0de311cf863bde30bb4de19f9cd7f08642 21-Sep-2014 Mark Salyzyn <salyzyn@google.com> logd: cleanup

- simplify access and control exposure to class list
- indent
- compile warning
- Follow standard naming convention for variables and methods
- merge common fragments
- Side Effects: none

(cherry pick from commit e72c6e43668c8c6e1af77e2e5038557581cbf148)

Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e010
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
823a4c727a31ead7c137fed6a62b4a29810b9fbd 28-Sep-2014 Mark Salyzyn <salyzyn@google.com> logd: auditd: report facility LOG_AUTH

(cherry pick from commit 7ee2aef8e0fd8aaa601c8c17e5429fa65b22e00d)

Change-Id: Ie325e1b58f52b6c728d5cfd6f6b87287fcf32e10
ogd/LogAudit.cpp
327cac6e0c9f09a9fe163c85530d749876dd9db7 19-Sep-2014 Mark Salyzyn <salyzyn@google.com> logd: auditd: kmsg priority

(cherry pick from commit 6bdeee0ce6898abd3873a758c47601efcdcc1b7c)

Change-Id: I2016fe140e2daf6c69efbd10aef205fffb931aa1
ogd/LogAudit.cpp
33b335495c7b8eea4b9af13a7157cf83cd085129 08-Oct-2014 Riley Andrews <riandrews@google.com> Merge "Make the default cgroup, the foreground cgroup." into lmp-mr1-dev
2c05b4fe419c6fc008a51359a894f172768977ac 08-Oct-2014 Elliott Hughes <enh@google.com> Fix top for very large VSS.

Bug: 17913995

(cherry picked from commit 052d78f3346a51d78f442b3612b9a680a1778675)

Change-Id: Ia657c1aa5776f947905d8b0d499d64b5cfbae50c
oolbox/top.c
79cf2d1d87a88a3511d034bbf27df542ab14834a 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 525db43bf5351865a0483eb7f20d171a4895788b
525db43bf5351865a0483eb7f20d171a4895788b 08-Oct-2014 Christopher Ferris <cferris@google.com> am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev

* commit '6f7fd39536b8d3dd7c0a5bbd9350e473e559ebff':
Fix write past end of memory.
6f7fd39536b8d3dd7c0a5bbd9350e473e559ebff 08-Oct-2014 Christopher Ferris <cferris@google.com> am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev

* commit '3fe9adc932948da8993d3f812bce1875efc47c0e':
Fix write past end of memory.
3fe9adc932948da8993d3f812bce1875efc47c0e 08-Oct-2014 Christopher Ferris <cferris@google.com> Merge "Fix write past end of memory." into lmp-dev
de722e56dfbd3bf46ae30be6317e03391d424ae6 24-Sep-2014 Christopher Ferris <cferris@google.com> Fix write past end of memory.

The computed flattened size of the blob does not match the size used by the
flatten function when the last cached entry size is not 4 byte aligned.

Bug: 17873145
Change-Id: I9f9fc102d4bde4681ae977b6de5f263aaaf56708
ibutils/BlobCache.cpp
522d72b7020a7d2f975531c7214ff34225391aba 04-Oct-2014 Riley Andrews <riandrews@google.com> Make the default cgroup, the foreground cgroup.

All kernel services will now be in the same cgroup as
foreground applications. This will now make kernel threads
not implicitly higher priority than android foreground
services.

Bug 17681097

Change-Id: I28e81c7aade50428d5395df86f00ce01c1e7af02
ibcutils/sched_policy.c
ootdir/init.rc
af162c8b80269781e3602fd0b0e79611ce041f93 07-Oct-2014 Christopher Ferris <cferris@google.com> am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.

* commit '63e6fe92bbfe73a3637393d0ca80856954c0d5f7':
DO NOT MERGE Restore libcorkscrew unwinding.
05c32e75df7ddb47c1a9a4615a5445a1bb331517 07-Oct-2014 Christopher Ferris <cferris@google.com> am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be created.

* commit 'eef1c7035aadf3b145e506d0e475cf3779befcb3':
Log stack even if tombstone cannot be created.
63e6fe92bbfe73a3637393d0ca80856954c0d5f7 07-Oct-2014 Christopher Ferris <cferris@google.com> am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.

* commit '4105613009614ed7a6622017a592b7bd728b1345':
DO NOT MERGE Restore libcorkscrew unwinding.
eef1c7035aadf3b145e506d0e475cf3779befcb3 07-Oct-2014 Christopher Ferris <cferris@google.com> am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be created.

* commit 'bf1f5cb928bc2dc92187b85b4aa04650475a857b':
Log stack even if tombstone cannot be created.
4b0374ae1a97cff279f287dded14619e9579da62 07-Oct-2014 Carson Liao <carson.liao@mediatek.com> am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM feature

* commit '4c4cf467f5857e9ec4a0688d75854cc9cdaa1d4d':
modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
4105613009614ed7a6622017a592b7bd728b1345 07-Oct-2014 Christopher Ferris <cferris@google.com> am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.

* commit '5a69c1db365323f984c6a8afd1fc035551e96d99':
DO NOT MERGE Restore libcorkscrew unwinding.
bf1f5cb928bc2dc92187b85b4aa04650475a857b 07-Oct-2014 Christopher Ferris <cferris@google.com> am 290efd24: (-s ours) Log stack even if tombstone cannot be created.

* commit '290efd244d8af18811b2ef2dac8f30cc7a37e066':
Log stack even if tombstone cannot be created.
8987ec87169bf5abb21f170a4057d50a67fc7011 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 67479c9771d2ce1b39fe5d074fac9f40a220f231
4c4cf467f5857e9ec4a0688d75854cc9cdaa1d4d 06-Oct-2014 Carson Liao <carson.liao@mediatek.com> modified AUDIO_SOURCE_FM_TUNER enum value for FM feature

Review: https://partner-android-review.git.corp.google.com/#/c/183993

Signed-off-by: Carson Liao <carson.liao@mediatek.com>

Change-Id: I8d70b197bcdc710119031bcf622fee0c1b3b3aa7
nclude/system/audio.h
67479c9771d2ce1b39fe5d074fac9f40a220f231 06-Oct-2014 Mike Lockwood <lockwood@google.com> am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev

* commit '24e3e831199e1279b3a12b0ccfeb00e06d4f4fd5':
Add bootanimation to audio group so it can play boot sound
24e3e831199e1279b3a12b0ccfeb00e06d4f4fd5 06-Oct-2014 Mike Lockwood <lockwood@google.com> am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev

* commit '7569b7b39f4f12cc4e87525113c82dae65c0b250':
Add bootanimation to audio group so it can play boot sound
7569b7b39f4f12cc4e87525113c82dae65c0b250 06-Oct-2014 Mike Lockwood <lockwood@google.com> Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
72a4178866155fde9a3aeb8bf5a3ba3702f3f8d4 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5a9d721baece3144ec3b9f43715d1c112d90b3d6
baaed328fba06ad3da42d3e7caeed5c8ac952faf 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5a9d721baece3144ec3b9f43715d1c112d90b3d6
cff956722f859a73f1cdb118a616ce91c31513f7 04-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5a9d721baece3144ec3b9f43715d1c112d90b3d6
7e58899bcfd83152581867b05bb012c5c4ec4b46 29-Sep-2014 Mike Lockwood <lockwood@google.com> Add bootanimation to audio group so it can play boot sound

Bug: 17674304

Change-Id: I5d31bc024fa36fedac2c0ba5c4a8b100937183ad
ootdir/init.rc
5a9d721baece3144ec3b9f43715d1c112d90b3d6 02-Oct-2014 Jesse Hall <jessehall@google.com> am 10b13131: am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev

* commit '10b131314d461d5fd94aeff0565942e04d03e16b':
init.trace.rc: fix race condition with class_start core
10b131314d461d5fd94aeff0565942e04d03e16b 02-Oct-2014 Jesse Hall <jessehall@google.com> am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev

* commit 'c263e671dfbc5d968275f6c088f05c21d1528325':
init.trace.rc: fix race condition with class_start core
c263e671dfbc5d968275f6c088f05c21d1528325 02-Oct-2014 Jesse Hall <jessehall@google.com> Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
a9772a5c39b58549de05ab052d61eb08e4d8351d 02-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5a0f0e97109b1558df0bc04940525f477f4db356
a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c 02-Oct-2014 Stephen Hines <srhines@google.com> am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags.

* commit '6cf1193bcff2c2f1a43abeeac1ad2b33e422182e':
Fix windows-specific error without messing up Makefile flags.
6cf1193bcff2c2f1a43abeeac1ad2b33e422182e 02-Oct-2014 Stephen Hines <srhines@google.com> am 2f431a8d: Fix windows-specific error without messing up Makefile flags.

* commit '2f431a8d5a1c2029af470a7336751a555131ee51':
Fix windows-specific error without messing up Makefile flags.
2f431a8d5a1c2029af470a7336751a555131ee51 02-Oct-2014 Stephen Hines <srhines@google.com> Fix windows-specific error without messing up Makefile flags.

Bug: 14416410

The proper fix for the error/warning we encountered is to move winsock2.h
in front of windows.h.

Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
db/Android.mk
db/sysdeps.h
db/sysdeps_win32.c
db/usb_windows.c
541a780454ca5299a96a5d9bae1fcb650a0c0659 02-Oct-2014 Stephen Hines <srhines@google.com> am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.

* commit '490f03d560e873ad73f964815ca109381efec147':
Fix build breakage for missing -Wcpp option on old GCC versions.
490f03d560e873ad73f964815ca109381efec147 02-Oct-2014 Stephen Hines <srhines@google.com> am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.

* commit '3ea87c33a1c6e940322f5436cf0dd70a0bdadd75':
Fix build breakage for missing -Wcpp option on old GCC versions.
3ea87c33a1c6e940322f5436cf0dd70a0bdadd75 02-Oct-2014 Stephen Hines <srhines@google.com> Fix build breakage for missing -Wcpp option on old GCC versions.

Bug: 14416410
Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
db/Android.mk
2ae2dd0db8a7f217b5785e20cefc7c51e0e50b5f 02-Oct-2014 Dmitriy Ivanov <dimitry@google.com> Merge "Add -std=gnu++11 to test cflags" into lmp-mr1-dev
8386725771893bb7dd618abbf6d8ebd556a98486 12-Sep-2014 Dmitriy Ivanov <dimitry@google.com> Add -std=gnu++11 to test cflags

(cherry picked from commit 5f68087efe0476f15b0df8c78ac7e31689ec0121)

Change-Id: I6fc0d3673391654aa72e1e6bd98f4a8469c79868
iblog/tests/Android.mk
4acabfee9e00962be02d06a6771da2e7ade20859 02-Oct-2014 Stephen Hines <srhines@google.com> am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev

* commit '64f44b8444dabd69cf391d42e10d44e8e926a79d':
Remove obsolete reference to ddk; Fixes for -Werror
64f44b8444dabd69cf391d42e10d44e8e926a79d 02-Oct-2014 Stephen Hines <srhines@google.com> Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
3684c83687e449f2440d9267e0e54fbbfac87a1d 01-Oct-2014 Calin Juravle <calin@google.com> am 00851a53: Use initUnchangeableSystemProperty for initializing os.arch.

* commit '00851a53bebe16dd2a0460245505461f40a7a307':
Use initUnchangeableSystemProperty for initializing os.arch.
331a939bf8f966d80a2dbf5caf5741b2446bae1a 30-Sep-2014 Fred Fettinger <fettinge@motorola.com> init.trace.rc: fix race condition with class_start core

The systrace permissions from init.trace.rc and the "class_start core"
which launches surfaceflinger are both in an "on boot" section. However,
the init.trace.rc commands are parsed after all commands in init.rc.
This means that "class_start core" is executed before the chmod command
which allows processes to write to trace_marker. If any services
execute their first trace command before the chmod occurs, then that
service won't be able to write traces until the service is restarted.

To fix this, run all of the init.trace.rc commands in the "early-boot"
section to ensure they are completed first.

Bug: 17612265
Change-Id: Ibf544762173d5ba98272c66ef485d8eab7d70bf3
ootdir/init.trace.rc
00851a53bebe16dd2a0460245505461f40a7a307 01-Oct-2014 Calin Juravle <calin@google.com> Use initUnchangeableSystemProperty for initializing os.arch.

Bug: 17713104
Change-Id: Ic847579981efcd2fd0526c994d786ee8b7a8a316
ibnativebridge/native_bridge.cc
f712f3e4cbf6ec1489feec29bc7576bd60efe8fb 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 2f207af86993aade2e3fbe68e0174901b526fc92
5a0f0e97109b1558df0bc04940525f477f4db356 01-Oct-2014 Brian Carlstrom <bdc@google.com> am 479ce0c1: Merge "Fix mac build for nativebridge tests." into lmp-dev

* commit '479ce0c1f3d9ecbaf7947651a5e00828ec522f15':
Fix mac build for nativebridge tests.
0edbf89e687802d4c92fb8b81af1a0715017aa8f 01-Oct-2014 Vince Harron <vharron@google.com> am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev

* commit 'c75dac394e3fcd9760841a820d8a0c93dd0c276e':
fix for adbd pinning CPU
2f207af86993aade2e3fbe68e0174901b526fc92 30-Sep-2014 Mark Salyzyn <salyzyn@google.com> am 7391575a: logd: in nonblocking read, sched_yield() synchronization

* commit '7391575afdd6c27bf444dcde7a140f1b17629b8c':
logd: in nonblocking read, sched_yield() synchronization
dfb58c630833f634035552d2725290143c7f725d 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 2d83ca4cc1f2a3f59086906fae3e419151f11068
b75d6f1429edf41cd15772a8d9d3a96f84a21862 07-May-2014 Andrew Hsieh <andrewhsieh@google.com> Remove obsolete reference to ddk; Fixes for -Werror

Bug: 14416410

1. The new mingw-w64 toolchain x86_64-w64-mingw32-4.8 has ddk
in x86_64-w64-mingw32/include/ddk
2. Add -Wno-error=cpp to suppress a warning that turns into error
thanks to -Werror:

Please include winsock2.h before windows.h
3. Cast GetLastError() return type DWORD to "int"
4. Include direct.h for _mkdir
5. Include stdint.h for uint8_t on Windows

Change-Id: I4bec0587f6573692f08c760da6c98ae551b8b5eb
db/Android.mk
db/commandline.c
db/sysdeps.h
db/sysdeps_win32.c
astboot/Android.mk
479ce0c1f3d9ecbaf7947651a5e00828ec522f15 30-Sep-2014 Brian Carlstrom <bdc@google.com> Merge "Fix mac build for nativebridge tests." into lmp-dev
c75dac394e3fcd9760841a820d8a0c93dd0c276e 30-Sep-2014 Vince Harron <vharron@google.com> Merge "fix for adbd pinning CPU" into lmp-dev
7391575afdd6c27bf444dcde7a140f1b17629b8c 16-Sep-2014 Mark Salyzyn <salyzyn@google.com> logd: in nonblocking read, sched_yield() synchronization

- sched_yield and lock synchronization in reader thread
startup to give writer thread a chance to catch up

(cherry picked from commit f669acb01880216b6c1d29fc226f2c3ec3a6368a)

Bug: 17512203
Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
ogd/LogReader.cpp
7e5a0aca2cd81809786fad990b95f1fd404a83a5 29-Sep-2014 Calin Juravle <calin@google.com> Fix mac build for nativebridge tests.

Bug: 17671501

Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
ibnativebridge/tests/PreInitializeNativeBridge_test.cpp
a69ada1a6030ab85c1e1c4c317d516f4ea60e408 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 2d83ca4cc1f2a3f59086906fae3e419151f11068
2d83ca4cc1f2a3f59086906fae3e419151f11068 29-Sep-2014 jgu21 <jinghui.gu@intel.com> am b3facbfd: LibNativeBridge: Add early init & env setup

* commit 'b3facbfdecf46eb7c063b99529ab8c18a08a6b42':
LibNativeBridge: Add early init & env setup
2af66feba8274dc72b60e2da283b20f32312d09e 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to bdf11c76a39d979abd105a4f27bc1973b88893ad
3dedfca506723fca1af4b36560202f085b4a7bc9 27-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to bdf11c76a39d979abd105a4f27bc1973b88893ad
bdf11c76a39d979abd105a4f27bc1973b88893ad 26-Sep-2014 Ruchi Kandoi <kandoiruchi@google.com> healthd: Add callback for screen_on to the healthdHAL

Adds a callback to the healthdHAL which can check for device specific
properties to decide if the screen should turn on.

Change-Id: I543e7729ecb291157df4d3be1bd718f8af01ac40
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
ealthd/healthd.cpp
ealthd/healthd.h
ealthd/healthd_mode_charger.cpp
b3facbfdecf46eb7c063b99529ab8c18a08a6b42 10-Sep-2014 jgu21 <jinghui.gu@intel.com> LibNativeBridge: Add early init & env setup

Add a method to set up /proc/cpuinfo with enough privileges. Set
up the environment for an app in InitializeNativeBridge().

Turn on -Wall for libnativebridge.

(cherry picked from commit 962eb40abb68eb60077da158755b6a09c306aa41)
(cherry picked from commit ab0da5a9a6860046619629b8e6b83692d35dff86)
(cherry picked from commit 2f71cb24fa16c0388591918f1354d1f8608cc6e5)
(cherry picked from commit 04054e28e24866d76034236843490829b80df40c)
(cherry picked from commit 4390a632366ecf89af5f6c0fed39baf9aab2d0f1)

Bug: 17671501
Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
nclude/nativebridge/native_bridge.h
ibnativebridge/Android.mk
ibnativebridge/native_bridge.cc
ibnativebridge/tests/Android.mk
ibnativebridge/tests/NeedsNativeBridge_test.cpp
ibnativebridge/tests/PreInitializeNativeBridge_test.cpp
ibnativebridge/tests/UnavailableNativeBridge_test.cpp
af436b1e10bed3b89880b3bd4f3031ea14057def 26-Sep-2014 Vince Harron <vharron@google.com> fix for adbd pinning CPU

adbd was spinning between select & read (0 bytes) for an adb_auth
socket. The read documentation states: "On success, the number of
bytes read is returned (zero indicates end of file)" so the code has
been modified to close the connection (like the read error case).

BUG=17419868

Change-Id: I1d8fb70c8e1876225ba8d47ea0a2b6265a7d182b
db/adb_auth_client.c
ea52030bc6819c7ea6ffc921df9c3f13b7f8b94c 26-Sep-2014 Andreas Gampe <agampe@google.com> am 8dd3ea58: Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev

* commit '8dd3ea58fdd99912f631156c37bcb2555ce8aec3':
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
8dd3ea58fdd99912f631156c37bcb2555ce8aec3 25-Sep-2014 Andreas Gampe <agampe@google.com> Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev
25bacb3ab71ee7e8289c76d0aa0c6473e47340e3 25-Sep-2014 Andreas Gampe <agampe@google.com> Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"

This reverts commit f00de413ed451f1a90d614ea5dce8b3d685e877c.

Bug: 17645833
Change-Id: Ie5480de9cf4da2c9167db2e6137679019a29f867
ibnativebridge/native_bridge.cc
ibnativebridge/tests/ValidNameNativeBridge_test.cpp
fcbb23adc939dd27122d962e5f7e7f016259f03e 21-Sep-2014 Hochi Huang <hochi.huang@mediatek.com> [AU] Update volume setting and Audio Device API 3.0

Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Change-Id: I772584ae05e6a8d2fdc8c4a52e44ad80c3c1a4a7
nclude/system/audio.h
9b789d7a30ba3c7f4fd41e3e99c827feb80b0fb3 25-Sep-2014 Jeff Sharkey <jsharkey@android.com> am 2b16bf88: Merge "Include reason when wiping data." into lmp-dev

* commit '2b16bf88c768003291f027fdfac94d84abe9dbe6':
Include reason when wiping data.
ab5c28e4081e0f5b8e5789eecc6c06103c0174c7 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ce6bfc93a1843a48f1f459fcefb30bf9f05aa013
2b16bf88c768003291f027fdfac94d84abe9dbe6 25-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Include reason when wiping data." into lmp-dev
d26135b34d4ee9d983931d64c8cb18dd2562b938 24-Sep-2014 Jeff Sharkey <jsharkey@android.com> Include reason when wiping data.

This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: I40f73d2d0f08123d2afc044a3dde485151b400d9
nit/builtins.c
ce6bfc93a1843a48f1f459fcefb30bf9f05aa013 24-Sep-2014 Ruchi Kandoi <kandoiruchi@google.com> am 301a907f: Merge "healthd: charger: Run animation even if capacity is 0" into lmp-dev

* commit '301a907f28570ff1627e30a37069e6c5ab6a4b75':
healthd: charger: Run animation even if capacity is 0
301a907f28570ff1627e30a37069e6c5ab6a4b75 24-Sep-2014 Ruchi Kandoi <kandoiruchi@google.com> Merge "healthd: charger: Run animation even if capacity is 0" into lmp-dev
9d3f42316ba7925909495f1042058c61ad9b9a3e 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 62e05407da5c36b6c4057e613ae6d4e3068a3721
62e05407da5c36b6c4057e613ae6d4e3068a3721 24-Sep-2014 Eric Laurent <elaurent@google.com> am f6cce347: audio: add HW hotword capture flag

* commit 'f6cce347a73e3b3da9ff6698ead25b5a543ce47b':
audio: add HW hotword capture flag
9b0d442385fa1376f5115f9c167c50aa0d275b47 20-Sep-2014 Devin Kim <dojip.kim@lge.com> healthd: charger: Run animation even if capacity is 0

If charger is connected and battery capacity is 0, charging animation should
run. The device would be booted up even if capacity is 0 in off-mode charging.
At that time, it would take some time to be 1 from 0 for capacity if you
use USB charger.

Bug: 17606689
Change-Id: I37e0f1b6ab0ee1f6d833882e169bf3ea06cf2399
ealthd/healthd_mode_charger.cpp
08b319d123e34781f4c3c72f8be4cf5f84ea1230 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 40af09297f9d60a3cfd4a186ff294cef6255a9df
ebeb0c0ea63af9fd8b2c8a7a20f919e48098ad9a 23-Sep-2014 Todd Poynor <toddpoynor@google.com> healthd: use warning level for info logs

To allow healthd/charger info to appear in systems where the loglevel
has been bumped to squelch chatty drivers.

Change-Id: I4ab135765700d7584a1ce5d972ea473d77f299f8
ealthd/BatteryMonitor.cpp
ealthd/healthd_mode_charger.cpp
e01e253f1e7fe285901af36b1023cacfc2202a28 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 40af09297f9d60a3cfd4a186ff294cef6255a9df
43af1afb1891f420c87dec5ea9b2d494666fb874 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 40af09297f9d60a3cfd4a186ff294cef6255a9df
82e3a42244ac119a55e2a4da392873dca9083cc4 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 40af09297f9d60a3cfd4a186ff294cef6255a9df
10fb00d15ddfee58a096f9bbeda3dabed03cc1f0 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 40af09297f9d60a3cfd4a186ff294cef6255a9df
f6cce347a73e3b3da9ff6698ead25b5a543ce47b 20-Sep-2014 Eric Laurent <elaurent@google.com> audio: add HW hotword capture flag

Bug: 17575019.
Change-Id: I12c0a2e0200f3d839dfd74650724391e54ac3534
nclude/system/audio.h
40af09297f9d60a3cfd4a186ff294cef6255a9df 16-Sep-2014 Paul Lawrence <paullawrence@google.com> Fix charger mode on first boot of force encrypt devices

waitpid breaks whenever child status signals. Need to loop, continuing
on errno EINTR

Bug: 17515976
Change-Id: Ibb29056a38b3c90dc7904de8c6aedb5a362e511d
nit/builtins.c
81b857f3a21f3ae96a5ec72e54982fe30278049f 16-Sep-2014 Daniel Rosenberg <drosen@google.com> Merge "fastboot: Remove tos from flashall" into lmp-dev
a5ab96eb50f27989240ab8917e8ebf3a028bcdfb 11-Sep-2014 Esteban de la Canal <estebandlc@google.com> 74602: Fixes adb not seeing connected devices on Mac.

Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html

Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
db/usb_osx.c
015d73ff4e12e0ae3a5c44ed2f69d24cbe7982d3 15-Sep-2014 Daniel Rosenberg <drosen@google.com> fastboot: Remove tos from flashall

bug: 17498561
Change-Id: I0190c1a5ac635375404799c040e4be523fa29622
Signed-off-by: Daniel Rosenberg <drosen@google.com>
astboot/fastboot.c
8ce3b9e28418d78d1d3c38330977b35da29e0ff5 15-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 07dda6b57c6a476177b68ad42966f24cbbdb04c1
5788c6514dc6e93a9bd758b87899e15f9352dc7f 14-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 07dda6b57c6a476177b68ad42966f24cbbdb04c1
07dda6b57c6a476177b68ad42966f24cbbdb04c1 14-Sep-2014 Christopher Ferris <cferris@google.com> Merge "Use the correct debuggerd given the tid." into lmp-dev
0df591f920e5d54191874147bac36756b6c37217 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 767dee2d39cbd10d13c2abe51f62d5986ca66e43
775dcb13d5de35831e56b29521b11c9ee218fc5b 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cf234dc7e081ac4063c3c5ddcdd4da40c82d51cb
a9fa7b87f1aefd7b96f749a545d3385ad384c12b 12-Sep-2014 Christopher Ferris <cferris@google.com> Use the correct debuggerd given the tid.

On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.

This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.

Bug: 17487122
Change-Id: Icf123a6f4508b1aeec073663aa1a0ceae5380aa1
nclude/cutils/debugger.h
ibcutils/debugger.c
cf234dc7e081ac4063c3c5ddcdd4da40c82d51cb 09-Sep-2014 Paul Lawrence <paullawrence@google.com> Preserve errno from fsmgr_do_mount

Bug: 17358530
Change-Id: I4cd7403c0b7c4f878d6afa5199f998e6f614adb9
s_mgr/fs_mgr.c
s_mgr/include/fs_mgr.h
c3e6eb21b58ae3067ed03358687d1edb851f2abf 12-Sep-2014 Jeff Brown <jeffbrown@google.com> Merge "Move ABI: line below header when dumping stacks." into lmp-dev
9b12d53b1a180bb7c6c946649254e6f23e6ca04d 11-Sep-2014 Jeff Brown <jeffbrown@google.com> Move ABI: line below header when dumping stacks.

Bug: 17474152
Change-Id: I66b6e7e1cbb004f7a1915a2c1515df6555fe176f
ebuggerd/backtrace.cpp
767dee2d39cbd10d13c2abe51f62d5986ca66e43 20-Jun-2014 Jon Eklund <jeklund@motorola.com> audio.h: Add "safe speaker" device for limited-loudness use cases

Bug: 17319721
Change-Id: Ie1af5b73258f8a0009c3bc3cecb3e0e8b2262ed7
nclude/system/audio.h
9caba481ccac1584ba03c09c60e6a076e28fd143 11-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4d1365b4d3a1b3f904eb5900be8b5269a8807511
fcfa86403e206e2caa519299939480cb45deb8ba 20-Jun-2014 Jon Eklund <jeklund@motorola.com> audio.h: Add "safe speaker" device for limited-loudness use cases

Bug: 17319721
Change-Id: Ie1af5b73258f8a0009c3bc3cecb3e0e8b2262ed7
nclude/system/audio.h
35fc4dea92cefd8b0137630af6b9d4b17ff69c12 10-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4d1365b4d3a1b3f904eb5900be8b5269a8807511
4d1365b4d3a1b3f904eb5900be8b5269a8807511 10-Sep-2014 Andreas Gampe <agampe@google.com> Merge "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen" into lmp-dev
f00de413ed451f1a90d614ea5dce8b3d685e877c 10-Sep-2014 Andreas Gampe <agampe@google.com> DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen

Bug: 17440362
Change-Id: Ifceeecd39d4ffd948f62212ebb5280ebec9bf6ff
ibnativebridge/native_bridge.cc
ibnativebridge/tests/ValidNameNativeBridge_test.cpp
69052994fd21f2b594295f62e2f867e911e8468d 10-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
228f8261fd778e1c03184b5f79f979d1a25abf50 09-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "delete_file() should force removal." into lmp-dev
41b3cfa29602d5f5065e7eafc25692cd75dc1871 09-Sep-2014 Jeff Sharkey <jsharkey@android.com> delete_file() should force removal.

It's a shell command with a pty, but it's not really interactive,
so force the removal to avoid giving users dead-end prompts.

Bug: 17339227
Change-Id: Iaf5d95c49f032066aa741a711a2c45557d93c598
db/commandline.c
8a42769f7abc01109f16f3f85fe475d4f1b08353 09-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 41df668c7be461f461b3d70951dee7634ded868f
17622d09d5ba54ae3c8b11644c6d7556bdc6644c 09-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Support resetting connections tied to any nonexistent address.

Bug: 15414453
Change-Id: Ibf1f052e12b88838a328148e25817a96f10d50f5
nclude/netutils/ifc.h
ibnetutils/ifc_utils.c
41df668c7be461f461b3d70951dee7634ded868f 03-Sep-2014 Andreas Gampe <agampe@google.com> NativeBridge: Refactor for new initialization flow

Setup becomes Load, have explicit Initialize and Unload.

(cherry picked from commit 035bd7541ed909344348b6a4e17a7ef01a434653)

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
nclude/nativebridge/native_bridge.h
ibnativebridge/Android.mk
ibnativebridge/native_bridge.cc
ibnativebridge/tests/InvalidCharsNativeBridge_test.cpp
ibnativebridge/tests/ReSetupNativeBridge_test.cpp
ibnativebridge/tests/UnavailableNativeBridge_test.cpp
ibnativebridge/tests/ValidNameNativeBridge_test.cpp
7e013a97193fc85fcb41de26e24f2dfe68f81f1f 08-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 97b536f1fbfd1fa711833b7dc92aed902dea4bdf
b287297885cabd998628e84279862ddabb4e7878 07-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 97b536f1fbfd1fa711833b7dc92aed902dea4bdf
57668d01fc81069a4abb010f83ee500c29dfdc38 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 0b0bf8787497365f38b19a37b629a8a1f734e509
151ac33a18fef06a2721fa22d30c42deaf787887 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 97b536f1fbfd1fa711833b7dc92aed902dea4bdf
97b536f1fbfd1fa711833b7dc92aed902dea4bdf 05-Sep-2014 Badhri Jagan Sridharan <badhri@google.com> init.usb.rc: Change product id to for add only config

Change product id from D002 to 4EE7 when adb is the
only supported function

Change-Id: I8f6bcb9a1dc5ea6da0493a2dd730f9ac1f0bed24
ootdir/init.usb.rc
3c8e92cebe9f5246f502d9e82d16f9621ac0bed7 03-Sep-2014 Arseniy Antonov <arseniy.antonov@intel.com> Fix for parenthesis error

Added parentheses as it was suggested by compiler.
error: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' [-Werror=parentheses]

(Cherry picked from commit c3ce224c622e064207d1aff03f2440ca19617b4a)

Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
Change-Id: Ic3746d9804488411d10d460ddfda11f1fad8efef
ogd/LogStatistics.cpp
0b0bf8787497365f38b19a37b629a8a1f734e509 04-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cad56b6ad3ba24d76e073c024aae78d2282058f3
be19ae7df9193de861585cbd87eeb4b724db1e1f 03-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cad56b6ad3ba24d76e073c024aae78d2282058f3
cad56b6ad3ba24d76e073c024aae78d2282058f3 01-Aug-2014 Hans Boehm <hboehm@google.com> Remove android_... store_barriers and 64-bit atomics.

These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses. All users should move
to C11 or C++11 atomics.

(Resolved conflicts in atomic-...64.h with uniprocessor support
removal as in AOSP.)

Bug:16880454

Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
(cherry picked from commit 9959ed953069ac9a7f08bebd2df55440e9370c0f)
nclude/cutils/atomic-arm.h
nclude/cutils/atomic-arm64.h
nclude/cutils/atomic-inline.h
nclude/cutils/atomic-mips.h
nclude/cutils/atomic-mips64.h
nclude/cutils/atomic-x86.h
nclude/cutils/atomic-x86_64.h
nclude/cutils/atomic.h
6b0fcf1fbb3bafb3f891e6ff7e8fdbf9148d4b9b 02-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to c692410e1607a39cd6d55f4be8164fc630d9772c
6a594683ec8aa2c8cee98a95f502772db515e60e 01-Sep-2014 Mark Salyzyn <salyzyn@google.com> logcat: document help tail from time

Bug: 17323719
Change-Id: Id057dde60e699c946828f4aeabedf1728b3bc877
ogcat/logcat.cpp
19e8de0742e84355a63feb48b7e1fc6ffbcfbae1 11-Aug-2014 Mark Salyzyn <salyzyn@google.com> logd: simplification, return NULL instead of threadexit NULL

Bug: 16822776
Change-Id: I12133226f1b48d8fdc378dea0aadd78a4aae3da8
ogd/LogTimes.cpp
b7e1f891f859a34278f4047773ab47e8a455645c 01-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to c692410e1607a39cd6d55f4be8164fc630d9772c
e56f413b00574b85586615d12e08fe4855d6c01b 31-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to c692410e1607a39cd6d55f4be8164fc630d9772c
c692410e1607a39cd6d55f4be8164fc630d9772c 28-Aug-2014 Alex Light <allight@google.com> Change /dalvik-cache to be owned by root.

Bug: 16875245

(cherry picked from commit 3878ebd72493427ea5537b36dfb9cd7cb38677bb)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
nclude/private/android_filesystem_config.h
ootdir/init.rc
f9e4d72782e685c00587e09d0e560a49be49ab6c 28-Aug-2014 Narayan Kamath <narayan@google.com> Merge "Reject zip archives with entry names containing \0." into lmp-dev
8b6c1cf615db67a74c560e07a638882b753ede02 27-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 314313a9915c9a274f580c0fcf535a4db2ba0a9a
314313a9915c9a274f580c0fcf535a4db2ba0a9a 26-Aug-2014 Andres Morales <anmorales@google.com> Move bootanim and surfaceflinger to class core

They have no dependencies on /data so can be started early.
This permits us to unmount /data while bootanimation is running,
allowing an uninterrupted first boot encryption sequence.

Bug: 17260550
Change-Id: I323fe23e8cf488d8bc136387efdd9fcea96625eb
ootdir/init.rc
bbfa6984074bf5939a7544c6f053792a7ae41857 26-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a005e7795e3dfb7cc0bd2bc65208d2490bfc89d8
0c1b894b69ff1261f14bad616d8a4ddada186a0d 15-Aug-2014 Piotr Jastrzebski <haaawk@google.com> Reject zip archives with entry names containing \0.

There should never be a need of an entry name with \0 character.

Bug: 16162465

(cherry picked from commit 78271ba97b5d867e3597b7fc2257dd1bbd513b05)

Change-Id: I68c72fb45e8ec70eb125cfc887488bc18ba5447d
ibziparchive/zip_archive.cc
a005e7795e3dfb7cc0bd2bc65208d2490bfc89d8 25-Aug-2014 Paul Lawrence <paullawrence@google.com> Merge "Enable not rebooting during default encryption" into lmp-dev
c23074f386ded6cd28b2f8ba2331814b7491c802 18-Aug-2014 Paul Lawrence <paullawrence@google.com> Enable not rebooting during default encryption

Need to not set this property) during mount, since it can't
be changed later (ro property)

Also no reason to start class main on encryption cycle - we'll
show surfaceflinger, which is enough UI for this short cycle.

Bug: 17041092
Change-Id: Ica5339c54e45716d0fe20e23c0ab857f388d23ed
nit/builtins.c
ootdir/init.rc
352f799c62e699eaf499b38d7d754090d72cc4f3 25-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4089cda0ae73e71adb787e595c747846e30730ee
76cc07fab1e094fb4c97892828d4026c9c27f07e 24-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4089cda0ae73e71adb787e595c747846e30730ee
7b6d379f3f69a846f8ae39c0fabdcb1ef2041fab 23-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4089cda0ae73e71adb787e595c747846e30730ee
4089cda0ae73e71adb787e595c747846e30730ee 22-Aug-2014 Andreas Gampe <agampe@google.com> Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev
cd2ef4c1af69727231b84ebc82864c170ff0e8ad 20-Aug-2014 Andreas Gampe <agampe@google.com> NativeBridge: Tighten security on libnativebridge

Do not allow arbitrary paths for the native bridge - only allow
simple names.

Do not allow re-setup of the native bridge.

Bug: 16404669
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
nclude/nativebridge/native_bridge.h
ibnativebridge/Android.mk
ibnativebridge/native_bridge.cc
ibnativebridge/tests/Android.mk
ibnativebridge/tests/InvalidCharsNativeBridge_test.cpp
ibnativebridge/tests/NativeBridgeTest.h
ibnativebridge/tests/ReSetupNativeBridge_test.cpp
ibnativebridge/tests/UnavailableNativeBridge_test.cpp
ibnativebridge/tests/ValidNameNativeBridge_test.cpp
e40ce5bfbc1a0b3ca4900463d3fa385c76930b7f 21-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 0b12f0a7d6be18705d1972ef9a047159bb001e8f
0b12f0a7d6be18705d1972ef9a047159bb001e8f 21-Aug-2014 Colin Cross <ccross@android.com> Merge "processgroup: close directories opened by removeAllProcessGroups()" into lmp-dev
c15dd044705aa86f63b2642c1439d5f943a80d18 20-Aug-2014 Colin Cross <ccross@android.com> processgroup: close directories opened by removeAllProcessGroups()

removeAllProcessGroups and removeUidProcessGroups were calling
opendir, but never called closedir. This would leave a leaked
file descriptor for every /acct/uid_* directory that existed
at boot.

Change-Id: Ia08eccd42d6ad7a6c1c78402519ac2e53b4fc83a
ibprocessgroup/processgroup.cpp
15b671bbfea5d417eba53b0240fb8b38427938ef 20-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 6ba555f2ad878129cd1da9dd7b7613ab166090ab
6ba555f2ad878129cd1da9dd7b7613ab166090ab 20-Aug-2014 Igor Murashkin <iam@google.com> Merge "libutils: Don't segfault ProcessCallStack when getting thread name fails" into lmp-dev
63fbdb6440ce5009ef0bfd3d1e1cc60b46004973 19-Aug-2014 Igor Murashkin <iam@google.com> libutils: Don't segfault ProcessCallStack when getting thread name fails

There's an inherent race in trying to read out the thread name from
the system and the thread closing out on its own (and thus being removed
from procfs).

Try to handle this by formatting the thread name unconditionally with
the tid when getting the thread name fails (instead of dereferencing
NULL and crashing).

Bug: 15406837
Change-Id: Ibf2208b8ce345589e7e9c57e6a307728d1121c5d
ibutils/ProcessCallStack.cpp
d519970c4c3ff130d41db7e5f6a3f1a7357cdb42 19-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 342a2264b96ab05dc8fdbfa8bbe354ce2f4b06ca
342a2264b96ab05dc8fdbfa8bbe354ce2f4b06ca 18-Aug-2014 Todd Poynor <toddpoynor@google.com> healthd: charger: fix check for charger connected to enter suspend

Logic for this check was inadvertently reversed when porting this from
the charger daemon to healthd. Request suspend if a charegr is connected,
else stay out of suspend waiting for a charger connect or power off if
none.

Bug: 17112463
Change-Id: Iffdb6dbcd0d0a2a614ff8f50bf5f2e22e1ad552f
ealthd/healthd_mode_charger.cpp
e26656183bdc20c5e26aa9b55abc3e2dcf7ca054 18-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 82b76249fbc339e82ab47a956f7e17160247e4c4
82b76249fbc339e82ab47a956f7e17160247e4c4 04-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Remove obsolete tcp buffer size system properties.

Change-Id: If6fb6fdcf8975e6102e84594ee3f64a5be6166f6
ootdir/init.rc
5d641024f1b4ba386781465f0e3f534c341b2c1d 17-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a42adff905600219cbf5ef217d2b46670225aca3
3e3fbc4d734c1394823ac3d91b88c4aa87c6b265 19-Aug-2014 Dan Albert <danalbert@google.com> Merge "Update for public android_set_abort_message()." into lmp-dev
c68fedce06da19de4fde0ae0683ad2a8916586f7 19-Aug-2014 Dan Albert <danalbert@google.com> Update for public android_set_abort_message().

Since android_set_abort_message() is quite helpful to the platform, it's
becoming promoted to a real header with a non-private name.

Bug: 17059126
Change-Id: I3ed12b66eb07f3a6a08366d5eee147809d9a3ce9
(cherry picked from commit 4047075da6e3796c759e439d4f0bbbac8d2c03f3)
iblog/logd_write.c
iblog/logd_write_kern.c
a42adff905600219cbf5ef217d2b46670225aca3 17-Jul-2014 Jeremy Compostella <jeremy.compostella@intel.com> fastboot: add the support of the second stage image [DO NOT MERGE]

The AOSP bootimage format allows the use of a second stage image
however the fastboot boot and flash:row commands do not allow the
"secondstage" optional argument. This patch adds the support of this
argument for both commands.

Change-Id: I00403a95d7460a00233841ba0fe0e8a69d78c7b4
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
astboot/fastboot.c
4fe327b902a1d5ff48878c1801cce8cdbe718d31 19-Aug-2014 Michael Wright <michaelwr@google.com> Merge "Remove inputflinger from init. DO NOT MERGE" into lmp-dev
1de92cffc7ac1e1654bdef5e3849fe542b1fd9fc 19-Aug-2014 Michael Wright <michaelwr@google.com> Remove inputflinger from init. DO NOT MERGE

Change-Id: I6ae2815a0c3f6b9c69e712af3ed6ce9d455ef3d3
ootdir/init.rc
69d68b69e5341124c1947f3110c67aa8836e3437 16-Aug-2014 Jeff Brown <jeffbrown@google.com> Merge "Add trace tag for power management." into lmp-dev
935708be6fe366c8e519b01d1fba9fd2414c0dba 15-Aug-2014 Calin Juravle <calin@google.com> Switch libnativebridge to clang

This fixes the mac build.

Change-Id: Icaca0e3bb959072633caf6bfad828a429ff71140
ibnativebridge/Android.mk
338b33954b4f557e05e4264f31cd7d7af92b4801 15-Aug-2014 Calin Juravle <calin@google.com> Merge "Move native bridge library in system/core" into lmp-dev
4914fcd91bcd75400c0e023974158912f077464c 11-Aug-2014 Calin Juravle <calin@google.com> Move native bridge library in system/core

Bug: 16884833

(cherry picked from commit 961ae12dea419ff0965f00e50dd16ef07181fba5)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
nclude/nativebridge/native_bridge.h
ibnativebridge/Android.mk
ibnativebridge/native_bridge.cc
c3ba3245a0bb66179fa05aa357382a1886ce387a 15-Aug-2014 Narayan Kamath <narayan@google.com> Merge "Export the new system_server classpath." into lmp-dev
de4d921192853811775b51cac0787f5509b8cf4d 15-Aug-2014 Jeff Brown <jeffbrown@google.com> Add trace tag for power management.

Bug: 17004602
Change-Id: Iecd79e6e0417c02b902cde468b0e842f9348b386
nclude/cutils/trace.h
4459478957e0bbbe1b8181631242869fc559f963 14-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 0be19a53cf9532a5e071e640cb3af5946bfc3d6f
2e150cf6d218a2bdd29a9bf1d5d309200326f2f6 13-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 0be19a53cf9532a5e071e640cb3af5946bfc3d6f
0be19a53cf9532a5e071e640cb3af5946bfc3d6f 12-Aug-2014 Badhri Jagan Sridharan <badhri@google.com> Merge "libusbhost: Fix IOCTL call during usb_request_cancel" into lmp-dev
df41053cdd17883a518dc16a663acdf759b546e9 12-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a639b97d4ac9f22b64fd4aa8d5ac24177817a0dc
a639b97d4ac9f22b64fd4aa8d5ac24177817a0dc 09-Aug-2014 Dmitriy Ivanov <dimitry@google.com> Do not suppress maps dump when si_addr<PAGE_SIZE

Also remove alignment of si_addr.

(cherry picked from commit f10aa3ae9d58269465c579e4c286ccef6be4c2d0)

Bug: 16950250
Change-Id: I60170b9eb7dd8fe99c0eeeaec74d13cfbaa920d9
ebuggerd/tombstone.cpp
b09fc16e9475bcbae1a8df45f0f706d9fda62825 11-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cc2566f12760d66837b52213e5ffd2cb30cce19e
4a5579a047970855b1d6243ca52435e3dea3c954 10-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cc2566f12760d66837b52213e5ffd2cb30cce19e
5134c525f95c9815ae1e868a696812c25c20b60d 09-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cc2566f12760d66837b52213e5ffd2cb30cce19e
cc2566f12760d66837b52213e5ffd2cb30cce19e 09-Aug-2014 Rachad <rachad@google.com> Merge "Tunneled Video Playback support" into lmp-dev
c113c5813ebd620e0bc60ece9a32ea14c08ea237 07-Aug-2014 Mark Salyzyn <salyzyn@google.com> logd: persistent reader threads

Bug: 16822776
Change-Id: I5bea468a41089b51108880044f32e2b2df1278e7
ogd/LogTimes.cpp
ogd/LogTimes.h
1fabc35cb51e6f019141c25430e4e285741625fd 05-Aug-2014 Narayan Kamath <narayan@google.com> Export the new system_server classpath.

bug: 16555230

Change-Id: I99d2d219b5bd6dc4807cb53e44dc5715cc0815b3
ootdir/Android.mk
ootdir/init.environ.rc.in
b26728efe148c7f1f8c2fa6de5bc3c4df192b821 07-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fb2343da60bdf56205a29ec11db5e3bdd87d9651
266685924a81eb6a6c82f8e04cbe1ad5ffbff491 06-Aug-2014 Badhri Jagan Sridharan <badhri@google.com> libusbhost: Fix IOCTL call during usb_request_cancel

USBDEVFS_DISCARDURB IOCTL call expects a pointer to the
the urb structure to be passed from userspace. LibusbHost
instead sends usbdevfs_urb**. Change this to usbdevfs_urb*.

Fixes Issue: https://code.google.com/p/android/issues/detail?id=74530

Change-Id: Ifb8a13857e1a9f62536f2a07c0965e9c419b7d4c
ibusbhost/usbhost.c
678bd2e8225ccebe678430d4095b7fc78253bcf8 06-Aug-2014 Alexander Ivchenko <alexander.ivchenko@intel.com> Fix build of adb with gcc-4.9.

Without this patch we get:

system/core/adb/commandline.c:1629:16: error: array subscript is above
array bounds [-Werror=array-bounds]

Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>

(cherry picked from commit 53723338858772a0189aa3f92f4d4bbdaa9b6772)

Change-Id: I920c1de933ce5ba0a0d57eb8a9b557325a767a2a
db/commandline.c
fb2343da60bdf56205a29ec11db5e3bdd87d9651 06-Aug-2014 Eric Laurent <elaurent@google.com> Merge "audio: add defines for audio HW sync source" into lmp-dev
9d6c233a7e15b9b6ffac295d5ef9a274169b7bea 06-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 46a8ffe87f3cba070fb18a90e3c5c1f73468f99c
46a8ffe87f3cba070fb18a90e3c5c1f73468f99c 06-Aug-2014 Brian Carlstrom <bdc@google.com> Fix Windows adb build by avoiding "bool"

Change-Id: I9ca59e400c199d497a1a18d5e64c2cafe628097b
db/commandline.c
d91e6df901eeebadb92a0361796a387c5b0ceec0 01-Aug-2014 Eric Laurent <elaurent@google.com> audio: add defines for audio HW sync source

Bug: 16132368.
Change-Id: I4008c315f2cba9c6027998be92f4af649359bcce
nclude/system/audio.h
3b1215c374d9267a61c588826b97ccd54f052bc9 05-Aug-2014 Eric Laurent <elaurent@google.com> Merge "sound_trigger HAL update" into lmp-dev
a98a520ce873a1a4b5c5c891f54794d4a929701b 05-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2a363421348fb83963b44752c524c4023b34c996
2a363421348fb83963b44752c524c4023b34c996 05-Aug-2014 Brian Carlstrom <bdc@google.com> Add uncached argument to BacktraceMap::Create on darwin

(cherry picked from commit b978a329efbe0e4489e8556f77bba689065f0499)

Change-Id: Ia2ce3193bc0b17f2a17bb3757a5930b03f84c5ec
ibbacktrace/BacktraceMap.cpp
43d65b6903249a409031b081bb6175b9ad3e5c2a 06-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Escape single quotes in arguments." into lmp-dev
d9c4b14b44e93006efdffb059b769d46af509e2d 15-Jul-2014 Simon Ye <sye@google.com> Move host 'get-state' service up so that it works.

Due to previous bad merge, the get-state service was moved out of the
ADB_HOST #ifdef block.

(cherry picked from commit dc22c3c7a82ad1919c52dc4d00c601ad7210c61b)

Change-Id: I08465e7c666104a4c2d15eadef8a4d4be7f91456
db/adb.c
d0eee747f6389a5800b485f36b265b3f5521852f 06-Aug-2014 Jeff Sharkey <jsharkey@android.com> Escape single quotes in arguments.

Verified that these use-cases continue working:

$ adb shell arg a a 'b b'
$ adb shell arg a a "b b"
|arg|a|a|b b|

$ adb shell arg "a a 'b b'"
|arg|a a 'b b'|

$ adb shell arg 'a a "b b"'
|arg|a a "b b"|

$ adb shell arg a\"b\'c
|arg|a"b'c|

$ adb shell "arg a && arg b"
|arg|a|
|arg|b|

$ adb shell "arg 'a' \"b\" c"
|arg|a|b|c|

Bug: 16139781
Change-Id: I3b010b6cdf57281695c11fda318c9bea0a7221cc
db/commandline.c
f02593b0e61f8108449770094caa7bb39a646ec1 05-Aug-2014 Christopher Ferris <cferris@google.com> Allow getting an uncached process map.

Change-Id: I58d7e90a7b5c4476a4b9f51640c54d13748ac220
nclude/backtrace/BacktraceMap.h
ibbacktrace/UnwindMap.cpp
d6d4c61a93e8ad1438c272e7540acea0a99770a2 30-Jul-2014 Rachad <rachad@google.com> Tunneled Video Playback support

Added native_window_set_sideband_stream() method to window.h

Bug: 16132368
Change-Id: Iff5770cb2e2d27176bee37edacaed7b783bbce2a
nclude/system/window.h
37b6298d5b3857e050fa51b23344188d0b1ea93b 04-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 3679d5f49a1e3caf69fffd1afa2d6139a0bfbb17
3fc434e9c11bd9601c6046273e552a97c7cef4e0 28-Jul-2014 Eric Laurent <elaurent@google.com> sound_trigger HAL update

Indicate if trigger capture is returned with
recognition event in implementation properties
Add coarse confidence level to keyphrase recognition event.
Add capture format to recognition event

Bug: 12378680.

Change-Id: I52303ce2e46b9ebfb9993e47d153799921f9f8e7
nclude/system/sound_trigger.h
bb6a96d1095a9414cb21ea6792f7aab0c616f22d 03-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 3679d5f49a1e3caf69fffd1afa2d6139a0bfbb17
4b580576e5ce3d343d6175b962f1ff7a47565c1c 02-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 3679d5f49a1e3caf69fffd1afa2d6139a0bfbb17
3679d5f49a1e3caf69fffd1afa2d6139a0bfbb17 31-Jul-2014 Elliott Hughes <enh@google.com> Merge "Fix sdcard truncates." into lmp-dev
4568565e85bf2e1ea11b2e09d72e244088c05dbc 31-Jul-2014 Elliott Hughes <enh@google.com> Fix sdcard truncates.

Use truncate64 instead of truncate so we don't truncate (ho ho) the offset.

Bug: https://code.google.com/p/android/issues/detail?id=74039
Change-Id: I63711ccd299e3ebc475563b1999817d1919571ab
dcard/sdcard.c
4ffed01fb7d945a584e4cf82fd9fd13cfee07b73 31-Jul-2014 Dmitriy Ivanov <dimitry@google.com> Exclude bionic private headers from include path

(cherry picked from commit 9516139c03e7e48b2c23a5b53dc4309989e54c6b)

Change-Id: I2883e2a13a523e6938c8a3aed93e66af948cdcd8
ibutils/Android.mk
ibutils/Threads.cpp
7e791c62491c9c75031767c40de8cc624e500f76 29-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1e92ed5e83474c157237de18af5b2201095f37e3
1e92ed5e83474c157237de18af5b2201095f37e3 28-Jul-2014 Eric Laurent <elaurent@google.com> audio: define type for unique audio Ids.

Define a type for unique audio Ids allocated by AudioFLinger
for use as session Ids or I/O handles.

Bug: 12378680.
Change-Id: Ic9019fff97a1227b60e48c88c57d25dbbdcd7d1e
nclude/system/audio.h
a768c306b2391b8b573f047de3416c693fa50e62 28-Jul-2014 Eric Laurent <elaurent@google.com> audio: add audio device address helper function

Add helper function to derive set_parameter command
string from device type and address.

14815883

Change-Id: Icf47218f1809f567ef93bdd99d6308475886b298
nclude/system/audio.h
0a381a379d00f708a0dfe4da758697128177749a 28-Jul-2014 Eric Laurent <elaurent@google.com> audio: move struct audio_config definition to audio.h

struct audio_config definition moved from hardware/audio.h to
system/audio.h for use inside the framework and not only at the HAL.

Added frame_count field to struct audio_config.

Bug: 14815883.

Change-Id: Ib0e99a60234b8e5302eb882b89e5a021a94ec2cb
nclude/system/audio.h
dd3363cd21d5dadad0c7fdc5e270636c888e9cf6 28-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Define new audio attribute flag: beacon" into lmp-dev
b1c80913ea179f286be13a3523be9110c6529c6c 28-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 64567d165ac69b6656cd078856265e6c80745a75
0047368d7da2ab861c6ec626668c901940297f9c 25-Jul-2014 Neil Fuller <nfuller@google.com> Prevent the accidental closure of fd[0] for missing zip files.

(cherry picked from commit b1a113f618561b274ab793e6401416d449c60449)
Bug: 16530747

Change-Id: I0d1be3dcadfa5128ffe04cec60f6c998dff61991
ibziparchive/zip_archive.cc
ibziparchive/zip_archive_test.cc
c3dbe121be45733c0fcae04054e51665c493e453 22-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> Define new audio attribute flag: beacon

Flag AUDIO_FLAG_BEACON characterizes streams where the system
ensures that the playback of the sound will be compatible
with its use as a broadcast for surrounding people
and/or devices. Ensures audibility with no or minimal
post-processing applied.

Bug 15415971

Change-Id: I1df9dc50e3fcc973a0709a55df5b3bd95f81eb58
nclude/system/audio.h
da1bd8ed8721c07bdec19bc7dcf9f9809bc995b1 27-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 64567d165ac69b6656cd078856265e6c80745a75
bda354415c33fcef6df04a59560aa993d613064f 26-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 64567d165ac69b6656cd078856265e6c80745a75
a361503e3e68d1b26ce737547c4e1d53a03ec2d9 30-Jul-2014 leozwang <leozwang@google.com> Merge "Consolidate adb trace macro defines into its own header file." into lmp-dev
d3fc15f4841a8cbfd15fa9f051f2712266b5cd78 29-Jul-2014 leozwang <leozwang@google.com> Consolidate adb trace macro defines into its own header file.

Most code is copied and pasted from adb.h.
Any file can just include it to enable tracing.
Removed some duplications.

Change-Id: Ie1ed9e9edbf92158aac84669fbcbf7dc85fe2cf0
db/adb.h
db/adb_trace.h
db/fdevent.c
4bb951a85a4888540caba4f14f18e99917d4c994 30-Jul-2014 Antoine Labour <piman@google.com> Merge "BlobCache: fix uninitialized memory" into lmp-dev
2f2e79de0c5cdf5494a54b44b8bee24c5cf2851d 25-Jul-2014 Mark Salyzyn <salyzyn@google.com> debuggerd: tombstone: suppress logger request for logd process

(cherry pick from 45ae446cab9cfc9b6100d91b1a37c6ad82e0cb99)

Change-Id: I619880342ee6febd1a6cc98d2a4f536120efc1c8
ebuggerd/tombstone.cpp
ebuggerd/utility.h
166cfe68c3b0212f8e9714a0acd470d488817093 17-Jul-2014 Brigid Smith <brigidsmith@google.com> Added default constructor for log_t.

Bug: 16357258

(cherry picked from commit c75a02fe3f9abec006a1e88794f2fa12fbeafd8f)

Change-Id: I96be34ee1664af54b0dcbc928ea542cd749852fd
ebuggerd/utility.cpp
ebuggerd/utility.h
a6ff5c95a3fa798d661e09aa628cd0c5e5c8608f 29-Jul-2014 Elliott Hughes <enh@google.com> Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.

(cherry picked from commit d235288553f8c0535f51dfb8f05f81e1bc01e4ed)

Change-Id: I05f8160bc8c356cb8a57e2bc5677517750700456
db/services.c
b0b856e2c69b594b7ba63dccaaaf0e12ac165b65 29-Jul-2014 Elliott Hughes <enh@google.com> Fix "ptsname is not thread-safe; use ptsname_r instead" build break.

(cherry picked from commit 84cfd1092d1087a9a4d9f13c2fa2440ecd73f5fc)

Change-Id: I5035348a4b17648996c7b8d53c990e3cebbe4baf
ogwrapper/logwrap.c
5f6ebc2f9c9820c8faa2f83b265e31842dc5ed6d 29-Jul-2014 Antoine Labour <piman@google.com> BlobCache: fix uninitialized memory

When flattening the BlobCache, we insert padding for alignment. Make
sure to zero the padding bytes to have reproducible results.

Bug: 16569863
Change-Id: Id39eac5e6a1687459eb6bc2074b1339393fce711
ibutils/BlobCache.cpp
64567d165ac69b6656cd078856265e6c80745a75 26-Jul-2014 Zhijun He <zhijunhe@google.com> Merge "graphics: update raw10 to allow padding between rows" into lmp-dev
d41f1a7ae4f45a510009926d29abbca3457c2f7f 25-Jul-2014 Elliott Hughes <enh@google.com> Clarify init's write command.

Bug: https://code.google.com/p/android/issues/detail?id=73996

(cherry picked from commit afc08ce39235d0e3f1e63f30ee587f2a5952be44)

Change-Id: Id2fb11d5259957ef23cc839fba14af8452fc69e4
nit/readme.txt
c73b73a3c9b1eb008446ca4e96598dc7bc56a937 25-Jul-2014 Zhijun He <zhijunhe@google.com> graphics: update raw10 to allow padding between rows

Change-Id: Ied1f42bb977212d9e5f3b2b2b3caa9c8c2caac5d
nclude/system/graphics.h
5a2552388e698fec4efda270d2d88bb18ed3f299 25-Jul-2014 leozwang <leozwang@google.com> Merge "Redirect debug output to logcat." into lmp-dev
504b4e9cc93abbcd115c72e7b2707d73df442090 25-Jul-2014 Nick Kralevich <nnk@google.com> Merge "sdcard: ensure installd fs upgrade has completed" into lmp-dev
8d28fa71fce6a5623488614250970ce78551a924 25-Jul-2014 Nick Kralevich <nnk@google.com> sdcard: ensure installd fs upgrade has completed

Before running the sdcard daemon, make sure that installd has
completed all upgrades to /data that it needs to complete.
This avoids race conditions between installd and the sdcard daemon.

Maybe fixes bug 16329437.

Bug: 16329437
Change-Id: I5e164f08009c1036469f8734ec07cbae9c5e262b
dcard/sdcard.c
2befa73f680c8340e5581aa3ef68281f7223e6e4 25-Jul-2014 Elliott Hughes <enh@google.com> Remove <cutils/tztime.h>.

(cherry picked from commit f2e4b411e6e1a90209a4c815c37a36f0af1af120)

Bug: 15765976
Change-Id: I758acdb18d75ea601a06d02b53f1df9f1ad17a26
nclude/cutils/tztime.h
d5c417469b4cc4fb42d090350ad8209de6e70512 10-Jul-2014 Mark Salyzyn <salyzyn@google.com> logcat: test: logrotate flags

- test -f -n and -r flags
- fix issue with parse error for sizes in bytes (no multiplier)

(cherry pick from d03caa23ddd8670ccd83eaf4ef4fc0c78e065c1b)

Bug: 16147190
Change-Id: Iadf2fd903d5e881d02f1d2b491441cc8090ee1c9
ogcat/tests/logcat_test.cpp
e43b99a0741dd481aacf76c3dc0f5102864a6857 23-Jul-2014 Marcus Oakland <marcus.oakland@arm.com> Correction to TRACE format strings

When built with "#define FUSE_TRACE 1" numerous TRACE statements
failed to compile because of mismatches between format strings and
types (uint64_t and size_t). These have been corrected by using the
format strings from the inttype.h header file, or %zu.

Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

(cherry picked from commit d33308752fb7cecac751f20f4651aec05fc889db)

Change-Id: I550b422a6b7c92ea903b4dd8f5e4aec5637cdf67
dcard/sdcard.c
74ff4fcfc46e853ecd9fe34b5cedb47fc379f1af 25-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Follow refactoring of install-abandon command." into lmp-dev
7bb5660647d0106f96b000c25f5690a45734c38c 23-Jul-2014 Elliott Hughes <enh@google.com> Refresh toolbox.

Use more upstream NetBSD, and update those things that were already NetBSD.

Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have
changes marked by __ANDROID__.

Bug: 16493461

(cherry picked from commit fd4c6b0a3a25921a9fe24691a695d715aecb6afe)

Change-Id: I53267edaac0b92ad062a5df0f3201e3952eb084e
oolbox/Android.mk
oolbox/NOTICE
oolbox/bsd-compatibility.h
oolbox/cat.c
oolbox/chown.c
oolbox/cp/cp.c
oolbox/cp/extern.h
oolbox/cp/utils.c
oolbox/dd.c
oolbox/dd.h
oolbox/du.c
oolbox/grep/fastgrep.c
oolbox/grep/file.c
oolbox/grep/grep.c
oolbox/grep/grep.h
oolbox/grep/queue.c
oolbox/grep/util.c
oolbox/ln.c
oolbox/ls.c
oolbox/mv.c
oolbox/printenv.c
oolbox/pwcache.c
oolbox/rm.c
oolbox/rmdir.c
oolbox/sleep.c
oolbox/swapon.c
oolbox/sync.c
oolbox/uid_from_user.c
oolbox/upstream-netbsd/bin/cat/cat.c
oolbox/upstream-netbsd/bin/cp/cp.c
oolbox/upstream-netbsd/bin/cp/extern.h
oolbox/upstream-netbsd/bin/cp/utils.c
oolbox/upstream-netbsd/bin/dd/args.c
oolbox/upstream-netbsd/bin/dd/conv.c
oolbox/upstream-netbsd/bin/dd/dd.c
oolbox/upstream-netbsd/bin/dd/dd.h
oolbox/upstream-netbsd/bin/dd/dd_hostops.c
oolbox/upstream-netbsd/bin/dd/extern.h
oolbox/upstream-netbsd/bin/dd/misc.c
oolbox/upstream-netbsd/bin/dd/position.c
oolbox/upstream-netbsd/bin/ln/ln.c
oolbox/upstream-netbsd/bin/mv/mv.c
oolbox/upstream-netbsd/bin/mv/pathnames.h
oolbox/upstream-netbsd/bin/rm/rm.c
oolbox/upstream-netbsd/bin/rmdir/rmdir.c
oolbox/upstream-netbsd/bin/sleep/sleep.c
oolbox/upstream-netbsd/bin/sync/sync.c
oolbox/upstream-netbsd/include/namespace.h
oolbox/upstream-netbsd/include/sys/extattr.h
oolbox/upstream-netbsd/include/sys/mtio.h
oolbox/upstream-netbsd/lib/libc/gen/getbsize.c
oolbox/upstream-netbsd/lib/libc/gen/humanize_number.c
oolbox/upstream-netbsd/lib/libc/stdlib/strsuftoll.c
oolbox/upstream-netbsd/lib/libc/string/swab.c
oolbox/upstream-netbsd/lib/libutil/raise_default_signal.c
oolbox/upstream-netbsd/sbin/chown/chown.c
oolbox/upstream-netbsd/usr.bin/du/du.c
oolbox/upstream-netbsd/usr.bin/grep/fastgrep.c
oolbox/upstream-netbsd/usr.bin/grep/file.c
oolbox/upstream-netbsd/usr.bin/grep/grep.c
oolbox/upstream-netbsd/usr.bin/grep/grep.h
oolbox/upstream-netbsd/usr.bin/grep/queue.c
oolbox/upstream-netbsd/usr.bin/grep/util.c
oolbox/upstream-netbsd/usr.bin/printenv/printenv.c
eb49dd791ec80d42cbe066b78b6f0d8c17791ecd 21-Jul-2014 Stephen Hines <srhines@google.com> Remove invalid 64-bit host objects.

Bug: 16408818

These targets are no longer in use, since we have a proper way to create both
32-bit and 64-bit host libraries in a single build now.

Cherry-pick from AOSP: 03cc1f747c4e92d572a88ec3eb9fde920e871a7e

Change-Id: Icd09f795acd220de5b5e956a8d8e1b4ab4864fa9
ibcutils/Android.mk
iblog/Android.mk
ibutils/Android.mk
ac77e1f4e40479ee7018f10dd070d5a6d5f4cfec 25-Jul-2014 Jeff Sharkey <jsharkey@android.com> Follow refactoring of install-abandon command.

Bug: 16543552
Change-Id: I1f54254813fd7d7f4341b8815f816535a39de079
db/commandline.c
0df4768f89ef6878a322bfebd78fa01c0b592878 24-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to e5ab3e3a4c23077ede0515320c5585a99b236671
48a904240bf32fcba701ad8634651569a586d0aa 24-Jul-2014 leozwang <leozwang@google.com> Redirect debug output to logcat.

If ADB_TRACE is enabled, debug output will be redirected to logcat.

Change-Id: I9c36ada7690a2b946ecd6a926d04e36a8313c36a
db/Android.mk
db/adb.h
e5ab3e3a4c23077ede0515320c5585a99b236671 23-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Add a comment to not delete seemingly unused code.

Change-Id: I5b9d23eea7e850ab5a1f3a4e6c4f8ecdc3844864
ibnetutils/ifc_utils.c
eec232603d314e486888e5a0d2dd8d507c266be7 23-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Put back some deleted code.

http://ag/507249 removed a bunch of supposedly dead (unused) code. It turns out
at least ifc_disable() is being used in some protected partner branches. Put
back that as well as ifc_enable() to keep it symmetric.

Bug: 15413389
Change-Id: Ibec83a66e5d9079876ccf36d250b95b7c0294c03
nclude/netutils/ifc.h
ibnetutils/ifc_utils.c
67dc849061b217d3101dce8715eb411185c8e649 23-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 759356bbd889d780a57c51c19761b32cbba8e6ef
ef3e3a30476417073105ac436811b247a85c8502 16-Jul-2014 Riley Andrews <riandrews@google.com> Remove the /dev/.booting file before triggering boot.

On mako only, there is a race condition such that
core + main services must be started after releasing
ueventd (by removing /dev/.booting).

bug 16304711
bug 16333352
ootdir/init.rc
759356bbd889d780a57c51c19761b32cbba8e6ef 23-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Cleanup: Delete dead code." into lmp-dev
435fe9bb02f250c5bc617462d82f718b67207774 19-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGE

netd is supposed to be restarted when the zygote is restarted (see the
"onrestart" section for "service zygote" in init.zygote*.rc). But this
only works if you send a restart command (say via "ctl.restart").

"stop && start" != "restart". It seems ingrained in developers to do
"stop && start", so we don't have much hope of convincing everyone to
switch to "adb shell restart", even if we did add such a toolbox command.

(cherry picked from commit 018c6a57f3ba41b46deb8dc5fe542765e5b78791)

Bug: 15855807
Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
oolbox/start.c
oolbox/stop.c
a723689eca75c71fd5260d918c18054a64e8d701 20-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Cleanup: Delete dead code.

Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
nclude/netutils/ifc.h
ibnetutils/ifc_utils.c
etcfg/netcfg.c
930d53eae6a12b3b11c7d0043ec8c7674b1047cc 22-Jul-2014 Elliott Hughes <enh@google.com> Switch to NetBSD's kill(1).

(cherry picked from commit 5054c0db7075c5565c476f74ec0a995e9b756660)

Change-Id: I7e1e311d8d8e43e4ee59119eef4eec13c552cae9
oolbox/Android.mk
oolbox/kill.c
oolbox/upstream-netbsd/bin/kill/kill.c
bb2e400ec761eb811423101d48f9768b2d4d8e18 22-Jul-2014 Elliott Hughes <enh@google.com> Fix cp(1) for files in /proc.

Also modernize the Android-specific hacks.

Bug: https://code.google.com/p/android/issues/detail?id=70793

(cherry picked from commit 1dc64f7a46a9cbac4a90c2cb7445fbbb7c5c8193)

Change-Id: Icacb20e735ec4ab3a93889f06a8d7b1a917f6b16
oolbox/cp/cp.c
oolbox/cp/utils.c
e12a79f90a9403601633e20618f6b1e5e199e3cf 22-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to ef16a17afb8894776ce0be88b8a9ea705f9d64e5
67cb1aeaa5bb8dbd43d5a1bfb21d1a8c39822fb6 16-Jul-2014 Riley Andrews <riandrews@google.com> Remove the /dev/.booting file before triggering boot.

On mako only, there is a race condition such that
core + main services must be started after releasing
ueventd (by removing /dev/.booting).

bug 16304711
bug 16333352
ootdir/init.rc
ef16a17afb8894776ce0be88b8a9ea705f9d64e5 22-Jul-2014 Nick Kralevich <nnk@google.com> Merge "adb: set O_CLOEXEC on lots of file descriptors" into lmp-dev
12fa08df7e9d9861a7294cda0fd50de9f67d82a8 21-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to b14f65cb50d020982866cb2ca0f932171abc7aa1
9f7ffbf2cbd2fc6a6e483992bf12c132d0601e46 20-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to b14f65cb50d020982866cb2ca0f932171abc7aa1
52e442c6ddfda78f3e234f048edcfc1371781687 19-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to b14f65cb50d020982866cb2ca0f932171abc7aa1
fe8d7f4f2e775d46d61f7c2d29a4e852434984da 19-Jul-2014 Nick Kralevich <nnk@google.com> adb: set O_CLOEXEC on lots of file descriptors

Too many leaking FDs.

Fixes bug: https://code.google.com/p/android/issues/detail?id=65857
(and more)

Change-Id: I67d8683244e54288a8105f6f65ee40abe2378d7e
db/adb_auth_client.c
db/file_sync_service.c
db/remount_service.c
db/services.c
db/usb_linux.c
b14f65cb50d020982866cb2ca0f932171abc7aa1 16-Jul-2014 Hans Boehm <hboehm@google.com> Do not typedef char16_t if it is a keyword.

Don't define char16_t on platforms where char16_t is a keyword, as
C11 and C++11 define it to be.

(cherry picked from commit dfdbe61d28dbf3e45b6108d739170482ca19a03c)
Change-Id: I6717bc2133c1363ecd85861f3869e1eabd2ce96a
nclude/cutils/jstring.h
c11146efdf41b2f2b5cabc00acbb90ee11fd1c8d 19-Jul-2014 Elliott Hughes <enh@google.com> Fix implicit declaration of function 'prctl' in logd.

(cherry picked from commit e5a0f2064bcecbea2b0b1afd72033508e96c5c64)

Change-Id: Iee202daf3c637271a30ba0271abe68e939b5a887
ogd/main.cpp
cbbb83b0eb8b09b729c9287238d709bec7b833b5 19-Jul-2014 Elliott Hughes <enh@google.com> Fix implicit declaration of function 'prctl' in adb.

(cherry picked from commit b4dd6ef223c4744f8583add1b4999c9ce0b5a0fe)

Change-Id: Ia64bec746ae8d2c45663f61afb46702838b1e5bf
db/adb.c
400c381835b9eed533c67a062d88af5365590f7f 18-Jul-2014 Elliott Hughes <enh@google.com> Move sched_policy.c off bionic's PR_SET_TIMERSLACK_PID.

Change-Id: I3a27803d46b5b88a10aa8043a114d780ed685e56
ibcutils/sched_policy.c
7677e04ef6a0796172101b6849d48997c2b9899f 18-Jul-2014 Daniel Rosenberg <drosen@google.com> Merge "newfs_msdos: Added option to cluster-align the start of the root directory" into lmp-dev
4415e2a2696dd422fbe5511fdcd2f896b3d13595 11-Jul-2014 Patrick Tjin <pattjin@google.com> Scan all descriptors when checking for fastboot [DO NOT MERGE]

For Linux, the USB code was only looking at the first
descriptor when searching for the fastboot interface
which caused some devices to not be found.

Also clarify some code by using the actual USB structures
instead of void or char pointers.

(Cherry Picked from aac89db8a541f609d8268966f7b3ded44da03bd1)
Change-Id: I9e4871c4d477ac10ba75bb17a955f176809af289
Signed-off-by: Patrick Tjin <pattjin@google.com>
astboot/usb_linux.c
e4097155d47ba347802859d8da9cfc1ff5edca2a 17-Jul-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 04f9b2a809cb83c3d36c75791bfa28690800c883
04f9b2a809cb83c3d36c75791bfa28690800c883 17-Jul-2014 Nick Kralevich <nnk@google.com> debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones

Change-Id: I71bdfba30346a9fad3129b404f39eda8190698e3
ebuggerd/tombstone.cpp
052f27562154d175267999106bd6bf18fc8c363e 16-Jul-2014 Daniel Rosenberg <drosen@google.com> newfs_msdos: Added option to cluster-align the start of the root directory

This follows the recommendations of the SD-card association.

Change-Id: Ie89a5972d086b3df9d92e631c394a521f807b016
Signed-off-by: Daniel Rosenberg <drosen@google.com>
oolbox/newfs_msdos.c
a35249569e550bc674d7956073ba7292386c0879 16-Jul-2014 Riley Andrews <riandrews@google.com> Remove the /dev/.booting file before triggering boot.

On mako only, there is a race condition such that
core + main services must be started after releasing
ueventd (by removing /dev/.booting).

bug 16304711
bug 16333352
ootdir/init.rc
cadd5bb70eae200d744f115fd63c3ebe17069db8 15-Jul-2014 Jungshik Jang <jayjang@google.com> Add force usage and config type for HDMI-CEC system audio mode.

New Usage Type: AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO
New Config Type: AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED
When HDMI-CEC system audio mode is enabled, AudioService will
call
setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED);
in order to notify enabled system audio mode, so that
audio policy manager chooses proper output.
When it turns into off, AudioService will call
setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
AUDIO_POLICY_FORCE_NONE);

Along with it, add new audio output devic type,
AUDIO_DEVICE_OUT_AUX_LINE, in order to distinguish
line out for headphone and aux output of av device.

Bug: 16305986
Bug: 16002150
Change-Id: Idecdf626737f6635ea3cda638c343260b1661c77
nclude/system/audio.h
nclude/system/audio_policy.h
e9f7361ea9506c8bd8ad1442a43f270859b1b119 15-Jul-2014 Elliott Hughes <enh@google.com> Add SIGFPE to crasher.

Bug: 3399996

(cherry picked from commit 3ecc42106ea4cf825a57859cfd58442442685d24)

Change-Id: I075613ca3c022ce8d38a06a5ba236ceff32d181c
ebuggerd/crasher.c
7e55d8899c45de1c5a48f794abf794f5500065f1 15-Jul-2014 Colin Cross <ccross@android.com> Merge topic 'lmkd' into lmp-dev

* changes:
lmkd: kill a process if zoneinfo can't be read
lmkd: kill multiple tasks
lmkd: use open instead of fopen
lmkd: make lmkd SCHED_FIFO
lmkd: mlock all memory
lmkd: remove libcutils from LOCAL_SHARED_LIBRARIES
aae5d437556d877f2a198601394ba8ea7a559a70 15-Jul-2014 Elliott Hughes <enh@google.com> Add missing arm64 registers.

Also fix dumping of arm64's vector registers, which are actually 128 bits wide.

Also move the arm/arm64 FP registers to the tombstone. (We've never dumped
them at all for the other architectures.)

(cherry picked from commit b40c50351ebd9fb40b76a3169ad5cc6a25c453f1)

Change-Id: Ic646fb9ea01e9beb42e1757feb8742c1d4efafa7
ebuggerd/arm/machine.cpp
ebuggerd/arm64/machine.cpp
ebuggerd/utility.h
f8857cc24a54393f904fc4918bd5c2b6adf672e2 12-Jul-2014 Colin Cross <ccross@android.com> lmkd: kill a process if zoneinfo can't be read

Opening /proc/zoneinfo may return -ENOMEM under memory pressure,
assume something needs to be killed if that happens.

Bug: 16236289
Change-Id: I25aab09f4c3f2b9e176eaaeca94fd6bd790dad4e
mkd/lmkd.c
16b0946da1745877311562b8cbce08584c6a1b37 14-Jul-2014 Colin Cross <ccross@android.com> lmkd: kill multiple tasks

The task selected to die may be small, add its approximate size
to other_free and other_file and keep killing until all thresholds
are met.

Bug: 16236289
Change-Id: Iceeca4c63fec98cae2bf53e258f7707cea408b07
mkd/lmkd.c
ce85d955a3ce73abffbdde1f5fdb41580d70cffc 12-Jul-2014 Colin Cross <ccross@android.com> lmkd: use open instead of fopen

fopen and fgets require allocations, switch to open/read with
stack allocated buffers.

Bug: 16236289
Change-Id: I10586883fe78caf59d309eff7f7989b3e45beb7d
mkd/lmkd.c
1a0d9be53ec41ce335c5b586b6be2194d01eb23d 14-Jul-2014 Colin Cross <ccross@android.com> lmkd: make lmkd SCHED_FIFO

If kswapd runs more than lmkd it may throw away all page cache pages
before lmkd gets a chance to kill a process. Make lmkd SCHED_FIFO
so it can react quickly to kernel low memory notifications.

Bug: 16236289
Change-Id: I46767b4ec81ef8638d0c9e47d168a68b62e3cac5
mkd/lmkd.c
71bbc6789fb6750d8fddda0a3ff9a87f09a32c74 15-Jul-2014 Christopher Tate <ctate@google.com> Fix the build in clang

"fprintf(stderr, buf)" is a warning in some compilers, and we're
building with all warnings promoted to error.

Change-Id: Ie3c6ddcd74cf4dda40cf7b742df955dde1d1a5ff
db/commandline.c
b28ff9131363f7b4a698990da5748b2a88c3ed35 12-Jul-2014 Colin Cross <ccross@android.com> lmkd: mlock all memory

Use mlockall(MCL_FUTURE) to lock all lmkd pages in memory. This
avoids lmkd thrashing when the system is low on memory.

As a side effect, it will also keep the .text sections of liblog, libm,
libc, and libprocessgroup in memory at all times.

Bug: 16236289
Change-Id: Idd70557efa4b1e14bc86f14220672a30f6c956e3
mkd/lmkd.c
9d9e62cf376cf3f70ebf2a11335c02cc155416bc 12-Jul-2014 Colin Cross <ccross@android.com> lmkd: remove libcutils from LOCAL_SHARED_LIBRARIES

While lmkd does technically use libcutils' socket.h, it only
uses a static inline. Remove libcutils from LOCAL_SHARED_LIBRARIES
so it doesn't end up mlock'd in memory in the next patch.

Bug: 16236289
Change-Id: I744d69bfff06cb904836f64e1d5f6e530604bff4
mkd/Android.mk
a5e65d86a2a07997b92f83cfac2f0ee37feeee6f 28-Jun-2014 Ruben Brunk <rubenbrunk@google.com> Allow sticky transform to be set in ANativeWindow.

Bug: 15116722

- Adds methods to set the sticky transform field.

Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
nclude/system/window.h
1404e6547265c50b85262436f8275c80750c6808 14-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Fix 64-bit builds." into lmp-dev
c03064ea71dba91a8fd94e37fabd401a66b8cc7f 14-Jul-2014 Jeff Sharkey <jsharkey@android.com> Fix 64-bit builds.

Change-Id: I1ff5c9c3dc8d870aef2885f8a1989c6c913ccb3d
db/commandline.c
fd0f390869962fb314e39983155372b31be6ff92 14-Jul-2014 Riley Andrews <riandrews@google.com> Merge "Move unlink("/dev/.booting") until after filesystems are mounted." into lmp-dev
80c7a5e8a861de42ddade15704f1785953cee345 12-Jul-2014 Riley Andrews <riandrews@google.com> Move unlink("/dev/.booting") until after filesystems are mounted.

Move the unlink out of init.c and into init.rc, so that the file
will be removed after all the filesystems with firmware are up.

Change-Id: Ifdd5dd1e95d7e064dde5c80b70198882d949a710
nit/init.c
ootdir/init.rc
2eb3d3b55cb1f7f5410e585dd7520e8787de43ea 14-Jul-2014 Todd Poynor <toddpoynor@google.com> am 7b29cc8c: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp

* commit '7b29cc8c026548306e661f22573dc80c8e7fba0f':
7b29cc8c026548306e661f22573dc80c8e7fba0f 14-Jul-2014 Todd Poynor <toddpoynor@google.com> Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp
c6cca01756404f045e31f69ae087646e1c94de60 14-Jul-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> am 24ca56e1: am 923e7408: audio: add definitions for aac sub formats

* commit '24ca56e1e0f04061d5ea0d5750ea2d487bcd5322':
2cb1c3c23bf1b894375264b7313643b24478a5b5 14-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 9ec4cb80: am f813da2d: am e26ca55b: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit '9ec4cb80658b67e6fe95917cb9a1f697546beb13':
c43a3e875a938d9ea39a7f0a98737bff55baf97a 14-Jul-2014 Elliott Hughes <enh@google.com> am 9f8fa8f2: am 99adb755: am b5dfe272: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit '9f8fa8f2786c0156b43be7e83e70b8a267c4527a':
4d5d830bc4dffcea712a557da5d1de8f02fc1e17 14-Jul-2014 Elliott Hughes <enh@google.com> am b5e36713: am afacbefb: am 7ca8bae8: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."

* commit 'b5e367131568573f9b9da7c130a1a73c85261958':
342681c2a25b209dfc956a0a92eb402da6ac3f36 14-Jul-2014 dcashman <dcashman@google.com> am 80e236a1: am 9ae2b5e1: am 8c7e0520: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."

* commit '80e236a11cd2d1d327ccfae47421a5c35188216b':
b61ae5d9a0017b77b4922c5042dc19abd06f6098 14-Jul-2014 Jungshik Jang <jayjang@google.com> am d7fedf9a: am 6fe31610: Merge "Fix size of "values" fields of audio_gain_config."

* commit 'd7fedf9abd5ad0b6ba1ea93ed0d6f53f73d2a891':
37ad4cc9653ea314fdbb578720d3950824e93b9f 14-Jul-2014 Jungshik Jang <jayjang@google.com> am 6a6f1166: am 2c7cfc10: Remove forced usage types for HDMI-CEC system audio mode.

* commit '6a6f116621d549554679523be35db7033a710445':
c543235814d2411063ad329d0566453ff19d0eda 14-Jul-2014 Ruchi Kandoi <kandoiruchi@google.com> am d48e5fb4: am a78fc234: healthd: Reports arbitrary numbers for capacity and temperature when connected to fake battery.

* commit 'd48e5fb4378b6e29d8d33194ece7e5f02d210d76':
4d96be15b649a869e290fda60558a0124d5da12c 14-Jul-2014 Colin Cross <ccross@android.com> am 59a954a8: am 212e9798: add cleanspec for lmkd

* commit '59a954a80cc6669dadd9444ddb6b2fb39ef778dd':
01dc8b19ab6f1b247d15b9a9856e566a9a6ad191 14-Jul-2014 Colin Cross <ccross@android.com> am 8cb357ea: am 420f0a25: Merge "lmkd: use libprocessgroup to kill forked processes"

* commit '8cb357ea50f993c3a61a2aaf511c37a1d69b26a1':
67fcd844af83526c9a364cc6213df81e0c4b4488 14-Jul-2014 Colin Cross <ccross@android.com> am 350a68bf: am fb27d34d: Merge "Add libprocessgroup"

* commit '350a68bf24ade269acc4ee69b0af01b9533f8187':
2cdaf1c38bec121e311544d13d3e0f94692b722d 14-Jul-2014 Badhri Jagan Sridharan <badhri@google.com> am 8f6c821b: am bf9ef519: am cb7be1e8: am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"

* commit '8f6c821bb5d1e410935cf6cf17c560e27b4c964c':
b28f4c0b1f03e0cea9027eb84d3c27c5319da2f8 14-Jul-2014 Elliott Hughes <enh@google.com> am 5dda36bd: am c89c0c65: am 75b3d8c0: am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."

* commit '5dda36bd7cb56a0dcfe8ea55ddf955cc5622923c':
67f549b6510aef7c07c4f4afe91ea34122e6b3e4 14-Jul-2014 Elliott Hughes <enh@google.com> am 3a03e61c: am 0dd3fe22: am b237f5fb: am 5acbb9bc: am b5186598: Merge "Integrate vfp-crasher with crasher."

* commit '3a03e61ccfe97c76d09c2d8588ef18477af9de73':
920fca2a31913cc6fd27b51e010df105ffef2e54 14-Jul-2014 Elliott Hughes <enh@google.com> am a06bbdf5: am 67db9d5f: am b2ac4243: am f76c8fe6: am 328c3ef6: Merge "Fix typo in fs.h"

* commit 'a06bbdf54334870c233ff4206c78dd2b7fc265eb':
b91775ba3fd961419e3019290b64043612d3cb16 14-Jul-2014 Colin Cross <ccross@android.com> am 1d6279ee: am 038975a5: Merge "lmkd: pass uid from ActivityManager to lmkd"

* commit '1d6279ee3d0771687a56a22e70dc1e7aa5ac3078':
cc20ac8bf0daf53ddcb5f3ab7cabd4403a94717c 14-Jul-2014 Nick Kralevich <nnk@google.com> am a352c8c8: am ee0388e7: am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"

* commit 'a352c8c8569a2d020fd9030bd841ef5f4c4f7755':
37b8600f96eea755a9364a162dc8adfbe09ce4f4 14-Jul-2014 Daniel Rosenberg <drosen@google.com> am 9d09b12d: am 33e7b131: Made formatting for newfs_msdos.c more uniform

* commit '9d09b12d4da492d5bc22c8b71264720a9bdac816':
72629c94bc4e5f77d8e02d8fff3e16acef9cc7a4 14-Jul-2014 Elliott Hughes <enh@google.com> am e360bb45: am 6ebab06d: am f043f061: am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."

* commit 'e360bb459e983521d09586971a5a3a94339af60c':
076c480f61af0868aa1ef8ae88207ef3e4db0763 14-Jul-2014 Elliott Hughes <enh@google.com> am 63917b10: am 40372e5b: am 94645665: am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."

* commit '63917b10273451878d509d908f040d04e8bcccdb':
554006b7ceb2bf6f2d638c5b60eeb53973bbdbb1 14-Jul-2014 Terry Heo <terryheo@google.com> am ac53a4af: am a916e260: Merge "audio: add definition for new audio loopback input device"

* commit 'ac53a4af6afd1f4747f527dc28f9fec3c53f3901':
d9d01d0e1027b609a4e264c502474f672f4ac626 14-Jul-2014 Nick Kralevich <nnk@google.com> am 09ef42ab: am 14253c1a: Merge "init.rc: add seclabel to flash_recovery"

* commit '09ef42ab63dc36d1097390bda6bf08d1cf5332e1':
de8566330cffb93a5e89a8aaee68419e2ea7821c 14-Jul-2014 Eric Laurent <elaurent@google.com> am 0c9dc552: am aecb7f84: Merge "Revert "Revert "sound trigger: several data structure updates"""

* commit '0c9dc552921bf50d62c8b81084a703ac07e48cd6':
e20825077c98284fae8cf4e02fa9efd16b6ba52f 14-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 2f26cd9e: am 85449d36: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit '2f26cd9ea62f24123b0f82316cc0a00f4ed5689a':
c4330352f1f9664b0a1992271efb9912d0efa2f5 14-Jul-2014 Elliott Hughes <enh@google.com> am ef0a3cfa: am 81542db7: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit 'ef0a3cfaf063ba36cb8515dc3698a30bc01b7fc3':
1a23f5a8a359d35a7e7feb92242c07acdef2300c 14-Jul-2014 Elliott Hughes <enh@google.com> am 3c6216a8: am 85090337: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."

* commit '3c6216a894140024f01f8c7223324bb228b629cf':
b82ef7e00cd9be1992b79d932aced00655638a96 14-Jul-2014 dcashman <dcashman@google.com> am 1ecce47d: am 9f3a11ed: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."

* commit '1ecce47dfbaa4d84880f8500fd83e2863725c271':
7d8490eb734307eeffea4734697701fd20cff26e 14-Jul-2014 Hans Boehm <hboehm@google.com> am 0de8ac24: am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."

* commit '0de8ac248a8a31c4baa4c1b9ab9dd08d8bdaaecb':
am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
960df97c2356f5a804d3ef87fe49f788d7ecdfaf 10-Jun-2014 Jeff Sharkey <jsharkey@android.com> Add install-multiple to adb.

The new install-multiple command automates creating an install
session, streaming multiple files into place, and then committing
or destroying the session. This uses the recent "exec" feature to
stream APK contents over stdin directly into their final resting
place, requiring no extra copies.

Blindly pass through command line arguments to "pm" to make adding
new flags easier in future.

Remove support for verifying APK before sending across wire, since it
was reading the entire APK into memory (!) before sending. Also
remove encrypted APKs, since they are no longer supported. Drop
support for undocumented verification files.

Bug: 14975160
Change-Id: I0c538471873061798160e2e47cec4c0424c27361
db/commandline.c
db/file_sync_client.c
db/file_sync_service.h
db/services.c
24ca56e1e0f04061d5ea0d5750ea2d487bcd5322 14-Jul-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> am 923e7408: audio: add definitions for aac sub formats

* commit '923e740879c871e0c3806f7c6df77093e715bb38':
audio: add definitions for aac sub formats
9ec4cb80658b67e6fe95917cb9a1f697546beb13 14-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am f813da2d: am e26ca55b: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit 'f813da2dfc4990c09d40b2088c27a35683050eb0':
9f8fa8f2786c0156b43be7e83e70b8a267c4527a 14-Jul-2014 Elliott Hughes <enh@google.com> am 99adb755: am b5dfe272: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit '99adb7556250f4bd1665f16ce49359d009bbd2bd':
b5e367131568573f9b9da7c130a1a73c85261958 14-Jul-2014 Elliott Hughes <enh@google.com> am afacbefb: am 7ca8bae8: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."

* commit 'afacbefba861703716d4a761846b2a0f9b1e6cd0':
80e236a11cd2d1d327ccfae47421a5c35188216b 14-Jul-2014 dcashman <dcashman@google.com> am 9ae2b5e1: am 8c7e0520: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."

* commit '9ae2b5e1f41f47617e4a960a64f98f01330209a0':
d7fedf9abd5ad0b6ba1ea93ed0d6f53f73d2a891 14-Jul-2014 Jungshik Jang <jayjang@google.com> am 6fe31610: Merge "Fix size of "values" fields of audio_gain_config."

* commit '6fe316102a17b644ea2525a393e1f2ea4b299f8d':
Fix size of "values" fields of audio_gain_config.
6a6f116621d549554679523be35db7033a710445 14-Jul-2014 Jungshik Jang <jayjang@google.com> am 2c7cfc10: Remove forced usage types for HDMI-CEC system audio mode.

* commit '2c7cfc10f5d869a52038198aed6bd6e8e6fc9a54':
Remove forced usage types for HDMI-CEC system audio mode.
d48e5fb4378b6e29d8d33194ece7e5f02d210d76 14-Jul-2014 Ruchi Kandoi <kandoiruchi@google.com> am a78fc234: healthd: Reports arbitrary numbers for capacity and temperature when connected to fake battery.

* commit 'a78fc23491f3490bec4e4ac72c4bdc8c6d554fe3':
healthd: Reports arbitrary numbers for capacity and temperature when connected to fake battery.
59a954a80cc6669dadd9444ddb6b2fb39ef778dd 14-Jul-2014 Colin Cross <ccross@android.com> am 212e9798: add cleanspec for lmkd

* commit '212e97986564060678bb69b756e700e1db85bc39':
add cleanspec for lmkd
8cb357ea50f993c3a61a2aaf511c37a1d69b26a1 14-Jul-2014 Colin Cross <ccross@android.com> am 420f0a25: Merge "lmkd: use libprocessgroup to kill forked processes"

* commit '420f0a2567e8697b828e59802f972382360e667d':
lmkd: use libprocessgroup to kill forked processes
350a68bf24ade269acc4ee69b0af01b9533f8187 14-Jul-2014 Colin Cross <ccross@android.com> am fb27d34d: Merge "Add libprocessgroup"

* commit 'fb27d34dacf45fa1b5a5ea8ded778889827e5c99':
Add libprocessgroup
8f6c821bb5d1e410935cf6cf17c560e27b4c964c 14-Jul-2014 Badhri Jagan Sridharan <badhri@google.com> am bf9ef519: am cb7be1e8: am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"

* commit 'bf9ef5196995119a9801b55d2df2e683eeba2168':
adbd: adb root should terminate adbd only if it's debuggable
5dda36bd7cb56a0dcfe8ea55ddf955cc5622923c 14-Jul-2014 Elliott Hughes <enh@google.com> am c89c0c65: am 75b3d8c0: am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."

* commit 'c89c0c65c7683835248c06899dc0712a50f6caa2':
Fix arm emulator "D register out of range for selected VFP version" build failure.
3a03e61ccfe97c76d09c2d8588ef18477af9de73 14-Jul-2014 Elliott Hughes <enh@google.com> am 0dd3fe22: am b237f5fb: am 5acbb9bc: am b5186598: Merge "Integrate vfp-crasher with crasher."

* commit '0dd3fe220b3c7d7013871ec4b1f7875586f4d719':
Integrate vfp-crasher with crasher.
a06bbdf54334870c233ff4206c78dd2b7fc265eb 14-Jul-2014 Elliott Hughes <enh@google.com> am 67db9d5f: am b2ac4243: am f76c8fe6: am 328c3ef6: Merge "Fix typo in fs.h"

* commit '67db9d5f7373e96a1f2279f25a544be76b26a88f':
Fix typo in fs.h
1d6279ee3d0771687a56a22e70dc1e7aa5ac3078 14-Jul-2014 Colin Cross <ccross@android.com> am 038975a5: Merge "lmkd: pass uid from ActivityManager to lmkd"

* commit '038975a5c85caa758294102d4577d063d7e02651':
lmkd: pass uid from ActivityManager to lmkd
a352c8c8569a2d020fd9030bd841ef5f4c4f7755 14-Jul-2014 Nick Kralevich <nnk@google.com> am ee0388e7: am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"

* commit 'ee0388e768bb27eb845809a0b3ba85f4f7f21885':
restorecon_recursive /cache
9d09b12d4da492d5bc22c8b71264720a9bdac816 14-Jul-2014 Daniel Rosenberg <drosen@google.com> am 33e7b131: Made formatting for newfs_msdos.c more uniform

* commit '33e7b13167bcfd65b6c595e316e515ff8eab4b33':
Made formatting for newfs_msdos.c more uniform
e360bb459e983521d09586971a5a3a94339af60c 14-Jul-2014 Elliott Hughes <enh@google.com> am 6ebab06d: am f043f061: am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."

* commit '6ebab06dc4e7149b4deb5032518c64b881801259':
Fix sdcard's FUSE_FSYNCDIR handling.
63917b10273451878d509d908f040d04e8bcccdb 14-Jul-2014 Elliott Hughes <enh@google.com> am 40372e5b: am 94645665: am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."

* commit '40372e5b4ed1027418485a66d80e48748eedc07f':
Make sdcard log to the log rather than stderr.
ac53a4af6afd1f4747f527dc28f9fec3c53f3901 14-Jul-2014 Terry Heo <terryheo@google.com> am a916e260: Merge "audio: add definition for new audio loopback input device"

* commit 'a916e260db1e6c2c20fe0451ffe380f5e19af818':
audio: add definition for new audio loopback input device
09ef42ab63dc36d1097390bda6bf08d1cf5332e1 14-Jul-2014 Nick Kralevich <nnk@google.com> am 14253c1a: Merge "init.rc: add seclabel to flash_recovery"

* commit '14253c1aab42e4e4ec4e68798c068436b4260288':
init.rc: add seclabel to flash_recovery
0c9dc552921bf50d62c8b81084a703ac07e48cd6 14-Jul-2014 Eric Laurent <elaurent@google.com> am aecb7f84: Merge "Revert "Revert "sound trigger: several data structure updates"""

* commit 'aecb7f84cfe505403372a19c6247e34e366916ab':
Revert "Revert "sound trigger: several data structure updates""
2f26cd9ea62f24123b0f82316cc0a00f4ed5689a 14-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 85449d36: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit '85449d360f86ed9faaf1403f972f9657698a8289':
ef0a3cfaf063ba36cb8515dc3698a30bc01b7fc3 14-Jul-2014 Elliott Hughes <enh@google.com> am 81542db7: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit '81542db7c2cdf44803ba36be0f8cd76972790fc0':
3c6216a894140024f01f8c7223324bb228b629cf 14-Jul-2014 Elliott Hughes <enh@google.com> am 85090337: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."

* commit '850903371fce13933d5b9cfaf16d777fcd329296':
1ecce47dfbaa4d84880f8500fd83e2863725c271 14-Jul-2014 dcashman <dcashman@google.com> am 9f3a11ed: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."

* commit '9f3a11edde07af068217581cf11c004f1cdca3f0':
0de8ac248a8a31c4baa4c1b9ab9dd08d8bdaaecb 12-Jul-2014 Hans Boehm <hboehm@google.com> am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."

* commit 'e6b0c566762dbea1c45198d15ecc5e8a59378d73':
Add comment to discourage use of cutils/atomic.h.
nclude/cutils/atomic.h
4b9f899bf1f5d09622307df85ba7d7f7aabbb834 12-Jul-2014 Hans Boehm <hboehm@google.com> am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."

* commit 'e6b0c566762dbea1c45198d15ecc5e8a59378d73':
Add comment to discourage use of cutils/atomic.h.
611dceecd57ab651514942823cd1eb4a10b8a9fb 12-Jul-2014 Christopher Ferris <cferris@google.com> am ce61f74f: am 56cbd19b: Merge "Fix build."

* commit 'ce61f74f153c7d185d1a3d5e2d6dc02ccf768963':
Fix build.
c785caa4b44a1a96e21904fac8cf857f2d9f5e96 12-Jul-2014 Elliott Hughes <enh@google.com> am 802943ab: am 8098114c: Merge "Sync with upstream grep."

* commit '802943ab514de0814078b2e0a400d18632daa188':
Sync with upstream grep.
3aad879660686ec3d88994bd9f0716ac861f6e2f 12-Jul-2014 Elliott Hughes <enh@google.com> am 895d6747: am 7a8420ec: Merge "fix duplicated grep usage printing"

* commit '895d67473854e89abf5834be66a79589de8c4b9e':
fix duplicated grep usage printing
7fc37b542509a235423d605829c9f0cde058c4e8 12-Jul-2014 Mark Salyzyn <salyzyn@google.com> am ad806908: am 755df295: Merge "logd: test: disable kernel LOGGER"

* commit 'ad806908bb68a03d34bc0bda3ad83abe321021a1':
logd: test: disable kernel LOGGER
ecba4dc0370f4dd04833acb08901be63b6bde4b3 12-Jul-2014 Elliott Hughes <enh@google.com> am 85dfe988: am 796fccb8: Merge "Fix environment variable assignment in init"

* commit '85dfe98830c78f1c3d400ca7be4ac594bfcdd275':
Fix environment variable assignment in init
e6b0c566762dbea1c45198d15ecc5e8a59378d73 12-Jul-2014 Hans Boehm <hboehm@google.com> am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."

* commit '981dcd79d5cbfb2192dc14706e2825b81a467af7':
Add comment to discourage use of cutils/atomic.h.
981dcd79d5cbfb2192dc14706e2825b81a467af7 12-Jul-2014 Hans Boehm <hboehm@google.com> Merge "Add comment to discourage use of cutils/atomic.h."
5af7877950ea5f96b6522e5210966365ece04e25 12-Jul-2014 Hans Boehm <hboehm@google.com> Add comment to discourage use of cutils/atomic.h.

Change-Id: Ib05c745158fdf5a11fd4697c3665a6370ffc04f5
nclude/cutils/atomic.h
923e740879c871e0c3806f7c6df77093e715bb38 18-Jun-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> audio: add definitions for aac sub formats

add definitions for aac sub formats

Change-Id: I610caa510dfc7347f7c98e19359545423edd76b3
nclude/system/audio.h
f813da2dfc4990c09d40b2088c27a35683050eb0 11-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am e26ca55b: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit 'e26ca55bdd3ca6530826e5248fd8dc5d8f6ba26e':
99adb7556250f4bd1665f16ce49359d009bbd2bd 11-Jul-2014 Elliott Hughes <enh@google.com> am b5dfe272: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit 'b5dfe27206336787a351111cc45ca362b185eb78':
afacbefba861703716d4a761846b2a0f9b1e6cd0 11-Jul-2014 Elliott Hughes <enh@google.com> am 7ca8bae8: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."

* commit '7ca8bae8b4148eb204530ceeca885a3245c436b1':
9ae2b5e1f41f47617e4a960a64f98f01330209a0 11-Jul-2014 dcashman <dcashman@google.com> am 8c7e0520: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."

* commit '8c7e0520777acff9212580972d7ae04e026df1cd':
e26ca55bdd3ca6530826e5248fd8dc5d8f6ba26e 11-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit 'b12e40da2526881c1730a3d3387556e4600c7040':
Create a data directory for netd and other network-related files.
b5dfe27206336787a351111cc45ca362b185eb78 11-Jul-2014 Elliott Hughes <enh@google.com> am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit 'f761709a8e0f440afbdcd0df8f78d5e8ebc94211':
Fix LP64 tombstone.cpp build failure.
7ca8bae8b4148eb204530ceeca885a3245c436b1 11-Jul-2014 Elliott Hughes <enh@google.com> am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."

* commit '4f27968f988808c713564de99c04612b9e8768b9':
Improving maps output.
e60eb623845b6809657b18ea068a0b93f052fa0c 13-Jul-2014 Glenn Kasten <gkasten@google.com> Merge "Representation of channel masks for position assignment and index assignment"
b53af3f60f3d6a9b1557f2891183c3322ec3aa14 12-Jul-2014 Hans Boehm <hboehm@google.com> am 4b9f899b: am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."

* commit '4b9f899bf1f5d09622307df85ba7d7f7aabbb834':
Add comment to discourage use of cutils/atomic.h.
06ca5fadbdb2f2f97895a43cf4e866b9f25ea008 12-Jul-2014 Christopher Ferris <cferris@google.com> am 611dceec: am ce61f74f: am 56cbd19b: Merge "Fix build."

* commit '611dceecd57ab651514942823cd1eb4a10b8a9fb':
Fix build.
9d6dfd63c919eaf9333d794524b33d8743452946 12-Jul-2014 Elliott Hughes <enh@google.com> am c785caa4: am 802943ab: am 8098114c: Merge "Sync with upstream grep."

* commit 'c785caa4b44a1a96e21904fac8cf857f2d9f5e96':
Sync with upstream grep.
dddb191cba408e44c5b974b52040b934fa3de14b 12-Jul-2014 Elliott Hughes <enh@google.com> am 3aad8796: am 895d6747: am 7a8420ec: Merge "fix duplicated grep usage printing"

* commit '3aad879660686ec3d88994bd9f0716ac861f6e2f':
fix duplicated grep usage printing
719dda65d71b121b609e0890dee2a70d585cb92b 12-Jul-2014 Mark Salyzyn <salyzyn@google.com> am 7fc37b54: am ad806908: am 755df295: Merge "logd: test: disable kernel LOGGER"

* commit '7fc37b542509a235423d605829c9f0cde058c4e8':
logd: test: disable kernel LOGGER
913613a51dc57c001f00eb81752a8de43883a16e 12-Jul-2014 Elliott Hughes <enh@google.com> am ecba4dc0: am 85dfe988: am 796fccb8: Merge "Fix environment variable assignment in init"

* commit 'ecba4dc0370f4dd04833acb08901be63b6bde4b3':
Fix environment variable assignment in init
432b7c6da2bd47c0db9db190b05733a45f744d6c 15-Apr-2014 Glenn Kasten <gkasten@google.com> Representation of channel masks for position assignment and index assignment

Bug: 16245854
Change-Id: I76c7c39c7d4f8d5035016653aa91fa7c1e749bbd
nclude/system/audio.h
e07d77e422b328f0b7e8a542e99989dab8c95dac 12-Jul-2014 Elliott Hughes <enh@google.com> Use <sys/prctl.h> instead of <linux/prctl.h>.

Change-Id: I708da00e36a9da8be9184c451453774be6b78c06
ibcutils/sched_policy.c
8c7e0520777acff9212580972d7ae04e026df1cd 11-Jul-2014 dcashman <dcashman@google.com> am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."

* commit 'cddb15b8a9057e7efacf2de9c9a6a887fd666663':
Remove sshd.
ce61f74f153c7d185d1a3d5e2d6dc02ccf768963 11-Jul-2014 Christopher Ferris <cferris@google.com> am 56cbd19b: Merge "Fix build."

* commit '56cbd19b1b8a42a0011be78aa1051304bc57127d':
Fix build.
2c7cfc10f5d869a52038198aed6bd6e8e6fc9a54 08-Jul-2014 Jungshik Jang <jayjang@google.com> Remove forced usage types for HDMI-CEC system audio mode.

Change-Id: Ice8aab76281aa62a42665d7c86df1041c7f64ab9
nclude/system/audio_policy.h
802943ab514de0814078b2e0a400d18632daa188 11-Jul-2014 Elliott Hughes <enh@google.com> am 8098114c: Merge "Sync with upstream grep."

* commit '8098114c904923d187368a331ed34a9f2d98cac5':
Sync with upstream grep.
895d67473854e89abf5834be66a79589de8c4b9e 11-Jul-2014 Elliott Hughes <enh@google.com> am 7a8420ec: Merge "fix duplicated grep usage printing"

* commit '7a8420ec4a7d248028b0a922e2d947f2129b1fe7':
fix duplicated grep usage printing
ad806908bb68a03d34bc0bda3ad83abe321021a1 11-Jul-2014 Mark Salyzyn <salyzyn@google.com> am 755df295: Merge "logd: test: disable kernel LOGGER"

* commit '755df2956fdf43e2a8e416a84361f14c474e6a8f':
logd: test: disable kernel LOGGER
85dfe98830c78f1c3d400ca7be4ac594bfcdd275 11-Jul-2014 Elliott Hughes <enh@google.com> am 796fccb8: Merge "Fix environment variable assignment in init"

* commit '796fccb80d603bb79d2591047f1c3b83755bfa8b':
Fix environment variable assignment in init
a78fc23491f3490bec4e4ac72c4bdc8c6d554fe3 11-Jul-2014 Ruchi Kandoi <kandoiruchi@google.com> healthd: Reports arbitrary numbers for capacity and temperature when
connected to fake battery.

Detects if the device is attached to a fake battery if yes, healthd
reports 42% battery charge and 42.2 degrees temperature.

Change-Id: I2508fd91c8d3848ea64f57ab59d20be1c2817913
ealthd/BatteryMonitor.cpp
6fe316102a17b644ea2525a393e1f2ea4b299f8d 11-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Fix size of "values" fields of audio_gain_config."
f7e5aeadb71cf786bea6a9ee8c86069e939e8267 11-Jul-2014 Jungshik Jang <jayjang@google.com> Fix size of "values" fields of audio_gain_config.

It should be sizeof(audio_channel_mask_t) * 8 not
sizeof(audio_channel_mask_t) alone.

Change-Id: I3523dd4d44a0900ba1845b3675a22451f1fc2f3c
nclude/system/audio.h
8098114c904923d187368a331ed34a9f2d98cac5 11-Jul-2014 Elliott Hughes <enh@google.com> Merge "Sync with upstream grep."
04650ef7f6167d59aad19d4cd6fc78b2d84c83e5 11-Jul-2014 Elliott Hughes <enh@google.com> Sync with upstream grep.

Change-Id: Ie1da2e95ee7e3513afb87f357be983dc80cd1515
oolbox/bsd-compatibility.h
oolbox/grep/grep.c
oolbox/grep/grep.h
oolbox/grep/util.c
212e97986564060678bb69b756e700e1db85bc39 10-Jul-2014 Colin Cross <ccross@android.com> add cleanspec for lmkd

Change-Id: I249a4dcac4b12382c25f68c8d57a108794475623
leanSpec.mk
7a8420ec4a7d248028b0a922e2d947f2129b1fe7 11-Jul-2014 Elliott Hughes <enh@google.com> Merge "fix duplicated grep usage printing"
b34b1fcb2bfb5034c23e2e8ad424c34387fe6714 11-Jul-2014 Rocky Zhang <Rocky.Zhang@arm.com> fix duplicated grep usage printing

Change-Id: I579d2046f96ba8ae9fd0bf8f36e2e2f64da622ea
Signed-off-by: Rocky Zhang <zhangyan.hit@gmail.com>
oolbox/grep/grep.c
755df2956fdf43e2a8e416a84361f14c474e6a8f 10-Jul-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: test: disable kernel LOGGER"
56cbd19b1b8a42a0011be78aa1051304bc57127d 11-Jul-2014 Christopher Ferris <cferris@google.com> Merge "Fix build."
3cbea9f0565b0b3a3d5688a3c06ab4651cac7849 11-Jul-2014 Christopher Ferris <cferris@google.com> Fix build.

Change-Id: Ied4adacde94ee10deb30647156f07d46a38fbe1f
oolbox/grep/util.c
89472df4cd799182062656352958edb12341b411 10-Jul-2014 Mark Salyzyn <salyzyn@google.com> logd: test: disable kernel LOGGER

Bug: 15384806
Change-Id: I3072d6dd0618fa9ebe151c78a85eb121327f9df3
ogd/tests/logd_test.cpp
796fccb80d603bb79d2591047f1c3b83755bfa8b 10-Jul-2014 Elliott Hughes <enh@google.com> Merge "Fix environment variable assignment in init"
381341f5f72a46b34126e5c8e6f62f04b702ba47 16-May-2014 James Morrissey <james.morrissey@arm.com> Fix environment variable assignment in init

The init process allows environment variables to be specified in
the rc script globally, via 'export', and for a specific process,
via the 'setenv' option.

However, the mechanism for assembling the environment simply
appended the new variable without checking whether it was already
defined, so it was not possible to overwrite an existing entry.
This patch fixes that behaviour.

Limitations and concerns:

The limit of a maximum number of 31 variables is unchanged.

Currently, most callers of "add_environment" do not check the return
value, but the function now logs the failure rather than failing
silently.

Change-Id: Ie9a68c37a0f55c5b40e904e695cd35514f67f480
nit/builtins.c
nit/init.c
bf9ef5196995119a9801b55d2df2e683eeba2168 10-Jul-2014 Badhri Jagan Sridharan <badhri@google.com> am cb7be1e8: am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"

* commit 'cb7be1e8cd4e4388d014a5c48df455a5715f2180':
adbd: adb root should terminate adbd only if it's debuggable
c89c0c65c7683835248c06899dc0712a50f6caa2 10-Jul-2014 Elliott Hughes <enh@google.com> am 75b3d8c0: am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."

* commit '75b3d8c07b3a658be574584f7004fe4468916b5b':
Fix arm emulator "D register out of range for selected VFP version" build failure.
0dd3fe220b3c7d7013871ec4b1f7875586f4d719 10-Jul-2014 Elliott Hughes <enh@google.com> am b237f5fb: am 5acbb9bc: am b5186598: Merge "Integrate vfp-crasher with crasher."

* commit 'b237f5fb5d691adbb7e20b7e94096a019ff60bca':
Integrate vfp-crasher with crasher.
67db9d5f7373e96a1f2279f25a544be76b26a88f 10-Jul-2014 Elliott Hughes <enh@google.com> am b2ac4243: am f76c8fe6: am 328c3ef6: Merge "Fix typo in fs.h"

* commit 'b2ac4243000057baf1656c93197150ba7665137e':
Fix typo in fs.h
cb7be1e8cd4e4388d014a5c48df455a5715f2180 10-Jul-2014 Badhri Jagan Sridharan <badhri@google.com> am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"

* commit '87c7a0d74b9dadaedfe6805c57d221d9c445aaf6':
adbd: adb root should terminate adbd only if it's debuggable
75b3d8c07b3a658be574584f7004fe4468916b5b 10-Jul-2014 Elliott Hughes <enh@google.com> am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."

* commit 'd0fa7342c536180519ddc475fbf6f5219b0424d9':
Fix arm emulator "D register out of range for selected VFP version" build failure.
b237f5fb5d691adbb7e20b7e94096a019ff60bca 10-Jul-2014 Elliott Hughes <enh@google.com> am 5acbb9bc: am b5186598: Merge "Integrate vfp-crasher with crasher."

* commit '5acbb9bcb82c396279afb5cebc4e76a435066c9f':
Integrate vfp-crasher with crasher.
b2ac4243000057baf1656c93197150ba7665137e 10-Jul-2014 Elliott Hughes <enh@google.com> am f76c8fe6: am 328c3ef6: Merge "Fix typo in fs.h"

* commit 'f76c8fe630c45fc30dde177c42bee9809cf6b645':
Fix typo in fs.h
87c7a0d74b9dadaedfe6805c57d221d9c445aaf6 10-Jul-2014 Badhri Jagan Sridharan <badhri@google.com> am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"

* commit '77a2c22dcbab56b260eb9d39c84fe8f98258cebb':
adbd: adb root should terminate adbd only if it's debuggable
d0fa7342c536180519ddc475fbf6f5219b0424d9 10-Jul-2014 Elliott Hughes <enh@google.com> am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."

* commit '660ba372989f4289990d91277c4334475769fe04':
Fix arm emulator "D register out of range for selected VFP version" build failure.
5acbb9bcb82c396279afb5cebc4e76a435066c9f 10-Jul-2014 Elliott Hughes <enh@google.com> am b5186598: Merge "Integrate vfp-crasher with crasher."

* commit 'b518659848b6f3f939e1b5b150ae8586b9b8d0ce':
Integrate vfp-crasher with crasher.
f76c8fe630c45fc30dde177c42bee9809cf6b645 10-Jul-2014 Elliott Hughes <enh@google.com> am 328c3ef6: Merge "Fix typo in fs.h"

* commit '328c3ef6e0c89686d56b8ce5f926affacd98e815':
Fix typo in fs.h
328c3ef6e0c89686d56b8ce5f926affacd98e815 10-Jul-2014 Elliott Hughes <enh@google.com> Merge "Fix typo in fs.h"
c335a3500c0ea2057be74a686b14f427058ce75c 08-Jul-2014 Markus Mayer <code@mmayer.net> Fix typo in fs.h

fs.h defined _FH_H_ rather than _FS_H_

Change-Id: I710ef53e88d3601e486fde9957f6d022871d9602
Signed-off-by: Markus Mayer <code@mmayer.net>
astboot/fs.h
77a2c22dcbab56b260eb9d39c84fe8f98258cebb 10-Jul-2014 Badhri Jagan Sridharan <badhri@google.com> Merge "adbd: adb root should terminate adbd only if it's debuggable"
420f0a2567e8697b828e59802f972382360e667d 10-Jul-2014 Colin Cross <ccross@android.com> Merge "lmkd: use libprocessgroup to kill forked processes"
fef9522d9b9c0c0c5c55625a770cc58ece778da2 11-Jun-2014 Colin Cross <ccross@android.com> lmkd: use libprocessgroup to kill forked processes

After sending sigkill to the main process, also call into
libprocessgroup to kill any processes that were forked.

Bug: 15313911
Change-Id: I05577c6f5b70800ce0a01f480c8870c2c601afda
mkd/Android.mk
mkd/lmkd.c
cf8d1c22f7e239f502a7d209e2255d2997dbeb8b 03-Jun-2014 Colin Cross <ccross@android.com> Add libprocessgroup

libprocessgroup will allow Zygote to place processes
in a cgroup, and then kill the process and all forked processes
later. lmkd will also kill all forked processes.

Bug: 15313911
Change-Id: I20404d0dbe448f1c475d2f4c61cccca462f9e544
ibprocessgroup/Android.mk
ibprocessgroup/cleanup.cpp
ibprocessgroup/include/processgroup/processgroup.h
ibprocessgroup/processgroup.cpp
ibprocessgroup/processgroup_priv.h
038975a5c85caa758294102d4577d063d7e02651 10-Jul-2014 Colin Cross <ccross@android.com> Merge "lmkd: pass uid from ActivityManager to lmkd"
ee0388e768bb27eb845809a0b3ba85f4f7f21885 09-Jul-2014 Nick Kralevich <nnk@google.com> am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"

* commit 'f89ddf76f9e3c10af9002cdb0d9b8eadcd59bf15':
restorecon_recursive /cache
f89ddf76f9e3c10af9002cdb0d9b8eadcd59bf15 09-Jul-2014 Nick Kralevich <nnk@google.com> am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"

* commit 'd05245a4b10044670ed8456c5c869490fd90583f':
restorecon_recursive /cache
d05245a4b10044670ed8456c5c869490fd90583f 09-Jul-2014 Nick Kralevich <nnk@google.com> am c87237f5: Merge "restorecon_recursive /cache"

* commit 'c87237f5af41905a21a348a164a1ef3c31ace6c6':
restorecon_recursive /cache
fbb78c6fee58d102770cf388bbb8ce5c077f1de0 13-Jun-2014 Colin Cross <ccross@android.com> lmkd: pass uid from ActivityManager to lmkd

lmkd will use the uid to find processgroups and kill forked processes.

Bug: 15313911
Change-Id: I3f7bb003ccf15650cae6ebc2c042ddeb4cc796fc
mkd/lmkd.c
33e7b13167bcfd65b6c595e316e515ff8eab4b33 09-Jul-2014 Daniel Rosenberg <drosen@google.com> Made formatting for newfs_msdos.c more uniform

Change-Id: I3d14350c70c05a7e2f713d0065524d78f9a413c6
Signed-off-by: Daniel Rosenberg <drosen@google.com>
oolbox/newfs_msdos.c
660ba372989f4289990d91277c4334475769fe04 10-Jul-2014 Elliott Hughes <enh@google.com> Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."
cb7aae167e016a7fb85e64c9245f18d72a4a375b 10-Jul-2014 Elliott Hughes <enh@google.com> Fix arm emulator "D register out of range for selected VFP version" build failure.

Change-Id: Ia37cb3f8ecb00a927fa3fc8b4131c158413646e7
ebuggerd/Android.mk
ebuggerd/arm/crashglue.S
b518659848b6f3f939e1b5b150ae8586b9b8d0ce 10-Jul-2014 Elliott Hughes <enh@google.com> Merge "Integrate vfp-crasher with crasher."
e7f18e14a9e9267150e24f0cb8bd8bd52db7946e 09-Jul-2014 Elliott Hughes <enh@google.com> Integrate vfp-crasher with crasher.

There's no good reason to separate "fill the integer registers with
recognizable patterns and crash" from "fill the FP registers with recognizable
patterns and crash".

Also remove the incorrect use of ARCH_ARM_HAVE_VFP_D32 rather than try to fix
it.

Change-Id: I3a4a3aca1575de5489314027ae52168997404d79
ebuggerd/Android.mk
ebuggerd/arm/crashglue.S
ebuggerd/arm/machine.cpp
ebuggerd/arm/vfp.S
ebuggerd/arm64/crashglue.S
ebuggerd/arm64/machine.cpp
ebuggerd/arm64/vfp.S
ebuggerd/vfp-crasher.c
fb27d34dacf45fa1b5a5ea8ded778889827e5c99 10-Jul-2014 Colin Cross <ccross@android.com> Merge "Add libprocessgroup"
6ebab06dc4e7149b4deb5032518c64b881801259 09-Jul-2014 Elliott Hughes <enh@google.com> am f043f061: am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."

* commit 'f043f061295a787aca42186fe9ab87c24d393b92':
Fix sdcard's FUSE_FSYNCDIR handling.
40372e5b4ed1027418485a66d80e48748eedc07f 09-Jul-2014 Elliott Hughes <enh@google.com> am 94645665: am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."

* commit '9464566580559b7353e6e2c898da79ffbbf993aa':
Make sdcard log to the log rather than stderr.
f043f061295a787aca42186fe9ab87c24d393b92 09-Jul-2014 Elliott Hughes <enh@google.com> am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."

* commit '060b6ecb663a903d4a2c0496fadcfbc4148bc0d6':
Fix sdcard's FUSE_FSYNCDIR handling.
060b6ecb663a903d4a2c0496fadcfbc4148bc0d6 09-Jul-2014 Elliott Hughes <enh@google.com> am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."

* commit '6e141aea189769a428a7da6c2206df6d0ed2c69d':
Fix sdcard's FUSE_FSYNCDIR handling.
9464566580559b7353e6e2c898da79ffbbf993aa 08-Jul-2014 Elliott Hughes <enh@google.com> am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."

* commit 'f8acdcbe1103637c9d339bd9c954fb36e6785a74':
Make sdcard log to the log rather than stderr.
f8acdcbe1103637c9d339bd9c954fb36e6785a74 08-Jul-2014 Elliott Hughes <enh@google.com> am 75b7171f: Merge "Make sdcard log to the log rather than stderr."

* commit '75b7171fcb1a8f898ba533011ccb813792932e4c':
Make sdcard log to the log rather than stderr.
85449d360f86ed9faaf1403f972f9657698a8289 08-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit 'b12e40da2526881c1730a3d3387556e4600c7040':
Create a data directory for netd and other network-related files.
b12e40da2526881c1730a3d3387556e4600c7040 08-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit '0a7b44d55b9e9d038de390457246ec7fd0999cad':
Create a data directory for netd and other network-related files.
0a7b44d55b9e9d038de390457246ec7fd0999cad 08-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit 'ab98d2e6a9392e0481dc9cf246b378072d37e95b':
Create a data directory for netd and other network-related files.
81542db7c2cdf44803ba36be0f8cd76972790fc0 08-Jul-2014 Elliott Hughes <enh@google.com> am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit 'f761709a8e0f440afbdcd0df8f78d5e8ebc94211':
Fix LP64 tombstone.cpp build failure.
f761709a8e0f440afbdcd0df8f78d5e8ebc94211 08-Jul-2014 Elliott Hughes <enh@google.com> am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit '1829b14cd5887d510d8aedfc1a5b9fa636219525':
Fix LP64 tombstone.cpp build failure.
1829b14cd5887d510d8aedfc1a5b9fa636219525 08-Jul-2014 Elliott Hughes <enh@google.com> am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit '18e754eebd3d3252e122034c46023df915dd89f6':
Fix LP64 tombstone.cpp build failure.
850903371fce13933d5b9cfaf16d777fcd329296 08-Jul-2014 Elliott Hughes <enh@google.com> am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."

* commit '4f27968f988808c713564de99c04612b9e8768b9':
Improving maps output.
4f27968f988808c713564de99c04612b9e8768b9 08-Jul-2014 Elliott Hughes <enh@google.com> am 494bd36d: am dda63545: Merge "Improving maps output."

* commit '494bd36d463eeae6398ee340872e6356e498396d':
Improving maps output.
494bd36d463eeae6398ee340872e6356e498396d 08-Jul-2014 Elliott Hughes <enh@google.com> am dda63545: Merge "Improving maps output."

* commit 'dda635455fb085d2f33fd1bdc5140805a055ea05':
Improving maps output.
c87237f5af41905a21a348a164a1ef3c31ace6c6 09-Jul-2014 Nick Kralevich <nnk@google.com> Merge "restorecon_recursive /cache"
e1695914d55d9ced3645fc532191970c9450e9e9 09-Jul-2014 Nick Kralevich <nnk@google.com> restorecon_recursive /cache

Make sure all files / directories within /cache are properly
labeled, not just the directory itself.

Addresses the following denial:

type=1400 audit(0.0:26): avc: denied { getattr } for comm="Thread-85" path="/cache/lost+found" dev="mmcblk0p27" ino=11 scontext=u:r:untrusted_app:s0 tcontext=u:object_r:unlabeled:s0 tclass=dir

Change-Id: I5937b30043efeb696ffaa77258b7294d20d1494e
ootdir/init.rc
75b7171fcb1a8f898ba533011ccb813792932e4c 08-Jul-2014 Elliott Hughes <enh@google.com> Merge "Make sdcard log to the log rather than stderr."
300d5649800744b3f5eab478f2bd7921f584b07d 08-Jul-2014 Elliott Hughes <enh@google.com> Make sdcard log to the log rather than stderr.

Change-Id: I9c78941184c5e364055bfac766e1e542d3c23c87
dcard/sdcard.c
aecb7f84cfe505403372a19c6247e34e366916ab 08-Jul-2014 Eric Laurent <elaurent@google.com> Merge "Revert "Revert "sound trigger: several data structure updates"""
81c006d7922b02aaa43fc81c022b66deb06d9048 07-Jul-2014 Eric Laurent <elaurent@google.com> Revert "Revert "sound trigger: several data structure updates""

This reverts commit 6ef7c14b0292a87dd3a04d243d5c7de36a0eb3da.

Change-Id: I285b8388e7fd6f697b76fd18697edea7368991bb
nclude/system/sound_trigger.h
18e754eebd3d3252e122034c46023df915dd89f6 08-Jul-2014 Elliott Hughes <enh@google.com> Merge "Fix LP64 tombstone.cpp build failure."
7e775952e173b02d1930c56885da4ab7a9e62e0a 08-Jul-2014 Elliott Hughes <enh@google.com> Fix LP64 tombstone.cpp build failure.

Change-Id: Id071417f56dd883e9d2e38a6f3296cb23a0352fb
ebuggerd/tombstone.cpp
9f3a11edde07af068217581cf11c004f1cdca3f0 08-Jul-2014 dcashman <dcashman@google.com> am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."

* commit 'cddb15b8a9057e7efacf2de9c9a6a887fd666663':
Remove sshd.
cddb15b8a9057e7efacf2de9c9a6a887fd666663 08-Jul-2014 dcashman <dcashman@google.com> am b4e74db7: am 3fa71b8e: Merge "Remove sshd."

* commit 'b4e74db79c9fda5e63ae49f299df3c0dd80a87f9':
Remove sshd.
b4e74db79c9fda5e63ae49f299df3c0dd80a87f9 08-Jul-2014 dcashman <dcashman@google.com> am 3fa71b8e: Merge "Remove sshd."

* commit '3fa71b8e83dfc074b7628052ee6fd18d9e2290d0':
Remove sshd.
4b39c6aca973470812caf4f7911b494c891e0c3a 08-Jul-2014 Doug Zongker <dougz@google.com> fix windows build

Change-Id: Ia7b236f1a915630fe85d488072efb9784ba10dad
db/commandline.c
6d6a898b0c4e0283569209ba74bd7dbf49da73a2 07-Jul-2014 Colin Cross <ccross@android.com> adb: fix 64-bit build

strlen returns a size_t, but the * modifier in printf expects an int.
On arm64 size_t != int.

Change-Id: I11e84a7b62c935162abc0aba910d14e63d11efd3
db/commandline.c
4ef159a3c711650fce74ab13e3a883fab0598124 07-Jul-2014 Nick Kralevich <nnk@google.com> am 7367ecbc: am 06023134: am 8022ce1e: Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"

* commit '7367ecbc4839e3a608ab9b7742c659b58065209f':
ueventd fixup_sys_perms: fixup SELinux labels unconditionally
7367ecbc4839e3a608ab9b7742c659b58065209f 07-Jul-2014 Nick Kralevich <nnk@google.com> am 06023134: am 8022ce1e: Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"

* commit '060231346b9901f28ee8692518bcbc059e5777ca':
ueventd fixup_sys_perms: fixup SELinux labels unconditionally
060231346b9901f28ee8692518bcbc059e5777ca 07-Jul-2014 Nick Kralevich <nnk@google.com> am 8022ce1e: Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"

* commit '8022ce1e8742fc21aa0f4653d905c5a404b941dc':
ueventd fixup_sys_perms: fixup SELinux labels unconditionally
9a357b884fcc46f10f16860987614a2b9b610208 07-Jul-2014 Mark Salyzyn <salyzyn@google.com> am badc23f8: am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"

* commit 'badc23f847d40b9b076818550bf5ef6272a8010e':
logcat: parse failure for -n <KBsize> and -r <rotate limit>
badc23f847d40b9b076818550bf5ef6272a8010e 07-Jul-2014 Mark Salyzyn <salyzyn@google.com> am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"

* commit 'f6ef1f53ac1b4dd659d23f418042db8dd556b9c2':
logcat: parse failure for -n <KBsize> and -r <rotate limit>
8022ce1e8742fc21aa0f4653d905c5a404b941dc 07-Jul-2014 Nick Kralevich <nnk@google.com> Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"
3b4c0bda07ee883df8ad354d7288b7f37bec33ba 04-Jul-2014 Nick Kralevich <nnk@google.com> ueventd fixup_sys_perms: fixup SELinux labels unconditionally

Currently, the fixup code in fixup_sys_perms() scans through all
entries in uevent*.rc. If it finds a match, then it performs a fixup.
If there's no match in that file, no fixup is performed.

SELinux file labels are independently stored in /file_contexts,
with no relationship to the files in /ueventd.rc. Even when no
entries exist in ueventd.rc, we still want to fixup the SELinux
file label in /sys when a uevent message occurs.

Change-Id: I0ccb5395ec0be9282095b844a5022e8c0d8903ac
nit/devices.c
dda635455fb085d2f33fd1bdc5140805a055ea05 08-Jul-2014 Elliott Hughes <enh@google.com> Merge "Improving maps output."
8606eaa7700609a2f9f2383b954b4e64dbc4c827 07-Jul-2014 Brigid Smith <brigidsmith@google.com> Improving maps output.

Maps output now displays fault address location more intelligently. If
the fault is not in a mapped region, it now shows where that address is
with respect to the other maps.

In addition, the size of the map is now printed as part of the output.

Also, crasher now supports an "mmap" option which mmaps/munmaps a region
of memory and then attempts to access it, causing a fault address in
between mapped regions that can be used to test that new part of the
maps output.

Change-Id: Ia5e1926802bdfcbbdb7857e3631ddf395ae0c5b8
ebuggerd/crasher.c
ebuggerd/tombstone.cpp
3fa71b8e83dfc074b7628052ee6fd18d9e2290d0 08-Jul-2014 dcashman <dcashman@google.com> Merge "Remove sshd."
b4cbff47ad4c8f15213189959c2ea33cb0ee529f 08-Jul-2014 dcashman <dcashman@google.com> Remove sshd.

This may require changes to other code, such as fastbootd, which relies on this
service. sshd is not currently, used, however, so this change will force any
such code to be changed.

Bug: 11594902
Change-Id: I07e52008290dab5825be2ad062cbe730fa7dff71
ootdir/init.rc
f6ef1f53ac1b4dd659d23f418042db8dd556b9c2 07-Jul-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"
0b2dac4f3f289448e5728e6c2f7d9ac04cdafdeb 07-Jul-2014 Mark Salyzyn <salyzyn@google.com> logcat: parse failure for -n <KBsize> and -r <rotate limit>

Bug: https://code.google.com/p/android/issues/detail?id=72867
Change-Id: Id0c988543ecfccc5054d15d4195ef578468d50af
ogcat/logcat.cpp
14253c1aab42e4e4ec4e68798c068436b4260288 09-Jul-2014 Nick Kralevich <nnk@google.com> Merge "init.rc: add seclabel to flash_recovery"
a1d97e5d1c15e0adf40b5853f2f85db7008baa77 08-Jul-2014 Nick Kralevich <nnk@google.com> init.rc: add seclabel to flash_recovery

Make sure flash_recovery is always running in the
install_recovery SELinux domain.

Change-Id: I9495eedd03f6b5dfcf2e78c03d1102f6032b327a
ootdir/init.rc
7df14ef339fcdd9103f2ef4e0eb66bf9c4ad3f5b 07-Jul-2014 Doug Zongker <dougz@google.com> Merge "add sideload-host mode to adb"
42461b7a59673b3567857a5ce501dd2b2fe496ba 07-Jul-2014 Mark Salyzyn <salyzyn@google.com> am 9a357b88: am badc23f8: am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"

* commit '9a357b884fcc46f10f16860987614a2b9b610208':
logcat: parse failure for -n <KBsize> and -r <rotate limit>
6ef7c14b0292a87dd3a04d243d5c7de36a0eb3da 07-Jul-2014 Eric Laurent <elaurent@google.com> Revert "sound trigger: several data structure updates"

This reverts commit 135dd2ee3dc56cf79b14a6de57fcdc805face6bc.

Change-Id: Iad97090c77ad36567eb3c6550ebe3812768e88ad
nclude/system/sound_trigger.h
71fe584a1a7256c057267ae46a35f7c74d1d549e 27-Jun-2014 Doug Zongker <dougz@google.com> add sideload-host mode to adb

The sideload-host mode turns the host into a server capable of sending
the device various pieces of the file on request, rather than
downloading it all in one transfer. It's used to support sideloading
OTA packages to devices without the need for them to hold the whole
package in RAM.

If the connected device doesn't support sideload-host mode, we fall
back to the older sideload connection.

Change-Id: I5adaedd8243dc3b76414bba0149879ca2bbf35fa
db/adb.h
db/adb_client.c
db/commandline.c
135dd2ee3dc56cf79b14a6de57fcdc805face6bc 07-Jul-2014 Eric Laurent <elaurent@google.com> sound trigger: several data structure updates

Added sound model implementor UUID.
Added capture preamble duration in recognition event.
Replaced number of users by list of user IDs in key phrase
descriptor.
Report confidence level for each user with user ID in recognition
event.
Added more configuration data to start_recognition() grouped in a
recognition configuration structure.
- List of keyphrases to listen to
- Recognition mode
- List of users with min confidence level
Added definitions for sound model load callback event.

Bug: 12378680.
Change-Id: Ia8c12ab20448b702d13db964bdd90ac4117a58d7
nclude/system/sound_trigger.h
db37858a171c101a2eeb5ce473391112e314856a 06-Jul-2014 Eric Laurent <elaurent@google.com> sound trigger: add sound model and key phrase IDs.

Bug: 12378680.
Change-Id: I93b1916151108ccf6eb625b0078e6ed574720b76
nclude/system/sound_trigger.h
6e141aea189769a428a7da6c2206df6d0ed2c69d 09-Jul-2014 Elliott Hughes <enh@google.com> Merge "Fix sdcard's FUSE_FSYNCDIR handling."
f6d6737529ea164fd2ea79f02cc78a46bb9260f5 08-Jul-2014 Elliott Hughes <enh@google.com> Fix sdcard's FUSE_FSYNCDIR handling.

For a file the FUSE fh is a struct handle containing an int fd;
for a directory it's a struct dirhandle containing a DIR*. Fix
handle_fsync to extract the file descriptor appropriately in
both cases.

Bug: 14613980
Change-Id: I45515cff6638e27a99b849e6fc639d355dbb4d27
dcard/sdcard.c
019b8ece22e07e284e6bb0e83bd22ace4524a014 03-Jul-2014 Nick Kralevich <nnk@google.com> am e73fc3ab: am 039b9cef: am 5529de0f: Merge "logd_write: set SOCK_CLOEXEC on socket"

* commit 'e73fc3ab65e2db62da2e3d11c711068fdb811773':
logd_write: set SOCK_CLOEXEC on socket
e73fc3ab65e2db62da2e3d11c711068fdb811773 03-Jul-2014 Nick Kralevich <nnk@google.com> am 039b9cef: am 5529de0f: Merge "logd_write: set SOCK_CLOEXEC on socket"

* commit '039b9cef807b278a49815bcfe10389fe6efa5c82':
logd_write: set SOCK_CLOEXEC on socket
039b9cef807b278a49815bcfe10389fe6efa5c82 03-Jul-2014 Nick Kralevich <nnk@google.com> am 5529de0f: Merge "logd_write: set SOCK_CLOEXEC on socket"

* commit '5529de0fa3f41edb72737b00be13ef77b33d0a2b':
logd_write: set SOCK_CLOEXEC on socket
5529de0fa3f41edb72737b00be13ef77b33d0a2b 03-Jul-2014 Nick Kralevich <nnk@google.com> Merge "logd_write: set SOCK_CLOEXEC on socket"
118d1b393067fbc4fbb26af6815a7a4f131f0148 03-Jul-2014 Nick Kralevich <nnk@google.com> logd_write: set SOCK_CLOEXEC on socket

Socket file descriptors remain open across exec unless
SOCK_CLOEXEC is set. Enable this option, to avoid leaking
file descriptors.

See https://android-review.googlesource.com/53736 for a similar
problem with the old logging code.

Change-Id: I9e045d2291ae6680044ab86604f3ff2c55b5eaed
iblog/logd_write.c
0c44584b47f5636a475420a42826e3e5bc98fd5d 03-Jul-2014 Colin Cross <ccross@android.com> am b18d44e4: am ab7e5752: am 09117c70: Merge "ueventd: allow matching symlink names when setting permissions"

* commit 'b18d44e458501f6b5b99349acc68d3d4e90e9d62':
ueventd: allow matching symlink names when setting permissions
774ca8931583322813f290cf7f1632b981ee17ee 03-Jul-2014 Nick Kralevich <nnk@google.com> am ed559bdb: am 3dbd7e10: am 1aad06dd: Merge "implement LOG_EVENT_STRING"

* commit 'ed559bdb38e4f8edb183420f69490d4eba39f94b':
implement LOG_EVENT_STRING
cee206880ef80ac570df6b369d12f111c00f653a 02-Jul-2014 JP Abgrall <jpa@google.com> [HACK]fs_mgr+init: Format via recovery if encryptable /data is wiped

If the encryptable partition is wiped (4KB worth of 0 or 0xff),
then reboot into recovery to format /data+/cache

This is while waiting for the Mac OS support to format f2fs.
The flashstation running on Mac OS will currently just erase userdata
and not format it with f2fs.

Bug: 15720406
Bug: 15747366
Change-Id: Ib7cca3e1701483a09573457a835750f34da71ee0
s_mgr/fs_mgr.c
s_mgr/include/fs_mgr.h
nit/builtins.c
b18d44e458501f6b5b99349acc68d3d4e90e9d62 02-Jul-2014 Colin Cross <ccross@android.com> am ab7e5752: am 09117c70: Merge "ueventd: allow matching symlink names when setting permissions"

* commit 'ab7e5752b0f02d8a5b6d70b94c41eed9f4068005':
ueventd: allow matching symlink names when setting permissions
ab7e5752b0f02d8a5b6d70b94c41eed9f4068005 02-Jul-2014 Colin Cross <ccross@android.com> am 09117c70: Merge "ueventd: allow matching symlink names when setting permissions"

* commit '09117c70f1cc0de77c62d6f7f5bee04e3fc7ef83':
ueventd: allow matching symlink names when setting permissions
09117c70f1cc0de77c62d6f7f5bee04e3fc7ef83 02-Jul-2014 Colin Cross <ccross@android.com> Merge "ueventd: allow matching symlink names when setting permissions"
43d537e0deeb4ba20e13db22e4fc28b87a4621c7 02-Jul-2014 Colin Cross <ccross@android.com> ueventd: allow matching symlink names when setting permissions

Change-Id: I5f6cc2a25f1236fbe2c7193b65363b7883b9ba2e
nit/devices.c
ab98d2e6a9392e0481dc9cf246b378072d37e95b 08-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Create a data directory for netd and other network-related files."
b46efdb08ef8a700654d28be94b90550b8d90822 08-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Create a data directory for netd and other network-related files.

Allows the 'shell' group (which is what dumpstate uses) to read the files in
this directory.

Change-Id: I69deb1a64d5d6647470823405bf0cc55b24b22de
ootdir/init.rc
f22b7452940c99b830749cabdd929f9f7cfdaacc 02-Jul-2014 JP Abgrall <jpa@google.com> fs_mrg: clean up multi-type mount_all

Move the code that attempts to mount alternative fstab entries
into its own function.
Clarify return codes.
Suggest wipe via recovery in error messages.

Bug: 15747366
Change-Id: I3634477cd4d1d73f974f3e906c53285f0d9e0eac
Signed-off-by: JP Abgrall <jpa@google.com>
s_mgr/fs_mgr.c
s_mgr/include/fs_mgr.h
nit/builtins.c
686bce6390db802bfd2cb4e78f9270596b6decb2 01-Jul-2014 Daniel Rosenberg <drosen@google.com> Added support for vendor partition to adb

Remount will now remount the vendor partition as well, if it exists.
Sync will also allow you to sync vendor, and will include it by
default if it exists.

Change-Id: Iea1e8212f445e96233438a8d8a9d3266bf3d6557
Signed-off-by: Daniel Rosenberg <drosen@google.com>
db/commandline.c
db/file_sync_client.c
db/file_sync_service.c
db/remount_service.c
a916e260db1e6c2c20fe0451ffe380f5e19af818 09-Jul-2014 Terry Heo <terryheo@google.com> Merge "audio: add definition for new audio loopback input device"
b63dd8a005ad3133915a949e6b31e81d51007688 27-Jun-2014 Terry Heo <terryheo@google.com> audio: add definition for new audio loopback input device

Bug: 15437484
Change-Id: I62da0596d405c3bb5e00b461f7d4fd11627ed391
nclude/system/audio.h
ed559bdb38e4f8edb183420f69490d4eba39f94b 02-Jul-2014 Nick Kralevich <nnk@google.com> am 3dbd7e10: am 1aad06dd: Merge "implement LOG_EVENT_STRING"

* commit '3dbd7e10688e29022db7dd0778ec8078c2a7a545':
implement LOG_EVENT_STRING
3dbd7e10688e29022db7dd0778ec8078c2a7a545 02-Jul-2014 Nick Kralevich <nnk@google.com> am 1aad06dd: Merge "implement LOG_EVENT_STRING"

* commit '1aad06ddde2018f8cd896be4c2ad211f4a7a8705':
implement LOG_EVENT_STRING
1aad06ddde2018f8cd896be4c2ad211f4a7a8705 02-Jul-2014 Nick Kralevich <nnk@google.com> Merge "implement LOG_EVENT_STRING"
2a4d05a4e38b84cf287bb2d2266c07b6f10c9dee 01-Jul-2014 Nick Kralevich <nnk@google.com> implement LOG_EVENT_STRING

Implement LOG_EVENT_STRING, so that native code can create new
event log entries. This is needed to support logging SELinux denials
to the event log.

Change-Id: I6a269a832bc2f5e5da6c9dbd169ed2f901b49166
nclude/log/log.h
nclude/log/logd.h
iblog/logd_write.c
iblog/logd_write_kern.c
4a974df8adec7767bbd9be834008fd882bf33ffb 02-Jul-2014 Todd Poynor <toddpoynor@google.com> Merge "fs_mgr: fix crash on "noemulatedsd" in fstab"
22f63e393fbc87494b6d9be3ed93b8289f41b123 02-Jul-2014 Todd Poynor <toddpoynor@google.com> fs_mgr: fix crash on "noemulatedsd" in fstab

MF_FORCECRYPT claimed same flag value as existing MF_NOEMULATEDSD.
MF_FORCECRYPT also crashes if no "=" in the option.

Modify MF_NOEMULATEDSD flag value to unique, and reformat comment to keep
the definition near the other defines.

Change-Id: Iec86f40ff43eea14b791d3d19c0ae11fd4b5f784
s_mgr/fs_mgr_priv.h
d2b5bfa0cdf18c3b8593c777ccfcb1221df4e953 01-Jul-2014 Colin Cross <ccross@android.com> healthd: fix 64-bit build

int64_t needs to be printed with PRId64

Change-Id: If59b60bac71856e4266d459d159a570961e7340a
ealthd/healthd_mode_charger.cpp
ecedc9a6977c69bf742569a450840061c047fa6b 01-Jul-2014 Todd Poynor <toddpoynor@google.com> Merge "charger: leave screen off when entered with very low battery"
0c3664f08dd5bfa786b3fe82ed2343c7989d35dd 26-Jun-2014 Jungshik Jang <jayjang@google.com> Define force usage and category for System Audio.

System Audio Control in HDMI-CEC delegates audio
output to Audio Receiver and audio output port
is one of ARC, SPDIF and analog output (line).

Change-Id: Ieb325f754f039e09aae68b700349861ca4e08cbc
nclude/system/audio_policy.h
a7300274fdc5c92144471b1fe6dd19a8d18ae393 30-Jun-2014 Todd Poynor <toddpoynor@google.com> charger: leave screen off when entered with very low battery

Change-Id: I28e3d6adaf4bb59d14eca7103d7b063d54a41c75
ealthd/healthd_mode_charger.cpp
e61679c2fea0c26c1f40f9fd6cfb897a8bb057b0 30-Jun-2014 Elliott Hughes <enh@google.com> am fac28281: am b13e4b5e: am 5a53ee05: Merge "Remove an unused #include of <sys/_properties.h>."

* commit 'fac2828161b6b14b7e862d94f2f4ef467621c832':
Remove an unused #include of <sys/_properties.h>.
fac2828161b6b14b7e862d94f2f4ef467621c832 30-Jun-2014 Elliott Hughes <enh@google.com> am b13e4b5e: am 5a53ee05: Merge "Remove an unused #include of <sys/_properties.h>."

* commit 'b13e4b5eb6ad00bfcd8b4cdb6219f8bbbca4c85d':
Remove an unused #include of <sys/_properties.h>.
b13e4b5eb6ad00bfcd8b4cdb6219f8bbbca4c85d 30-Jun-2014 Elliott Hughes <enh@google.com> am 5a53ee05: Merge "Remove an unused #include of <sys/_properties.h>."

* commit '5a53ee0502c198fb114bbf7bb34643d9682ba9b8':
Remove an unused #include of <sys/_properties.h>.
092954dec1df391274217a99d623d16fd01d0347 30-Jun-2014 Todd Poynor <toddpoynor@google.com> am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE"

* commit 'f9db4ab97e58f15f84642ac133e33bd89107c944':
Charger: Avoid animation while not charging DO NOT MERGE
f9db4ab97e58f15f84642ac133e33bd89107c944 30-Jun-2014 Todd Poynor <toddpoynor@google.com> am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE"

* commit 'd4d1b5045cfb602a7c57cbf29b2543e26106a1fd':
Charger: Avoid animation while not charging DO NOT MERGE
03c7c8e9444cb49b8a1b463aa4e42d73ac08b6c3 30-Jun-2014 JP Abgrall <jpa@google.com> Merge "fs_msg: fix bad tmpfs detection (fix /persist mount errors)"
0f41d453537093115ba1a5c1bc076fa5c5207b5e 30-Jun-2014 Todd Poynor <toddpoynor@google.com> am 092954de: (-s ours) am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE"

* commit '092954dec1df391274217a99d623d16fd01d0347':
Charger: Avoid animation while not charging DO NOT MERGE
7553d57298c3d807371298b5e5d99eb9ce5ca6aa 30-Jun-2014 JP Abgrall <jpa@google.com> fs_msg: fix bad tmpfs detection (fix /persist mount errors)

Without this, the wrong mount point is flagged as being mounted.
Which leads to:

<6>[ 3.278040] fs_mgr: __mount(source=/dev/block/platform/msm_sdcc.1/by-name/userdata,target=/data,type=ext4)=-1
<7>[ 3.278834] SELinux: initialized (dev tmpfs, type tmpfs), uses transition SIDs
<6>[ 3.278925] fs_mgr: fs_mgr_mount_all(): skipping fstab dup mountpoint=/persist rec[3].fs_type=ext4 already mounted.


Bug: 15925030
Bug: 15976144
Change-Id: I0bc617f11dfc97c32bb2d0e52b94ec19282568eb
s_mgr/fs_mgr.c
d4d1b5045cfb602a7c57cbf29b2543e26106a1fd 30-Jun-2014 Todd Poynor <toddpoynor@google.com> Merge "Charger: Avoid animation while not charging DO NOT MERGE"
9cc4ea329fd63ecd8a5764b1762c1574904842f6 30-Apr-2014 Jenny TC <jenny.tc@intel.com> Charger: Avoid animation while not charging DO NOT MERGE

At present, charging animation runs irrespective of whether charger
is connected or not. When the charger is disconnected, device not shutdown
for 10secs. Charging animation during this period should be avoided.

Change-Id: Idf8e6a11261aec2812f1ebbbdec1bd1ad769565e
Signed-off-by: Pavan Kumar S <pavan.kumar.s@intel.com>
Signed-off-by: Jenny TC <jenny.tc@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
harger/charger.c
7742d9bf292b3ab8bdefc90f66f40c1d4b547e3a 30-Jun-2014 Narayan Kamath <narayan@google.com> am 98569bc7: am da3fb537: am 6e074c68: Merge "Build pixelflinger tests as native tests, not executables."

* commit '98569bc7089d84478e4ab39046c0a297358a9603':
Build pixelflinger tests as native tests, not executables.
98569bc7089d84478e4ab39046c0a297358a9603 30-Jun-2014 Narayan Kamath <narayan@google.com> am da3fb537: am 6e074c68: Merge "Build pixelflinger tests as native tests, not executables."

* commit 'da3fb5374a5c012dc65f193d0d84a732dd628b21':
Build pixelflinger tests as native tests, not executables.
da3fb5374a5c012dc65f193d0d84a732dd628b21 30-Jun-2014 Narayan Kamath <narayan@google.com> am 6e074c68: Merge "Build pixelflinger tests as native tests, not executables."

* commit '6e074c68e2cfb35683733ab561801c647723ac57':
Build pixelflinger tests as native tests, not executables.
f267b063059e34276a063463368e53da86769892 30-Jun-2014 Ian Rogers <irogers@google.com> am 3e906630: am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."

* commit '3e906630099e0508a72300e14512a62110c864c3':
Rename __unused to __UNUSED for glibc support.
3e906630099e0508a72300e14512a62110c864c3 30-Jun-2014 Ian Rogers <irogers@google.com> am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."

* commit '33dce382fd39b633731c925a1487a74332e86871':
Rename __unused to __UNUSED for glibc support.
33dce382fd39b633731c925a1487a74332e86871 30-Jun-2014 Ian Rogers <irogers@google.com> am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."

* commit '63a61e561d7d3d6f10488a194fb730f9edec3edc':
Rename __unused to __UNUSED for glibc support.
63a61e561d7d3d6f10488a194fb730f9edec3edc 30-Jun-2014 Ian Rogers <irogers@google.com> Merge "Rename __unused to __UNUSED for glibc support."
de8b98335763b1fbb51254e3f22247971d1c7cfe 28-Jun-2014 Ian Rogers <irogers@google.com> Rename __unused to __UNUSED for glibc support.

Glibc declares unused fields as __unused and so a #define for __unused causes
issues when we built against glibc on the host. Rename __unused to __UNUSED as
a workaround.
This fixed checkbuild for 64-bit host builds. Bug: 13751317

Change-Id: Ic2cd52518c16661497cc819cb3fd7f1fa5c6f0fb
nclude/system/window.h
a22f86668fd234b771f7128e5fedc47dd866e1e7 28-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 36d04e37: am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"

* commit '36d04e37ee84f17220442002d880473d465ca5ae':
debuggerd: synchronize cosmetics to internal
36d04e37ee84f17220442002d880473d465ca5ae 28-Jun-2014 Mark Salyzyn <salyzyn@google.com> am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"

* commit 'ac4efdd2b448b5a961776f481b1d753841bde5bb':
debuggerd: synchronize cosmetics to internal
ac4efdd2b448b5a961776f481b1d753841bde5bb 28-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"

* commit '0a350f4f0857cd4a42b5099b8fda7766a35398cb':
debuggerd: synchronize cosmetics to internal
dfc3490c90e6c839b6e24a33fb343d423f11e507 27-Jun-2014 Elliott Hughes <enh@google.com> am 7e3a492f: am 6f185dea: am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output."

* commit '7e3a492ff205a2e5ac5880e95dbb5bd0fa634cff':
Fixed tid/pid mixup in debuggerd gdbclient output.
7e3a492ff205a2e5ac5880e95dbb5bd0fa634cff 27-Jun-2014 Elliott Hughes <enh@google.com> am 6f185dea: am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output."

* commit '6f185dea32783dae7c833028460a6545eed0e09a':
Fixed tid/pid mixup in debuggerd gdbclient output.
6f185dea32783dae7c833028460a6545eed0e09a 27-Jun-2014 Elliott Hughes <enh@google.com> am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output."

* commit 'e080be575419e77c909b54791ea2b44467a1a913':
Fixed tid/pid mixup in debuggerd gdbclient output.
d4b6d18d7e6b8c2a11ee0b9bd8a0e3bdaf819b23 27-Jun-2014 Mark Salyzyn <salyzyn@google.com> resolved conflicts for merge of ab5b8603 to master

Change-Id: I857725640bc77f04d93f04c52efc73335122e5ea
ab5b8603ee70ecd04f9dda8ca0ee15789c32ca84 27-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 44029223: am c8a7e34d: Merge "tombstone: log output header suppressed in crash"

* commit '44029223daef21ebd06a7b0e1655aff9254da63d':
tombstone: log output header suppressed in crash
44029223daef21ebd06a7b0e1655aff9254da63d 27-Jun-2014 Mark Salyzyn <salyzyn@google.com> am c8a7e34d: Merge "tombstone: log output header suppressed in crash"

* commit 'c8a7e34dfc0f8f1c994168672db21175b28b931f':
tombstone: log output header suppressed in crash
5a53ee0502c198fb114bbf7bb34643d9682ba9b8 30-Jun-2014 Elliott Hughes <enh@google.com> Merge "Remove an unused #include of <sys/_properties.h>."
11d783f1e7adaa6a9f966707dd6fd5e69a6676bb 30-Jun-2014 Elliott Hughes <enh@google.com> Remove an unused #include of <sys/_properties.h>.

Bug: 15704351
Change-Id: I7841da7176d0638ae6737fe719cd187892bc38e6
nit/init_parser.c
0a350f4f0857cd4a42b5099b8fda7766a35398cb 28-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "debuggerd: synchronize cosmetics to internal"
17e85c06716fe1a6973d46e6b8b19c6b72de1c81 28-Jun-2014 Mark Salyzyn <salyzyn@google.com> debuggerd: synchronize cosmetics to internal

Change-Id: I66bc2b181cd75da188c046571492224d5ac3fc98
ebuggerd/tombstone.cpp
c8a7e34dfc0f8f1c994168672db21175b28b931f 27-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "tombstone: log output header suppressed in crash"
e43290d7ed6e90bd64c93fe8796f5aeaf1e68436 27-Jun-2014 Mark Salyzyn <salyzyn@google.com> tombstone: log output header suppressed in crash

Bug: 15520846
Change-Id: I18934cc60af3dda98ab729fbabc4c7a66834512e
ebuggerd/tombstone.cpp
e29cbd3372e5af761d3c2423723182acf6951166 27-Jun-2014 JP Abgrall <jpa@google.com> fs_mgr: increase tmpfs size to accommodate bigger dex2oat data

During encryption and decryption, art is pumping out data via
dex2oat into the /data that is actually a tmpfs.
It currently needs ~195MB.
So we increase the tmpfs from 128MB to 256MB.

Bug: 15909689
Change-Id: I5d518a87d7b4eccf32fcd77f61980646ee8a3d35
Signed-off-by: JP Abgrall <jpa@google.com>
s_mgr/fs_mgr_priv.h
24912dc446439b0aaa1c3417a8159af758f76ff6 27-Jun-2014 Riley Andrews <riandrews@google.com> resolved conflicts for merge of fa6f2543 to master

Change-Id: I04ce82e5d245e90e2cc62b76d688ec902c1a471d
fa6f25432b45958af870674529ce79e84986e0fa 27-Jun-2014 Riley Andrews <riandrews@google.com> am 23340d8a: am 10f8cd1d: Merge changes Ia15b2110,I5498c725

* commit '23340d8adac7bf68a6e47064ab7b48c1e227a077':
Add ability to adjust init log level at runtime.
Improve init's debug printing.
23340d8adac7bf68a6e47064ab7b48c1e227a077 27-Jun-2014 Riley Andrews <riandrews@google.com> am 10f8cd1d: Merge changes Ia15b2110,I5498c725

* commit '10f8cd1d87eccde36da2ac54ad7d390e34a6e224':
Add ability to adjust init log level at runtime.
Improve init's debug printing.
f67d6bd3c0fb41d167c675b9d2b5d377b6f38a74 26-Jun-2014 Daniel Rosenberg <drosen@google.com> Moved symlink back up.

Moving the vendor symlink down was causing issues with some devices.
Moved it back up, and adjusted mount to remove symlinks if necessary.

Change-Id: I77126d77cfbef32250012bea3960c99b55db4cbb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
s_mgr/fs_mgr.c
ootdir/init.rc
6e074c68e2cfb35683733ab561801c647723ac57 30-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Build pixelflinger tests as native tests, not executables."
e080be575419e77c909b54791ea2b44467a1a913 27-Jun-2014 Elliott Hughes <enh@google.com> Merge "Fixed tid/pid mixup in debuggerd gdbclient output."
75582957cfe1c985aa58dd64d7e1405fa93b04e0 26-Jun-2014 Brigid Smith <brigidsmith@google.com> Fixed tid/pid mixup in debuggerd gdbclient output.

Now the debugging output shows the tid of the crashed thread instead of
the pid of the process that crashed.

Change-Id: I637f409ff02d73d458edc6d1a5c462c21d128211
ebuggerd/debuggerd.cpp
10f8cd1d87eccde36da2ac54ad7d390e34a6e224 27-Jun-2014 Riley Andrews <riandrews@google.com> Merge changes Ia15b2110,I5498c725

* changes:
Add ability to adjust init log level at runtime.
Improve init's debug printing.
1bbef88e8011805f7a3995a4d81928a853cb5cff 26-Jun-2014 Riley Andrews <riandrews@google.com> Add ability to adjust init log level at runtime.

+ Add a new property, sys.init_log_level, which can be set after init
bootstrap. This will control the level at which init does prints to klog.

Change-Id: Ia15b2110157b5e6b713785ece9b0fb94889be6c8
nit/builtins.c
ootdir/init.rc
24a3b783d5fcf55fdc9034ef395a5fbc77290c75 26-Jun-2014 Riley Andrews <riandrews@google.com> Improve init's debug printing.

+ Make prints of rc commands significantly more verbose. All commands
will log all arguments, file/line number of the command, return value,
and parent action which triggered the command.

init: command 'mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000' action=init
status=0 (/init.rc:89)
init: command 'setprop net.tcp.default_init_rwnd 60' action=boot status=0
(/init.rc:403)

Change-Id: I5498c7258e4891706be4a12546df4231d14d86c4
nit/init.c
nit/init.h
nit/init_parser.c
064b562aa1119818d53ffe877ec573d50e6dcf78 26-Jun-2014 Narayan Kamath <narayan@google.com> am 3bf00fd6: am 10e36e80: am a42d5bf0: Merge "pixelflinger: Use pointer arithmetic to determine cache flush parameters"

* commit '3bf00fd6a6901dfb52b0030581745f52ff98f537':
pixelflinger: Use pointer arithmetic to determine cache flush parameters
3bf00fd6a6901dfb52b0030581745f52ff98f537 26-Jun-2014 Narayan Kamath <narayan@google.com> am 10e36e80: am a42d5bf0: Merge "pixelflinger: Use pointer arithmetic to determine cache flush parameters"

* commit '10e36e8087db5420fef9904a0e37de088435b1ee':
pixelflinger: Use pointer arithmetic to determine cache flush parameters
10e36e8087db5420fef9904a0e37de088435b1ee 26-Jun-2014 Narayan Kamath <narayan@google.com> am a42d5bf0: Merge "pixelflinger: Use pointer arithmetic to determine cache flush parameters"

* commit 'a42d5bf0064e8c8ce50b22abe13bb6eed4ea9dac':
pixelflinger: Use pointer arithmetic to determine cache flush parameters
992031c8767ed7f5af35462b77533048aa29fee0 26-Jun-2014 Narayan Kamath <narayan@google.com> Build pixelflinger tests as native tests, not executables.

This has the side effect of building tests for both 32
and 64 bit, where required.

Change-Id: I674800d34b4fa7cc5d34573c96b754ac85777970
ibpixelflinger/tests/arch-arm64/assembler/Android.mk
ibpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
ibpixelflinger/tests/arch-arm64/disassembler/Android.mk
ibpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
ibpixelflinger/tests/codegen/Android.mk
ibpixelflinger/tests/gglmul/Android.mk
f95244a9fc61382ce8ea6bfc19948246bb1d1853 26-Jun-2014 Nick Kralevich <nnk@google.com> resolved conflicts for merge of dd8e63a4 to master

Change-Id: I5ee88d4a3846cb617ec115cb55c8192c8ecf2f4f
dd8e63a4ecc00b45f0bc41c5e3d4a26f3c4c11f2 26-Jun-2014 Nick Kralevich <nnk@google.com> am 3a3b12c2: am 64f5fe27: Merge "property_service: get rid of hard coded property / control list"

* commit '3a3b12c2a1876eaa90615a473c330e1a4f5118f3':
property_service: get rid of hard coded property / control list
3a3b12c2a1876eaa90615a473c330e1a4f5118f3 26-Jun-2014 Nick Kralevich <nnk@google.com> am 64f5fe27: Merge "property_service: get rid of hard coded property / control list"

* commit '64f5fe2796c5d20e0b1069837cac269f4aade331':
property_service: get rid of hard coded property / control list
f0c195625b499257d8b957321b75b52aacac857e 26-Jun-2014 Elliott Hughes <enh@google.com> am fdd4ffd1: am 01ad7710: Merge "Fix %llx to PRIx64 in nandread.c."

* commit 'fdd4ffd1820b9ea5f89b0f7435f80d366343020d':
Fix %llx to PRIx64 in nandread.c.
fdd4ffd1820b9ea5f89b0f7435f80d366343020d 26-Jun-2014 Elliott Hughes <enh@google.com> am 01ad7710: Merge "Fix %llx to PRIx64 in nandread.c."

* commit '01ad77107bfdc641ad818fe452448f0887aef961':
Fix %llx to PRIx64 in nandread.c.
64f5fe2796c5d20e0b1069837cac269f4aade331 26-Jun-2014 Nick Kralevich <nnk@google.com> Merge "property_service: get rid of hard coded property / control list"
01ad77107bfdc641ad818fe452448f0887aef961 26-Jun-2014 Elliott Hughes <enh@google.com> Merge "Fix %llx to PRIx64 in nandread.c."
a5f28628b1a9d23722e032cd11af645eb27ca67c 26-Jun-2014 Elliott Hughes <enh@google.com> Fix %llx to PRIx64 in nandread.c.

Change-Id: I541d1f4efac3c91d1a26f60735c72e799490fcc9
oolbox/nandread.c
cbaecbb961b9474236c0d3306f3aa5e3266e39c2 26-Jun-2014 Zhijun He <zhijunhe@google.com> Merge "graphics: add android raw10 format"
d2b82e3099bd510e85a01313b856bd209cfbfd10 26-Jun-2014 Elliott Hughes <enh@google.com> am f0c19562: am fdd4ffd1: am 01ad7710: Merge "Fix %llx to PRIx64 in nandread.c."

* commit 'f0c195625b499257d8b957321b75b52aacac857e':
Fix %llx to PRIx64 in nandread.c.
72fce30eeb2a3eecaefc858ffb0a478a41196572 24-Jun-2014 Zhijun He <zhijunhe@google.com> graphics: add android raw10 format

Change-Id: Ib1b74b1664159190e417f2e68a5a13493d04adfc
nclude/system/graphics.h
983411318fb3b841c567cf1357649335806a0657 25-Jun-2014 JP Abgrall <jpa@google.com> fs_mgr: fix double mounting of partition

When looking for partitions to encrypt, it would setup a tmpfs
onto the mount point. But with multi-type mount points it would
repeat the mount.
This would lead to having and extra tmpfs mounted on /data, as
only one would get removed.

Change-Id: I28f2c2c4955906f1172342ea07e0795d6880986b
Signed-off-by: JP Abgrall <jpa@google.com>
s_mgr/fs_mgr.c
61be43907f2ad3430deeb0223ffe8ac5c165b986 25-Jun-2014 Nick Kralevich <nnk@google.com> am 471a7034: am aadf9f11: am 4ad20e55: Merge "Redirect libselinux logging to dmesg for ueventd."

* commit '471a7034b2fca93f174c88e275d3968032730aa7':
Redirect libselinux logging to dmesg for ueventd.
471a7034b2fca93f174c88e275d3968032730aa7 25-Jun-2014 Nick Kralevich <nnk@google.com> am aadf9f11: am 4ad20e55: Merge "Redirect libselinux logging to dmesg for ueventd."

* commit 'aadf9f11db6e7c2320ca0fc77b9fb300cd5b2f11':
Redirect libselinux logging to dmesg for ueventd.
aadf9f11db6e7c2320ca0fc77b9fb300cd5b2f11 25-Jun-2014 Nick Kralevich <nnk@google.com> am 4ad20e55: Merge "Redirect libselinux logging to dmesg for ueventd."

* commit '4ad20e55e5a5d2acbecd564523f47056d3156638':
Redirect libselinux logging to dmesg for ueventd.
91c73f6c51bd279e494730012a8e7d5eff5cdf4f 25-Jun-2014 Ian Rogers <irogers@google.com> am 38dda3b8: am c309b97e: am e4022279: Merge "libbacktrace_libc++ needs to be multilib on the Mac too."

* commit '38dda3b8887286c44964dda0ce1c96425d9744f0':
libbacktrace_libc++ needs to be multilib on the Mac too.
38dda3b8887286c44964dda0ce1c96425d9744f0 25-Jun-2014 Ian Rogers <irogers@google.com> am c309b97e: am e4022279: Merge "libbacktrace_libc++ needs to be multilib on the Mac too."

* commit 'c309b97eb1dd689e0e15afa067640391bd2430b3':
libbacktrace_libc++ needs to be multilib on the Mac too.
c309b97eb1dd689e0e15afa067640391bd2430b3 25-Jun-2014 Ian Rogers <irogers@google.com> am e4022279: Merge "libbacktrace_libc++ needs to be multilib on the Mac too."

* commit 'e4022279e192f08c5110896917403c5eea40e151':
libbacktrace_libc++ needs to be multilib on the Mac too.
4ad20e55e5a5d2acbecd564523f47056d3156638 25-Jun-2014 Nick Kralevich <nnk@google.com> Merge "Redirect libselinux logging to dmesg for ueventd."
e4022279e192f08c5110896917403c5eea40e151 25-Jun-2014 Ian Rogers <irogers@google.com> Merge "libbacktrace_libc++ needs to be multilib on the Mac too."
c132aaf0c3668af3e5e2ef5b026143e04bfcf6cb 25-Jun-2014 Ian Rogers <irogers@google.com> libbacktrace_libc++ needs to be multilib on the Mac too.

Change-Id: I2053345253c1d57c3485b790163ba0b4b10cc326
ibbacktrace/Android.mk
42552bc66043fdd5d2bf2340e00b4c1fc0938049 25-Jun-2014 Michael Wright <michaelwr@google.com> am 9eb6e1bc: am 3888cefc: am 949bd4c2: Merge "Print ABI in backtraces."

* commit '9eb6e1bcbc54f4e2c4317a0c997e0623091ddece':
Print ABI in backtraces.
9eb6e1bcbc54f4e2c4317a0c997e0623091ddece 25-Jun-2014 Michael Wright <michaelwr@google.com> am 3888cefc: am 949bd4c2: Merge "Print ABI in backtraces."

* commit '3888cefc4d0b28707fa5f6620f05ea4954dfae83':
Print ABI in backtraces.
3888cefc4d0b28707fa5f6620f05ea4954dfae83 25-Jun-2014 Michael Wright <michaelwr@google.com> am 949bd4c2: Merge "Print ABI in backtraces."

* commit '949bd4c208fb9e2ccea2cb0ed76fafef7a5cecea':
Print ABI in backtraces.
949bd4c208fb9e2ccea2cb0ed76fafef7a5cecea 25-Jun-2014 Michael Wright <michaelwr@google.com> Merge "Print ABI in backtraces."
fab6ebafa693989a629ec9c662f0ed0668c2c42d 25-Jun-2014 JP Abgrall <jpa@google.com> am 47050442: am 31132182: am 07703339: Merge "Wait for device to disappear after "fastboot reboot"."

* commit '4705044243225ffde88910154485a84c27a33709':
Wait for device to disappear after "fastboot reboot".
80f596984e3a941353a7d179efdf86ff0181d412 21-Jun-2014 Michael Wright <michaelwr@google.com> Print ABI in backtraces.

This lets the stack tool figure out which toolchain to use
automatically.

Change-Id: Ia235d6904622423fe6fbc7b0315a1861e52a41ad
ebuggerd/backtrace.cpp
ebuggerd/tombstone.cpp
ebuggerd/utility.h
4705044243225ffde88910154485a84c27a33709 25-Jun-2014 JP Abgrall <jpa@google.com> am 31132182: am 07703339: Merge "Wait for device to disappear after "fastboot reboot"."

* commit '311321820bfbe11f88432d9b9cc8429d3f85b17b':
Wait for device to disappear after "fastboot reboot".
311321820bfbe11f88432d9b9cc8429d3f85b17b 25-Jun-2014 JP Abgrall <jpa@google.com> am 07703339: Merge "Wait for device to disappear after "fastboot reboot"."

* commit '077033391bf9dc9c73bbcebf011fc63a6501674b':
Wait for device to disappear after "fastboot reboot".
f530c93c4aab818de51fd7123199bef6621047f8 28-May-2014 Daniel Rosenberg <drosen@google.com> Added support for vendor partition and image

Modified fastboot to flash vendor.img as well. Moved symlink
for /vendor to occur after mounting partitions. Changed mount
to also create the mount point.

Change-Id: I78e1ba24e6bb8b4af96a67ee0569af579439e682
Signed-off-by: Daniel Rosenberg <drosen@google.com>
astboot/fastboot.c
s_mgr/fs_mgr.c
ootdir/init.rc
929842aaf9f79571952fcee6b3cb29c655677e43 24-Jun-2014 Elliott Hughes <enh@google.com> am 1e462eb5: am b1939864: am c4a09654: Merge "Fixed pathname for connecting to debugger."

* commit '1e462eb50a853424feda24e7de0dd8f1eaa92a12':
Fixed pathname for connecting to debugger.
1472dd465c4176bfaff912bebbd008e88f85cb65 24-Jun-2014 Christopher Ferris <cferris@google.com> am f77cf6c6: am 5450a441: am 676f3755: Merge "Add android_memset16/android_memset32 for aarch64."

* commit 'f77cf6c6986057aceece5d7e09d1c23a9efaf20c':
Add android_memset16/android_memset32 for aarch64.
ce10b191c56057e494f6b46de06b0054d77b4726 24-Jun-2014 Elliott Hughes <enh@google.com> am f6d86d75: am d08b80cc: am 20bda70f: Merge "Add Smartisan usb config"

* commit 'f6d86d75461ae3a246522932759e045dcc7a4952':
Add Smartisan usb config
1e462eb50a853424feda24e7de0dd8f1eaa92a12 24-Jun-2014 Elliott Hughes <enh@google.com> am b1939864: am c4a09654: Merge "Fixed pathname for connecting to debugger."

* commit 'b193986452f8b0d43d96f014926ee243e7ba27e2':
Fixed pathname for connecting to debugger.
f77cf6c6986057aceece5d7e09d1c23a9efaf20c 24-Jun-2014 Christopher Ferris <cferris@google.com> am 5450a441: am 676f3755: Merge "Add android_memset16/android_memset32 for aarch64."

* commit '5450a4415ca5d53abbff3f01098e6e4ddee18a66':
Add android_memset16/android_memset32 for aarch64.
f6d86d75461ae3a246522932759e045dcc7a4952 24-Jun-2014 Elliott Hughes <enh@google.com> am d08b80cc: am 20bda70f: Merge "Add Smartisan usb config"

* commit 'd08b80ccc6f7d106a8bfc410f89e466b798e2ebe':
Add Smartisan usb config
b193986452f8b0d43d96f014926ee243e7ba27e2 24-Jun-2014 Elliott Hughes <enh@google.com> am c4a09654: Merge "Fixed pathname for connecting to debugger."

* commit 'c4a09654cc2c91ad27f7d29d4584bec58d75e9f8':
Fixed pathname for connecting to debugger.
439224e27530353351c7df504fb29fad9ac776a0 24-Jun-2014 Stephen Smalley <sds@tycho.nsa.gov> Redirect libselinux logging to dmesg for ueventd.

We already do this for init, but had failed to do it for ueventd
and could not capture any logging from libselinux calls made by
ueventd.

Truly enabling non-error logging also requires uncommenting a line
in Android.mk:
LOCAL_CFLAGS += -DLOG_UEVENTS=1
which enables other logging and sets the default log level to INFO,
or otherwise changing the klog level in the ueventd code (is not
settable by init.rc loglevel).

Change-Id: I00e6f9d6271f2a21d9078c96368816d74d6d2850
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/init.c
nit/log.h
nit/ueventd.c
5450a4415ca5d53abbff3f01098e6e4ddee18a66 24-Jun-2014 Christopher Ferris <cferris@google.com> am 676f3755: Merge "Add android_memset16/android_memset32 for aarch64."

* commit '676f37554d7bfdb33dfd4420ff82c73cc581b1bd':
Add android_memset16/android_memset32 for aarch64.
d08b80ccc6f7d106a8bfc410f89e466b798e2ebe 24-Jun-2014 Elliott Hughes <enh@google.com> am 20bda70f: Merge "Add Smartisan usb config"

* commit '20bda70f9a8dff764bcbad3e711a91700fc6346b':
Add Smartisan usb config
a42d5bf0064e8c8ce50b22abe13bb6eed4ea9dac 26-Jun-2014 Narayan Kamath <narayan@google.com> Merge "pixelflinger: Use pointer arithmetic to determine cache flush parameters"
676f37554d7bfdb33dfd4420ff82c73cc581b1bd 24-Jun-2014 Christopher Ferris <cferris@google.com> Merge "Add android_memset16/android_memset32 for aarch64."
d660d895c1401fa96d65a397d0667664bca60b58 20-Jun-2014 Christopher Ferris <cferris@google.com> Add android_memset16/android_memset32 for aarch64.

Included new unit tests for these functions.

Bug: 15456369

Change-Id: I3fac02f61c62d15d54d0df51957680d7155e98ae
ibcutils/Android.mk
ibcutils/arch-arm/memset32.S
ibcutils/arch-arm64/android_memset.S
ibcutils/tests/Android.mk
ibcutils/tests/MemsetTest.cpp
6bd4588d65977956cadf2e5d384673c64329c8e8 24-Jun-2014 Riley Andrews <riandrews@google.com> resolved conflicts for merge of 079c637f to master

Change-Id: Iab9a857026de954d7497d6b0eaf3751d2d3904c7
077033391bf9dc9c73bbcebf011fc63a6501674b 25-Jun-2014 JP Abgrall <jpa@google.com> Merge "Wait for device to disappear after "fastboot reboot"."
ec25e7bc4bb8c203f89f133136a62a08410d6ceb 24-Jun-2014 Mark Wachsler <wachsler@google.com> Wait for device to disappear after "fastboot reboot".

This is a follow-up to commit 157b00171a06f9ac2fd25ee3a86e801e896713d6.
After "fastboot reboot", "fastboot devices" was still showing the device as
connected even though it was starting to reboot; now "fastboot reboot" will
wait until the device has disconnected.

The wait timeout is 3 seconds.

Change-Id: I8066741f0be91e53f3e3f5bc968bc1b9de31db05
astboot/fastboot.c
c4a09654cc2c91ad27f7d29d4584bec58d75e9f8 24-Jun-2014 Elliott Hughes <enh@google.com> Merge "Fixed pathname for connecting to debugger."
20c214f857ea97cfbfdd16c006601ff1369db0ca 24-Jun-2014 Brigid Smith <brigidsmith@google.com> Fixed pathname for connecting to debugger.

The debug output was still showing the pathname that worked with
gdbclient before my changes, and therefore did not work after the fact.

Change-Id: Ie12d79f5346088914ce0a70bda69780707b31d31
ebuggerd/debuggerd.cpp
20bda70f9a8dff764bcbad3e711a91700fc6346b 24-Jun-2014 Elliott Hughes <enh@google.com> Merge "Add Smartisan usb config"
079c637f3d269242bbc772b9207179b8cf56738a 23-Jun-2014 Riley Andrews <riandrews@google.com> am 5b45e08a: am 7950fc47: Merge "Add ability to boot from charger mode."

* commit '5b45e08aabd6dcbab527d221584fe348c73c70d4':
Add ability to boot from charger mode.
5b45e08aabd6dcbab527d221584fe348c73c70d4 23-Jun-2014 Riley Andrews <riandrews@google.com> am 7950fc47: Merge "Add ability to boot from charger mode."

* commit '7950fc47a76cf7fe2d5c5e1a25002cb7848cf155':
Add ability to boot from charger mode.
8e1f3f58e41e97cb6cf131d8bcd75e3ad2e733ad 23-Jun-2014 Elliott Hughes <enh@google.com> am 2c2fdae7: am 633be1f3: Merge "Remove android_atomic_swap from mips & mips64."

* commit '2c2fdae75490130b3df2c4989716381deaac0969':
Remove android_atomic_swap from mips & mips64.
2c2fdae75490130b3df2c4989716381deaac0969 23-Jun-2014 Elliott Hughes <enh@google.com> am 633be1f3: Merge "Remove android_atomic_swap from mips & mips64."

* commit '633be1f37e11703be90fc2c900f548a68b8c86d7':
Remove android_atomic_swap from mips & mips64.
bad62c532c8fabbada924c617d983fbfc94623e3 23-Jun-2014 Elliott Hughes <enh@google.com> am ba467827: am 29705171: Merge "[MIPS64] add atomic-mips64"

* commit 'ba46782770743ad8331047fc839c4e98060d167c':
[MIPS64] add atomic-mips64
089d3c93adfadc25a9b66760969865812a4c49c1 23-Jun-2014 Elliott Hughes <enh@google.com> am e09c8a06: am e1f17ebb: Merge "Fixing debuggerd header output."

* commit 'e09c8a06a278b382626c0ee8126da99821d69a8a':
Fixing debuggerd header output.
ba46782770743ad8331047fc839c4e98060d167c 23-Jun-2014 Elliott Hughes <enh@google.com> am 29705171: Merge "[MIPS64] add atomic-mips64"

* commit '29705171325ad923df478e41b94af812990764cd':
[MIPS64] add atomic-mips64
e09c8a06a278b382626c0ee8126da99821d69a8a 23-Jun-2014 Elliott Hughes <enh@google.com> am e1f17ebb: Merge "Fixing debuggerd header output."

* commit 'e1f17ebb7c0bd16c9bc48e0fae018e26e75e7d7f':
Fixing debuggerd header output.
f473200d355a10dca1260948acc85bf059034768 23-Jun-2014 Brigid Smith <brigidsmith@google.com> Fixing debuggerd header output.

PID and TID output line was missing.

Change-Id: I609af5727bc22ea0b97f3975ddb3cf0102910bc2
ebuggerd/tombstone.cpp
62ecd51f8a5435e925382ee1f0064655b75cc936 23-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> Merge "healthd: Avoid animation while not charging."
e6d567bd106de30e97d33a8b93b967ada5edd328 23-Jun-2014 Elliott Hughes <enh@google.com> am 8e1f3f58: am 2c2fdae7: am 633be1f3: Merge "Remove android_atomic_swap from mips & mips64."

* commit '8e1f3f58e41e97cb6cf131d8bcd75e3ad2e733ad':
Remove android_atomic_swap from mips & mips64.
7688ef0063060aa0437621aa126352ec9eca94e6 23-Jun-2014 Elliott Hughes <enh@google.com> am bad62c53: am ba467827: am 29705171: Merge "[MIPS64] add atomic-mips64"

* commit 'bad62c532c8fabbada924c617d983fbfc94623e3':
[MIPS64] add atomic-mips64
db40a578c4005b8e2ad910f18584c6b970fb7019 23-Jun-2014 Elliott Hughes <enh@google.com> am 089d3c93: am e09c8a06: am e1f17ebb: Merge "Fixing debuggerd header output."

* commit '089d3c93adfadc25a9b66760969865812a4c49c1':
Fixing debuggerd header output.
c603720aed304fdd36a5815f81eb22bd4d9968b7 23-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> ueventd: UEVENT_MSG_LEN changed to 2048 from 1048 in compliance with the
BUFFER_LEN in the kobject_uevent in kernel.

Change-Id: Ib98626f20a7c26e7718bbe4d5ec4513a1ae5d9b7
nit/devices.c
9015eaa30fec3b5763e49124d7aa822862261842 23-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> healthd: Avoid animation while not charging.

At present, charging animation runs irrespective of whether charger is
connected or not. When the charger is disconnected, device does not
shutdown for 10sec. Charger animation during this period should be
avoided.

Change-Id: I34dc5028522ca199d50a1a1b684b035b2d81ef68
ealthd/healthd_mode_charger.cpp
7950fc47a76cf7fe2d5c5e1a25002cb7848cf155 23-Jun-2014 Riley Andrews <riandrews@google.com> Merge "Add ability to boot from charger mode."
633be1f37e11703be90fc2c900f548a68b8c86d7 23-Jun-2014 Elliott Hughes <enh@google.com> Merge "Remove android_atomic_swap from mips & mips64."
a74680fcc844fe4dc0707367fc5aa5aaab1927ce 23-Jun-2014 Elliott Hughes <enh@google.com> Remove android_atomic_swap from mips & mips64.

Looks like this got left behind in mips by mistake, and
84c3e9923108122045d689f1d2412359ad5208eb carried this over to mips64.
Clean up before it wastes any more time...

Change-Id: I6aeaa6e68be81f94065589337e2f7d3483e6e43c
nclude/cutils/atomic-mips.h
nclude/cutils/atomic-mips64.h
29705171325ad923df478e41b94af812990764cd 23-Jun-2014 Elliott Hughes <enh@google.com> Merge "[MIPS64] add atomic-mips64"
e4b7b294f37d9b64d6b7c1931e2c9bfb1a500d68 17-Jun-2014 Riley Andrews <riandrews@google.com> Add ability to boot from charger mode.

Add the ability to boot up directly from charger mode, instead of forcing
charger mode to initiate a full restart to launch 'full' android. This
should shave a few seconds off of boot time on supported devices (just
manta for now).

Change-Id: Ieec4494d929e92806e039f834d78b9002afd15c4
harger/charger.c
nit/builtins.c
nit/init.c
nit/init_parser.c
nit/keywords.h
nit/property_service.c
nit/property_service.h
ootdir/init.rc
ab2a7dcef3ecfe45f9906d318b1c10a82b8c61a8 21-Jun-2014 Riley Andrews <riandrews@google.com> am 5ff6da8c: am dbb93515: Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled"

* commit '5ff6da8c6f1a9e3f2e1dbee080fb0fbc4b547ec4':
libcutils: Fix warnings in properties.c when verbose logging is enabled
5ff6da8c6f1a9e3f2e1dbee080fb0fbc4b547ec4 21-Jun-2014 Riley Andrews <riandrews@google.com> am dbb93515: Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled"

* commit 'dbb93515c9a1a60a6e824e789920f43d625a8c2a':
libcutils: Fix warnings in properties.c when verbose logging is enabled
72f66d982af8a76cc61b9bfffba07bafa88dca26 21-Jun-2014 Riley Andrews <riandrews@google.com> am 1fe97b3d: am 5bd578e1: Merge "cutils: Add property_get_bool, _get_int32, _get_int64"

* commit '1fe97b3d0f6dbc6376a0ebe1f66725e9f73b4442':
cutils: Add property_get_bool, _get_int32, _get_int64
105ecf71c2a7f683d34995dc290a4bf50413cf15 21-Jun-2014 Colin Cross <ccross@android.com> am 72d9c0b1: am 56b1d74e: Merge "init/ueventd: adds wildcard matching for ueventd rules"

* commit '72d9c0b18ed6162b769ee07a7cd61b01cb3a2e74':
init/ueventd: adds wildcard matching for ueventd rules
1fe97b3d0f6dbc6376a0ebe1f66725e9f73b4442 21-Jun-2014 Riley Andrews <riandrews@google.com> am 5bd578e1: Merge "cutils: Add property_get_bool, _get_int32, _get_int64"

* commit '5bd578e10dc417e9c8d98705366456cc613b6152':
cutils: Add property_get_bool, _get_int32, _get_int64
72d9c0b18ed6162b769ee07a7cd61b01cb3a2e74 20-Jun-2014 Colin Cross <ccross@android.com> am 56b1d74e: Merge "init/ueventd: adds wildcard matching for ueventd rules"

* commit '56b1d74e27772b7e1fa759a252ffecd9a7b03dc9':
init/ueventd: adds wildcard matching for ueventd rules
5bd578e10dc417e9c8d98705366456cc613b6152 21-Jun-2014 Riley Andrews <riandrews@google.com> Merge "cutils: Add property_get_bool, _get_int32, _get_int64"
56b1d74e27772b7e1fa759a252ffecd9a7b03dc9 20-Jun-2014 Colin Cross <ccross@android.com> Merge "init/ueventd: adds wildcard matching for ueventd rules"
d8f2a8d34a5655d81fec2f56eb3ec36bd508886a 08-Apr-2014 Igor Murashkin <iam@google.com> cutils: Add property_get_bool, _get_int32, _get_int64

* Read out system properties with same syntax as SystemProperties.java
* Also adds unit test suite to validate correctness of properties
* Also fixes buffer overrun in property_get

(cherry picked from commit d4507e9246e4855c5431cac5c3d1a9155caebc87)

Change-Id: Ifd42911f93e17da09e6ff1298e8875e02f3b6608
nclude/cutils/properties.h
ibcutils/properties.c
ibcutils/tests/Android.mk
ibcutils/tests/PropertiesTest.cpp
de7bdc9424aa598b145e108f8d34ae90921902f2 20-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> am 1a57b1d6: am c40b9f00: Merge "healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel."

* commit '1a57b1d6cb65ac496f1877d41ed6a69b79056e2a':
healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel.
1a57b1d6cb65ac496f1877d41ed6a69b79056e2a 20-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> am c40b9f00: Merge "healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel."

* commit 'c40b9f0021c159cc12119c6f92d8fe664ac677f8':
healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel.
d3ef8f416b9cd9609a0002e186fb2ab45a0a312d 20-Jun-2014 Elliott Hughes <enh@google.com> am 2520f1eb: am 37d7fdbb: Merge "Maps output now marks the fault address location."

* commit '2520f1eb9323ba2129c001cf5658c9e7912ae2a1':
Maps output now marks the fault address location.
2520f1eb9323ba2129c001cf5658c9e7912ae2a1 20-Jun-2014 Elliott Hughes <enh@google.com> am 37d7fdbb: Merge "Maps output now marks the fault address location."

* commit '37d7fdbb7491aa91b56035285cb56c0630dd5909':
Maps output now marks the fault address location.
2e8290463eff6e66e17b8afa0bcdfe4ff2e920cf 20-Jun-2014 Brigid Smith <brigidsmith@google.com> Maps output now marks the fault address location.

If the fault address is not within a mapped region, it logs an error
message after the output. Otherwise, it prefixes the location of the
fault address with "--->" to make it easier to locate.

Change-Id: I330adaade4402ffeb09f1a6d34a944c2f054d06d
ebuggerd/tombstone.cpp
c0c1ffea588c7d3c565b79d4f8bf3d4a8f75abc9 02-Jul-2012 Daniel Leung <daniel.leung@intel.com> init/ueventd: adds wildcard matching for ueventd rules

The sysfs nodes can change from devices to devices for
a particular class of peripheral. Some of them even change
after suspend/resume, e.g. rfkill for USB bluetooth adapters.

This patch adds to the way how ueventd rules with wildcard are
handled. In addition to matching the prefix with a trailing
wildcard, now rules can have wildcard anywhere in the rule.
The wildcard matching is implemented using fnmatch(), where
its matching is simliar to shell pathname expansion. It suits
this particular usage model well. To avoid abuse, the number of
slashes has to match between path name and the rule.

For example, instead of creating a rule to match:

/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.3/2-1.3:1.0/bluetooth/hci0/rfkill*

, this would suffice:

/sys/devices/pci0000:00/0000:00:1d.0/*/*/*/*/bluetooth/hci0/rfkill*

The prefix matching behavior is retained, such that those
rules do not have to pay for processing penalty with fnmatch().

Change-Id: I3ae6a39c838f6d12801cb71958e481b016f731f5
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
nit/devices.c
nit/devices.h
nit/ueventd.c
dbb93515c9a1a60a6e824e789920f43d625a8c2a 21-Jun-2014 Riley Andrews <riandrews@google.com> Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled"
1f7f70a629b9c1c37bde73f0ddbb9428a9e22be7 16-Apr-2014 Igor Murashkin <iam@google.com> libcutils: Fix warnings in properties.c when verbose logging is enabled

Change-Id: I07c5eb59b9395734ad3fc25eba753564c0f096a0
ibcutils/properties.c
ibcutils/tests/Android.mk
c40b9f0021c159cc12119c6f92d8fe664ac677f8 20-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> Merge "healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel."
37d7fdbb7491aa91b56035285cb56c0630dd5909 20-Jun-2014 Elliott Hughes <enh@google.com> Merge "Maps output now marks the fault address location."
aab0d57d18b202d059fec57c832d6443faff6ee3 20-Jun-2014 Riley Andrews <riandrews@google.com> am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"

* commit '94fa20058fbd0e4f7e3c6d1381cdb9718dd90cde':
Make indentation sane in init.rc
94fa20058fbd0e4f7e3c6d1381cdb9718dd90cde 20-Jun-2014 Riley Andrews <riandrews@google.com> am 4f5392cb: Merge "Make indentation sane in init.rc"

* commit '4f5392cb6c09618b968a4c86bbde079bef57afd1':
Make indentation sane in init.rc
e1f17ebb7c0bd16c9bc48e0fae018e26e75e7d7f 23-Jun-2014 Elliott Hughes <enh@google.com> Merge "Fixing debuggerd header output."
4f5392cb6c09618b968a4c86bbde079bef57afd1 20-Jun-2014 Riley Andrews <riandrews@google.com> Merge "Make indentation sane in init.rc"
6dfdc7cd0c9d1b266b599b3ee7f5dd3a60e45c39 19-Jun-2014 Riley Andrews <riandrews@google.com> Make indentation sane in init.rc

Change-Id: Ic632fbe1423eeef7ec958877d74db7b87fc385c6
ootdir/init.rc
25af09e16d463b33a0b6f1b5f28bdc56be895749 21-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Support parsing netlink route messages."
d7ff7ea65220718398cae1e1aa0005072229b4e7 11-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Support parsing netlink route messages.

Bug: 9180552
Change-Id: I4a36d869ac692647fb226d0912285bdf2ffcb1fa
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
9b34293566833ead1d7bac7518e5ccad0d92d61c 19-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Improvements to netlink event parsing.

1. Accept that parseNetlinkMessage can only parse one netlink
message, because its way of returning output is to modify its
member variables (mAction, mParams, etc.). Currently, it
loops through all the messages it finds, updating its member
variables as it goes along, and always returns true at the end
of the buffer. This has the following problems:

1. Since the function always returns true even when no
messages were parsed, the caller has no way to know if
parsing succeeded, and we get lots of "No subsystem found
in netlink event" logs if the buffer did not contain any
valid messages we were interested in.
2. If there are multiple messages in the buffer, all but the
last message will be silently ignored.
3. If there are multiple messages and previous messages have
more parameters than the last one, the resulting event will
have a mixture of parameters from multiple messages.

Instead of doing all this, change the contract to "parse the
first valid message of interest in the buffer and return true,
or return false if there were no such messages", and update
the code and the comments accordingly.

2. Modify the caller (NetlinkListener) so it doesn't log an
error when parseBinaryNetlinkMessage returns false, because
this can now simply mean that we weren't interested in that
particular message. parseBinaryNetlinkMessage already logs
more informative errors.

3. Provide utility functions to check received message lengths and
to convert message types to message names.

4. Simplify logging duplicate attributes.

5. Use the appropriate IFLA_xxx macros instead of rolling our own
code to parse link state messages.

6. Move all the parsing code out to per-message-type parsing
functions to order to simplify parseBinaryNetlinkMessage.

Bug: 9180552
Change-Id: I6bbc2f7a104f618674dde2369c1fd5e93ea49430
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
ibsysutils/src/NetlinkListener.cpp
4937431a4ba5896427da077c44404ca70eabb283 21-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Improvements to netlink event parsing."
409cd572ec72dc610e159e7c74ee289790440255 21-Jun-2014 Riley Andrews <riandrews@google.com> am ab2a7dce: am 5ff6da8c: am dbb93515: Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled"

* commit 'ab2a7dcef3ecfe45f9906d318b1c10a82b8c61a8':
libcutils: Fix warnings in properties.c when verbose logging is enabled
51329ff20aa914e861719e028b48f4928ff569b3 21-Jun-2014 Riley Andrews <riandrews@google.com> am 72f66d98: (-s ours) am 1fe97b3d: am 5bd578e1: Merge "cutils: Add property_get_bool, _get_int32, _get_int64"

* commit '72f66d982af8a76cc61b9bfffba07bafa88dca26':
cutils: Add property_get_bool, _get_int32, _get_int64
c7ee12d7ed313920523c01d74a9adeddc22f5a90 21-Jun-2014 Colin Cross <ccross@android.com> am 105ecf71: am 72d9c0b1: am 56b1d74e: Merge "init/ueventd: adds wildcard matching for ueventd rules"

* commit '105ecf71c2a7f683d34995dc290a4bf50413cf15':
init/ueventd: adds wildcard matching for ueventd rules
91cdb4cb9496f370d070c00698936af623458c4c 21-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> resolved conflicts for merge of de7bdc94 to master

Change-Id: Ib329587d47b21e680dbbf45d797543720ce8d688
07ce7cab72d9b3e5c701491daf8fd457d035eec8 21-Jun-2014 Rom Lemarchand <romlem@google.com> adb: use oom_score_adj instead of oom_adj

Change-Id: I76c6ce83d7d400c8b84bfece5d30189640cb2505
db/services.c
4c3d9be5945bf2235deacfc79473d86f698ea29b 21-Jun-2014 Narayan Kamath <narayan@google.com> am 8975f302: Add a zygote 64/32 bit config.

* commit '8975f302ee2eaff93ab5a7723d7afdedc660230c':
Add a zygote 64/32 bit config.
4614f5097c66991319576e9adb68a834aae19f9e 20-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> resolved conflicts for merge of de7bdc94 to master

Change-Id: I6dc10c8220c0984b31a05534b576ca25afdf5383
ealthd/healthd.cpp
545b127a7834636fb80fdcca1b293cec711d4a7d 20-Jun-2014 Elliott Hughes <enh@google.com> am d3ef8f41: am 2520f1eb: am 37d7fdbb: Merge "Maps output now marks the fault address location."

* commit 'd3ef8f416b9cd9609a0002e186fb2ab45a0a312d':
Maps output now marks the fault address location.
8975f302ee2eaff93ab5a7723d7afdedc660230c 21-May-2014 Narayan Kamath <narayan@google.com> Add a zygote 64/32 bit config.

64 bit zygote is the "primary" and the system server is run
as a 64 bit process.

(cherry picked from commit 7cdbbcabda9906910548954f0a35cdea366ef467)

Change-Id: I56363e08b546dead14c2ee46b0069235cc4597e8
ootdir/init.zygote64_32.rc
2181407511fe07dae699a9e35e1afa621c1874ac 20-Jun-2014 JP Abgrall <jpa@google.com> Merge "[HACK]fs_mgr: force recovery+wipe if data looks wiped"
4bb7bba118ae02b8f4c52d5c7eeac15514794971 20-Jun-2014 JP Abgrall <jpa@google.com> [HACK]fs_mgr: force recovery+wipe if data looks wiped

We do the recovery+wipe if
- the mount fails and
- the partition is forceencrypt
- the partition seems wiped (== the 1st 4KB are all 0x00 or 0xFF).

This is a hack until we get the flashstation up and running with f2fs.
Bug: 15731906

The alternative would be for the user to manually enter
recovery and wipe his device.

Bug: 15747366
Change-Id: Ic8f3ef59f3d7d01d5d93d8e4c01502080f422157
Signed-off-by: JP Abgrall <jpa@google.com>
s_mgr/fs_mgr.c
53f24c2f940b946805821db1036466d95061b1e1 20-Jun-2014 Riley Andrews <riandrews@google.com> am aab0d57d: am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"

* commit 'aab0d57d18b202d059fec57c832d6443faff6ee3':
Make indentation sane in init.rc
188fdd1c0f71a19d1b4656eb3ad8a19eff60af40 19-Jun-2014 JP Abgrall <jpa@google.com> Merge "fastboot: Allow searching for needed dynamic libs in '.' (F2FS)"
436abebf8c7df9e528e534b3c8dab955449c055b 19-Jun-2014 JP Abgrall <jpa@google.com> fastboot: Allow searching for needed dynamic libs in '.' (F2FS)

Currently the default rpath includes $ORIGIN/../lib
So we throw in '.' which should help distributions of fastboot.

readelf -d $(which fastboot)|grep RPATH
0x0000000f (RPATH) Library rpath: [$ORIGIN/../lib:.]

Bug: 15731906
Change-Id: I2f4345d178e5b3c87f6f159faf105ae30f3b52eb
Signed-off-by: JP Abgrall <jpa@google.com>
astboot/Android.mk
a3098b9ada4f9464ae1870117ae4afa17d1e360e 19-Jun-2014 Ying Wang <wangying@google.com> Merge "Store libf2fs_fmt_host_dyn on the build server."
6b048ce839ce0bcbce684284f68a2f32ee9d764c 19-Jun-2014 Ying Wang <wangying@google.com> Store libf2fs_fmt_host_dyn on the build server.

It will be dynamically loaded by fastboot.

Bug: 15731906
Change-Id: Iff6f2b745b4ffd2c5fe343160b3efb8dcd5702fa
astboot/Android.mk
ec249c84ba526c27e75caf5d289f01aabb683d8b 19-Jun-2014 Elliott Hughes <enh@google.com> am f0a4855c: am c28e3c31: am a4fb975e: Merge "Fix debuggerd "format \'%p\'" build breakage."

* commit 'f0a4855c2f6331690bee33db9b5a83de816921bb':
Fix debuggerd "format '%p'" build breakage.
9363b2668e847c8fec77224ae1f4ec155351862c 19-Jun-2014 Elliott Hughes <enh@google.com> am e8b65473: am dc0261f9: am 030ba83c: Merge "Updated non-ARM archs to reflect logging changes."

* commit 'e8b654733931eaf5c63d816ae41f7d38ac146e36':
Updated non-ARM archs to reflect logging changes.
04db8a55b847413ee63d19efbc3f3bdc7dd395bb 19-Jun-2014 Ruchi Kandoi <kandoiruchi@google.com> healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with
BUFFER_LEN in the kobject_uevent in kernel.

Change-Id: Ia9f4b520847d40fe4e032875dfb79bd063bc723d
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
ealthd/healthd.cpp
787a2a697e0affb6e2c5785204e70a586d5696a0 19-Jun-2014 Elliott Hughes <enh@google.com> Fix debuggerd "format '%p'" build breakage.

Change-Id: I589d44485e55c23d1f1a6edfa8310a90cac2429e
ebuggerd/debuggerd.cpp
f0a4855c2f6331690bee33db9b5a83de816921bb 19-Jun-2014 Elliott Hughes <enh@google.com> am c28e3c31: am a4fb975e: Merge "Fix debuggerd "format \'%p\'" build breakage."

* commit 'c28e3c310c3815dbf1ebdcde82b1971984aeeb7f':
Fix debuggerd "format '%p'" build breakage.
c28e3c310c3815dbf1ebdcde82b1971984aeeb7f 19-Jun-2014 Elliott Hughes <enh@google.com> am a4fb975e: Merge "Fix debuggerd "format \'%p\'" build breakage."

* commit 'a4fb975e3d85b7668aa6f564c6a0d4d85f550f2e':
Fix debuggerd "format '%p'" build breakage.
e8b654733931eaf5c63d816ae41f7d38ac146e36 19-Jun-2014 Elliott Hughes <enh@google.com> am dc0261f9: am 030ba83c: Merge "Updated non-ARM archs to reflect logging changes."

* commit 'dc0261f9d159cb120f450ff5665fee36b65be38b':
Updated non-ARM archs to reflect logging changes.
dc0261f9d159cb120f450ff5665fee36b65be38b 19-Jun-2014 Elliott Hughes <enh@google.com> am 030ba83c: Merge "Updated non-ARM archs to reflect logging changes."

* commit '030ba83c28c4d6faa23ccb20d1001b9be6464c3a':
Updated non-ARM archs to reflect logging changes.
e6880b74536af86c265d0dac05bc0d4cc43af395 19-Jun-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of 476b069a to master

Change-Id: I647232e584ba29c0a7b57e1f6e520f05f7986bb1
476b069aa0e86707847b2e7915cde3782aa0e0a8 19-Jun-2014 Elliott Hughes <enh@google.com> am a0619be0: am 32cd6ec6: Merge "Removed log.quiet and log = NULL cases from debuggerd."

* commit 'a0619be0f6180074109c8b7097147a11b9934953':
Removed log.quiet and log = NULL cases from debuggerd.
a0619be0f6180074109c8b7097147a11b9934953 19-Jun-2014 Elliott Hughes <enh@google.com> am 32cd6ec6: Merge "Removed log.quiet and log = NULL cases from debuggerd."

* commit '32cd6ec6a71a2e022fc39278287f1b8751338b0e':
Removed log.quiet and log = NULL cases from debuggerd.
32cd6ec6a71a2e022fc39278287f1b8751338b0e 19-Jun-2014 Elliott Hughes <enh@google.com> Merge "Removed log.quiet and log = NULL cases from debuggerd."
50eb546ec1584c04cf18f1941a042d7c5d045a67 18-Jun-2014 Brigid Smith <brigidsmith@google.com> Removed log.quiet and log = NULL cases from debuggerd.

Now the functionality implemented by these semi-confusing cases has been
replaced with the same logtype enum behavior that is easier to
understand, and cases that used log-looking behavior to print to logcat
(when log = NULL) now use the more transparent ALOGE/ALOGD functions.

Change-Id: I7e38f2d4ca74a828df4d2266b3ea34edd3c6f5bb
ebuggerd/backtrace.cpp
ebuggerd/debuggerd.cpp
ebuggerd/tombstone.cpp
ebuggerd/tombstone.h
ebuggerd/utility.cpp
ebuggerd/utility.h
ce30de3553ecaaa0a85eec8a788e808630d766b4 11-Jun-2014 Eric Laurent <elaurent@google.com> audio: added new audio formats.

Bug: 9428304.

Change-Id: Ife1f6968a8d079b477b5afb5e5cf544e8fe3298f
nclude/system/audio.h
b10fb88e1ea02bce8c052d51662fe2c6fd00f275 19-Jun-2014 Colin Cross <ccross@android.com> am d7d9b6fc: am f02fd9f0: am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"

* commit 'd7d9b6fcaa415ea6251e45d84b95a95740ea807e':
adb: Add USB vendor ID for Honeywell
d7d9b6fcaa415ea6251e45d84b95a95740ea807e 19-Jun-2014 Colin Cross <ccross@android.com> am f02fd9f0: am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"

* commit 'f02fd9f0b061d29bb872664479ed4a5949d23ac9':
adb: Add USB vendor ID for Honeywell
f02fd9f0b061d29bb872664479ed4a5949d23ac9 19-Jun-2014 Colin Cross <ccross@android.com> am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"

* commit '5e504a4e64824e3e7132b2e4b3f68c02f417466e':
adb: Add USB vendor ID for Honeywell
410ae2fe8e5d78cbce7b20be87828c5595e76842 19-Jun-2014 Ashok Bhat <ashok.bhat@arm.com> pixelflinger: Use pointer arithmetic to determine cache flush parameters

CodeCache casts base address to long and then adds size (of type
ssize_t) to get end address. This can cause sign-extension problems.
This patch instead uses simple pointer arithmetic.

Change-Id: Ib71d515a6fd6a7f4762cf974d6cf4eba9a601fa8
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ibpixelflinger/codeflinger/CodeCache.cpp
bb8aec417531010eadc27bdfed0c19fc5f669fbc 19-Jun-2014 Colin Cross <ccross@android.com> am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"

* commit '08c704a0fe64927fa8618c576c20e39de7f1aa19':
Use inet_ntoa to display ipaddr and mask values
08c704a0fe64927fa8618c576c20e39de7f1aa19 19-Jun-2014 Colin Cross <ccross@android.com> am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"

* commit '1a9e9c203bd2240e7b7768c74c5da1bcf107f159':
Use inet_ntoa to display ipaddr and mask values
1a9e9c203bd2240e7b7768c74c5da1bcf107f159 19-Jun-2014 Colin Cross <ccross@android.com> am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"

* commit '974a4f3e00861da9aa1301efd5c349c3e2a5cf07':
Use inet_ntoa to display ipaddr and mask values
030ba83c28c4d6faa23ccb20d1001b9be6464c3a 19-Jun-2014 Elliott Hughes <enh@google.com> Merge "Updated non-ARM archs to reflect logging changes."
e17f267b2a54d4b1a2b440a94ce06818ece49c7b 19-Jun-2014 Brigid Smith <brigidsmith@google.com> Updated non-ARM archs to reflect logging changes.

Change-Id: I0af865881c19ea4a57ec1aa9455bc32c08a60d75
ebuggerd/arm64/machine.cpp
ebuggerd/mips/machine.cpp
ebuggerd/x86/machine.cpp
ebuggerd/x86_64/machine.cpp
974a4f3e00861da9aa1301efd5c349c3e2a5cf07 19-Jun-2014 Colin Cross <ccross@android.com> Merge "Use inet_ntoa to display ipaddr and mask values"
9875ee97c7119f52fc6ce9f5e176e009faf9a753 19-Jun-2014 Bhanu Chetlapalli <bhanu@mips.com> Use inet_ntoa to display ipaddr and mask values

Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Iee72a6b987e4ec1c720e925b59e9e2631ae978e5
oolbox/ifconfig.c
fd9cfb4c226fe76b50d828c737e7664d8b04a59b 19-Jun-2014 Ying Wang <wangying@google.com> am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."

* commit '68d97430dd2cc25bb753df748d859415520a7dcb':
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
68d97430dd2cc25bb753df748d859415520a7dcb 19-Jun-2014 Ying Wang <wangying@google.com> am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."

* commit '4924d10ae04574a15d94c6812153321af59a3e5b':
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
a4fb975e3d85b7668aa6f564c6a0d4d85f550f2e 19-Jun-2014 Elliott Hughes <enh@google.com> Merge "Fix debuggerd "format '%p'" build breakage."
e901c1bf8ab7455ccb013244959045d4cddc124b 19-Jun-2014 Elliott Hughes <enh@google.com> Fix debuggerd "format '%p'" build breakage.

Change-Id: I589d44485e55c23d1f1a6edfa8310a90cac2429e
ebuggerd/debuggerd.cpp
5e504a4e64824e3e7132b2e4b3f68c02f417466e 19-Jun-2014 Colin Cross <ccross@android.com> Merge "adb: Add USB vendor ID for Honeywell"
8c4c8e8988411449ecb2f50c25d3e4188e81e7c0 19-Jun-2014 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for Honeywell

Change-Id: Ib92eca23a6c75ec9323bb1b0e7d7f8cd5f9ca207
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
db/usb_vendors.c
4700dfa0fbb9be31809b250c001d0275ce0b38dc 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 8d782f51: am 3f55d2f4: Merge "logcat: test: modernize"

* commit '8d782f5170960f023a77be656e60398390aa58aa':
logcat: test: modernize
8d782f5170960f023a77be656e60398390aa58aa 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 3f55d2f4: Merge "logcat: test: modernize"

* commit '3f55d2f4e69dd155d558fc2aa38e6f9bb0900152':
logcat: test: modernize
4224edf51dcddf9e014b198bb23fc40ef61a5834 18-Jun-2014 Nick Kralevich <nnk@google.com> am 89e4fad0: am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"

* commit '89e4fad09e1ae765ab0be1580a468bc0837ef7e4':
adbd: unconditionally call setgroups
89e4fad09e1ae765ab0be1580a468bc0837ef7e4 18-Jun-2014 Nick Kralevich <nnk@google.com> am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"

* commit '4e6aa6a227401d8b56c9b149719b1e0de6afd6e8':
adbd: unconditionally call setgroups
5a69c1db365323f984c6a8afd1fc035551e96d99 18-Jun-2014 Christopher Ferris <cferris@google.com> DO NOT MERGE Restore libcorkscrew unwinding.

Bug: 15701117
Change-Id: I1d2164726b8f421d8e6741b84749fddb86b60809
ibbacktrace/Android.mk
93a67779dc0d85d71dfe333244084341be0aa458 19-Jun-2014 JP Abgrall <jpa@google.com> Merge "fsmgr: support multiple fs-types/mountpoint"
5c01dac6d81a804dcff233da777882bec852f25b 18-Jun-2014 JP Abgrall <jpa@google.com> fsmgr: support multiple fs-types/mountpoint

Previous attempt was broken.
It would incorrectly be affected by mount failures.

This changes allows an fstab to contain multiple lines for a given
mount point.
The lines sharing a mount MUST be after each other.

The 1st matching line is the primary when it comes to mounting
and look ups for wiping.

Mounting based on a mount_point will attempt each dup in turn
until one succeeds.
The reported error will be that of the last failed attempt.

This is to allow quick experimentation between different FSes.

Bug: 15702546
Change-Id: I378d68ad13eb0098ec1ccb8dcf108b82acbe9ebb
Signed-off-by: JP Abgrall <jpa@google.com>
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/include/fs_mgr.h
da7a448f38cd812b3d2519381dcae23a4dc305bb 19-Jun-2014 JP Abgrall <jpa@google.com> Merge "fastboot: correctly set dependency on f2fs dynamic lib"
e35e709ecb71cee0055625e111773ca3c480c0b1 19-Jun-2014 Ying Wang <wangying@google.com> am fd9cfb4c: am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."

* commit 'fd9cfb4c226fe76b50d828c737e7664d8b04a59b':
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
025133a8db4b78dae5c4ed904179b77f9620d51e 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 4700dfa0: am 8d782f51: am 3f55d2f4: Merge "logcat: test: modernize"

* commit '4700dfa0fbb9be31809b250c001d0275ce0b38dc':
logcat: test: modernize
000a62f64424f0dafa83c9f0fffb07e8ab49f540 18-Jun-2014 Nick Kralevich <nnk@google.com> am 4224edf5: am 89e4fad0: am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"

* commit '4224edf51dcddf9e014b198bb23fc40ef61a5834':
adbd: unconditionally call setgroups
e53714bf59db13d0e0cd6f4b0c5361fd49697abe 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 2757d76c: am deae968a: am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"

* commit '2757d76cd6f0b0c0560751f5e8b9c2656692ffa9':
logd: Allow apps to clear their UID-specific data
722e859dec25b97e6d535ebfc545e78d0b2acc0c 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 9f621cf8: am 6bda7716: am 9e7bef0e: Merge changes I759c65e8,I97699037

* commit '9f621cf8724859419bbb058f197a0b4fa691aa4e':
logd: test: deal with spam filter turned off
logd: test: modernize
2757d76cd6f0b0c0560751f5e8b9c2656692ffa9 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am deae968a: am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"

* commit 'deae968a2c6384531d208f00f27085f5d725989f':
logd: Allow apps to clear their UID-specific data
9f621cf8724859419bbb058f197a0b4fa691aa4e 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 6bda7716: am 9e7bef0e: Merge changes I759c65e8,I97699037

* commit '6bda7716405f3ddc8571c578beaaac4368c840d0':
logd: test: deal with spam filter turned off
logd: test: modernize
deae968a2c6384531d208f00f27085f5d725989f 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"

* commit '4da93e34388748879a25974ee33ff1eb6cc47cd2':
logd: Allow apps to clear their UID-specific data
6bda7716405f3ddc8571c578beaaac4368c840d0 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 9e7bef0e: Merge changes I759c65e8,I97699037

* commit '9e7bef0ef91e819a11ceb8b14489cb451970e62e':
logd: test: deal with spam filter turned off
logd: test: modernize
64c0ff21e484331bcd796284bc16160ab04f53e2 18-Jun-2014 JP Abgrall <jpa@google.com> fastboot: correctly set dependency on f2fs dynamic lib

In the past it would incorrectly also link against the dlopen()'d lib.

Now it clearly does not care about it.

ldd $(which fastboot)
linux-gate.so.1 => (0xf7735000)
libdl.so.2 => /lib/i386-linux-gnu/libdl.so.2 (0xf76d9000)
libstdc++.so.6 => /usr/lib/i386-linux-gnu/libstdc++.so.6 (0xf75f4000)
libm.so.6 => /lib/i386-linux-gnu/libm.so.6 (0xf75c7000)
libgcc_s.so.1 => /lib/i386-linux-gnu/libgcc_s.so.1 (0xf75a9000)
libc.so.6 => /lib/i386-linux-gnu/libc.so.6 (0xf73ff000)
/lib/ld-linux.so.2 (0xf7736000)

Bug: 15717498
Change-Id: I5465e97a445b17f5493a1f590e181ef98a382451
Signed-off-by: JP Abgrall <jpa@google.com>
astboot/Android.mk
11d8ac2afb48aad2ae4e71042107f7d79a15c5c4 18-Jun-2014 Torne (Richard Coles) <torne@google.com> Only try and use f2fs on linux.

F2FS was already disabled on windows, but the library doesn't build for
mac either, so only try and use it on Linux hosts.

Change-Id: I8bacfa4c01c9ee13123aef6d05d17b3f9094c765
astboot/Android.mk
528c13eb07069028cd62d8caca2bd2074445cc91 18-Jun-2014 Nick Kralevich <nnk@google.com> property_service: get rid of hard coded property / control list

Don't force people to make modifications to property_service.c
when handling properties. Exclusively use the SELinux rules,
which are more flexible and easily adjusted.

Change-Id: Ic0bbd01b5df2eef0040286ac59c0a01e9bd14315
nit/property_service.c
55e298e6dc2a3e30046fe178ddb836bf9c7c7849 18-Jun-2014 JP Abgrall <jpa@google.com> Merge "fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)"
f786fe54388cb4461f8e13845ca6a1df0d2e1236 18-Jun-2014 JP Abgrall <jpa@google.com> fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)

This is apparently breaking N5, so reverting for now.

This reverts commit a794f86522f9125f2547c94ebc7c74d1e7ace013.

Bug: 15709256
Change-Id: I37a5160eead17e153e2c83fa94632ffa5d8553c2
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/include/fs_mgr.h
6bd72beff6136a8e83f781a47d76cd395e673799 18-Jun-2014 JP Abgrall <jpa@google.com> fastboot: fix windows sdk build (don't do f2fs dyn load on windows)

Only do f2fs dynamic loading on linux.
Adds a stub for windows builds.

Change-Id: I7bbaaa1b2ff5992709d904b7ace40ae263d32922
Signed-off-by: JP Abgrall <jpa@google.com>
astboot/Android.mk
astboot/fs.c
a794f86522f9125f2547c94ebc7c74d1e7ace013 18-Jun-2014 JP Abgrall <jpa@google.com> fsmgr: allow for a multiple fs-types for a mount point.

This changes allows an fstab to contain multiple lines for a given
mount point.
The lines sharing a mount MUST be after each other.

The 1st matching line is the primary when it comes to mounting
and look ups for wiping.

Mounting based on a mount_point will attempt each dup in turn
until one succeeds.

This is to allow quick experimentations between different FSes.
It does not deal with checkfs yet, because the underlying invocation
of fs-type appropriate fsck does not handle the error code.
Only the primary FS (1st in the dups) is checked.

Change-Id: I8329737454b53e2681436fe85cd00a9bc522676b
Signed-off-by: JP Abgrall <jpa@google.com>
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/include/fs_mgr.h
1235158c29909132fbe9aa52939061fc81f0800e 18-Jun-2014 JP Abgrall <jpa@google.com> F2FS support for fastboot format and fsmgr

- Enables fsck.f2fs for partitions with type F2FS.
- Adds support for f2fs as format fs-type.
- f2fs is optional and support is dlopen()d when needed.

Needs changes in
system/extras/f2fs_utils
external/f2fs-tools

Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
astboot/Android.mk
astboot/fs.c
s_mgr/fs_mgr.c
d478aec2a9aea7c0e041a9c4f81202fa77862622 18-Jun-2014 Elliott Hughes <enh@google.com> am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."

* commit 'bd80e0d8e6de5c2d4fbd2e8a1bc750dc6e0b7e20':
Changed maps output in debuggerd.
bd80e0d8e6de5c2d4fbd2e8a1bc750dc6e0b7e20 18-Jun-2014 Elliott Hughes <enh@google.com> am 0ef3fa24: Merge "Changed maps output in debuggerd."

* commit '0ef3fa24fb0c3c58b8440527e4de4f3f98ddaaa5':
Changed maps output in debuggerd.
4e6aa6a227401d8b56c9b149719b1e0de6afd6e8 18-Jun-2014 Nick Kralevich <nnk@google.com> Merge "adbd: unconditionally call setgroups"
e5cbf4e0441a280985cb4768d5ce65d70fc9c725 18-Jun-2014 Nick Kralevich <nnk@google.com> adbd: unconditionally call setgroups

We should ensure that the appropriate supplementary groups are
set, regardless of whether we're running UID=0 or UID=shell.

Change-Id: I3a1624a574102be08176a41f9c7eb5f82af2b3e5
db/adb.c
4da93e34388748879a25974ee33ff1eb6cc47cd2 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Allow apps to clear their UID-specific data"
3f55d2f4e69dd155d558fc2aa38e6f9bb0900152 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: test: modernize"
9879ac8e1290d744fc4363e6a976516053d5f64d 03-Jun-2014 Mark Salyzyn <salyzyn@google.com> logcat: test: modernize

- split sequential sort output test out as a benchmark check
- Allow up to two failures of sort results because of occasional reader locks.
- logcat -g output was changed to handle wider set of values incorporating a
multiplier for UX, and would not pass test if 'logcat -G 1M' was run.
- If spam filter is turned off, prune checks would fail, allowed for an
empty default.

Change-Id: I06d6089e18279df7525d1c16a1f76b3125ddbf05
ogcat/tests/Android.mk
ogcat/tests/logcat_benchmark.cpp
ogcat/tests/logcat_test.cpp
4924d10ae04574a15d94c6812153321af59a3e5b 19-Jun-2014 Ying Wang <wangying@google.com> Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
2359b3c1621ff9af7fe2fb3d7f0707ef2efe2440 14-Jun-2014 Ying Wang <wangying@google.com> Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.

(cherry picked from commit 7011a85606bfdeefbd5f8db668c69b61e8d612a5)

Change-Id: I025fe1f64c87fd406b3a3bf3d20fd3b78be8a940
ootdir/Android.mk
9e7bef0ef91e819a11ceb8b14489cb451970e62e 18-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge changes I759c65e8,I97699037

* changes:
logd: test: deal with spam filter turned off
logd: test: modernize
6e9aaae9eda474beea26802c360b45e96402399a 13-Jun-2014 Mark Salyzyn <salyzyn@google.com> logd: test: deal with spam filter turned off

Change-Id: I759c65e869d0c7cd81063fa7993ba3d67ef9cd06
ogd/tests/logd_test.cpp
0c57bd864d2353e8f03c8b128bdacb58fc5dce95 06-Jun-2014 Mark Salyzyn <salyzyn@google.com> logd: test: modernize

- Correct default tense for kernel or user logger
- harden code that parses the benchmark data
- give more meaning to the spam filter test

Change-Id: I97699037ca9d56718f53f08d22be79092fb431de
ogd/tests/Android.mk
ogd/tests/logd_test.cpp
e1f7c176f6e6fe9349f3c238bde31c62b09e534a 17-Jun-2014 Elliott Hughes <enh@google.com> am 6419687f: am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."

* commit '6419687fe05ea5b64e3db4f380f45b157d6fa10a':
Fixed logcat debug output issue.
6419687fe05ea5b64e3db4f380f45b157d6fa10a 17-Jun-2014 Elliott Hughes <enh@google.com> am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."

* commit '929c7fe179dc8c7ca0e0f0268ffb1213d0c929f4':
Fixed logcat debug output issue.
929c7fe179dc8c7ca0e0f0268ffb1213d0c929f4 17-Jun-2014 Elliott Hughes <enh@google.com> am 5bc6b5b8: Merge "Fixed logcat debug output issue."

* commit '5bc6b5b804546c683953393441e697e0eb84ac48':
Fixed logcat debug output issue.
0ef3fa24fb0c3c58b8440527e4de4f3f98ddaaa5 18-Jun-2014 Elliott Hughes <enh@google.com> Merge "Changed maps output in debuggerd."
7b2078eeb4f68f3a81695de64ec8df003d3f8e3c 17-Jun-2014 Brigid Smith <brigidsmith@google.com> Changed maps output in debuggerd.

Now the map output is only sent to the tombstone, and the entire
contents of /prod/$PID/maps is logged, not just 3 lines. Additionally,
crasher now supports "crasher SIGSEGV-non-null", which attempts to write to a
dereferenced function address, causing a SIGSEGV at a non-zero address.
This new crasher mode can be used to test the new maps output.

Bug: 15343662
Change-Id: I796d92e8352a6b9714bbbfe96f3143c56565ef2f
ebuggerd/crasher.c
ebuggerd/tombstone.cpp
5bc6b5b804546c683953393441e697e0eb84ac48 17-Jun-2014 Elliott Hughes <enh@google.com> Merge "Fixed logcat debug output issue."
1babede38b2431b3148d9ff387d309b3070ebfe8 17-Jun-2014 Brigid Smith <brigidsmith@google.com> Fixed logcat debug output issue.

Change-Id: Ibeb048b683ec11b05af23371e5e4b17cdd50fea0
ebuggerd/utility.cpp
e14efeac9a75edfa0cc58d8bb98b8a5ae56689b6 18-Jun-2014 JP Abgrall <jpa@google.com> Merge topic 'f2fs'

* changes:
fsmgr: allow for a multiple fs-types for a mount point.
F2FS support for fastboot format and fsmgr
429502d4da13efc904c23e820280e18bc3897e8e 18-Jun-2014 Elliott Hughes <enh@google.com> am d478aec2: am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."

* commit 'd478aec2a9aea7c0e041a9c4f81202fa77862622':
Changed maps output in debuggerd.
4436749284dc2b74e6e0f430d0f803d1b7862d19 17-Jun-2014 Ian Rogers <irogers@google.com> am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."

* commit '4ac17e3b1979f3dcdc2b515fc9d1f349f1b21da6':
Enable host multilib for ART testing.
4ac17e3b1979f3dcdc2b515fc9d1f349f1b21da6 17-Jun-2014 Ian Rogers <irogers@google.com> am 4dfe6faa: Merge "Enable host multilib for ART testing."

* commit '4dfe6faa932e255413dc4dbbaada7e19dd01efd4':
Enable host multilib for ART testing.
545c6599fa2702a3a220f486367e9df42b20e0b6 17-Jun-2014 Nick Kralevich <nnk@google.com> am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."

* commit 'a029d14d03ecc9bde97b9394298c5123c14be081':
Extend ueventd to use the label-by-symlink support in libselinux.
a029d14d03ecc9bde97b9394298c5123c14be081 17-Jun-2014 Nick Kralevich <nnk@google.com> am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."

* commit '2af91ffb6c5f93ecbc322183c755bb249edc2488':
Extend ueventd to use the label-by-symlink support in libselinux.
5695df2427f115274a8f1f99e5039b2886a186af 17-Jun-2014 William Luh <williamluh@google.com> Merge "Add event log tag for Safety Net."
9db200f7ade51a7c6fcfaf0eac9db4351f354c50 17-Jun-2014 Ian Rogers <irogers@google.com> am 44367492: am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."

* commit '4436749284dc2b74e6e0f430d0f803d1b7862d19':
Enable host multilib for ART testing.
3a53b49075d53434212875c139d6c1ca074429d8 17-Jun-2014 Nick Kralevich <nnk@google.com> am 545c6599: am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."

* commit '545c6599fa2702a3a220f486367e9df42b20e0b6':
Extend ueventd to use the label-by-symlink support in libselinux.
66929dbe1b38566af36c74ad71e9d7eb8a4cda72 16-Jun-2014 William Luh <williamluh@google.com> Add event log tag for Safety Net.

This is for clients who log to EventLog and want Safety Net to
pick up and send the logs.

Bug:15572351
Change-Id: I6fdbe7905ec8b3b27a36eb38aee61c97bcd8d4bf
ogcat/event.logtags
4dfe6faa932e255413dc4dbbaada7e19dd01efd4 17-Jun-2014 Ian Rogers <irogers@google.com> Merge "Enable host multilib for ART testing."
5af80aa11953a39532042192bbbb76e68ce66fcf 17-Jun-2014 Ian Rogers <irogers@google.com> Enable host multilib for ART testing.

Change-Id: Ic3ae5122eba13565fb5a4cb1bd0e7e465fb2140c
ibbacktrace/Android.build.mk
ibbacktrace/Android.mk
ibziparchive/Android.mk
2af91ffb6c5f93ecbc322183c755bb249edc2488 17-Jun-2014 Nick Kralevich <nnk@google.com> Merge "Extend ueventd to use the label-by-symlink support in libselinux."
97690a28ea4f2d845027b52d84553b521a3174e7 17-Jun-2014 Nick Kralevich <nnk@google.com> Merge "fs_mkdirs: use O_NOFOLLOW and O_CLOEXEC"
30a86ebc7a0f5a2e0fc698f432ee626cd96525b8 17-Jun-2014 Nick Kralevich <nnk@google.com> fs_mkdirs: use O_NOFOLLOW and O_CLOEXEC

Don't follow symlinks. Suggestion from Jann Horn.

Also, add O_CLOEXEC. This prevents file descriptor leakage should
this code ever run in a multithreaded environment.

I'm not sure if either of these changes actually address any
security concerns, but it's harmless, so go ahead and add it.

Bug: 15675141
Change-Id: I7ba4e9d10439b7150f59759b54e3ad8ccba411e3
ibcutils/fs.c
b3afd6c7f47c0e734eab2ec707b0194c4a62ffc9 17-Jun-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of 96021e03 to master

Change-Id: I60815f9581cdd5b43be5b0ef0612db3dcce2dcdb
96021e03d6bfb3228e2c6b9c1530101685be2217 16-Jun-2014 Elliott Hughes <enh@google.com> am e3c2e761: am 46a97883: Merge "Changing how debuggerd filters log messages to different locations."

* commit 'e3c2e761ffb9de62dd277673a6c9a486362cef8b':
Changing how debuggerd filters log messages to different locations.
e3c2e761ffb9de62dd277673a6c9a486362cef8b 16-Jun-2014 Elliott Hughes <enh@google.com> am 46a97883: Merge "Changing how debuggerd filters log messages to different locations."

* commit '46a97883e7eb12fa00946f8ba6eb578e6514ea1c':
Changing how debuggerd filters log messages to different locations.
46a97883e7eb12fa00946f8ba6eb578e6514ea1c 16-Jun-2014 Elliott Hughes <enh@google.com> Merge "Changing how debuggerd filters log messages to different locations."
62ba489ba00a2689d4e257bc178cff87495f99d7 10-Jun-2014 Brigid Smith <brigidsmith@google.com> Changing how debuggerd filters log messages to different locations.

The system by which debuggerd filters its output to different locations
is now based on an enum called logtype with easy to understand
categories for log messages (like THREAD, MEMORY, etc.) instead of the
old, fairly esoteric scope_flags variable. Now much of the output that
previously went to logcat does not show up on the screen, but all output
can be found in the tombstone file. In addition, the tombstone's
location is now printed so it can be located easily.

Bug: 15341747
Change-Id: Ia2f2051d1dfdea934d0e6ed220f24345e35ba6a2
ebuggerd/arm/machine.cpp
ebuggerd/arm64/machine.cpp
ebuggerd/backtrace.cpp
ebuggerd/backtrace.h
ebuggerd/debuggerd.cpp
ebuggerd/machine.h
ebuggerd/mips/machine.cpp
ebuggerd/tombstone.cpp
ebuggerd/utility.cpp
ebuggerd/utility.h
ebuggerd/x86/machine.cpp
ebuggerd/x86_64/machine.cpp
def14fc4ed5e38ea942cc6cb8d7d8a68568cf729 16-Jun-2014 Elliott Hughes <enh@google.com> am cd0d5935: am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."

* commit 'cd0d593569d7f2b8f8ec81ab3ef6dd942230e973':
Add gionee USB vendor id.
cd0d593569d7f2b8f8ec81ab3ef6dd942230e973 16-Jun-2014 Elliott Hughes <enh@google.com> am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."

* commit '6c65cd5db84361c66983903638ddb251762f9151':
Add gionee USB vendor id.
6c65cd5db84361c66983903638ddb251762f9151 16-Jun-2014 Elliott Hughes <enh@google.com> am 60218f19: Merge "Add gionee USB vendor id."

* commit '60218f19c94a12ab38444dc598cbb8f8db1f72ca':
Add gionee USB vendor id.
60218f19c94a12ab38444dc598cbb8f8db1f72ca 16-Jun-2014 Elliott Hughes <enh@google.com> Merge "Add gionee USB vendor id."
4f8d3be3b2a78813a0769ec787a29789c27cf21e 16-Jun-2014 xuefeng cai <caixuefeng130@gmail.com> Add gionee USB vendor id.

Change-Id: I3745f0e8462d0bffcd2eb4d926a9d2f9af8578f9
db/usb_vendors.c
b4c5200f51c3568f604a4557119ab545a6ddac94 12-Jun-2014 Stephen Smalley <sds@tycho.nsa.gov> Extend ueventd to use the label-by-symlink support in libselinux.

When ueventd creates a device node, it may also create one or more
symlinks to the device node. These symlinks may be the only stable
name for the device, e.g. if the partition is dynamically assigned.
A corresponding change with the same Change-Id to external/libselinux
introduces selabel_lookup_best_match() to support looking up the "best match"
for a device node based on its real path (key) and any links to it
(aliases). This change updates ueventd to use this new interface
to find the best match for the device node when creating it.

Change-Id: Id6c2597eee2b6723a5089dcf7c450f8d0a4128f4
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/devices.c
7011a85606bfdeefbd5f8db668c69b61e8d612a5 14-Jun-2014 Ying Wang <wangying@google.com> Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.

Change-Id: I4686c1239aa5ed361c918ce4e7a5abf9a1552ab4
ootdir/Android.mk
1a240b47903c0dc3d7f23b609b6520f17f11b953 12-Jun-2014 Mark Salyzyn <salyzyn@google.com> logd: Allow apps to clear their UID-specific data

Bug: 13501501
Change-Id: Ia72e25fc19430ce63fb359cd9b3f0523d41f5aa8
ogd/CommandListener.cpp
ogd/LogBuffer.cpp
ogd/LogBuffer.h
e5fdfcdcb462195b1a91d5408c0ac738a0a55888 13-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 9b86360f: am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"

* commit '9b86360fb41b46abfc0e475cfdea4370a93179d5':
log: Fix warning with __USE_MINGW_ANSI_STDIO
9b86360fb41b46abfc0e475cfdea4370a93179d5 13-Jun-2014 Mark Salyzyn <salyzyn@google.com> am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"

* commit 'c3e2366602c428cf39ce9068a834771f535d58b2':
log: Fix warning with __USE_MINGW_ANSI_STDIO
c3e2366602c428cf39ce9068a834771f535d58b2 13-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"

* commit '7fa1cd19638c8ada0786e03abe50b5fe9b9f4270':
log: Fix warning with __USE_MINGW_ANSI_STDIO
232c711795bfdbe2048222b57b1374fbea548839 13-Jun-2014 Dan Albert <danalbert@google.com> am 46ed1c8c: am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."

* commit '46ed1c8c99fce33c78e239d4155ece84feca069d':
Fix windows sdk build.
46ed1c8c99fce33c78e239d4155ece84feca069d 13-Jun-2014 Dan Albert <danalbert@google.com> am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."

* commit 'ed1a0dbd43ba81c3f1cb723c0e4fa5ca2807d473':
Fix windows sdk build.
ed1a0dbd43ba81c3f1cb723c0e4fa5ca2807d473 13-Jun-2014 Dan Albert <danalbert@google.com> am b44e626c: Merge "Fix windows sdk build."

* commit 'b44e626cf0c29dd8b8112db3d8e72970dc09b617':
Fix windows sdk build.
9ea2ad5796279435d14899c6357d56094c5feda1 13-Jun-2014 Dan Albert <danalbert@google.com> am 6dfe9495: am 9b2d964d: am 08430b1e: Merge "Use syscall(2) instead of ioprio_get/ioprio_set."

* commit '6dfe949568fa9413db72cdccb26baca2c4592a2a':
Use syscall(2) instead of ioprio_get/ioprio_set.
6dfe949568fa9413db72cdccb26baca2c4592a2a 13-Jun-2014 Dan Albert <danalbert@google.com> am 9b2d964d: am 08430b1e: Merge "Use syscall(2) instead of ioprio_get/ioprio_set."

* commit '9b2d964d0139198c2cce2b8f6bb5b1a566e47913':
Use syscall(2) instead of ioprio_get/ioprio_set.
9b2d964d0139198c2cce2b8f6bb5b1a566e47913 13-Jun-2014 Dan Albert <danalbert@google.com> am 08430b1e: Merge "Use syscall(2) instead of ioprio_get/ioprio_set."

* commit '08430b1e8c9cf42289289d88e7dd05294da7589e':
Use syscall(2) instead of ioprio_get/ioprio_set.
8ffe8eac5b4f04ce82ae553f2155959a8b165a61 13-Jun-2014 Nick Kralevich <nnk@google.com> am f8cb68e1: am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"

* commit 'f8cb68e15ba242200e3525fffa2f969960e18a50':
Create /data/dalvik-cache/profiles
f8cb68e15ba242200e3525fffa2f969960e18a50 13-Jun-2014 Nick Kralevich <nnk@google.com> am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"

* commit '3bff77a8f90e673dbf41d97b7b842a3e4a6986bf':
Create /data/dalvik-cache/profiles
3bff77a8f90e673dbf41d97b7b842a3e4a6986bf 13-Jun-2014 Nick Kralevich <nnk@google.com> am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"

* commit '875dc8f3f31fe9f5ee42d900737149bdeb95f1c7':
Create /data/dalvik-cache/profiles
7fa1cd19638c8ada0786e03abe50b5fe9b9f4270 13-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"
b44e626cf0c29dd8b8112db3d8e72970dc09b617 13-Jun-2014 Dan Albert <danalbert@google.com> Merge "Fix windows sdk build."
5e541bf47d28bae4a04ad124c3a82b0f33f85d17 13-Jun-2014 Dan Albert <danalbert@google.com> Fix windows sdk build.

Change-Id: I53c9f43a5f9ae2f40de686316185d162d0e0503a
ibcutils/iosched_policy.c
08430b1e8c9cf42289289d88e7dd05294da7589e 13-Jun-2014 Dan Albert <danalbert@google.com> Merge "Use syscall(2) instead of ioprio_get/ioprio_set."
167c0ed6da9d6c67d01d1e4635d8773a606419c0 13-Jun-2014 Dan Albert <danalbert@google.com> Use syscall(2) instead of ioprio_get/ioprio_set.

Change-Id: Ibfd0bdd3dd0bad9804ec9fd9292f4b68a510afdb
ibcutils/iosched_policy.c
0cddcc67ccee57b4f06d0b1c4fef70ef9d16f0a3 12-Jun-2014 Dan Willemsen <dwillemsen@nvidia.com> log: Fix warning with __USE_MINGW_ANSI_STDIO

I haven't seen this warning in any AOSP code, but some of our code is
using this header differently than the rest of the build system, and
hits this warning-turned-error:

error: "__USE_MINGW_ANSI_STDIO" is not defined [-Werror=undef]

Change-Id: I3c5a91f107af8bf6078e06f2ce326c5466349b79
nclude/android/log.h
511998fcdb3d35847f1222aec956e6ac6f5a17ba 12-Jun-2014 Nick Kralevich <nnk@google.com> am 44aadc4d: am 1eebf538: am 59d16c9e: Merge "make console shell run as GID=shell"

* commit '44aadc4daf926155bf06bcf9d8f2daa96f861cdf':
make console shell run as GID=shell
44aadc4daf926155bf06bcf9d8f2daa96f861cdf 12-Jun-2014 Nick Kralevich <nnk@google.com> am 1eebf538: am 59d16c9e: Merge "make console shell run as GID=shell"

* commit '1eebf538d3e5465bbec84d86017bb9ca250a052b':
make console shell run as GID=shell
1eebf538d3e5465bbec84d86017bb9ca250a052b 12-Jun-2014 Nick Kralevich <nnk@google.com> am 59d16c9e: Merge "make console shell run as GID=shell"

* commit '59d16c9e9171f4367ad3a0516e7000c0d95e89cf':
make console shell run as GID=shell
59d16c9e9171f4367ad3a0516e7000c0d95e89cf 12-Jun-2014 Nick Kralevich <nnk@google.com> Merge "make console shell run as GID=shell"
f2cb352412252f8e609986520cff830096248b9f 12-Jun-2014 Nick Kralevich <nnk@google.com> make console shell run as GID=shell

Change-Id: I240bec07b04de1b26eef14e4f590af56c1aaa276
ootdir/init.rc
8396e75192fef65549fcb4a1e59aca0dc4a6bcb8 11-Jun-2014 Ian Rogers <irogers@google.com> am 2b958116: am a31dab8a: am a9aa0f2c: Merge "Build the libc++ variant of libbacktrace on the host for Mac."

* commit '2b95811601b05db7894359f037005a008274a973':
Build the libc++ variant of libbacktrace on the host for Mac.
297f52acaacc3258a32cc4e75b686adf44114ab7 11-Jun-2014 Colin Cross <ccross@android.com> am cfd002c9: am 428a6d23: am f2521e76: Merge changes I46586cba,I6c500ab5,I2f7d9934

* commit 'cfd002c90d4001bc2370428aa554e6f46110adff':
Add mknod utility to system/core/toolbox
Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
toolbox: Add nohup command
b14ab71f0e7b08dfe0b4e23e0d1e7d28b3727efb 11-Jun-2014 Nick Kralevich <nnk@google.com> am 0487e50a: am 24fc60c7: am 304d31f0: Merge "Make su 04750"

* commit '0487e50accf44f13acafad5fb5d76b4958d86550':
Make su 04750
2b95811601b05db7894359f037005a008274a973 11-Jun-2014 Ian Rogers <irogers@google.com> am a31dab8a: am a9aa0f2c: Merge "Build the libc++ variant of libbacktrace on the host for Mac."

* commit 'a31dab8a8fbdd6d4e91d5e5fb3d0031594b92dfc':
Build the libc++ variant of libbacktrace on the host for Mac.
a31dab8a8fbdd6d4e91d5e5fb3d0031594b92dfc 11-Jun-2014 Ian Rogers <irogers@google.com> am a9aa0f2c: Merge "Build the libc++ variant of libbacktrace on the host for Mac."

* commit 'a9aa0f2c42e2291496f39ca60775ff95648eba31':
Build the libc++ variant of libbacktrace on the host for Mac.
b5113d5d0727d3bc9bd12edc451138af8d400d9f 11-Jun-2014 Narayan Kamath <narayan@google.com> am ce9313fa: am 07cf9445: am 0319f528: Merge "Replace hand written offsets with structures."

* commit 'ce9313faed28c5592d03f278611f438ab25dee2d':
Replace hand written offsets with structures.
cfd002c90d4001bc2370428aa554e6f46110adff 11-Jun-2014 Colin Cross <ccross@android.com> am 428a6d23: am f2521e76: Merge changes I46586cba,I6c500ab5,I2f7d9934

* commit '428a6d23fc71b1fe5c5e785905693b9d1c414958':
Add mknod utility to system/core/toolbox
Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
toolbox: Add nohup command
428a6d23fc71b1fe5c5e785905693b9d1c414958 11-Jun-2014 Colin Cross <ccross@android.com> am f2521e76: Merge changes I46586cba,I6c500ab5,I2f7d9934

* commit 'f2521e76ffd5baaf13f7ddf16bcc0ef58959cfae':
Add mknod utility to system/core/toolbox
Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
toolbox: Add nohup command
a9aa0f2c42e2291496f39ca60775ff95648eba31 11-Jun-2014 Ian Rogers <irogers@google.com> Merge "Build the libc++ variant of libbacktrace on the host for Mac."
deebae596be0dcf7e66f57d9a3c1bf65406c1992 11-Jun-2014 Ian Rogers <irogers@google.com> Build the libc++ variant of libbacktrace on the host for Mac.

Bug: 13751317
Change-Id: Iefadec1cd9b3ca109ac436bd5eb7c096c2dcbe40
ibbacktrace/Android.mk
f2521e76ffd5baaf13f7ddf16bcc0ef58959cfae 11-Jun-2014 Colin Cross <ccross@android.com> Merge changes I46586cba,I6c500ab5,I2f7d9934

* changes:
Add mknod utility to system/core/toolbox
Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
toolbox: Add nohup command
032d4e298b0eb8e55e9963c7f3699acc30527c85 15-Jan-2014 Sujith Ramakrishnan <sujithrk@google.com> Add mknod utility to system/core/toolbox

Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
oolbox/Android.mk
oolbox/mknod.c
140b13546ac30a836e39ad4f22da042b3fcb57a4 23-Oct-2013 Sasha Levitskiy <sanek@google.com> Getevent: make sure the monotonic timestamp is displayed; warning cleanup.

Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
oolbox/getevent.c
38e5f07c0f93e333b35cffc9bb902de599a3bef9 24-Sep-2013 Glenn Kasten <gkasten@google.com> toolbox: Add nohup command

Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
oolbox/Android.mk
oolbox/nohup.c
296ac287a18a0c8954d7785a02535266f087d42e 11-Jun-2014 Jeff Sharkey <jsharkey@android.com> Merge "Partially revert argument escaping."
7dfdb3c4365a325fb6dd781a7aa3464998152fe5 11-Jun-2014 Kenny Root <kroot@google.com> resolved conflicts for merge of 41b797de to master

Change-Id: Id433da0bde006a6661431ee58a627497f07c7cdf
45bda7696e8d92d9c1051b09fe4366cbda0b8e70 11-Jun-2014 Brian Carlstrom <bdc@google.com> am 6d7649b6: Merge "Add missing headers" into lmp-preview-dev

* commit '6d7649b6fa6594eb57d30d3f15f56d969fc9ab41':
Add missing headers
acda4829dfe1cadc38c5a7c0db0034d923a0e3f2 11-Jun-2014 Brian Carlstrom <bdc@google.com> am 8c170ef7: Merge "Remove libstdc++ dependency from host libbacktrace" into lmp-preview-dev

* commit '8c170ef764b2703669e163842d22ba42b042ebb2':
Remove libstdc++ dependency from host libbacktrace
7c460351f53cb683097fe4071b9ec1e4cd7cdf82 11-Jun-2014 Jeff Sharkey <jsharkey@android.com> Partially revert argument escaping.

Commands chained with && need to be passed through literally instead
of always being quoted.

Bug: 15479704
Change-Id: I2998e40a92a3bfd092098cd526403b469c86c9a6
db/commandline.c
3b1380385004e535c6214b8199181a055f1e21d0 11-Jun-2014 Cylen Yao <cylen.yao@mediatek.com> am 72299bf0: [Bug]NE when playing mp3 with incorrect UTF16 char

* commit '72299bf0d240072174f847d13f1c9498b3ef9fa6':
[Bug]NE when playing mp3 with incorrect UTF16 char
9e55879f43b685d07c3c499c21cfee9a2fcd8f33 06-Jun-2014 Riley Andrews <riandrews@google.com> Add gtest conformance tests for libsync. Not complete yet, but substantially more comprehensive than the interactive test that was there before.
Change-Id: I9019b0a8babbc91f78aa850e0e288bbf05f93500
ibsync/tests/Android.mk
ibsync/tests/sync_test.cpp
6d7649b6fa6594eb57d30d3f15f56d969fc9ab41 11-Jun-2014 Brian Carlstrom <bdc@google.com> Merge "Add missing headers" into lmp-preview-dev
8c170ef764b2703669e163842d22ba42b042ebb2 11-Jun-2014 Brian Carlstrom <bdc@google.com> Merge "Remove libstdc++ dependency from host libbacktrace" into lmp-preview-dev
875dc8f3f31fe9f5ee42d900737149bdeb95f1c7 13-Jun-2014 Nick Kralevich <nnk@google.com> Merge "Create /data/dalvik-cache/profiles"
347ee511e44a4b6419c144917e079c78fde46f32 12-Jun-2014 Nick Kralevich <nnk@google.com> Create /data/dalvik-cache/profiles

Make sure /data/dalvik-cache/profiles gets the correct
permissions and SELinux context, and ownership is properly
assigned to the system UID.

Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
ootdir/init.rc
0487e50accf44f13acafad5fb5d76b4958d86550 10-Jun-2014 Nick Kralevich <nnk@google.com> am 24fc60c7: am 304d31f0: Merge "Make su 04750"

* commit '24fc60c7a686afb06a8a4a6246ede277ef300e50':
Make su 04750
24fc60c7a686afb06a8a4a6246ede277ef300e50 10-Jun-2014 Nick Kralevich <nnk@google.com> am 304d31f0: Merge "Make su 04750"

* commit '304d31f05ee76a834209ad837ce78255cf70ae5f':
Make su 04750
304d31f05ee76a834209ad837ce78255cf70ae5f 10-Jun-2014 Nick Kralevich <nnk@google.com> Merge "Make su 04750"
fd546e8c35341b518873eb4f883afbed92e947af 10-Jun-2014 Jeff Sharkey <jsharkey@android.com> Uniformly escape shell arguments.

Arguments with embedded spaces need to be wrapped in quotes, which
changes the overall escaping strategy. Instead of mixing the two
strategies, just always wrap arguments in quotes.

Bug: 15479704
Change-Id: I03eacfa1bd6c220d4ec6617b825ebb0c43c7221e
db/commandline.c
72299bf0d240072174f847d13f1c9498b3ef9fa6 04-Jun-2014 Cylen Yao <cylen.yao@mediatek.com> [Bug]NE when playing mp3 with incorrect UTF16 char

Bug: 15274351
Bug: 15539240

Many MP3 files have incorrect utf16 chars, but the
Utf16_to_utf8_length() routine checks for errors in
standard utf16 char. utf16_to_utf8() was not checking
for errors in standard utf16 char.

Change-Id: Iafd922ff92cabe6bba8971215fcfd1fd471c894b
(cherry picked from commit 605b139cdf56364c6c9b37e59dd12efc61c24631)
ibutils/Unicode.cpp
3e13d4dd2a8aff4040a78f4e2abe0c7b5667f4c3 10-Jun-2014 Jeff Brown <jeffbrown@google.com> am c24b98c7: (-s ours) Add a couple of useful string functions. (DO NOT MERGE)

* commit 'c24b98c7d8d9380f885bb6ea4055a34082353879':
Add a couple of useful string functions. (DO NOT MERGE)
ce9313faed28c5592d03f278611f438ab25dee2d 10-Jun-2014 Narayan Kamath <narayan@google.com> am 07cf9445: am 0319f528: Merge "Replace hand written offsets with structures."

* commit '07cf9445a4afebf82cc1b9a0e44bc9aced51e0a0':
Replace hand written offsets with structures.
07cf9445a4afebf82cc1b9a0e44bc9aced51e0a0 10-Jun-2014 Narayan Kamath <narayan@google.com> am 0319f528: Merge "Replace hand written offsets with structures."

* commit '0319f528b2d94df89cb489905f7e1c65af511d75':
Replace hand written offsets with structures.
0319f528b2d94df89cb489905f7e1c65af511d75 10-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Replace hand written offsets with structures."
926973ec1486dc7cd4692c7e339d744ea442699c 09-Jun-2014 Narayan Kamath <narayan@google.com> Replace hand written offsets with structures.

Given that all current & future android ABIs are
little endian, we can get rid of the explicit conversions
from memory regions to little endian data members.

Also cleans up a few C style casts that snuck in during
several -Werror efforts and fixes temporary file generation
on target.

bug: 15448202

Change-Id: I4fcbb3c1124cb82c82139d328344e54fc7895353
ibziparchive/zip_archive.cc
ibziparchive/zip_archive_test.cc
41b797de46ce27d133f4d887cbde8f25303a05c5 10-Jun-2014 Elliott Hughes <enh@google.com> am c720a12a: am e2d5a3b4: Merge "Switch md5 over to openssl rather than libc."

* commit 'c720a12a6ae1901c5a1537372897fc763e7a44a9':
Switch md5 over to openssl rather than libc.
c720a12a6ae1901c5a1537372897fc763e7a44a9 10-Jun-2014 Elliott Hughes <enh@google.com> am e2d5a3b4: Merge "Switch md5 over to openssl rather than libc."

* commit 'e2d5a3b4b1e614252dac39218147d2027218d4bf':
Switch md5 over to openssl rather than libc.
e2d5a3b4b1e614252dac39218147d2027218d4bf 10-Jun-2014 Elliott Hughes <enh@google.com> Merge "Switch md5 over to openssl rather than libc."
7fc47129cf6a25b01b551816ac58ff3f53320123 08-Jun-2014 Elliott Hughes <enh@google.com> Switch md5 over to openssl rather than libc.

It doesn't make any sense for the C library to contain private stuff
that's only used by toolbox. Rather than move that stuff out of bionic
and into here, let's just use the same MD5 implementation the rest of
the system's using.

Change-Id: Ia1c73164124094b532af3453b90c4bd1ebfdaa24
oolbox/Android.mk
oolbox/md5.c
203c561416b18d5b15fef764eb98e9cc192a273b 22-May-2014 Dan Albert <danalbert@google.com> Add missing headers

These headers are needed for pid_t and free when using libc++ headers (POSIX
does not require that the symbols be exposed with the previous includes).

(cherry picked from commit ac2fe7eb81789274ab98573d0c4b0866bed1f254)

Change-Id: I3b3635c8f446f1ca0c20a23d63d77587c2dffc16
nclude/backtrace/BacktraceMap.h
ibbacktrace/UnwindMap.cpp
b495400451d53a2d6a57fb1d23315d719d82f802 22-May-2014 Dan Albert <danalbert@google.com> Remove libstdc++ dependency from host libbacktrace

The libc++ version of libbacktrace on the host was still linking against
libstdc++, and this was causing problems in art.

(cherry picked from commit a3a8f6d2ab16afaa3018406c694c7d63929f2a83)

Change-Id: Id511dd9cca05c3aa0de2ad13682675ea4ac6424d
ibbacktrace/Android.build.mk
c24b98c7d8d9380f885bb6ea4055a34082353879 07-Jun-2014 Jeff Brown <jeffbrown@google.com> Add a couple of useful string functions. (DO NOT MERGE)

Change-Id: I158f69917bab5f15482dd8f2b66b36a4cc0f11ad
(cherry picked from commit 5ee915afe17b7190f992addc48cb53ed6371a68d)
nclude/utils/String8.h
ibutils/String8.cpp
cbe8464ddda27aed04129bb57282d4153d813993 09-Jun-2014 Jeff Brown <jeffbrown@google.com> Merge "Add a couple of useful string functions."
5ee915afe17b7190f992addc48cb53ed6371a68d 07-Jun-2014 Jeff Brown <jeffbrown@google.com> Add a couple of useful string functions.

Change-Id: I158f69917bab5f15482dd8f2b66b36a4cc0f11ad
nclude/utils/String8.h
ibutils/String8.cpp
ded895c033aa028ccd1e0b5b798e675ed1601044 09-Jun-2014 Mathieu Chartier <mathieuc@google.com> am 08511d6e: Make host ashmem_create_region seed only once.

* commit '08511d6e3129eb811261b5b5af7c41e3e3625eac':
Make host ashmem_create_region seed only once.
c3df8d756291b5258c21335e1266efb941fd7d0a 09-Jun-2014 Nick Kralevich <nnk@google.com> Make su 04750

Currently, /system/xbin/su is world executable. Prior to SELinux
enforcement, anyone (including third party apps) could run su.
The su code itself checks to see if the calling UID is root or shell.

Rather than relying on enforcement within the su binary, modify the
binary so it has group=shell, and remove world-execute permission.
This helps avoid some annoying SELinux denial messages as third party
apps call su on userdebug/eng builds.

Change-Id: I61c9231bb7e201d14ee3a5b6fe81b3fa7b12599f
nclude/private/android_filesystem_config.h
5c70f7e3106bb9457cd5ea2f638cd430ba67eb9c 07-Jun-2014 Nick Kralevich <nnk@google.com> am f3af14e6: am ef47eb19: am 30136150: Merge "adb: avoid leaking file descriptors"

* commit 'f3af14e6df266f466e0bf7868d002cfe8104c128':
adb: avoid leaking file descriptors
f3af14e6df266f466e0bf7868d002cfe8104c128 07-Jun-2014 Nick Kralevich <nnk@google.com> am ef47eb19: am 30136150: Merge "adb: avoid leaking file descriptors"

* commit 'ef47eb1948ba394866f53c41c459561fc372a3b5':
adb: avoid leaking file descriptors
ef47eb1948ba394866f53c41c459561fc372a3b5 07-Jun-2014 Nick Kralevich <nnk@google.com> am 30136150: Merge "adb: avoid leaking file descriptors"

* commit '3013615077bbf1ccedaef59181f5e96062ad479a':
adb: avoid leaking file descriptors
08511d6e3129eb811261b5b5af7c41e3e3625eac 03-Jun-2014 Mathieu Chartier <mathieuc@google.com> Make host ashmem_create_region seed only once.

Not seeding this each call should help reduce collisions when multiple
threads are calling ashmem_create_region. Also cleaned up code by
deleting gotos, and making formatting consistent.

Bug: 15394258

(cherry picked from commit 1104ae8cfc0e5144e7d796cf29ee124d05401cbf)

Change-Id: Iafdaea57b2317e0eb7c40d7b5595c523814fd88c
ibcutils/Android.mk
ibcutils/ashmem-host.c
3013615077bbf1ccedaef59181f5e96062ad479a 07-Jun-2014 Nick Kralevich <nnk@google.com> Merge "adb: avoid leaking file descriptors"
45e2756409bee6b766fd965bd945f9d42789fb33 06-Jun-2014 Christopher Ferris <cferris@google.com> am f6d8dedd: am 8af98621: am 5db5b8aa: Merge "Port libcutils memset16/32 to x86_64."

* commit 'f6d8dedd87eb8bbccbbdeb17a6d226f089449d92':
Port libcutils memset16/32 to x86_64.
f6d8dedd87eb8bbccbbdeb17a6d226f089449d92 06-Jun-2014 Christopher Ferris <cferris@google.com> am 8af98621: am 5db5b8aa: Merge "Port libcutils memset16/32 to x86_64."

* commit '8af98621975f8d5f0754a81329cb5358a74f59ee':
Port libcutils memset16/32 to x86_64.
8af98621975f8d5f0754a81329cb5358a74f59ee 06-Jun-2014 Christopher Ferris <cferris@google.com> am 5db5b8aa: Merge "Port libcutils memset16/32 to x86_64."

* commit '5db5b8aa51b43ca98b8dafdd5d57a2ac0f41d21b':
Port libcutils memset16/32 to x86_64.
5db5b8aa51b43ca98b8dafdd5d57a2ac0f41d21b 06-Jun-2014 Christopher Ferris <cferris@google.com> Merge "Port libcutils memset16/32 to x86_64."
d01f72a3532574cdfac07fdb48a33f7fbf09c21b 06-Jun-2014 Dave Allison <dallison@google.com> am b311ca9e: Add LD_PRELOAD for libsigchain.so to the environment

* commit 'b311ca9ee82c91d411164a90e9c5b32565a1e43c':
Add LD_PRELOAD for libsigchain.so to the environment
ff97881f5d6769e98f3be640bb0d34969d8c20a7 06-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 6a5b8cf5: am 02de7d7a: am ae8f67d7: Merge "logd: logcat unexpected EOF on slow consoles"

* commit '6a5b8cf5753f8f49590f326ba168908bb44d3a10':
logd: logcat unexpected EOF on slow consoles
6a5b8cf5753f8f49590f326ba168908bb44d3a10 06-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 02de7d7a: am ae8f67d7: Merge "logd: logcat unexpected EOF on slow consoles"

* commit '02de7d7a87b6918e2c7d70ba9445a3e1559f13d8':
logd: logcat unexpected EOF on slow consoles
02de7d7a87b6918e2c7d70ba9445a3e1559f13d8 06-Jun-2014 Mark Salyzyn <salyzyn@google.com> am ae8f67d7: Merge "logd: logcat unexpected EOF on slow consoles"

* commit 'ae8f67d71e9999325b8b914c01590369e4f628a5':
logd: logcat unexpected EOF on slow consoles
ae8f67d71e9999325b8b914c01590369e4f628a5 06-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: logcat unexpected EOF on slow consoles"
8d7656b8c175cbb60162aff56cdfc51d551d9c14 06-Jun-2014 Mark Salyzyn <salyzyn@google.com> logd: logcat unexpected EOF on slow consoles

Change-Id: I3520aa05e080de85df352ef36ae16e0406311f3c
ogd/LogTimes.cpp
8eb268fe2b7c1a826e299f9e3b87440cdcb3303b 06-Jun-2014 Narayan Kamath <narayan@google.com> am 5ceec65d: am de3ff60d: am b7b92ae2: Merge "Fix build."

* commit '5ceec65d6482c472d6b55368d02f9f0d3992727c':
Fix build.
5ceec65d6482c472d6b55368d02f9f0d3992727c 06-Jun-2014 Narayan Kamath <narayan@google.com> am de3ff60d: am b7b92ae2: Merge "Fix build."

* commit 'de3ff60d5a30c7a3d157ac95b2f7985aaae73a25':
Fix build.
370c3a05b53463f2afee524c8cc13a2d6804b0fa 06-Jun-2014 Narayan Kamath <narayan@google.com> am 35cafdfc: am 141e3503: am a8c89ee3: Merge "Reject zip files that have trailing bytes after their CD."

* commit '35cafdfc4c21c062c5d223d795f639b3756853d8':
Reject zip files that have trailing bytes after their CD.
35cafdfc4c21c062c5d223d795f639b3756853d8 06-Jun-2014 Narayan Kamath <narayan@google.com> am 141e3503: am a8c89ee3: Merge "Reject zip files that have trailing bytes after their CD."

* commit '141e35034a8da26b7bf47ee69a847f7cbc350688':
Reject zip files that have trailing bytes after their CD.
de3ff60d5a30c7a3d157ac95b2f7985aaae73a25 06-Jun-2014 Narayan Kamath <narayan@google.com> am b7b92ae2: Merge "Fix build."

* commit 'b7b92ae22c172bbeb7af0d1e1efea9ee24976460':
Fix build.
b7b92ae22c172bbeb7af0d1e1efea9ee24976460 06-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Fix build."
c00de56063deaa3c27ab0f1778730e3f14e9a952 06-Jun-2014 Narayan Kamath <narayan@google.com> Fix build.

Uncommitted changes from a rename.

Change-Id: If1cac7104c436970f905eede683040ae79529292
ibziparchive/zip_archive.cc
141e35034a8da26b7bf47ee69a847f7cbc350688 06-Jun-2014 Narayan Kamath <narayan@google.com> am a8c89ee3: Merge "Reject zip files that have trailing bytes after their CD."

* commit 'a8c89ee35a87de29afc0e828f0b22b537d2cc410':
Reject zip files that have trailing bytes after their CD.
a8c89ee35a87de29afc0e828f0b22b537d2cc410 06-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Reject zip files that have trailing bytes after their CD."
8fcb631389123ab7f5d795ae3a36a67842b3028c 06-Jun-2014 Nick Kralevich <nnk@google.com> adb: avoid leaking file descriptors

If an adb shell connection comes in while taking a screenshot,
an open pipe file descriptor will be leaked to the shell process.
This causes SELinux denials of the form:

avc: denied { read } for path="pipe:[21838]" dev="pipefs" ino=21838 scontext=u:r:shell:s0 tcontext=u:r:adbd:s0 tclass=fifo_file permissive=0
avc: denied { write } for path="pipe:[21838]" dev="pipefs" ino=21838 scontext=u:r:shell:s0 tcontext=u:r:adbd:s0 tclass=fifo_file permissive=0

Set O_CLOEXEC on the pipe connections, to avoid leaking them
across an exec boundary.

Bug: 15437785
Change-Id: Id2304b316bd7082d8baac246dce1f0e0e26e9197
db/framebuffer_service.c
86a1600fb6291e3ba31d1366aa3ab8bff7d87dd7 16-May-2014 Henrik Smiding <henrik.smiding@intel.com> Port libcutils memset16/32 to x86_64.

Port libcutils memset16/32 assembly SSE2 optimizations to x86_64
architecture. Ensures the same performance on 64-bit arch.

Change-Id: I874a71a884c0d28a152933ddff9cb886c9a6e99e
Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
ibcutils/Android.mk
ibcutils/arch-x86_64/android_memset16_SSE2-atom.S
ibcutils/arch-x86_64/android_memset32_SSE2-atom.S
ibcutils/arch-x86_64/cache.h
1165cf4f443bdc347485b19f8c6902ba1b5f2466 06-Jun-2014 Ian Rogers <irogers@google.com> am 928821bd: am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bit libraries."

* commit '928821bd123aa38094289b9c62debb4d92b84069':
Host multilib build of both 32-bit and 64-bit libraries.
928821bd123aa38094289b9c62debb4d92b84069 06-Jun-2014 Ian Rogers <irogers@google.com> am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bit libraries."

* commit '72d77449d99833140f7dd838db6556484031da29':
Host multilib build of both 32-bit and 64-bit libraries.
72d77449d99833140f7dd838db6556484031da29 06-Jun-2014 Ian Rogers <irogers@google.com> am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bit libraries."

* commit '4ca26ce8ec3436727a92eb35d1698d2ae540faef':
Host multilib build of both 32-bit and 64-bit libraries.
4ca26ce8ec3436727a92eb35d1698d2ae540faef 06-Jun-2014 Ian Rogers <irogers@google.com> Merge "Host multilib build of both 32-bit and 64-bit libraries."
59ec765382d800e84662f7b196b5bd053157b71a 05-Jun-2014 Ian Rogers <irogers@google.com> Host multilib build of both 32-bit and 64-bit libraries.

Change-Id: I54f91f385b109fc664a1a1f9320affb2a846fef1
ibcutils/Android.mk
iblog/Android.mk
ibutils/Android.mk
fc5f049c5c0463673f970af726c58fddc88780bb 05-Jun-2014 Ian Rogers <irogers@google.com> am d1b8fc43: am bc28beda: am e0115dd1: Merge "Build host with multilib both enabled."

* commit 'd1b8fc4378451894a7f66a66a318f4f54c64f83a':
Build host with multilib both enabled.
d1b8fc4378451894a7f66a66a318f4f54c64f83a 05-Jun-2014 Ian Rogers <irogers@google.com> am bc28beda: am e0115dd1: Merge "Build host with multilib both enabled."

* commit 'bc28bedaf886e7dc05c7477e78a350f914115074':
Build host with multilib both enabled.
bc28bedaf886e7dc05c7477e78a350f914115074 05-Jun-2014 Ian Rogers <irogers@google.com> am e0115dd1: Merge "Build host with multilib both enabled."

* commit 'e0115dd1302f6156879938dfb8bcc9ac5a43d7a6':
Build host with multilib both enabled.
e0115dd1302f6156879938dfb8bcc9ac5a43d7a6 05-Jun-2014 Ian Rogers <irogers@google.com> Merge "Build host with multilib both enabled."
46601793e33c12acb9f6b9849e401453d5e90e83 05-Jun-2014 Ian Rogers <irogers@google.com> Build host with multilib both enabled.

Change-Id: I58fa91bc097dfba573b6db27e389f5ed6556032f
ibzipfile/Android.mk
4f6b499ead3de87888d37a74adceaec92c584c0a 03-Jun-2014 Narayan Kamath <narayan@google.com> Reject zip files that have trailing bytes after their CD.

bug: 15287086
Change-Id: I03219c4c2ca6afc9d417a35bd98ae682f478fc25
ibziparchive/zip_archive.cc
ibziparchive/zip_archive_test.cc
a54b7ca1565d314c88eb31e1f2375948b3c5616a 05-Jun-2014 Robin Lee <rgl@google.com> am b7c07da2: am 33154817: am 46fbaf06: Merge "Create world-searchable /data/misc/user directory"

* commit 'b7c07da2f4606ca36b93c2b9221e43e6ebe68831':
Create world-searchable /data/misc/user directory
b7c07da2f4606ca36b93c2b9221e43e6ebe68831 05-Jun-2014 Robin Lee <rgl@google.com> am 33154817: am 46fbaf06: Merge "Create world-searchable /data/misc/user directory"

* commit '33154817e274a4c7c381e2f5ef73ead7093e3985':
Create world-searchable /data/misc/user directory
33154817e274a4c7c381e2f5ef73ead7093e3985 05-Jun-2014 Robin Lee <rgl@google.com> am 46fbaf06: Merge "Create world-searchable /data/misc/user directory"

* commit '46fbaf062fd94e3fecc7165f4b42d42145e0603d':
Create world-searchable /data/misc/user directory
46fbaf062fd94e3fecc7165f4b42d42145e0603d 05-Jun-2014 Robin Lee <rgl@google.com> Merge "Create world-searchable /data/misc/user directory"
b575c3e37a72d25045856f86719a69773e17acad 05-Jun-2014 Elliott Hughes <enh@google.com> am 147d158e: am dd3b7f94: am aa2be4fd: Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"

* commit '147d158e2d2e9b6f6c520564b4a0c02d31af8513':
[MIPS64] Use generic cpu-independent libpixelflinger for mips64
147d158e2d2e9b6f6c520564b4a0c02d31af8513 05-Jun-2014 Elliott Hughes <enh@google.com> am dd3b7f94: am aa2be4fd: Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"

* commit 'dd3b7f94d8339bb9f85a30a090492d3c5939dc68':
[MIPS64] Use generic cpu-independent libpixelflinger for mips64
dd3b7f94d8339bb9f85a30a090492d3c5939dc68 05-Jun-2014 Elliott Hughes <enh@google.com> am aa2be4fd: Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"

* commit 'aa2be4fd691933524b91680cd7517a9334d9a2a7':
[MIPS64] Use generic cpu-independent libpixelflinger for mips64
aa2be4fd691933524b91680cd7517a9334d9a2a7 05-Jun-2014 Elliott Hughes <enh@google.com> Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"
3daee33b9660cfbc2b3b36de2a8eb479ab396bdf 04-Jun-2014 Elliott Hughes <enh@google.com> am 047a1cdd: am 29413726: am 20df39a0: Merge "Adding ABI output to debuggerd tombstones."

* commit '047a1cdd119aa626b1ea603873efcd52f0d6ecbb':
Adding ABI output to debuggerd tombstones.
047a1cdd119aa626b1ea603873efcd52f0d6ecbb 04-Jun-2014 Elliott Hughes <enh@google.com> am 29413726: am 20df39a0: Merge "Adding ABI output to debuggerd tombstones."

* commit '294137266378371a3d08da1d6fb82a25d5b42cea':
Adding ABI output to debuggerd tombstones.
294137266378371a3d08da1d6fb82a25d5b42cea 04-Jun-2014 Elliott Hughes <enh@google.com> am 20df39a0: Merge "Adding ABI output to debuggerd tombstones."

* commit '20df39a08981f6283359917382db4270ed3a4503':
Adding ABI output to debuggerd tombstones.
20df39a08981f6283359917382db4270ed3a4503 04-Jun-2014 Elliott Hughes <enh@google.com> Merge "Adding ABI output to debuggerd tombstones."
9c8dacce55455cacd282789982ef931e55bb4a40 03-Jun-2014 Brigid Smith <brigidsmith@google.com> Adding ABI output to debuggerd tombstones.

Bug: 15084471
Change-Id: If9fb260a3403e86f80928f2f5f79331fc0936030
ebuggerd/tombstone.cpp
f086a8134c059d32e19a60baf970e0f5b76f8592 04-Jun-2014 Robin Lee <rgl@google.com> am 63cdd840: am e948c9fa: am 489797c2: Merge "Add new AID shared by all apps in a profile"

* commit '63cdd840f81839bf6ce6e3723c42f09256cf4b3e':
Add new AID shared by all apps in a profile
63cdd840f81839bf6ce6e3723c42f09256cf4b3e 04-Jun-2014 Robin Lee <rgl@google.com> am e948c9fa: am 489797c2: Merge "Add new AID shared by all apps in a profile"

* commit 'e948c9faaa4861f578ebe00c8d2fabe7908e24a6':
Add new AID shared by all apps in a profile
e948c9faaa4861f578ebe00c8d2fabe7908e24a6 04-Jun-2014 Robin Lee <rgl@google.com> am 489797c2: Merge "Add new AID shared by all apps in a profile"

* commit '489797c2cbf9e22ea64dc9b88dec8271129e77bd':
Add new AID shared by all apps in a profile
489797c2cbf9e22ea64dc9b88dec8271129e77bd 04-Jun-2014 Robin Lee <rgl@google.com> Merge "Add new AID shared by all apps in a profile"
c9573e147e20e941410693c83e42544dc2709444 04-Jun-2014 Mark Salyzyn <salyzyn@google.com> am b2a9129e: am bf0ed824: am 60ca7a22: Merge "libutils: turn on -Werror"

* commit 'b2a9129e8f0666884dee660515c51d4dd5c17c7a':
libutils: turn on -Werror
b2a9129e8f0666884dee660515c51d4dd5c17c7a 04-Jun-2014 Mark Salyzyn <salyzyn@google.com> am bf0ed824: am 60ca7a22: Merge "libutils: turn on -Werror"

* commit 'bf0ed82485e0166dd5f5c9415026c2dc3fd2ae4b':
libutils: turn on -Werror
bf0ed82485e0166dd5f5c9415026c2dc3fd2ae4b 04-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 60ca7a22: Merge "libutils: turn on -Werror"

* commit '60ca7a222315569c043e23a515cd990d2857df17':
libutils: turn on -Werror
60ca7a222315569c043e23a515cd990d2857df17 04-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "libutils: turn on -Werror"
cc29030cc9c58697d1b75c1518274e34f0bb99e5 04-Jun-2014 Colin Cross <ccross@android.com> am 35ea352c: (-s ours) am 9924bfba: (-s ours) am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete libnl_2"

* commit '35ea352cb8e26a12835deb3fd034161c04961f7c':
DO NOT MERGE: Revert "delete libnl_2"
35ea352cb8e26a12835deb3fd034161c04961f7c 04-Jun-2014 Colin Cross <ccross@android.com> am 9924bfba: (-s ours) am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete libnl_2"

* commit '9924bfba6972861b0d0429717e02a27501a4e983':
DO NOT MERGE: Revert "delete libnl_2"
9924bfba6972861b0d0429717e02a27501a4e983 04-Jun-2014 Colin Cross <ccross@android.com> am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete libnl_2"

* commit '6e3fffeca6ac00379b0a22888d04a58ee0f51057':
DO NOT MERGE: Revert "delete libnl_2"
6e3fffeca6ac00379b0a22888d04a58ee0f51057 22-Mar-2014 Colin Cross <ccross@android.com> DO NOT MERGE: Revert "delete libnl_2"

This reverts commit 7097f052d946bc9fbe298c7a88e1d943f54f684e.

libnl_2 needs to stay in AOSP for now for compatibility with
GPL test builds.
ibnl_2/.gitignore
ibnl_2/Android.mk
ibnl_2/README
ibnl_2/attr.c
ibnl_2/cache.c
ibnl_2/dbg.c
ibnl_2/genl/family.c
ibnl_2/genl/genl.c
ibnl_2/handlers.c
ibnl_2/msg.c
ibnl_2/netlink.c
ibnl_2/object.c
ibnl_2/socket.c
213fce951b73a7bc8788ea4e6357aa9d56cbb50a 04-Jun-2014 Andrew Hsieh <andrewhsieh@google.com> am 4e3f28e7: am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"

* commit '4e3f28e748e0fe6e71d34a898c6a670621786200':
Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
4e3f28e748e0fe6e71d34a898c6a670621786200 04-Jun-2014 Andrew Hsieh <andrewhsieh@google.com> am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"

* commit '7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60':
Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60 04-Jun-2014 Andrew Hsieh <andrewhsieh@google.com> Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
a0c01818a2ffb1c8c85204000e3e43b710bfcc92 04-Jun-2014 Elliott Hughes <enh@google.com> am e7110ac0: am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."

* commit 'e7110ac09bdc77c4a8f7823aa666c9929a33984c':
Fix libcutils/dlmalloc_stubs.c build breakage.
e7110ac09bdc77c4a8f7823aa666c9929a33984c 04-Jun-2014 Elliott Hughes <enh@google.com> am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."

* commit 'b122da648dd1a7860776bc90b219ffa8c215faa6':
Fix libcutils/dlmalloc_stubs.c build breakage.
b122da648dd1a7860776bc90b219ffa8c215faa6 04-Jun-2014 Elliott Hughes <enh@google.com> Merge "Fix libcutils/dlmalloc_stubs.c build breakage."
7f0ef73e702e10b5a636eac5f988c82085d0dccb 04-Jun-2014 Elliott Hughes <enh@google.com> Fix libcutils/dlmalloc_stubs.c build breakage.

Change-Id: I344c410c100ce13c7a88063bf5354ad61c50094b
ibcutils/dlmalloc_stubs.c
39526f77405a12fb56c06bc418aad0c03c0c4e4f 04-Jun-2014 Mathieu Chartier <mathieuc@google.com> am 04511126: am d586e356: Merge "Fix build."

* commit '04511126a6e127705abce84735a3fe4eb48d882c':
Fix build.
04511126a6e127705abce84735a3fe4eb48d882c 04-Jun-2014 Mathieu Chartier <mathieuc@google.com> am d586e356: Merge "Fix build."

* commit 'd586e356526b77d3d64d4d247cd8f8e0871824d5':
Fix build.
d586e356526b77d3d64d4d247cd8f8e0871824d5 04-Jun-2014 Mathieu Chartier <mathieuc@google.com> Merge "Fix build."
e942d1f9ea3c7a5da6a9abab4ae17f06bd642c9a 04-Jun-2014 Mathieu Chartier <mathieuc@google.com> Fix build.

Change-Id: I7b0cf6a248c74f1a06e0b5d51a5be13124ced6a0
ibcutils/Android.mk
82cc77e8edc18d9b214ac108e76753c4384b9deb 04-Jun-2014 Christopher Ferris <cferris@google.com> am 2e389193: am a8a7f001: Merge "Fix x86 and x86_64 builds."

* commit '2e389193b01adb2d8f75e6c4038caaab4334b3ab':
Fix x86 and x86_64 builds.
2e389193b01adb2d8f75e6c4038caaab4334b3ab 04-Jun-2014 Christopher Ferris <cferris@google.com> am a8a7f001: Merge "Fix x86 and x86_64 builds."

* commit 'a8a7f001f142a77a2c406455ace4a8c00e692111':
Fix x86 and x86_64 builds.
2624df514a3f75209a93ebda265a5bcda8b868b4 04-Jun-2014 Eric Laurent <elaurent@google.com> Merge "add definitions for sound trigger"
a8a7f001f142a77a2c406455ace4a8c00e692111 04-Jun-2014 Christopher Ferris <cferris@google.com> Merge "Fix x86 and x86_64 builds."
3520086e3dac6ce33b94139811f34e22226bbe16 04-Jun-2014 Christopher Ferris <cferris@google.com> Fix x86 and x86_64 builds.

Change-Id: I1ee9117843aff2abe4067f288b8496d4bfc78c9e
ebuggerd/x86/machine.cpp
ebuggerd/x86_64/machine.cpp
6a0e5ba4243b74e4332625dd0d522385d497f588 04-Jun-2014 Elliott Hughes <enh@google.com> am a005445a: am ddde05f3: Merge "[MIPS64] Build debuggerd for mips64"

* commit 'a005445a7a0901675bbd04395a9eb699639aea9e':
[MIPS64] Build debuggerd for mips64
53363f4fa0e8ab38f0b75252b105162b6d86354f 04-Jun-2014 Mathieu Chartier <mathieuc@google.com> am 5a8335c3: am ed30b7ea: Merge "Fix build."

* commit '5a8335c3185ec329bf43b1edc733aef38ce76c36':
Fix build.
3c9f410e1679fe42257872e98ffa544ca0cdd691 04-Jun-2014 Elliott Hughes <enh@google.com> am 0d31d487: am d3b61d18: Merge "Clean up the debuggerd makefile."

* commit '0d31d4877ca451c9e15a0651ab2b4827556afeff':
Clean up the debuggerd makefile.
f1d63bdf0059da2f80478ed61cd6064f806752b0 23-May-2014 Duane Sand <duane.sand@imgtec.com> [MIPS64] Use generic cpu-independent libpixelflinger for mips64

For now, use generic C code instead of generated mips instructions,
in the same manner as used on x86 and x86_64 targets.

Change-Id: If3607484e0a446a755c62c030b3069d46ab5beb2
ibpixelflinger/scanline.cpp
ibpixelflinger/tests/codegen/codegen.cpp
a005445a7a0901675bbd04395a9eb699639aea9e 04-Jun-2014 Elliott Hughes <enh@google.com> am ddde05f3: Merge "[MIPS64] Build debuggerd for mips64"

* commit 'ddde05f3eec76513ae5d973a1c5d69494349f082':
[MIPS64] Build debuggerd for mips64
ddde05f3eec76513ae5d973a1c5d69494349f082 04-Jun-2014 Elliott Hughes <enh@google.com> Merge "[MIPS64] Build debuggerd for mips64"
a80b75985791ce492aeeceb5c78e0b36f55731f4 14-May-2014 Duane Sand <duane.sand@imgtec.com> [MIPS64] Build debuggerd for mips64

Change-Id: I361e9668baa218fc01e723c2df1a34ca6329cf47
ebuggerd/Android.mk
84c3e9923108122045d689f1d2412359ad5208eb 29-Apr-2014 Duane Sand <duane.sand@imgtec.com> [MIPS64] add atomic-mips64

Supplied by Broadcom.

Change-Id: Ica8f4f6e713623e372a68e1dc11086ceb52516da
nclude/cutils/atomic-inline.h
nclude/cutils/atomic-mips64.h
5a8335c3185ec329bf43b1edc733aef38ce76c36 04-Jun-2014 Mathieu Chartier <mathieuc@google.com> am ed30b7ea: Merge "Fix build."

* commit 'ed30b7ea75532a5b2963acb8bae23e73493a851b':
Fix build.
0d31d4877ca451c9e15a0651ab2b4827556afeff 04-Jun-2014 Elliott Hughes <enh@google.com> am d3b61d18: Merge "Clean up the debuggerd makefile."

* commit 'd3b61d184ecffc4ac69e8573fcb00cc295a0d550':
Clean up the debuggerd makefile.
ed30b7ea75532a5b2963acb8bae23e73493a851b 04-Jun-2014 Mathieu Chartier <mathieuc@google.com> Merge "Fix build."
d3b61d184ecffc4ac69e8573fcb00cc295a0d550 04-Jun-2014 Elliott Hughes <enh@google.com> Merge "Clean up the debuggerd makefile."
0b9674f2418cdc1f2ff20aae2c023443e322b901 04-Jun-2014 Mathieu Chartier <mathieuc@google.com> Fix build.

Change-Id: I6bafe6221e1ce7e4b04269df90996ab08b050e93
ibcutils/Android.mk
8c597684b191862105ddfced5982b38f983f8ff0 04-Jun-2014 Elliott Hughes <enh@google.com> Clean up the debuggerd makefile.

In particular, turn on -Wunused, which is globally off by default
thanks to build/core/config.mk.

Change-Id: Iba3ee1c0726f43eced972a53959f0e1cd97190c9
ebuggerd/Android.mk
5894b4bfaa4f72d41ecc5c3cf7f8c36b311bb167 15-Apr-2014 Eric Laurent <elaurent@google.com> add definitions for sound trigger

Add header file sound_trigger.h containing
base definitions and data types for sound
trigger native service and HAL.

Change-Id: Ie357d8c3909d0e1afda230523aded2d8699c69f1
nclude/system/sound_trigger.h
520a893b1a76598ac82cbbec2c8e5f36adfaa3af 03-Jun-2014 Mathieu Chartier <mathieuc@google.com> am b85c2494: am 03b87b49: Merge "Make host ashmem_create_region seed only once."

* commit 'b85c2494df1e1003b3101e36b29faace3a51dc3f':
Make host ashmem_create_region seed only once.
b85c2494df1e1003b3101e36b29faace3a51dc3f 03-Jun-2014 Mathieu Chartier <mathieuc@google.com> am 03b87b49: Merge "Make host ashmem_create_region seed only once."

* commit '03b87b49fae82a6304ab69b10426701c4f82c7e9':
Make host ashmem_create_region seed only once.
03b87b49fae82a6304ab69b10426701c4f82c7e9 03-Jun-2014 Mathieu Chartier <mathieuc@google.com> Merge "Make host ashmem_create_region seed only once."
1104ae8cfc0e5144e7d796cf29ee124d05401cbf 03-Jun-2014 Mathieu Chartier <mathieuc@google.com> Make host ashmem_create_region seed only once.

Not seeding this each call should help reduce collisions when multiple
threads are calling ashmem_create_region. Also cleaned up code by
deleting gotos, and making formatting consistent.

Bug: 15394258
Change-Id: Iafdaea57b2317e0eb7c40d7b5595c523814fd88c
ibcutils/ashmem-host.c
76a77c7ade532062e8b6c837c610677743494dc2 03-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Define audio attributes type in system audio header"
5f7189b68e446d5e6f05aba8cab4c1684bcd8f8d 03-Jun-2014 Mark Salyzyn <salyzyn@google.com> am a9fc6a52: am b0b343d0: Merge "liblog: test: Send bionc\'s fatal logging to the crash log"

* commit 'a9fc6a52b9d0f891b6cff3d9df92f89a81f8f002':
liblog: test: Send bionc's fatal logging to the crash log
a9fc6a52b9d0f891b6cff3d9df92f89a81f8f002 03-Jun-2014 Mark Salyzyn <salyzyn@google.com> am b0b343d0: Merge "liblog: test: Send bionc\'s fatal logging to the crash log"

* commit 'b0b343d0864556816d89af61f7418130cea047d0':
liblog: test: Send bionc's fatal logging to the crash log
b0b343d0864556816d89af61f7418130cea047d0 03-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: test: Send bionc's fatal logging to the crash log"
d69f6b6f7a31d753804363f3427aa7f1131618cc 03-Jun-2014 Nick Kralevich <nnk@google.com> am 38fd5650: am 82015d4f: Merge "Only allow disabling SELinux on userdebug / eng builds"

* commit '38fd5650ea03b1f47ead2a12a655298ef2f70a91':
Only allow disabling SELinux on userdebug / eng builds
38fd5650ea03b1f47ead2a12a655298ef2f70a91 03-Jun-2014 Nick Kralevich <nnk@google.com> am 82015d4f: Merge "Only allow disabling SELinux on userdebug / eng builds"

* commit '82015d4f127219700992f8800118fd9c388e3c99':
Only allow disabling SELinux on userdebug / eng builds
90aa3d59a5e4b6d348597f1941bb3ab42b3c1f8e 03-Jun-2014 Mark Salyzyn <salyzyn@google.com> liblog: test: Send bionc's fatal logging to the crash log

Bug: 14159417
Change-Id: Ia2e29ce03d4e2b02919c62be091da37ce4082647
iblog/tests/libc_test.cpp
82015d4f127219700992f8800118fd9c388e3c99 03-Jun-2014 Nick Kralevich <nnk@google.com> Merge "Only allow disabling SELinux on userdebug / eng builds"
0d580e83dd97b7f36869041cdc8f1af12dff8675 21-May-2014 Jean-Michel Trivi <jmtrivi@google.com> Define audio attributes type in system audio header

Change-Id: Iac2030a1e4a6827676e6c5f9b408f1e768207f00
nclude/system/audio.h
8f4ac8e1d3349170f319526e8cfcb036db954ee4 03-Jun-2014 Narayan Kamath <narayan@google.com> am 7cf8e1cb: am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present."

* commit '7cf8e1cb88c44963ccb2128113d8a804d85645b9':
Skip the "--abi" flag on "adb install" if present.
7cf8e1cb88c44963ccb2128113d8a804d85645b9 03-Jun-2014 Narayan Kamath <narayan@google.com> am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present."

* commit '4e26c95a6363da4885bb9178c9d42c273b357043':
Skip the "--abi" flag on "adb install" if present.
4e26c95a6363da4885bb9178c9d42c273b357043 03-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Skip the "--abi" flag on "adb install" if present."
f3c85b2488529404a170a28f9bc72538b1ace97d 03-Jun-2014 Nick Kralevich <nnk@google.com> Only allow disabling SELinux on userdebug / eng builds

Only parse and honor the kernel command line on userdebug
or eng builds. On user builds, assume that selinux is always enabled
and enforcing.

Change-Id: I71c66e4365bdf2f226800634126a38b716d96599
nit/Android.mk
nit/init.c
9e18975bac792fc4b0b18d7f679772c577fbd56f 03-Jun-2014 JP Abgrall <jpa@google.com> am c99dd0c5: am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"

* commit 'c99dd0c58d2a7572740599f81b5a20ddb18dbf9e':
libcutils: fix rw FS remount check issue
c99dd0c58d2a7572740599f81b5a20ddb18dbf9e 03-Jun-2014 JP Abgrall <jpa@google.com> am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"

* commit '676f7d509d683921335ccddc2f267a73eb5c60c6':
libcutils: fix rw FS remount check issue
676f7d509d683921335ccddc2f267a73eb5c60c6 03-Jun-2014 JP Abgrall <jpa@google.com> am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"

* commit 'fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7':
libcutils: fix rw FS remount check issue
fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7 03-Jun-2014 JP Abgrall <jpa@google.com> Merge "libcutils: fix rw FS remount check issue"
88f7683d9c935f31ba118defd2ec91de7f5cf11d 03-Jun-2014 Hong-Mei Li <a21834@motorola.com> libcutils: fix rw FS remount check issue

In some condition, some of FS would set disable_roll_forward option.
In this case, when we do power off or reboot, the power down progress
would stuck at android_reboot for 360 sec.
The reason is, remount_ro_done function check key word "rw" to determine
whether all the read-write FS has been remounted as read-only FS.
Unfortunately, it takes disable_roll_forward as a rw flag too by
mistake, so the check would always fail, until reach 360 sec threshold.

The patch would match "rw," from mount options, this can avoid the issue
successfully.

Change-Id: I409f9dc88c9ee5cf049615ea9dcccaf195b6bc5a
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
ibcutils/android_reboot.c
5bed8036644f552210a7cfcbed2d6d20cf2981b0 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> libutils: turn on -Werror

- Deal with some -Wunused issues
- Override PRI macros (windows)
- Revert use of PRI macros on off64_t (linux)
- Deal with a gnu++11 complaince issue

Change-Id: Ie66751293bd84477a5a6dfd8a57e700a16e36964
ibutils/Android.mk
ibutils/BlobCache.cpp
ibutils/FileMap.cpp
ibutils/LinearAllocator.cpp
ibutils/RefBase.cpp
ibutils/StopWatch.cpp
ibutils/String16.cpp
ibutils/String8.cpp
ibutils/SystemClock.cpp
ibutils/Threads.cpp
ibutils/Timers.cpp
ibutils/Unicode.cpp
ibutils/tests/BlobCache_test.cpp
b311ca9ee82c91d411164a90e9c5b32565a1e43c 16-May-2014 Dave Allison <dallison@google.com> Add LD_PRELOAD for libsigchain.so to the environment

To remove the need to modify the bionic dynamic linker, add the
signal chaining library as a preload in the environment. This
will be picked up by the dynamic linker and will override
sigaction and sigprocmask to allow for signal chaining.

Change-Id: I6e2d0628b009bd01e0ed9aed0b311871b9c8363a
ootdir/init.environ.rc.in
4b41092a5dbd8a62a620caa4828dbbb7ef1d4e80 02-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 5ce10c4d: am 00d70979: am bf0f2590: Merge "liblog: cache getuid() syscall"

* commit '5ce10c4d2415f25a4d2bfbf49c50bb152dff0fa2':
liblog: cache getuid() syscall
5ce10c4d2415f25a4d2bfbf49c50bb152dff0fa2 02-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 00d70979: am bf0f2590: Merge "liblog: cache getuid() syscall"

* commit '00d70979632fb72a7837206476505af3a030f782':
liblog: cache getuid() syscall
00d70979632fb72a7837206476505af3a030f782 02-Jun-2014 Mark Salyzyn <salyzyn@google.com> am bf0f2590: Merge "liblog: cache getuid() syscall"

* commit 'bf0f25905b12581f05b65b1ebe95211c727ae483':
liblog: cache getuid() syscall
bf0f25905b12581f05b65b1ebe95211c727ae483 02-Jun-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: cache getuid() syscall"
076ba81ce997e408c662be438ac37eb532b72eda 30-May-2014 Mark Salyzyn <salyzyn@google.com> liblog: cache getuid() syscall

BUG: 15315766
Change-Id: I8f889a1c6ede74f2621f1b8ea5fda666c4b9cba2
iblog/logd_write.c
b81708146f51afb434739374095161ab7ff32787 02-Jun-2014 Jeff Sharkey <jsharkey@android.com> Merge "Add "exec" service: shell commands with no pty."
ab1816a6c0dad525b2f26188bed96d1da6df293b 31-May-2014 Nick Kralevich <nnk@google.com> am 4f04439f: am 6fb92bd8: am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."

* commit '4f04439f0eab481d1b7938e78d8ee316dda4d641':
SELinux changes to check policy versions during a reload.
4f04439f0eab481d1b7938e78d8ee316dda4d641 31-May-2014 Nick Kralevich <nnk@google.com> am 6fb92bd8: am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."

* commit '6fb92bd84bea3c5efadd891f1853fef7c811e79d':
SELinux changes to check policy versions during a reload.
6fb92bd84bea3c5efadd891f1853fef7c811e79d 31-May-2014 Nick Kralevich <nnk@google.com> am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."

* commit '252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a':
SELinux changes to check policy versions during a reload.
252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a 31-May-2014 Nick Kralevich <nnk@google.com> Merge "SELinux changes to check policy versions during a reload."
40f321ab4965e38f0a50955f816a0de718deec99 31-May-2014 Jeff Sharkey <jsharkey@android.com> am 2e7d80d1: Per-app media directories on external storage.

* commit '2e7d80d10acf95076dfb1f2727455432091de65f':
Per-app media directories on external storage.
2e7d80d10acf95076dfb1f2727455432091de65f 31-May-2014 Jeff Sharkey <jsharkey@android.com> Per-app media directories on external storage.

This change defines per-app directories on external storage that
will be scanned and included in MediaStore. This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I6f03d8076a9391d8b9eb8421ec3fc93669b3ba0d
dcard/sdcard.c
70b53c4057094f48167b3d00954d7917e16cd5cf 30-May-2014 Dan Albert <danalbert@google.com> am 4b126c46: am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""

* commit '4b126c4604965ea029d9c741d074ad7f820b5269':
Revert "Move libutils to libc++"
4b126c4604965ea029d9c741d074ad7f820b5269 30-May-2014 Dan Albert <danalbert@google.com> am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""

* commit 'e8f90ca60d65f5a0542b77f8f517c4fb80da2e52':
Revert "Move libutils to libc++"
e8f90ca60d65f5a0542b77f8f517c4fb80da2e52 30-May-2014 Dan Albert <danalbert@google.com> am 570cd46d: Merge "Revert "Move libutils to libc++""

* commit '570cd46d14645f622e9972671308fdb4f2425292':
Revert "Move libutils to libc++"
570cd46d14645f622e9972671308fdb4f2425292 30-May-2014 Dan Albert <danalbert@google.com> Merge "Revert "Move libutils to libc++""
7bc49a16e80bd6306fc467e27c019aa72b9a2701 30-May-2014 Dan Albert <danalbert@google.com> Revert "Move libutils to libc++"

Causes issues in the unbundled branches.

This reverts commit dc133729b0bc983c6ecfecdb06ac8b433ea31350.

Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a
ibutils/Android.mk
ibutils/tests/Android.mk
6f8030c56503acf53a58e7abb51cbdc25845b57b 30-May-2014 Dan Albert <danalbert@google.com> am 58f4a09b: am 36f536fc: am 9f69e028: Merge "Move libutils to libc++"

* commit '58f4a09bb4375c2f7b85ec14449a0588e85e126a':
Move libutils to libc++
58f4a09bb4375c2f7b85ec14449a0588e85e126a 30-May-2014 Dan Albert <danalbert@google.com> am 36f536fc: am 9f69e028: Merge "Move libutils to libc++"

* commit '36f536fc7b88fe21a974bce6fed565bc622b5bc2':
Move libutils to libc++
36f536fc7b88fe21a974bce6fed565bc622b5bc2 30-May-2014 Dan Albert <danalbert@google.com> am 9f69e028: Merge "Move libutils to libc++"

* commit '9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6':
Move libutils to libc++
9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6 30-May-2014 Dan Albert <danalbert@google.com> Merge "Move libutils to libc++"
5d9d434efadf1c535c7fea634d5306e18c68ef1f 27-May-2014 Jeff Sharkey <jsharkey@android.com> Add "exec" service: shell commands with no pty.

To facilitate device scripts that want to read/write binary data from
the host side, this change introduces a new "exec" service that
behaves like "shell" but without creating a pty, which would otherwise
mangle binary data.

After forking, it hooks up stdin/stdout of the child process to
the socket connected through to the host. The adb transport doesn't
support shutdown(), so the host can't half-close the socket and wait
for device termination. Instead, the host side now has two explicit
commands "exec-in" and "exec-out" for either sending or receiving
data.

Teach host side copy_to_file() to deal with stdin/stdout special
cases. Switch device side backup/restore services to use the new
create_subproc_raw under the hood.

Change-Id: I5993049803519d3959761f2363037b02c50920ee
db/Android.mk
db/adb.h
db/backup_service.c
db/commandline.c
db/services.c
3051ddd13a45e61b2ace9459a0657ddf892c39db 30-May-2014 Mark Salyzyn <salyzyn@google.com> am 4547273b: am 265262a8: am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"

* commit '4547273b427422d69260a21dd19b1480aff7b890':
String16.cpp rm unused utils/Debug.h
4547273b427422d69260a21dd19b1480aff7b890 30-May-2014 Mark Salyzyn <salyzyn@google.com> am 265262a8: am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"

* commit '265262a8b243faa16c268ac40801a226359437a6':
String16.cpp rm unused utils/Debug.h
265262a8b243faa16c268ac40801a226359437a6 30-May-2014 Mark Salyzyn <salyzyn@google.com> am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"

* commit '5f815da3aba73e7605b72b6b3e2de648ca7c3390':
String16.cpp rm unused utils/Debug.h
5f815da3aba73e7605b72b6b3e2de648ca7c3390 30-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "String16.cpp rm unused utils/Debug.h"
664bdde0f1dd43c838dc65f30d3caa9fc85a754b 29-May-2014 Dave Allison <dallison@google.com> am 01546ff2: am dec41a38: am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"

* commit '01546ff208cec5ac15f81cc84f507fb8c9a51d98':
Add LD_PRELOAD for libsigchain.so to the environment
01546ff208cec5ac15f81cc84f507fb8c9a51d98 29-May-2014 Dave Allison <dallison@google.com> am dec41a38: am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"

* commit 'dec41a388d58ae515c83df4ec084c1e38edb427a':
Add LD_PRELOAD for libsigchain.so to the environment
6443033f6d22db50f9a75fb0df750928ea70b498 29-May-2014 Mark Salyzyn <salyzyn@google.com> String16.cpp rm unused utils/Debug.h

Change-Id: Ie7e3695770f20be33738a0f0a868cc914248d91a
ibutils/String16.cpp
dec41a388d58ae515c83df4ec084c1e38edb427a 29-May-2014 Dave Allison <dallison@google.com> am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"

* commit '967729b7ca675d6f2c895a1bd56216a62b217e50':
Add LD_PRELOAD for libsigchain.so to the environment
967729b7ca675d6f2c895a1bd56216a62b217e50 29-May-2014 Dave Allison <dallison@google.com> Merge "Add LD_PRELOAD for libsigchain.so to the environment"
dc133729b0bc983c6ecfecdb06ac8b433ea31350 29-May-2014 Dan Albert <danalbert@google.com> Move libutils to libc++

Bug: 15193147
Change-Id: Ib4b1835e77279db905e098abc7c9bf8d27d66b57
ibutils/Android.mk
ibutils/tests/Android.mk
a284f8b214a8b92775534922ac24f13498d3af0a 29-May-2014 Narayan Kamath <narayan@google.com> Skip the "--abi" flag on "adb install" if present.

This flag needs to be passed through to the package manager.
Without this change, the argument to this flag is interpreted
as a filename.

NOTE: If we don't want to add special treatment for this flag,
we'll have to assume that all flags with a -- prefix have an
argument, and that isn't necessarily true.

Change-Id: I78c3fa842bc24148d83d7278e6dee395686240a0
db/commandline.c
c3ef95f1e443db56d2238a17626b9877a000e8da 29-May-2014 Eric Laurent <elaurent@google.com> am d502cb34: (-s ours) DO NOT MERGE - audio: added definitions for audio routing extensions

* commit 'd502cb34834633d5d6de21620088d9ededa838f3':
DO NOT MERGE - audio: added definitions for audio routing extensions
f87012e0ab62126085d2356a402930553cd22230 29-May-2014 The Android Automerger <android-build@google.com> am e3e04a16: merge in master-release history after reset to 3db03a5ab0cb7713529c298531be6da7c2193525

* commit 'e3e04a16fdc039af92c2cb7a4273b568f30d4537':
logd: logcat: Add persist.logd.size group of properties
logd: default off by-UID spam filter
logd: logcat: Add persist.logd.size group of properties
logd: default off by-UID spam filter
logd: transitory reader thread create should be detached
Merge "Fix entry handling for 0 length entries."
liblog: high CPU usage from logcat
540a1849cb30a37f070fb7f252f5221ba41a0d4f 29-May-2014 Elliott Hughes <enh@google.com> am b3697ec2: am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."

* commit 'b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
1142d8eceae962d481d922358ebe9837ba975a2a 28-May-2014 Mike Lockwood <lockwood@google.com> Merge "audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02 28-May-2014 Elliott Hughes <enh@google.com> am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."

* commit 'c752d6dd37a943b2ef64c184a0ff542e78173bc9':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
c752d6dd37a943b2ef64c184a0ff542e78173bc9 28-May-2014 Elliott Hughes <enh@google.com> am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."

* commit 'bf082ffb71c40e4670410b246309a182d9dafcf5':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
bf082ffb71c40e4670410b246309a182d9dafcf5 28-May-2014 Elliott Hughes <enh@google.com> Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
d502cb34834633d5d6de21620088d9ededa838f3 18-Feb-2014 Eric Laurent <elaurent@google.com> DO NOT MERGE - audio: added definitions for audio routing extensions

Added definitons and structures for new audio routing features
in the framework and audio HAL.
The structures describe the objects needed to perform audio
routing and audio gain control: different variants of audio ports
and their corresponding configurations as well as gain controllers.

Change-Id: Iecd1b9186831067a52cc55619a63b7bba57dcbd9
nclude/system/audio.h
c8183af4b3a3515f8f0cff27b2808a7139f18230 12-May-2014 Mike Lockwood <lockwood@google.com> audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP

Change-Id: I32770abd42702d99f409f0968326041e78d1a826
nclude/system/audio.h
f661a8f53158bc28faf754adf896c0a5a9dc999e 28-May-2014 Mark Salyzyn <salyzyn@google.com> am 27348af6: am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"

* commit '27348af683a55d8701567fdeabdd37b547b187f0':
system/window.h: add deprecation warnings
27348af683a55d8701567fdeabdd37b547b187f0 28-May-2014 Mark Salyzyn <salyzyn@google.com> am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"

* commit '6445b40e93931dedcb831f38343c031c13b7ddb2':
system/window.h: add deprecation warnings
6445b40e93931dedcb831f38343c031c13b7ddb2 28-May-2014 Mark Salyzyn <salyzyn@google.com> am 811f2c0b: Merge "system/window.h: add deprecation warnings"

* commit '811f2c0b98d6f8935123221648c96ff975688902':
system/window.h: add deprecation warnings
811f2c0b98d6f8935123221648c96ff975688902 28-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "system/window.h: add deprecation warnings"
e7fd4078a225fdfa92edcb6be6d79ba2fd6e8eb9 28-May-2014 Nick Kralevich <nnk@google.com> am 7206eccb: am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"

* commit '7206eccbd904508a199c7ec302d7395b3b674968':
Remove dmesg_restrict
f9ff246dd7d4d44ad65d7f9690780eddaf74bde0 28-May-2014 Torne (Richard Coles) <torne@google.com> am 4f3ad823: am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."

* commit '4f3ad823eaf97fcbcbb1afac67371aff76677b1d':
Add UID and directory for RELRO sharing support.
7206eccbd904508a199c7ec302d7395b3b674968 28-May-2014 Nick Kralevich <nnk@google.com> am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"

* commit 'c4ffa5f62ef256ff286122d0ceea61364aa67e13':
Remove dmesg_restrict
c4ffa5f62ef256ff286122d0ceea61364aa67e13 28-May-2014 Nick Kralevich <nnk@google.com> am c290bed0: Merge "Remove dmesg_restrict"

* commit 'c290bed0350cded5620ed8dbb68b1cfb07d9828c':
Remove dmesg_restrict
c290bed0350cded5620ed8dbb68b1cfb07d9828c 28-May-2014 Nick Kralevich <nnk@google.com> Merge "Remove dmesg_restrict"
4f3ad823eaf97fcbcbb1afac67371aff76677b1d 28-May-2014 Torne (Richard Coles) <torne@google.com> am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."

* commit 'a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9':
Add UID and directory for RELRO sharing support.
a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9 28-May-2014 Torne (Richard Coles) <torne@google.com> am 96109cf3: Merge "Add UID and directory for RELRO sharing support."

* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
Add UID and directory for RELRO sharing support.
96109cf36c3dd44e9ecfe4b810e21e77eaf834dc 28-May-2014 Torne (Richard Coles) <torne@google.com> Merge "Add UID and directory for RELRO sharing support."
1a6184baf3e01bf7786fb14de4216bcb4e3b2f70 28-May-2014 Nick Kralevich <nnk@google.com> Remove dmesg_restrict

dmesg_restrict is too coarse of a control. In Android's case,
we want to allow the shell user to see dmesg output, but disallow
others from seeing it.

Rather than rely on dmesg_restrict, use SELinux to control access
to dmesg instead. See corresponding change in external/sepolicy .

Bug: 10020939
Change-Id: I9d4bbbd41cb02b707cdfee79f826a39c1ec2f177
ootdir/init.rc
accd09581eae7a7d3c746a4d9a7415c9a131d59e 28-May-2014 Mark Salyzyn <salyzyn@google.com> am 73334e60: am 1e4cfe06: am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"

* commit '73334e60530ac68c8b4686316924c225fd037a84':
logd: logcat: debuggerd: audit logs to events and main
73334e60530ac68c8b4686316924c225fd037a84 28-May-2014 Mark Salyzyn <salyzyn@google.com> am 1e4cfe06: am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"

* commit '1e4cfe0636f5ade52e8aabac90166b7040e60d8e':
logd: logcat: debuggerd: audit logs to events and main
1e4cfe0636f5ade52e8aabac90166b7040e60d8e 28-May-2014 Mark Salyzyn <salyzyn@google.com> am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"

* commit '5df557f6b05ebde2e3f98affa54ef60b717d4b96':
logd: logcat: debuggerd: audit logs to events and main
5df557f6b05ebde2e3f98affa54ef60b717d4b96 28-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: logcat: debuggerd: audit logs to events and main"
bccac026e9198e283fd2e276bfe5a7020db1bf88 27-May-2014 Elliott Hughes <enh@google.com> am 8ed26bd6: am 769db021: am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"

* commit '8ed26bd6531a8d52dcaff6c14b6fc59749791679':
adb: Add USB vendor ID for Unowhy
8ed26bd6531a8d52dcaff6c14b6fc59749791679 27-May-2014 Elliott Hughes <enh@google.com> am 769db021: am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"

* commit '769db021e6b61d10c13a7b17a72750f18ebdee16':
adb: Add USB vendor ID for Unowhy
e4369d68a255790ff0ed21ba31d3dcbb520df09d 27-May-2014 Mark Salyzyn <salyzyn@google.com> logd: logcat: debuggerd: audit logs to events and main

- auditd spawn log copy to events and main
- logcat delete events as one of the default logs
- debuggerd do not collect events.
- squish multiple spaces
- switch from strcpy to memmove for overlapping buffers

BUG: 14626551
Change-Id: I89b30273ce931ed2b25a53ea9be48e77f4c1bbf4
ebuggerd/tombstone.cpp
ogcat/logcat.cpp
ogd/LogAudit.cpp
769db021e6b61d10c13a7b17a72750f18ebdee16 27-May-2014 Elliott Hughes <enh@google.com> am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"

* commit 'b24085d55b082d802eba699243dba26fbc6ac712':
adb: Add USB vendor ID for Unowhy
b24085d55b082d802eba699243dba26fbc6ac712 27-May-2014 Elliott Hughes <enh@google.com> Merge "adb: Add USB vendor ID for Unowhy"
56266c75e2089500c30fcbc97f0d46df47f87f00 26-May-2014 Wing Tseng <Wing_Tseng@pegatroncorp.com> adb: Add USB vendor ID for Unowhy

Change-Id: I8bab07734d5b6acb4d8ceaf45b0bab0723f5fe03
Signed-off-by: Wing Tseng <Wing_Tseng@pegatroncorp.com>
db/usb_vendors.c
8c82b35239fff3b85acc7b2a76fb9488b10fb773 27-May-2014 Brigid Smith <brigidsmith@google.com> Updated trace.h to recognize ATRACE_TAG_BIONIC.

Bug: 15116468
Change-Id: If8d4971505ffe5cbc193c6ad71618a5adb8192b6
nclude/cutils/trace.h
7291ac60822c8b84e423de4f4abec6663d0e8f50 27-May-2014 David 'Digit' Turner <digit@android.com> am 97267755: am c3358875: am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""

* commit '972677557bd2c3a0678a945765783e85c7ec7b9c':
adb: implement "adb reverse <local> <remote>"
972677557bd2c3a0678a945765783e85c7ec7b9c 27-May-2014 David 'Digit' Turner <digit@android.com> am c3358875: am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""

* commit 'c3358875169b920847a72428f4e8b8f09f7bdf05':
adb: implement "adb reverse <local> <remote>"
c3358875169b920847a72428f4e8b8f09f7bdf05 27-May-2014 David 'Digit' Turner <digit@android.com> am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""

* commit '6e7343b8993fecb2f0600a9e5cff91dd4480a877':
adb: implement "adb reverse <local> <remote>"
6e7343b8993fecb2f0600a9e5cff91dd4480a877 27-May-2014 David 'Digit' Turner <digit@android.com> Merge "adb: implement "adb reverse <local> <remote>""
252586941934d23073a8d167ec240b221062505f 21-Mar-2013 David 'Digit' Turner <digit@android.com> adb: implement "adb reverse <local> <remote>"

This implements the logical opposite of 'adb forward', i.e.
the ability to reverse network connections from the device
to the host.

This feature is very useful for testing various programs
running on an Android device without root or poking at the
host's routing table.

Options and parameters are exactly the same as those for
'adb forward', except that the direction is reversed.

Examples:

adb reverse tcp:5000 tcp:6000
connections to localhost:5000 on the device will be
forwarded to localhost:6000 on the host.

adb reverse --no-rebind tcp:5000 tcp:6000
same as above, but fails if the socket is already
bound through a previous 'adb reverse tcp:5000 ...'
command.

adb reverse --list
list all active reversed connections for the target
device. Note: there is no command to list all
reversed connections for all devices at once.

adb reverse --remove tcp:5000
remove any reversed connection on the device from
localhost:5000

adb reverse --remove-all
remove all reversed connections form the current
device.

Reversed connections are tied to a transport, in other
words, they disappear as soon as a device is disconnected.

Simple testing protocol:

adb forward tcp:5000 tcp:6000
adb reverse tcp:6000 tcp:7000
nc -l localhost 7000

in another terminal:
echo "Hello" | nc localhost 5000

Will print "Hello" on the first terminal.

Change-Id: I761af790cdb06829b68430afa4145a919fa0e6d5
db/SERVICES.TXT
db/adb.c
db/adb.h
db/commandline.c
db/services.c
234f696ea7f97dc489290827c1c68f26279de294 22-May-2014 Torne (Richard Coles) <torne@google.com> Add UID and directory for RELRO sharing support.

Define a UID to be used by the process responsible for creating shared
RELRO files for the WebView native library, and create a directory owned
by that UID to use to store the files.

Bug: 13005501
Change-Id: I5bbb1e1035405e5534b2681f554fe16f74e3da1a
nclude/private/android_filesystem_config.h
ootdir/init.rc
ef386b3fb01b7458f2dcf11c9be7bd099f0ea2ed 27-May-2014 Narayan Kamath <narayan@google.com> am b5d6c188: am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."

* commit 'b5d6c18859424d86339ce895a42084a9c08552fd':
Add a zygote 64/32 bit config.
b5d6c18859424d86339ce895a42084a9c08552fd 27-May-2014 Narayan Kamath <narayan@google.com> am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."

* commit '9196f5f2df7890100e8968983680e196e944bd05':
Add a zygote 64/32 bit config.
9196f5f2df7890100e8968983680e196e944bd05 27-May-2014 Narayan Kamath <narayan@google.com> am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."

* commit '5fe6fcc35d10c88dd55213dc5b2303ea73c1883b':
Add a zygote 64/32 bit config.
5fe6fcc35d10c88dd55213dc5b2303ea73c1883b 27-May-2014 Narayan Kamath <narayan@google.com> Merge "Add a zygote 64/32 bit config."
5a1988564177a2f7e31fa11936c442b27b6468a1 24-May-2014 Christopher Ferris <cferris@google.com> am 012090e5: am a0962b68: am d917d64f: Merge "Only copy mcontext data from sigcontext."

* commit '012090e57b697133ad6f7d989e103d71302749f8':
Only copy mcontext data from sigcontext.
012090e57b697133ad6f7d989e103d71302749f8 24-May-2014 Christopher Ferris <cferris@google.com> am a0962b68: am d917d64f: Merge "Only copy mcontext data from sigcontext."

* commit 'a0962b687a20dace14b5b2e12d96141a51140cab':
Only copy mcontext data from sigcontext.
881c89c54a19187c68ac079d812e010436dc4e4d 24-May-2014 Mark Salyzyn <salyzyn@google.com> am 7aa8cdfb: am 21157abc: am 8814bd1d: Merge "include: cleanup for -Wsystem-header"

* commit '7aa8cdfb317dcb7efb7127b070526df09da05377':
include: cleanup for -Wsystem-header
7aa8cdfb317dcb7efb7127b070526df09da05377 24-May-2014 Mark Salyzyn <salyzyn@google.com> am 21157abc: am 8814bd1d: Merge "include: cleanup for -Wsystem-header"

* commit '21157abcd932e899032689dba120d4f7cb08aa23':
include: cleanup for -Wsystem-header
a0962b687a20dace14b5b2e12d96141a51140cab 24-May-2014 Christopher Ferris <cferris@google.com> am d917d64f: Merge "Only copy mcontext data from sigcontext."

* commit 'd917d64fafb2eca22c9c75a8527eb4e920a9f079':
Only copy mcontext data from sigcontext.
21157abcd932e899032689dba120d4f7cb08aa23 24-May-2014 Mark Salyzyn <salyzyn@google.com> am 8814bd1d: Merge "include: cleanup for -Wsystem-header"

* commit '8814bd1d24e3ce9476e64ba641d592521fcf80ed':
include: cleanup for -Wsystem-header
d917d64fafb2eca22c9c75a8527eb4e920a9f079 24-May-2014 Christopher Ferris <cferris@google.com> Merge "Only copy mcontext data from sigcontext."
8814bd1d24e3ce9476e64ba641d592521fcf80ed 24-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "include: cleanup for -Wsystem-header"
e48460762273586744a79d146c2916bcfca7e9e4 23-May-2014 Christopher Ferris <cferris@google.com> Only copy mcontext data from sigcontext.

The ucontext_t data structure could be bigger than the kernel data
structure. Since the unwinder only cares about the mcontext data, only
copy that out of the structure. The mcontext data is the same size in
the kernel and in the ucontext_t structure.

Bug: 15189014
Change-Id: I5978169c4425b8212e11db85a57eb319cd0e264b
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
289e111a009809ec18c3b652b7805e61bb515f6e 23-May-2014 Mark Salyzyn <salyzyn@google.com> system/window.h: add deprecation warnings

Change-Id: I38de3d281f28e0750b4abb86f28509f98dfc7a72
nclude/system/window.h
4887842c925f304dc862bdd5810f27cdd2eaedcb 23-May-2014 Mark Salyzyn <salyzyn@google.com> include: cleanup for -Wsystem-header

- warnings as errors, or errors introduced when -Wsystem-header
was experimentally introduced.

Change-Id: Ia8f5b3c1c1096e191741223d52526aa48c7f1cc4
nclude/cutils/bitops.h
nclude/cutils/fs.h
nclude/cutils/trace.h
nclude/log/log_read.h
nclude/log/logger.h
nclude/system/audio.h
nclude/system/window.h
nclude/utils/Functor.h
nclude/utils/LruCache.h
38b89f151d8beec87e8e372e49ffc077e4727c47 23-May-2014 Mark Salyzyn <salyzyn@google.com> am c37297f3: am 3f69451b: am 818f8004: Merge "logd: used before set warning"

* commit 'c37297f3318617849e5930870afb18bbaf91ddb5':
logd: used before set warning
4b8fde752990592c0d3fbee4194aa685c695d45b 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 0520298e: am 0b17e1cf: am 72be6d5e: Merge "cpio: Turn on -Werror"

* commit '0520298e3a58c99bc87a4e8c5f64aa419354159b':
cpio: Turn on -Werror
3c55219b73cb9a9df3591b1104a32b5972c5e303 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 04482eab: am f998116b: am 08c372d1: Merge "libnetutils: Turn on -Werror"

* commit '04482eaba2584c3a05bff4a6647f0a2e55475a91':
libnetutils: Turn on -Werror
b87a780240d5a4ad4756565d5f25d92a8737e7aa 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 800e8304: am 3bc628b2: am f5e2dc89: Merge "libctest: zap"

* commit '800e8304a5fbc40f7d0156941345635fe4e32555':
libctest: zap
2594f0f6d127f4983d9bff0d89ddf3688790aa3e 23-May-2014 Colin Cross <ccross@android.com> am 2113474a: am 17c3a227: am 617c28b8: Merge "Fix list_for_each_safe macro"

* commit '2113474ae090ee4c6a06864011ce8a4e4cae9673':
Fix list_for_each_safe macro
795e59b32aa50364c1f5cb26adf97eda31551168 23-May-2014 Colin Cross <ccross@android.com> am fcc81e3c: am 184eecf0: am 4ecbda41: Merge "Add list_add_head to libcutils"

* commit 'fcc81e3c6f0724b3b360b19071005e559334bc58':
Add list_add_head to libcutils
c37297f3318617849e5930870afb18bbaf91ddb5 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 3f69451b: am 818f8004: Merge "logd: used before set warning"

* commit '3f69451b030917a0f29459e8e9f08b11ec8a980d':
logd: used before set warning
0520298e3a58c99bc87a4e8c5f64aa419354159b 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 0b17e1cf: am 72be6d5e: Merge "cpio: Turn on -Werror"

* commit '0b17e1cf18def9830983aa5c37c7c62e83cf0169':
cpio: Turn on -Werror
3f69451b030917a0f29459e8e9f08b11ec8a980d 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 818f8004: Merge "logd: used before set warning"

* commit '818f80045fe4c925a7739a1d1e69e3ebb3a3dbd9':
logd: used before set warning
0b17e1cf18def9830983aa5c37c7c62e83cf0169 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 72be6d5e: Merge "cpio: Turn on -Werror"

* commit '72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff':
cpio: Turn on -Werror
818f80045fe4c925a7739a1d1e69e3ebb3a3dbd9 23-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: used before set warning"
72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff 23-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "cpio: Turn on -Werror"
ab4b7308ecd8a425cdeb3e289fcfeda0e08085be 23-May-2014 Mark Salyzyn <salyzyn@google.com> logd: used before set warning

Change-Id: I30c078f8b22ebe4dcb48d57adf88b3e51b4fa202
ogd/LogBuffer.cpp
5ce757518b8ce43849b6cfa1faac41ce6cb14894 16-May-2014 Mark Salyzyn <salyzyn@google.com> cpio: Turn on -Werror

- Solve st_mode is uint16_t on MAC
- Turn on -Werror

Change-Id: I67b62424245545099ed283c56dae544153b85425
pio/Android.mk
pio/mkbootfs.c
04482eaba2584c3a05bff4a6647f0a2e55475a91 23-May-2014 Mark Salyzyn <salyzyn@google.com> am f998116b: am 08c372d1: Merge "libnetutils: Turn on -Werror"

* commit 'f998116bb07375c4cfbd35aa4852ff9ca36600ad':
libnetutils: Turn on -Werror
f998116bb07375c4cfbd35aa4852ff9ca36600ad 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 08c372d1: Merge "libnetutils: Turn on -Werror"

* commit '08c372d18ecfc02cf7cba7ef65007118b78762bd':
libnetutils: Turn on -Werror
08c372d18ecfc02cf7cba7ef65007118b78762bd 23-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libnetutils: Turn on -Werror"
c829080ba9ef35237764cfb0d322e564a08ba842 16-May-2014 Mark Salyzyn <salyzyn@google.com> libnetutils: Turn on -Werror

- Get rid of a pair of out of range comparison warnings.
- Turn on -Werror for compilation

Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2883
ibnetutils/Android.mk
ibnetutils/dhcpclient.c
800e8304a5fbc40f7d0156941345635fe4e32555 23-May-2014 Mark Salyzyn <salyzyn@google.com> am 3bc628b2: am f5e2dc89: Merge "libctest: zap"

* commit '3bc628b2d4ddc3f53989bdb17f630bdf105aa1d8':
libctest: zap
2113474ae090ee4c6a06864011ce8a4e4cae9673 23-May-2014 Colin Cross <ccross@android.com> am 17c3a227: am 617c28b8: Merge "Fix list_for_each_safe macro"

* commit '17c3a227505988b33e1219a8e0a921de874f9b70':
Fix list_for_each_safe macro
fcc81e3c6f0724b3b360b19071005e559334bc58 23-May-2014 Colin Cross <ccross@android.com> am 184eecf0: am 4ecbda41: Merge "Add list_add_head to libcutils"

* commit '184eecf017b847bcb6999919f5aa4628521aca2d':
Add list_add_head to libcutils
3bc628b2d4ddc3f53989bdb17f630bdf105aa1d8 23-May-2014 Mark Salyzyn <salyzyn@google.com> am f5e2dc89: Merge "libctest: zap"

* commit 'f5e2dc8967d66362a1d57ce6f764e4585aad9883':
libctest: zap
17c3a227505988b33e1219a8e0a921de874f9b70 23-May-2014 Colin Cross <ccross@android.com> am 617c28b8: Merge "Fix list_for_each_safe macro"

* commit '617c28b8f2c9b90efa8b164ce2af2c7cd3007fbd':
Fix list_for_each_safe macro
184eecf017b847bcb6999919f5aa4628521aca2d 23-May-2014 Colin Cross <ccross@android.com> am 4ecbda41: Merge "Add list_add_head to libcutils"

* commit '4ecbda41c921f3209e96a3d72928a4bcba9422e6':
Add list_add_head to libcutils
f5e2dc8967d66362a1d57ce6f764e4585aad9883 23-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libctest: zap"
d7579650f5dc8d16cecfaec26f7c9d947b4debf9 16-May-2014 Mark Salyzyn <salyzyn@google.com> libctest: zap

Related Changes:
- https://android-review.googlesource.com/#/c/95364
- https://googleplex-android-review.git.corp.google.com/#/c/470584
- https://googleplex-android-review.git.corp.google.com/#/c/470591
- https://googleplex-android-review.git.corp.google.com/#/c/470590

Change-Id: I28a017104f48cc4216df876eb9102ecd332d28e3
ibctest/Android.mk
ibctest/NOTICE
ibctest/ctest.c
617c28b8f2c9b90efa8b164ce2af2c7cd3007fbd 23-May-2014 Colin Cross <ccross@android.com> Merge "Fix list_for_each_safe macro"
4ecbda41c921f3209e96a3d72928a4bcba9422e6 23-May-2014 Colin Cross <ccross@android.com> Merge "Add list_add_head to libcutils"
fd2442ebf98535cb3abad26d62549bcfdb9cdb42 22-May-2014 Colin Cross <ccross@android.com> am c34598aa: am 55c3401b: am 08befc3a: Merge "ueventd: support by-name symlinks for PCI block devices"

* commit 'c34598aa657121ed2feafdae35032e72aa1c9a80':
ueventd: support by-name symlinks for PCI block devices
c34598aa657121ed2feafdae35032e72aa1c9a80 22-May-2014 Colin Cross <ccross@android.com> am 55c3401b: am 08befc3a: Merge "ueventd: support by-name symlinks for PCI block devices"

* commit '55c3401b103bfe075aded28e0b5112f53f8a1fa1':
ueventd: support by-name symlinks for PCI block devices
4c61e3673133b4e29449685e0460cce84005f9c9 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 5cdb3f92: am 6b5f4c34: am 0c7e5cda: Merge "libusbhost: Turn on -Werror"

* commit '5cdb3f92c3f307d3d348a5a7247d052af6804740':
libusbhost: Turn on -Werror
c5e01d8616a0155349fb52fcb732c70e74aec79a 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 1291df76: am c5fa4b19: am 065c2706: Merge "libsuspend: Turn on -Werror"

* commit '1291df76956407d08e673443786f92c9a16006c1':
libsuspend: Turn on -Werror
96886f53a6a2255c3edf14a45bf2a84d3c1d125c 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 8a531327: am 1010b672: am b05866af: Merge "libion: Turn on -Werror"

* commit '8a53132710fc7f32056fe50f680edf11241384ad':
libion: Turn on -Werror
bba2ed8a6af1a2deb192c49b7ae1a9421e20b1f7 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 0455d792: am 7d28098b: am 99337883: Merge "sdcard: Turn on -Werror"

* commit '0455d792cf297f4661cfb00836d0c2bceee789e9':
sdcard: Turn on -Werror
55c3401b103bfe075aded28e0b5112f53f8a1fa1 22-May-2014 Colin Cross <ccross@android.com> am 08befc3a: Merge "ueventd: support by-name symlinks for PCI block devices"

* commit '08befc3a8066626bb7336dd9ad656e737712153e':
ueventd: support by-name symlinks for PCI block devices
08befc3a8066626bb7336dd9ad656e737712153e 22-May-2014 Colin Cross <ccross@android.com> Merge "ueventd: support by-name symlinks for PCI block devices"
5cdb3f92c3f307d3d348a5a7247d052af6804740 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 6b5f4c34: am 0c7e5cda: Merge "libusbhost: Turn on -Werror"

* commit '6b5f4c3413f993e36b37eecae15a53af8d8b9c43':
libusbhost: Turn on -Werror
1291df76956407d08e673443786f92c9a16006c1 22-May-2014 Mark Salyzyn <salyzyn@google.com> am c5fa4b19: am 065c2706: Merge "libsuspend: Turn on -Werror"

* commit 'c5fa4b19e3ea88905a02cf28c59410638445c485':
libsuspend: Turn on -Werror
8a53132710fc7f32056fe50f680edf11241384ad 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 1010b672: am b05866af: Merge "libion: Turn on -Werror"

* commit '1010b672718576c7099e95c8872e5113bed03f5a':
libion: Turn on -Werror
0455d792cf297f4661cfb00836d0c2bceee789e9 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 7d28098b: am 99337883: Merge "sdcard: Turn on -Werror"

* commit '7d28098b9adc450ca26c73b02b025a02891a0766':
sdcard: Turn on -Werror
6b5f4c3413f993e36b37eecae15a53af8d8b9c43 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 0c7e5cda: Merge "libusbhost: Turn on -Werror"

* commit '0c7e5cdaebc96fb1aee8860303eaeab351acf4bc':
libusbhost: Turn on -Werror
c5fa4b19e3ea88905a02cf28c59410638445c485 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 065c2706: Merge "libsuspend: Turn on -Werror"

* commit '065c2706ab105ff09212850bb521573afc0418db':
libsuspend: Turn on -Werror
1010b672718576c7099e95c8872e5113bed03f5a 22-May-2014 Mark Salyzyn <salyzyn@google.com> am b05866af: Merge "libion: Turn on -Werror"

* commit 'b05866afccd10b005e97804319abdd361b311f2a':
libion: Turn on -Werror
7d28098b9adc450ca26c73b02b025a02891a0766 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 99337883: Merge "sdcard: Turn on -Werror"

* commit '993378832e6f580b3b13b189f3656066492fe80a':
sdcard: Turn on -Werror
0c7e5cdaebc96fb1aee8860303eaeab351acf4bc 22-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libusbhost: Turn on -Werror"
065c2706ab105ff09212850bb521573afc0418db 22-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libsuspend: Turn on -Werror"
b05866afccd10b005e97804319abdd361b311f2a 22-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libion: Turn on -Werror"
993378832e6f580b3b13b189f3656066492fe80a 22-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "sdcard: Turn on -Werror"
72159a5804d8726254289d8bd5ce16e19b653bfb 22-May-2014 Rom Lemarchand <romlem@google.com> Merge "audio: added definitions for audio routing extensions"
6721412e28ba8e2e5c1b2fa07e620f68e7d6f8f6 22-May-2014 Mark Salyzyn <salyzyn@google.com> am a259bfdb: am f1c66a85: am 5e9c2b9f: Merge "reboot: Turn on -Werror"

* commit 'a259bfdb6750d42867aa85ec07eb3f27ba72fccc':
reboot: Turn on -Werror
425ed96a38975c97c6e9959fc29c7ca7960cc08c 22-May-2014 Dan Albert <danalbert@google.com> am 633a2e3b: am 3ab1d61b: am 3b5cd911: Merge "Remove libstdc++ dependency from host libbacktrace"

* commit '633a2e3b6a1d00257965a5772a5467a6df9911a5':
Remove libstdc++ dependency from host libbacktrace
6963176fb2b0423a33f985b13843d3b32c6e8de7 22-May-2014 Elliott Hughes <enh@google.com> am 7bbfb8cb: am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes of <sys/atomics.h>."

* commit '7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b':
Remove unnecessary #includes of <sys/atomics.h>.
69cdc60e04193bbf60b7e284a87af860f34d9f15 22-May-2014 Mark Salyzyn <salyzyn@google.com> am affc6e80: am 8c6245e1: am 80e16069: Merge "libsync: Turn on -Werror"

* commit 'affc6e809ddf774d646f859d70506eb9428d6619':
libsync: Turn on -Werror
a49ca5972a5ce4f1f91ff23900d5ba7a54a79f81 22-May-2014 Elliott Hughes <enh@google.com> am 2d2ee08e: am 49ea55f5: am 48ac3d1b: Merge "Judge mmap failed by MAP_FAILED instead of NULL"

* commit '2d2ee08e536ba5534a48d4b3ff148677edd0395e':
Judge mmap failed by MAP_FAILED instead of NULL
a259bfdb6750d42867aa85ec07eb3f27ba72fccc 22-May-2014 Mark Salyzyn <salyzyn@google.com> am f1c66a85: am 5e9c2b9f: Merge "reboot: Turn on -Werror"

* commit 'f1c66a852f8b6a888308c6a154a7d98bf262e480':
reboot: Turn on -Werror
f1c66a852f8b6a888308c6a154a7d98bf262e480 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 5e9c2b9f: Merge "reboot: Turn on -Werror"

* commit '5e9c2b9faa6fbf6ce8dab3a7d5029f582066b487':
reboot: Turn on -Werror
5e9c2b9faa6fbf6ce8dab3a7d5029f582066b487 22-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "reboot: Turn on -Werror"
633a2e3b6a1d00257965a5772a5467a6df9911a5 22-May-2014 Dan Albert <danalbert@google.com> am 3ab1d61b: am 3b5cd911: Merge "Remove libstdc++ dependency from host libbacktrace"

* commit '3ab1d61b75239515cbb3086a9991650301048cd3':
Remove libstdc++ dependency from host libbacktrace
3ab1d61b75239515cbb3086a9991650301048cd3 22-May-2014 Dan Albert <danalbert@google.com> am 3b5cd911: Merge "Remove libstdc++ dependency from host libbacktrace"

* commit '3b5cd9117df7e7420055352b496383a477f008d3':
Remove libstdc++ dependency from host libbacktrace
3b5cd9117df7e7420055352b496383a477f008d3 22-May-2014 Dan Albert <danalbert@google.com> Merge "Remove libstdc++ dependency from host libbacktrace"
7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b 22-May-2014 Elliott Hughes <enh@google.com> am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes of <sys/atomics.h>."

* commit '337f94f1eb6d65e37689e78d9d33ae0a33ce6607':
Remove unnecessary #includes of <sys/atomics.h>.
337f94f1eb6d65e37689e78d9d33ae0a33ce6607 22-May-2014 Elliott Hughes <enh@google.com> am e9a6d0a0: Merge "Remove unnecessary #includes of <sys/atomics.h>."

* commit 'e9a6d0a09950b9d28f63c8bb3e05530cd23574c0':
Remove unnecessary #includes of <sys/atomics.h>.
e9a6d0a09950b9d28f63c8bb3e05530cd23574c0 22-May-2014 Elliott Hughes <enh@google.com> Merge "Remove unnecessary #includes of <sys/atomics.h>."
617681d355e086b5523278d5dd7e54548223e74d 22-May-2014 Elliott Hughes <enh@google.com> Remove unnecessary #includes of <sys/atomics.h>.

Bug: 14903517
Change-Id: I5b0a418dd982f1a2fd90609b12bd8364f7f34996
nit/property_service.c
oolbox/watchprops.c
affc6e809ddf774d646f859d70506eb9428d6619 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 8c6245e1: am 80e16069: Merge "libsync: Turn on -Werror"

* commit '8c6245e11d7a3467719b75438e1690c4f2222236':
libsync: Turn on -Werror
8c6245e11d7a3467719b75438e1690c4f2222236 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 80e16069: Merge "libsync: Turn on -Werror"

* commit '80e160693c795aacfecd5ba34caa1485a6c717f4':
libsync: Turn on -Werror
7000e66643015d1d2313b06c1e07923b1bc4640f 22-May-2014 Calin Juravle <calin@google.com> am 29415ce2: am 72f51179: am cd3897d0: Merge "Move libutils from fdprintf to POSIX dprintf."

* commit '29415ce2fbb3a96e513abd00589da169d3399aee':
Move libutils from fdprintf to POSIX dprintf.
80e160693c795aacfecd5ba34caa1485a6c717f4 22-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libsync: Turn on -Werror"
2d2ee08e536ba5534a48d4b3ff148677edd0395e 22-May-2014 Elliott Hughes <enh@google.com> am 49ea55f5: am 48ac3d1b: Merge "Judge mmap failed by MAP_FAILED instead of NULL"

* commit '49ea55f5993773391db32e04c5dc94ca91a68c5e':
Judge mmap failed by MAP_FAILED instead of NULL
49ea55f5993773391db32e04c5dc94ca91a68c5e 22-May-2014 Elliott Hughes <enh@google.com> am 48ac3d1b: Merge "Judge mmap failed by MAP_FAILED instead of NULL"

* commit '48ac3d1b14f036a4994adba22707f7465ccfae2f':
Judge mmap failed by MAP_FAILED instead of NULL
48ac3d1b14f036a4994adba22707f7465ccfae2f 22-May-2014 Elliott Hughes <enh@google.com> Merge "Judge mmap failed by MAP_FAILED instead of NULL"
e3e04a16fdc039af92c2cb7a4273b568f30d4537 22-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 3db03a5ab0cb7713529c298531be6da7c2193525
29415ce2fbb3a96e513abd00589da169d3399aee 22-May-2014 Calin Juravle <calin@google.com> am 72f51179: am cd3897d0: Merge "Move libutils from fdprintf to POSIX dprintf."

* commit '72f51179849c338747fd83d638c90b6be42a43cf':
Move libutils from fdprintf to POSIX dprintf.
72f51179849c338747fd83d638c90b6be42a43cf 22-May-2014 Calin Juravle <calin@google.com> am cd3897d0: Merge "Move libutils from fdprintf to POSIX dprintf."

* commit 'cd3897d0af0c7b5a3b4913a2b0cca715fdfb890c':
Move libutils from fdprintf to POSIX dprintf.
cd3897d0af0c7b5a3b4913a2b0cca715fdfb890c 22-May-2014 Calin Juravle <calin@google.com> Merge "Move libutils from fdprintf to POSIX dprintf."
e2a3d37c8f7883255a7d9da0f3af79eccb1f013b 22-May-2014 Dan Albert <danalbert@google.com> am 219e867f: am 7f8ebb81: am 30291f21: Merge "Add missing headers"

* commit '219e867f61755720af3cddb5e8d2fe0e198a27ab':
Add missing headers
aef4743b8020138ed40c96cf286ab421293c685c 22-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 3db03a5ab0cb7713529c298531be6da7c2193525
dcc98da018ce7639b0dea3eb9df464031093bfbd 22-May-2014 Elliott Hughes <enh@google.com> Move libutils from fdprintf to POSIX dprintf.

Bug: 11156955
Change-Id: I70a75c07744d9897d76b180e4940b8717297c53f
ibutils/Printer.cpp
473a729937476d5e18b5e10b7b2eff119202fd46 22-May-2014 Hurri Lu <jlu32@marvell.com> Judge mmap failed by MAP_FAILED instead of NULL

Change-Id: I74422cfdba341fcd1a6235044700cf3986e853d0
Signed-off-by: Hurri Lu <jlu32@marvell.com>
astbootd/transport.c
ibpixelflinger/codeflinger/CodeCache.cpp
219e867f61755720af3cddb5e8d2fe0e198a27ab 22-May-2014 Dan Albert <danalbert@google.com> am 7f8ebb81: am 30291f21: Merge "Add missing headers"

* commit '7f8ebb8178cd6a3d9ea0206070682a9b463f15d2':
Add missing headers
7f8ebb8178cd6a3d9ea0206070682a9b463f15d2 22-May-2014 Dan Albert <danalbert@google.com> am 30291f21: Merge "Add missing headers"

* commit '30291f2119be5a8ce3491a715e07f28062532f4d':
Add missing headers
30291f2119be5a8ce3491a715e07f28062532f4d 22-May-2014 Dan Albert <danalbert@google.com> Merge "Add missing headers"
a3a8f6d2ab16afaa3018406c694c7d63929f2a83 22-May-2014 Dan Albert <danalbert@google.com> Remove libstdc++ dependency from host libbacktrace

The libc++ version of libbacktrace on the host was still linking against
libstdc++, and this was causing problems in art.

Change-Id: I1d14fb9e18abd074affcf46c8044407041970669
ibbacktrace/Android.build.mk
ac2fe7eb81789274ab98573d0c4b0866bed1f254 22-May-2014 Dan Albert <danalbert@google.com> Add missing headers

These headers are needed for pid_t and free when using libc++ headers (POSIX
does not require that the symbols be exposed with the previous includes).

Change-Id: Ia51a4fdfdbae7377130a43c401c2d8d241671d1e
nclude/backtrace/BacktraceMap.h
ibbacktrace/UnwindMap.cpp
3db03a5ab0cb7713529c298531be6da7c2193525 22-May-2014 Todd Poynor <toddpoynor@google.com> healthd: Set fixed battery level and temperature via properties

setprop persist.sys.battery.capacity 77
setprop persist.sys.battery.temperature 123

and reboot to cause a fixed battery level of 77% and temperature of 12.3C
to be reported to Android.

Typically used on power evaluation boards without batteries connected.

Bug: 14839868
Change-Id: Ibae5e16429d05891cb0787d74a2fe93b07013699
ealthd/BatteryMonitor.cpp
ealthd/BatteryMonitor.h
acc13d7b27aa7046b4cc705e08947e19091a41cd 22-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Support static IP config on Ethernet"
4cd050121fd22c0f7277a988d548d0e8f327a760 18-Feb-2014 Eric Laurent <elaurent@google.com> audio: added definitions for audio routing extensions

Added definitons and structures for new audio routing features
in the framework and audio HAL.
The structures describe the objects needed to perform audio
routing and audio gain control: different variants of audio ports
and their corresponding configurations as well as gain controllers.

Change-Id: Iecd1b9186831067a52cc55619a63b7bba57dcbd9
nclude/system/audio.h
879715333ac851dd66ba5fc32aeb68c99165b023 22-May-2014 Elliott Hughes <enh@google.com> am b7fdf4fa: am 4077acd2: am 21be143a: Merge "Fix register dump and back trace after a crash."

* commit 'b7fdf4fa82ca8c7446434df65562e833f4dac986':
Fix register dump and back trace after a crash.
51d65e6db930b32cbe477188e9a6bc56f901d4bc 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 2a7ce0bc: am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""

* commit '2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b':
Revert "libnetutils: Turn on -Werror"
fd04f91dffa3d574d8df169e4a93a2c7cc908fcf 22-May-2014 Mark Salyzyn <salyzyn@google.com> am d7465194: am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror"

* commit 'd746519443e37d7dde104779253830e92ae72c8e':
libnetutils: Turn on -Werror
b7fdf4fa82ca8c7446434df65562e833f4dac986 22-May-2014 Elliott Hughes <enh@google.com> am 4077acd2: am 21be143a: Merge "Fix register dump and back trace after a crash."

* commit '4077acd2c4e1efff0ad0942b54077b14859b06c1':
Fix register dump and back trace after a crash.
2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""

* commit '9a12e952b3e765e03130ca1ab8bfe1b67d765e1b':
Revert "libnetutils: Turn on -Werror"
d746519443e37d7dde104779253830e92ae72c8e 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror"

* commit '2c0a7f6fd9145ce9499cd7c25f7f19ec6150c2ee':
libnetutils: Turn on -Werror
373d9fa0824226c721c7b0c07952ebe3e3af770e 10-Mar-2014 Jaewan Kim <jaewan@google.com> Support static IP config on Ethernet

Bug: 7606609
Bug: 8687763
Change-Id: I1d76b5783e8511a8e3f5d981e6b4b9fb4fbecdf4
ootdir/init.rc
4077acd2c4e1efff0ad0942b54077b14859b06c1 22-May-2014 Elliott Hughes <enh@google.com> am 21be143a: Merge "Fix register dump and back trace after a crash."

* commit '21be143a0e4c1b24a6a5a3b5a681c570d63b2525':
Fix register dump and back trace after a crash.
21be143a0e4c1b24a6a5a3b5a681c570d63b2525 22-May-2014 Elliott Hughes <enh@google.com> Merge "Fix register dump and back trace after a crash."
6254f32f21a976b61cb13c7ee9caf17e6b675403 21-May-2014 Douglas Leung <douglas@mips.com> Fix register dump and back trace after a crash.

Change-Id: Ie5f6624b9dcf81d84769b9cdaf9d8a301c8826f7
Signed-off-by: Douglas Leung <douglas@mips.com>
ebuggerd/mips/machine.cpp
9a12e952b3e765e03130ca1ab8bfe1b67d765e1b 22-May-2014 Mark Salyzyn <salyzyn@google.com> am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""

* commit '5b7bb03ee84185bd83a594569264cc3841b80749':
Revert "libnetutils: Turn on -Werror"
2c0a7f6fd9145ce9499cd7c25f7f19ec6150c2ee 22-May-2014 Mark Salyzyn <salyzyn@google.com> am d3cd08f8: Merge "libnetutils: Turn on -Werror"

* commit 'd3cd08f831be240342a2364160e5a537d3795f22':
libnetutils: Turn on -Werror
5b7bb03ee84185bd83a594569264cc3841b80749 22-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "Revert "libnetutils: Turn on -Werror""
07dde4c314e01a4e146d404b2b3351c41f564663 22-May-2014 Mark Salyzyn <salyzyn@google.com> Revert "libnetutils: Turn on -Werror"

This reverts commit 249c26de823be0f9a84a9f092c776bcd9830fba5.

Change-Id: I2a56c574fa8d842d5f3c51fd57ecf078838fcfec
ibnetutils/Android.mk
d3cd08f831be240342a2364160e5a537d3795f22 21-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libnetutils: Turn on -Werror"
d6a657c81dcc091a07d18d5816e2d77aff639131 21-May-2014 Mark Salyzyn <salyzyn@google.com> am eb075e28: am c8179498: am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"

* commit 'eb075e28acff23804ef80d34cd08c5df9b1d583f':
libdiskconfig: Turn on -Werror
eb075e28acff23804ef80d34cd08c5df9b1d583f 21-May-2014 Mark Salyzyn <salyzyn@google.com> am c8179498: am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"

* commit 'c8179498225dc44350c3addc932be97a9ef3a941':
libdiskconfig: Turn on -Werror
c8179498225dc44350c3addc932be97a9ef3a941 21-May-2014 Mark Salyzyn <salyzyn@google.com> am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"

* commit '2f62edf77d94caaca57ff5e36bd866e02f3c2fa0':
libdiskconfig: Turn on -Werror
2f62edf77d94caaca57ff5e36bd866e02f3c2fa0 21-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libdiskconfig: Turn on -Werror"
6fb1557fda1b18b4696c9213df7b4f542cd30d3f 21-May-2014 Colin Cross <ccross@android.com> am b696bec3: am 28c30518: am 1742b7d2: Merge "Modify VID for Compal"

* commit 'b696bec3541dc3091fb7c8764750f8ba21f64636':
Modify VID for Compal
03b876953a0dffa2c1704e9ff46835161f34ab79 16-May-2014 Mark Salyzyn <salyzyn@google.com> libusbhost: Turn on -Werror

Change-Id: Ia765b56197c28d6cde633db9c429001993f75f17
ibusbhost/Android.mk
6e60d390d06886c7744f1543bf0431046f0879ee 16-May-2014 Mark Salyzyn <salyzyn@google.com> libsuspend: Turn on -Werror

Change-Id: I4ea982ab7d68a596ac79d93a01c05a109d24672d
ibsuspend/Android.mk
72c22bf69b969c8fa094ecd62e9612996d8f9434 16-May-2014 Mark Salyzyn <salyzyn@google.com> libion: Turn on -Werror

Change-Id: I0a933623147fb7bfb7251b1d9213cc174619ed42
ibion/Android.mk
676ffd54cb8be3ca5544349e475ddc8945dee5a9 16-May-2014 Mark Salyzyn <salyzyn@google.com> sdcard: Turn on -Werror

Change-Id: I40fce5a69a898e79542aa7688d077ff7bc40ed4f
dcard/Android.mk
efdf49f2762dc5d355cdfd8a078eafc8cd635e8e 16-May-2014 Mark Salyzyn <salyzyn@google.com> reboot: Turn on -Werror

Change-Id: Ic3186e457b80ee6149ef89321b0d16422872aea7
eboot/Android.mk
af7749891a9cd44b0ecbf7caceb87e70ed208c69 16-May-2014 Mark Salyzyn <salyzyn@google.com> libsync: Turn on -Werror

Change-Id: Ie34f935694034a069e844be64d6011eb9e3f9869
ibsync/Android.mk
249c26de823be0f9a84a9f092c776bcd9830fba5 16-May-2014 Mark Salyzyn <salyzyn@google.com> libnetutils: Turn on -Werror

Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2882
ibnetutils/Android.mk
42c79fe18bcc72a1d2eb8b47a8da560e5c2b8e2f 16-May-2014 Mark Salyzyn <salyzyn@google.com> libdiskconfig: Turn on -Werror

Change-Id: Ic0f5871bd434fda78df79b1417f7bc610d99f73e
ibdiskconfig/Android.mk
b696bec3541dc3091fb7c8764750f8ba21f64636 21-May-2014 Colin Cross <ccross@android.com> am 28c30518: am 1742b7d2: Merge "Modify VID for Compal"

* commit '28c305183a6596eb3241771422d22351fbeaa9fb':
Modify VID for Compal
28c305183a6596eb3241771422d22351fbeaa9fb 21-May-2014 Colin Cross <ccross@android.com> am 1742b7d2: Merge "Modify VID for Compal"

* commit '1742b7d218706c596e6b40c89a6660f30bdba022':
Modify VID for Compal
1742b7d218706c596e6b40c89a6660f30bdba022 21-May-2014 Colin Cross <ccross@android.com> Merge "Modify VID for Compal"
e12dd2975519f071ca05513927d1dabd8129d647 21-May-2014 Greg Hackmann <ghackmann@google.com> am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"

* commit 'ac239a915b08823166657d6a3bfad094e57db0be':
toolbox: fix x86 build
ac239a915b08823166657d6a3bfad094e57db0be 21-May-2014 Greg Hackmann <ghackmann@google.com> am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"

* commit '376aebdc9d92efed4928523227381ea18a4cb0cc':
toolbox: fix x86 build
376aebdc9d92efed4928523227381ea18a4cb0cc 21-May-2014 Greg Hackmann <ghackmann@google.com> am 76d057b9: Merge "toolbox: fix x86 build"

* commit '76d057b9708f92662a3002cffd55ecc05a860df4':
toolbox: fix x86 build
4dc379b59bcb60ff17501c2b7f3180fc0f6cdb61 21-May-2014 Greg Hackmann <ghackmann@google.com> am 5d93823e: am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"

* commit '5d93823e557834c9b17771241ea6eecad74a5749':
toolbox: fix build
76d057b9708f92662a3002cffd55ecc05a860df4 21-May-2014 Greg Hackmann <ghackmann@google.com> Merge "toolbox: fix x86 build"
f76d8a88a1477680aca6eca14c699e7fd41832c3 21-May-2014 Sreeram Ramachandran <sreeram@google.com> am 02c72357: (-s ours) am f8733c63: am 08c08f72: Merge "Move netd_client into netd."

* commit '02c723579d0ee4e06da59cd58b579ff8ff76965e':
Move netd_client into netd.
2122aac5c94fc53ae57b26542a468fa16d348a7b 21-May-2014 Greg Hackmann <ghackmann@google.com> toolbox: fix x86 build

Change-Id: Iadedae749b31adb1310fa50a68b2dc19097c3654
Signed-off-by: Greg Hackmann <ghackmann@google.com>
oolbox/grep/util.c
5d93823e557834c9b17771241ea6eecad74a5749 21-May-2014 Greg Hackmann <ghackmann@google.com> am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"

* commit '153c7aabdc1de609188ce2441442f985f75d4399':
toolbox: fix build
153c7aabdc1de609188ce2441442f985f75d4399 21-May-2014 Greg Hackmann <ghackmann@google.com> am 5eedd9d6: Merge "toolbox: fix build"

* commit '5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3':
toolbox: fix build
5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3 21-May-2014 Greg Hackmann <ghackmann@google.com> Merge "toolbox: fix build"
eeed45fa24f3bc3046f352bf9788061715b44dcf 21-May-2014 Greg Hackmann <ghackmann@google.com> toolbox: fix build

Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986
Signed-off-by: Greg Hackmann <ghackmann@google.com>
oolbox/insmod.c
oolbox/watchprops.c
6cd488e95a658b23cf503febd9c5201837d45ec7 21-May-2014 Mark Salyzyn <salyzyn@google.com> resolved conflicts for merge of faf84529 to master

Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
02c723579d0ee4e06da59cd58b579ff8ff76965e 21-May-2014 Sreeram Ramachandran <sreeram@google.com> am f8733c63: am 08c08f72: Merge "Move netd_client into netd."

* commit 'f8733c63aa7b7de8350264295a2c2c080b5307a4':
Move netd_client into netd.
f8733c63aa7b7de8350264295a2c2c080b5307a4 21-May-2014 Sreeram Ramachandran <sreeram@google.com> am 08c08f72: Merge "Move netd_client into netd."

* commit '08c08f72617b13696049bf295646d6a68f3f1a8c':
Move netd_client into netd.
08c08f72617b13696049bf295646d6a68f3f1a8c 21-May-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Move netd_client into netd."
91dc3369d3b75928816bc26f9e15ab140a520ee2 21-May-2014 Sreeram Ramachandran <sreeram@google.com> Move netd_client into netd.

(cherry picked from commit f1b21c5c735e9150c8f29bdb52db2f3eb3ffc469)

Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
nclude/netd_client/FwmarkCommands.h
ibnetd_client/Android.mk
ibnetd_client/FwmarkClient.cpp
ibnetd_client/FwmarkClient.h
ibnetd_client/NetdClient.cpp
f1b21c5c735e9150c8f29bdb52db2f3eb3ffc469 21-May-2014 Sreeram Ramachandran <sreeram@google.com> Move netd_client into netd.

Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
nclude/netd_client/FwmarkCommands.h
ibnetd_client/Android.mk
ibnetd_client/FwmarkClient.cpp
ibnetd_client/FwmarkClient.h
ibnetd_client/NetdClient.cpp
faf845290bb78824502d007209134c8dbfa296a2 21-May-2014 Mark Salyzyn <salyzyn@google.com> am e2fb764c: am 36ccca15: Merge "toolbox: turn on -Werror"

* commit 'e2fb764c3b1c3285bbc78f5e9a0c70785d2383f5':
toolbox: turn on -Werror
e2fb764c3b1c3285bbc78f5e9a0c70785d2383f5 21-May-2014 Mark Salyzyn <salyzyn@google.com> am 36ccca15: Merge "toolbox: turn on -Werror"

* commit '36ccca155c03053397b953e4cc0ed8a8338d2450':
toolbox: turn on -Werror
36ccca155c03053397b953e4cc0ed8a8338d2450 21-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "toolbox: turn on -Werror"
2b83a2202b9e49e7f7d1c1c354ca643940229314 21-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to e14b37eb07b394fef05da5ee09dc6d33e3a25711
7cdbbcabda9906910548954f0a35cdea366ef467 21-May-2014 Narayan Kamath <narayan@google.com> Add a zygote 64/32 bit config.

64 bit zygote is the "primary" and the system server is run
as a 64 bit process.

Change-Id: Ie1c2b0809faa92937bc407dd66e7a606ebb4f8f3
ootdir/init.zygote64_32.rc
e14b37eb07b394fef05da5ee09dc6d33e3a25711 20-May-2014 Todd Poynor <toddpoynor@google.com> healthd: Add hooks for ENERGY_COUNTER property

Bug: 10118565
Change-Id: Ibabae2a78a600ae37ce9b91da0f5980ee94b05c2
ealthd/BatteryMonitor.cpp
ealthd/healthd.cpp
ealthd/healthd.h
b65208d1a98c4cc6b4fbae302f7718f056e2fadd 20-May-2014 Elliott Hughes <enh@google.com> am f7a7e3c3: am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."

* commit 'f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d':
Fix win32 undefined reference to `_socket_network_client_timeout'.
f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d 20-May-2014 Elliott Hughes <enh@google.com> am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."

* commit '6dfb039b0ba56576b4ed043e02ae43fb6afd42aa':
Fix win32 undefined reference to `_socket_network_client_timeout'.
6dfb039b0ba56576b4ed043e02ae43fb6afd42aa 20-May-2014 Elliott Hughes <enh@google.com> am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."

* commit '4a343436e01b07c21c043f8a903689f70000ca73':
Fix win32 undefined reference to `_socket_network_client_timeout'.
4a343436e01b07c21c043f8a903689f70000ca73 20-May-2014 Elliott Hughes <enh@google.com> Merge "Fix win32 undefined reference to `_socket_network_client_timeout'."
0bff5bd95268184a34ae69c062584a8d1f4d87fb 20-May-2014 Elliott Hughes <enh@google.com> Fix win32 undefined reference to `_socket_network_client_timeout'.

Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
db/sysdeps_win32.c
ibcutils/Android.mk
ibcutils/socket_network_client.c
aceba829f127349b331601fcc65293f5e81f7a65 20-May-2014 Ben Cheng <bccheng@google.com> am cbe7544a: am 7563a601: am 3816305b: Merge "Address additional warnings found by GCC 4.9."

* commit 'cbe7544a3e848872def9cbf67110c78aa21d8ab1':
Address additional warnings found by GCC 4.9.
fa59e0a48786505d5d8e65e0714f65b85d260dfc 20-May-2014 Elliott Hughes <enh@google.com> am 9bcc5512: am 796b2015: am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."

* commit '9bcc55123ec814074417994db99730929a31fec8':
Fix win32 implicit declaration of function socket_network_client_timeout.
cbe7544a3e848872def9cbf67110c78aa21d8ab1 20-May-2014 Ben Cheng <bccheng@google.com> am 7563a601: am 3816305b: Merge "Address additional warnings found by GCC 4.9."

* commit '7563a601e47db0a7c429fff1776f8a17a6157ce0':
Address additional warnings found by GCC 4.9.
7563a601e47db0a7c429fff1776f8a17a6157ce0 20-May-2014 Ben Cheng <bccheng@google.com> am 3816305b: Merge "Address additional warnings found by GCC 4.9."

* commit '3816305b58b0eeb098f2f989ef03208d1f29f4da':
Address additional warnings found by GCC 4.9.
3816305b58b0eeb098f2f989ef03208d1f29f4da 20-May-2014 Ben Cheng <bccheng@google.com> Merge "Address additional warnings found by GCC 4.9."
43232920f398d3673dfc3cd2bd414c361ccb4237 20-May-2014 Ben Cheng <bccheng@google.com> Address additional warnings found by GCC 4.9.

Change-Id: I8aae6c3e1ccc2294f4db455e1b4f3b4c34a00aaf
iblog/tests/liblog_test.cpp
9bcc55123ec814074417994db99730929a31fec8 20-May-2014 Elliott Hughes <enh@google.com> am 796b2015: am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."

* commit '796b20157f75e46ad91b7d894796e0ba55a7766e':
Fix win32 implicit declaration of function socket_network_client_timeout.
796b20157f75e46ad91b7d894796e0ba55a7766e 20-May-2014 Elliott Hughes <enh@google.com> am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."

* commit '51e27f955b79846e36097532a725f4b7a3eefef8':
Fix win32 implicit declaration of function socket_network_client_timeout.
51e27f955b79846e36097532a725f4b7a3eefef8 20-May-2014 Elliott Hughes <enh@google.com> Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
b911cf0af43718a6dedb06561e787ba3bdbdfe8b 20-May-2014 Elliott Hughes <enh@google.com> Fix win32 implicit declaration of function socket_network_client_timeout.

Change-Id: Ic6070855a21920384c555c9c82b9a2e4a776cbae
db/sysdeps.h
0ae3f71c37ea1cc8740808719b26143383d54a8f 20-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to abcb99927d9ad3f66288a5ce16d7c86c14b49249
abcb99927d9ad3f66288a5ce16d7c86c14b49249 17-May-2014 Eric Laurent <elaurent@google.com> audio: add definitions for new audio devices

Change-Id: I7bbc564a81fd693fa7e6bcb3a817986b50568147
nclude/system/audio.h
5756d8873b0ab9c7d36b753728662b20424bd4e9 20-May-2014 Elliott Hughes <enh@google.com> am 87d0f45b: am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures."

* commit '87d0f45b3c30dff02bd92f542e5e9e64816f5315':
Fix Windows socket_network_client.c build failures.
3edc25271fd6696cede2d0e6ecdcaf3d6cc273a5 20-May-2014 Elliott Hughes <enh@google.com> am b42f1413: am 0e71e3ab: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"

* commit 'b42f141315ae0929325335645d397db04a500c88':
Bound the ADB connect time with a non-blocking connect
fbc5ca28c965add95bd5751525b09d70b0db76dc 20-May-2014 Dan Albert <danalbert@google.com> am c6112ca4: am 5b654f15: am 201bf676: Merge "Really fixes the ub branches"

* commit 'c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e':
Really fixes the ub branches
87d0f45b3c30dff02bd92f542e5e9e64816f5315 20-May-2014 Elliott Hughes <enh@google.com> am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures."

* commit '2dea56e05c45c1a16232152dec239c2506ab6d97':
Fix Windows socket_network_client.c build failures.
2dea56e05c45c1a16232152dec239c2506ab6d97 20-May-2014 Elliott Hughes <enh@google.com> am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures."

* commit '9e0a62487b9946c0403d6c4282010d28ae0b193e':
Fix Windows socket_network_client.c build failures.
9e0a62487b9946c0403d6c4282010d28ae0b193e 20-May-2014 Elliott Hughes <enh@google.com> Merge "Fix Windows socket_network_client.c build failures."
36739556db21352d056f9d0858d5c458d7a74636 20-May-2014 Elliott Hughes <enh@google.com> Fix Windows socket_network_client.c build failures.

Change-Id: Ie67a2305ade02e078bf0edf54104c295b091b1b7
ibcutils/socket_network_client.c
b42f141315ae0929325335645d397db04a500c88 20-May-2014 Elliott Hughes <enh@google.com> am 0e71e3ab: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"

* commit '0e71e3ab9cf66f41645ea286c7e62ed2b657ca38':
Bound the ADB connect time with a non-blocking connect
0e71e3ab9cf66f41645ea286c7e62ed2b657ca38 20-May-2014 Elliott Hughes <enh@google.com> am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"

* commit '9cae50b38d6a58efe0799ef3697f594cb4b100f9':
Bound the ADB connect time with a non-blocking connect
9cae50b38d6a58efe0799ef3697f594cb4b100f9 20-May-2014 Elliott Hughes <enh@google.com> Merge "Bound the ADB connect time with a non-blocking connect"
aecc6a6657746afc9b95a960eedad10484bf14ac 20-Jun-2013 Ken Lierman <ken.lierman@windriver.com> Bound the ADB connect time with a non-blocking connect

After a disconnect, the initial blocking connect takes
a long time to return, while subsequent calls return
quicks. Switch to a non-blocking connect to make the
re-connect time more consistent and faster overall.

Change-Id: I21d02b22a8eb9a457c2f1fa95eb17894d5612ccd
Signed-off-by: Ken Lierman <ken.lierman@windriver.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
db/services.c
nclude/cutils/sockets.h
ibcutils/socket_network_client.c
c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e 20-May-2014 Dan Albert <danalbert@google.com> am 5b654f15: am 201bf676: Merge "Really fixes the ub branches"

* commit '5b654f15313f1ad27246269f6e34214ddb798405':
Really fixes the ub branches
5b654f15313f1ad27246269f6e34214ddb798405 20-May-2014 Dan Albert <danalbert@google.com> am 201bf676: Merge "Really fixes the ub branches"

* commit '201bf6769fec1bb01446d25e6efad0bf10c39296':
Really fixes the ub branches
201bf6769fec1bb01446d25e6efad0bf10c39296 20-May-2014 Dan Albert <danalbert@google.com> Merge "Really fixes the ub branches"
ad51136267b3e192abe5087b6cba32563c65637e 19-May-2014 Dan Albert <danalbert@google.com> Really fixes the ub branches

Change-Id: I1d78f4e6c1d8086c2895f6739c3202e9ef74fee2
ibbacktrace/Android.build.mk
917152b8cce7a7d7cfd8904b077fd5dca169bc15 19-May-2014 Dan Albert <danalbert@google.com> am 3f01965b: am 121f209d: am e1efe23f: Merge "Fix unbundled branches"

* commit '3f01965b3d1335ffff57e15fd47e5d99400dad3f':
Fix unbundled branches
3f01965b3d1335ffff57e15fd47e5d99400dad3f 19-May-2014 Dan Albert <danalbert@google.com> am 121f209d: am e1efe23f: Merge "Fix unbundled branches"

* commit '121f209d3ea770109c9ebe0b6f8a965f91d5a2ef':
Fix unbundled branches
121f209d3ea770109c9ebe0b6f8a965f91d5a2ef 19-May-2014 Dan Albert <danalbert@google.com> am e1efe23f: Merge "Fix unbundled branches"

* commit 'e1efe23ff718d25c5f3d5ef7914f05f8f739eee5':
Fix unbundled branches
e1efe23ff718d25c5f3d5ef7914f05f8f739eee5 19-May-2014 Dan Albert <danalbert@google.com> Merge "Fix unbundled branches"
a8b846022063a98ca623f5c67916dc6cb3fd2ad6 19-May-2014 Dan Albert <danalbert@google.com> Fix unbundled branches

Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
ibbacktrace/Android.mk
7ce29b5826fca294319fd93f1dcf96f3e0479047 19-May-2014 Dan Albert <danalbert@google.com> am e9b36f1a: am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace"

* commit 'e9b36f1a9a280877cb130452c50af6a51360a203':
Adds libc++ versions of libbacktrace
e9b36f1a9a280877cb130452c50af6a51360a203 19-May-2014 Dan Albert <danalbert@google.com> am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace"

* commit '888f95e2e2dd4c56e4aba1785c77342ab4420186':
Adds libc++ versions of libbacktrace
888f95e2e2dd4c56e4aba1785c77342ab4420186 19-May-2014 Dan Albert <danalbert@google.com> am f03bd953: Merge "Adds libc++ versions of libbacktrace"

* commit 'f03bd9537b77f996cddd562d88558151d3d6c7fd':
Adds libc++ versions of libbacktrace
f03bd9537b77f996cddd562d88558151d3d6c7fd 19-May-2014 Dan Albert <danalbert@google.com> Merge "Adds libc++ versions of libbacktrace"
40a46dde9ceb8c5e314665d44fbd7c3537a82707 19-May-2014 Dan Albert <danalbert@google.com> Adds libc++ versions of libbacktrace

Change-Id: I4a1ce30e7c2166ac1846cc90de0252beee542ee6
ibbacktrace/Android.build.mk
ibbacktrace/Android.mk
6f72a62a8e7a6b2c4735b00e9cfa8d1cba1b8750 19-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to bb8e90e87e9dd89a47a659e0e4a669177d750d52
567a545550fd5ab16f6531715edec10d0351a6e9 18-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to bb8e90e87e9dd89a47a659e0e4a669177d750d52
5e0c9e28c94674ec98a40a893e3201fd99d9cf09 17-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to bb8e90e87e9dd89a47a659e0e4a669177d750d52
bb8e90e87e9dd89a47a659e0e4a669177d750d52 17-May-2014 Elliott Hughes <enh@google.com> am f6aa4863: am 343e49e3: am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP."

* commit 'f6aa4863a2f1e6f37685520de7f85c96f7b6f1d3':
Teach debuggerd the name of SIGTRAP.
f6aa4863a2f1e6f37685520de7f85c96f7b6f1d3 17-May-2014 Elliott Hughes <enh@google.com> am 343e49e3: am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP."

* commit '343e49e3343817ec3adf1145039cb4e5d143674a':
Teach debuggerd the name of SIGTRAP.
343e49e3343817ec3adf1145039cb4e5d143674a 17-May-2014 Elliott Hughes <enh@google.com> am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP."

* commit '0296be9d98fa429a17c90d4ec4d0becb18b9f8ec':
Teach debuggerd the name of SIGTRAP.
0296be9d98fa429a17c90d4ec4d0becb18b9f8ec 17-May-2014 Elliott Hughes <enh@google.com> Merge "Teach debuggerd the name of SIGTRAP."
a323b504a70af5f143532f0ef521eb61ecddad6b 17-May-2014 Elliott Hughes <enh@google.com> Teach debuggerd the name of SIGTRAP.

Also add SIGTRAP to the list of signals we don't want to double fault on.

Bug: 15024256
Change-Id: I23ab80800563c007fcd3e42527329fedf762f0c8
ebuggerd/debuggerd.cpp
ebuggerd/tombstone.cpp
20b40738bfdefc5dd42e71f4cb24ed2a6e171d83 17-May-2014 Elliott Hughes <enh@google.com> am 2aa894f3: am 2f1cddfd: am 541859db: Merge "Remove the broken LED flashing code from debuggerd."

* commit '2aa894f3736f6d93fd119b28ea9eb6c531187b68':
Remove the broken LED flashing code from debuggerd.
2aa894f3736f6d93fd119b28ea9eb6c531187b68 17-May-2014 Elliott Hughes <enh@google.com> am 2f1cddfd: am 541859db: Merge "Remove the broken LED flashing code from debuggerd."

* commit '2f1cddfd1f622df66bd5b369a650bf0a34c86667':
Remove the broken LED flashing code from debuggerd.
2f1cddfd1f622df66bd5b369a650bf0a34c86667 17-May-2014 Elliott Hughes <enh@google.com> am 541859db: Merge "Remove the broken LED flashing code from debuggerd."

* commit '541859dbf710946f03999a962e85c4ca3d5c816a':
Remove the broken LED flashing code from debuggerd.
541859dbf710946f03999a962e85c4ca3d5c816a 17-May-2014 Elliott Hughes <enh@google.com> Merge "Remove the broken LED flashing code from debuggerd."
27ab751c7bd0dbdb9c3d19034ffb133b545ce233 17-May-2014 Elliott Hughes <enh@google.com> Remove the broken LED flashing code from debuggerd.

Change-Id: I4d0cbe14daa90ac5f91ce4597584448ee3c65dda
ebuggerd/debuggerd.cpp
7393ba0bfd04ba93439b4def51548b2ace96b948 17-May-2014 Elliott Hughes <enh@google.com> am 227c3b6c: am a04bad63: am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd."

* commit '227c3b6ce7ef8c011ad2f3d9bebf9a25c4fffb4b':
Output correct gdbserver instructions from debuggerd.
227c3b6ce7ef8c011ad2f3d9bebf9a25c4fffb4b 17-May-2014 Elliott Hughes <enh@google.com> am a04bad63: am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd."

* commit 'a04bad63b905585645378d8de2e214dce75989f1':
Output correct gdbserver instructions from debuggerd.
a04bad63b905585645378d8de2e214dce75989f1 17-May-2014 Elliott Hughes <enh@google.com> am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd."

* commit '9cb0b5719c0ac5fefc043f0c61b1640e058b7793':
Output correct gdbserver instructions from debuggerd.
9cb0b5719c0ac5fefc043f0c61b1640e058b7793 17-May-2014 Elliott Hughes <enh@google.com> Merge "Output correct gdbserver instructions from debuggerd."
d9bf2b21370faeda4ef57932a42a14c05557e71a 17-May-2014 Elliott Hughes <enh@google.com> Output correct gdbserver instructions from debuggerd.

Bug: 15021938
Change-Id: I2df433d939f5f83ed2a2a30af357b83e4d8e5331
ebuggerd/debuggerd.cpp
ea289032728794a9baf10106e7dcbd7c9fb8eec3 17-May-2014 Ying Wang <wangying@google.com> am 73d6dc5c: am b0501ab6: am 770cd7c7: Merge "Fix host 64-bit build."

* commit '73d6dc5cdccedc3def241666aef7562b5fd5b5dd':
Fix host 64-bit build.
73d6dc5cdccedc3def241666aef7562b5fd5b5dd 17-May-2014 Ying Wang <wangying@google.com> am b0501ab6: am 770cd7c7: Merge "Fix host 64-bit build."

* commit 'b0501ab66ddf82f5d3b6aa99734e14a1e27c916a':
Fix host 64-bit build.
b0501ab66ddf82f5d3b6aa99734e14a1e27c916a 17-May-2014 Ying Wang <wangying@google.com> am 770cd7c7: Merge "Fix host 64-bit build."

* commit '770cd7c7e7c18a657f233d86aeecb1d9f3091449':
Fix host 64-bit build.
770cd7c7e7c18a657f233d86aeecb1d9f3091449 17-May-2014 Ying Wang <wangying@google.com> Merge "Fix host 64-bit build."
1bcfe061aaeabaa6a2d764adad3cb35a4e6c30f2 17-May-2014 Elliott Hughes <enh@google.com> am a7952c5c: am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."

* commit 'a7952c5c5911f612fd1f99259f2e06dc9d1b319d':
Add SIGTRAP support to crasher and debuggerd.
a7952c5c5911f612fd1f99259f2e06dc9d1b319d 17-May-2014 Elliott Hughes <enh@google.com> am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."

* commit '5e7421073243337075975ecf762ae084765fdb5f':
Add SIGTRAP support to crasher and debuggerd.
5e7421073243337075975ecf762ae084765fdb5f 17-May-2014 Elliott Hughes <enh@google.com> am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."

* commit 'c4afc19236ae7253acc3266b4ca8515473e9c7cc':
Add SIGTRAP support to crasher and debuggerd.
c4afc19236ae7253acc3266b4ca8515473e9c7cc 17-May-2014 Elliott Hughes <enh@google.com> Merge "Add SIGTRAP support to crasher and debuggerd."
7e35ae8fc840cc1855d26084fdd72cbc3241f04d 17-May-2014 Elliott Hughes <enh@google.com> Add SIGTRAP support to crasher and debuggerd.

Bug: 15024256
Change-Id: I3f34993fcfd9799306852b0a2195db468370be6e
ebuggerd/crasher.c
ebuggerd/debuggerd.cpp
a7e8f8615d357357712660d1ed3863c274c2c7bb 16-May-2014 Andy Hung <hunga@google.com> Add channel count functions for audio masks

audio_channel_count_from_in_mask
audio_channel_count_from_out_mask

Change-Id: Ic519f2c3f85d14acb9526cc8812360fcbd15346d
Signed-off-by: Andy Hung <hunga@google.com>
nclude/system/audio.h
14b667aa9108870bee31f2a9de3b00b123eb59ce 16-May-2014 Colin Cross <ccross@android.com> am f6309600: am 3277dc26: am 2d03a498: Merge "correct the setenv option judging condition"

* commit 'f630960088b2fbdb7f147bf9f7a137850df4c89c':
correct the setenv option judging condition
eb25db17062f877db298ae6a3df839066f8beb51 16-May-2014 Mark Salyzyn <salyzyn@google.com> resolved conflicts for merge of f742788a to master

Change-Id: I4f902eb0df09a32cbc19fcccc0747bb6a8e3a48c
f630960088b2fbdb7f147bf9f7a137850df4c89c 16-May-2014 Colin Cross <ccross@android.com> am 3277dc26: am 2d03a498: Merge "correct the setenv option judging condition"

* commit '3277dc269820e4d8785ea46d6a196145e7c88b78':
correct the setenv option judging condition
3277dc269820e4d8785ea46d6a196145e7c88b78 16-May-2014 Colin Cross <ccross@android.com> am 2d03a498: Merge "correct the setenv option judging condition"

* commit '2d03a498f9a1258740a9bbf6b28882506cde3ad9':
correct the setenv option judging condition
2d03a498f9a1258740a9bbf6b28882506cde3ad9 16-May-2014 Colin Cross <ccross@android.com> Merge "correct the setenv option judging condition"
c3a4676c7fe99ad094928007c6fa45896866ac42 27-Sep-2013 Gavin.Chang <gavin198511@gmail.com> correct the setenv option judging condition

Change-Id: I10ed6275374f572da639f26611f607bf7607905c
nit/init_parser.c
f742788ab84c16c1abfb44e1c73e18dc4d33d5b0 16-May-2014 Mark Salyzyn <salyzyn@google.com> am 24786645: am bc741ac2: Merge "logd: logcat: debuggerd: auditd logs to events"

* commit '24786645d68f76e6dbc9b83c4a113ff53b3c62ad':
logd: logcat: debuggerd: auditd logs to events
24786645d68f76e6dbc9b83c4a113ff53b3c62ad 16-May-2014 Mark Salyzyn <salyzyn@google.com> am bc741ac2: Merge "logd: logcat: debuggerd: auditd logs to events"

* commit 'bc741ac2126727d9de33042fa308307690efe13f':
logd: logcat: debuggerd: auditd logs to events
bc741ac2126727d9de33042fa308307690efe13f 16-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: logcat: debuggerd: auditd logs to events"
cf86e2f85d98ed10cf5e0672e41631f6ea7e3e34 16-May-2014 Ying Wang <wangying@google.com> Fix host 64-bit build.

Bug: 13751317
Change-Id: Ib42d24408d053bacc24142ed18fc5f3181d2345b
astboot/fastboot.c
ibziparchive/zip_archive_test.cc
50b6a4b1b7f5b4484bccbabf2a8057bf860f8c59 16-May-2014 Dave Allison <dallison@google.com> Add LD_PRELOAD for libsigchain.so to the environment

To remove the need to modify the bionic dynamic linker, add the
signal chaining library as a preload in the environment. This
will be picked up by the dynamic linker and will override
sigaction and sigprocmask to allow for signal chaining.

Change-Id: I6e2d0628b009bd01e0ed9aed0b311871b9c8363a
ootdir/init.environ.rc.in
8f132af495d208272ea55d0ca24068926fa80e51 09-May-2014 Todd Poynor <toddpoynor@google.com> healthd: Add ENERGY_COUNTER property placeholder, and 64-bit properties

Will add healthd HAL support for ENERGY_COUNTER, and support in some HALs,
in following CLs.

Change-Id: Ife2eaa30473be3a59183c6ce61fdaa61f32dd01b
ealthd/BatteryMonitor.cpp
e1d5247e0090b57f1f5c63df7eba6754c502a449 16-May-2014 Colin Cross <ccross@android.com> healthd: fix warnings

Fix a few warnings missed when turning on -Werror

Change-Id: I5728664a90d33b95ab3d6ea8823244c59643aedc
ealthd/healthd_mode_charger.cpp
2bb25bf372ab17bca204b1f42fd69bbd472faa90 16-May-2014 Mark Salyzyn <salyzyn@google.com> am 88a98149: am 13ee94c5: am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size"

* commit '88a981497ac06046d6da8a99ba17136aa8361b34':
init: logd: Allow Developer settings to adjust logd size
88a981497ac06046d6da8a99ba17136aa8361b34 16-May-2014 Mark Salyzyn <salyzyn@google.com> am 13ee94c5: am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size"

* commit '13ee94c5106a11bf74d485062115af8cf8d77fe3':
init: logd: Allow Developer settings to adjust logd size
13ee94c5106a11bf74d485062115af8cf8d77fe3 16-May-2014 Mark Salyzyn <salyzyn@google.com> am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size"

* commit '8b2d46a5fcbe81edde4b7c405916282a142a09d2':
init: logd: Allow Developer settings to adjust logd size
8b2d46a5fcbe81edde4b7c405916282a142a09d2 16-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "init: logd: Allow Developer settings to adjust logd size"
6e6e69e8743217c8266a1ff07c8d8734bc951154 16-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "healthd: Turn on -Werror"
bffba2d9a7477130fe61ba5f975d6cfc5b78b827 16-May-2014 Greg Hackmann <ghackmann@google.com> am dc17deaa: am 891a3919: am b4ad6911: Merge "libadf: silence false positive warning"

* commit 'dc17deaa1a750cace0c4d07d0c925208666e678c':
libadf: silence false positive warning
dc17deaa1a750cace0c4d07d0c925208666e678c 16-May-2014 Greg Hackmann <ghackmann@google.com> am 891a3919: am b4ad6911: Merge "libadf: silence false positive warning"

* commit '891a391951575c68eca793ff7f1bc05d4a102deb':
libadf: silence false positive warning
891a391951575c68eca793ff7f1bc05d4a102deb 16-May-2014 Greg Hackmann <ghackmann@google.com> am b4ad6911: Merge "libadf: silence false positive warning"

* commit 'b4ad6911a4e88ae5c8f8f0249cae8071a783e01c':
libadf: silence false positive warning
6f5b47f9144960412b0fb6bc417f0c41bf53438a 16-May-2014 Mark Salyzyn <salyzyn@google.com> healthd: Turn on -Werror

Change-Id: I72caf38008ee7d842dfacd3f58add9bc8e4787e8
ealthd/Android.mk
ealthd/BatteryMonitor.cpp
ealthd/BatteryPropertiesRegistrar.cpp
ealthd/healthd.cpp
ealthd/healthd_mode_android.cpp
ealthd/healthd_mode_charger.cpp
b4ad6911a4e88ae5c8f8f0249cae8071a783e01c 16-May-2014 Greg Hackmann <ghackmann@google.com> Merge "libadf: silence false positive warning"
283540147877ca3c5f7ecb280a6b5778ab63366c 15-May-2014 JP Abgrall <jpa@google.com> libdiskconfig: fix build (bad type in offset calculation)

Change-Id: I1acc490943f961a039acd3d40db825069b725abb
Signed-off-by: JP Abgrall <jpa@google.com>
ibdiskconfig/config_mbr.c
5e0db82858387ba8c529a8fbc667a58b29b79706 12-May-2014 Cylen Yao <cylen.yao@mediatek.com> libdiskconfig: set MBR signature when creating MBR

When formatting a blank SD card, it needs to set MBR signature when creating MBR.
If not, the 'format' operation will fail.

Change-Id: I860731243797d4da83f370af52822536983009ee
Signed-off-by: Cylen Yao <cylen.yao@mediatek.com>
ibdiskconfig/config_mbr.c
989980c55d9a11766b8698a97ce5eef3d8cfa286 14-May-2014 Mark Salyzyn <salyzyn@google.com> logd: logcat: debuggerd: auditd logs to events

- auditd switch to recording logs to events log id
- logcat add events as one of the default logs
- debuggerd collect events log as well.

ToDo: debuggerd & bugreport collect intermixed logs.

BUG: 14626551
Change-Id: I958f0e729b7596748be57488a38824db5645be7b
ebuggerd/tombstone.cpp
ogcat/logcat.cpp
ogd/Android.mk
ogd/LogAudit.cpp
ogd/event.logtags
35131c62a4d6048d96308d6a45f9baff3a6e9d9c 15-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 8c56cebd4450d5149828216291eb70d4d53aeb2b
8c56cebd4450d5149828216291eb70d4d53aeb2b 15-May-2014 Narayan Kamath <narayan@google.com> am 08a15076: am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."

* commit '08a1507603d63f07cfce65ead701330e1fe89894':
Change app_process reference to app_process32.
08a1507603d63f07cfce65ead701330e1fe89894 15-May-2014 Narayan Kamath <narayan@google.com> am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."

* commit 'a5f7aca82e63942e9449804fd11eb11aec710419':
Change app_process reference to app_process32.
a5f7aca82e63942e9449804fd11eb11aec710419 15-May-2014 Narayan Kamath <narayan@google.com> am 75a8eeb1: Merge "Change app_process reference to app_process32."

* commit '75a8eeb1ecf9f748b1d53e5ff3a5e138a0cdbebd':
Change app_process reference to app_process32.
75a8eeb1ecf9f748b1d53e5ff3a5e138a0cdbebd 15-May-2014 Narayan Kamath <narayan@google.com> Merge "Change app_process reference to app_process32."
50415394c5283a272ed42d478f8c0a320e2c1e9a 15-May-2014 Narayan Kamath <narayan@google.com> am b3bd09cd: am 9cbc8088: am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."

* commit 'b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2':
"stop" / "start must apply to the secondary zygote as well.
b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2 15-May-2014 Narayan Kamath <narayan@google.com> am 9cbc8088: am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."

* commit '9cbc808827950ae70b2a0bb9cb92f30fd1fbc724':
"stop" / "start must apply to the secondary zygote as well.
9cbc808827950ae70b2a0bb9cb92f30fd1fbc724 15-May-2014 Narayan Kamath <narayan@google.com> am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."

* commit '5f6beb12c1b66d6fbcebd86383f29337674ac75c':
"stop" / "start must apply to the secondary zygote as well.
5f6beb12c1b66d6fbcebd86383f29337674ac75c 15-May-2014 Narayan Kamath <narayan@google.com> Merge ""stop" / "start must apply to the secondary zygote as well."
7c01585339ef8ccbfb33e9886689e4018ae58978 15-May-2014 Kenny Root <kroot@google.com> resolved conflicts for merge of 101e92ac to master

Change-Id: I837bc0732c2e72d99ce47d0534915012ff43a21e
101e92acf18c43cffe1af30a3ced0296947c482d 15-May-2014 Kenny Root <kroot@google.com> am 020f81bf: am d20ba7fc: Merge "ps: add flag to show ABI"

* commit '020f81bf1270bfa72167e3c358abf33bb60778a5':
ps: add flag to show ABI
569e8346026513ea3d176a21097d0d055f22da4c 15-May-2014 Elliott Hughes <enh@google.com> am 7c633e6f: am 233bbd9d: am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."

* commit '7c633e6fe6f69006ca4299a475230dd583da38f3':
Clean up some unnecessary system_properties cruft.
020f81bf1270bfa72167e3c358abf33bb60778a5 15-May-2014 Kenny Root <kroot@google.com> am d20ba7fc: Merge "ps: add flag to show ABI"

* commit 'd20ba7fca295453648bc9093db03c16efbc6df1b':
ps: add flag to show ABI
7c633e6fe6f69006ca4299a475230dd583da38f3 15-May-2014 Elliott Hughes <enh@google.com> am 233bbd9d: am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."

* commit '233bbd9d515d16131d2e713e6909d992d27b8ef9':
Clean up some unnecessary system_properties cruft.
d20ba7fca295453648bc9093db03c16efbc6df1b 15-May-2014 Kenny Root <kroot@google.com> Merge "ps: add flag to show ABI"
233bbd9d515d16131d2e713e6909d992d27b8ef9 15-May-2014 Elliott Hughes <enh@google.com> am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."

* commit 'ed02fbf05c21442f40407bfaefcca35b985ad66a':
Clean up some unnecessary system_properties cruft.
ed02fbf05c21442f40407bfaefcca35b985ad66a 15-May-2014 Elliott Hughes <enh@google.com> Merge "Clean up some unnecessary system_properties cruft."
f94853f294059efc49ee5a057833cf8bc2b6c5df 15-May-2014 Elliott Hughes <enh@google.com> Clean up some unnecessary system_properties cruft.

Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
nit/builtins.c
nit/init.c
oolbox/getprop.c
8f197e65790265b362fc01c5f730365dc7dc1809 15-May-2014 Kenny Root <kroot@google.com> ps: add flag to show ABI

Allow us to easily identify the 32/64 bitness of the process. Yes, I
know this is not technically an ABI, but it seemed close enough!

Change-Id: Ia03a17fd74d61e7619911cb26b3dd7d82b62930c
oolbox/ps.c
d8b50fec84bf7ff0de79fd983fff651772a30caf 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 8f1c82c6: am 56935417: am f03397fa: Merge changes If5359c26,I5d09be41

* commit '8f1c82c697aeb774f63153b66c45d7dea43e4dbe':
Use a function instead of a macro.
Mark sockets on accept().
d6f34c8aefd72dc2ccedfd803966d5a55f37a101 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 5bd06936: (-s ours) am 07a1b526: am 75161485: Merge "Introduce netd_client, a dynamic library that talks to netd."

* commit '5bd06936e736c1fe029e929f9d3c22b0d31e0240':
Introduce netd_client, a dynamic library that talks to netd.
54b0c7b4313a747e86262e3f60b0d59ce0b83959 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 066c9b5a: am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."

* commit '066c9b5a005fdb84ea72a6d27a40ab5bf5e6f0e2':
Introduce fwmarkd: a service to set the fwmark of sockets.
8f1c82c697aeb774f63153b66c45d7dea43e4dbe 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 56935417: am f03397fa: Merge changes If5359c26,I5d09be41

* commit '56935417ceac36ea411b1489e08fec64d188bd79':
Use a function instead of a macro.
Mark sockets on accept().
5bd06936e736c1fe029e929f9d3c22b0d31e0240 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 07a1b526: am 75161485: Merge "Introduce netd_client, a dynamic library that talks to netd."

* commit '07a1b526ae36368293909b6c3ee7d5f18b89a2a7':
Introduce netd_client, a dynamic library that talks to netd.
066c9b5a005fdb84ea72a6d27a40ab5bf5e6f0e2 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."

* commit '9743f09724162186fb280627c3c125a55534a219':
Introduce fwmarkd: a service to set the fwmark of sockets.
56935417ceac36ea411b1489e08fec64d188bd79 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am f03397fa: Merge changes If5359c26,I5d09be41

* commit 'f03397fad4430742d85579fc7a80224ed6e6fb2a':
Use a function instead of a macro.
Mark sockets on accept().
07a1b526ae36368293909b6c3ee7d5f18b89a2a7 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 75161485: Merge "Introduce netd_client, a dynamic library that talks to netd."

* commit '751614859763c8846f4e98d2a0694a5d93fcd97e':
Introduce netd_client, a dynamic library that talks to netd.
9743f09724162186fb280627c3c125a55534a219 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."

* commit '09eaad793a8cec9196255d740ecb89a1426c0bf7':
Introduce fwmarkd: a service to set the fwmark of sockets.
f03397fad4430742d85579fc7a80224ed6e6fb2a 14-May-2014 Sreeram Ramachandran <sreeram@google.com> Merge changes If5359c26,I5d09be41

* changes:
Use a function instead of a macro.
Mark sockets on accept().
751614859763c8846f4e98d2a0694a5d93fcd97e 14-May-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Introduce netd_client, a dynamic library that talks to netd."
09eaad793a8cec9196255d740ecb89a1426c0bf7 14-May-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
aa907768af7ba9e29901d356cdcac6a436970323 08-May-2014 Mark Salyzyn <salyzyn@google.com> toolbox: turn on -Werror

- Deal with some signedness issues
- Deal with some size issues
- Deal with NULL pointer issues
- Deal with some -Wunused issues

Change-Id: I1479dd90d690084491bae3475f2c547833519a57
oolbox/Android.mk
oolbox/cp/cp.c
oolbox/cp/utils.c
oolbox/date.c
oolbox/dd.c
oolbox/du.c
oolbox/getevent.c
oolbox/getevent.h
oolbox/getprop.c
oolbox/grep/file.c
oolbox/grep/grep.c
oolbox/hd.c
oolbox/ioctl.c
oolbox/load_policy.c
oolbox/ls.c
oolbox/lsof.c
oolbox/mkdir.c
oolbox/newfs_msdos.c
oolbox/ps.c
oolbox/rmdir.c
oolbox/schedtop.c
oolbox/sendevent.c
oolbox/start.c
oolbox/stop.c
oolbox/top.c
oolbox/umount.c
oolbox/watchprops.c
e9272c70636999fdbe2f1b3d277101e8a59225ba 14-May-2014 Mark Salyzyn <salyzyn@google.com> am 12d9b827: am 4f801e60: am 3fe8afa4: Merge "fastboot: turn on -Werror"

* commit '12d9b8272df84a270a64269888378865e3d5148e':
fastboot: turn on -Werror
27c4acee95d872ba4364b70cb4445a284d26ea4d 14-May-2014 Mark Salyzyn <salyzyn@google.com> am 6bcab9f0: am ddf516f8: am 506a536b: Merge "libzipfile: turn on -Werror"

* commit '6bcab9f08020acdfc7a129fa34226ebb1d46a069':
libzipfile: turn on -Werror
6af621f7920e10129933ad15f04d8548d478eb23 14-May-2014 Sreeram Ramachandran <sreeram@google.com> Use a function instead of a macro.

(cherry picked from commit f3e4a8bb245afe874561eb7275f49dae0e7e55dd)

Change-Id: If5359c26a1474de0c278193fd2f09168f3184dee
ibnetd_client/NetdClient.cpp
b87b17a895383146cdec184a257a406fb93ab572 14-May-2014 Sreeram Ramachandran <sreeram@google.com> Mark sockets on accept().

(cherry picked from commit 1321cfecc6fb0e075796a34ed3c6a30d7ff3bea3)

Change-Id: I5d09be413cf720fbed905f96313b007997ada76c
ibnetd_client/NetdClient.cpp
154ebe80a01d85dff9340b0afaee102bfe31217f 12-May-2014 Sreeram Ramachandran <sreeram@google.com> Introduce netd_client, a dynamic library that talks to netd.

This library is dynamically loaded and used by bionic, to replace selected
standard socket syscalls with versions that talk to netd.

Implement connect() by requesting that the socket be marked with the netId of
the default network and then calling through to the actual syscall.

There are two escape hatches:

+ If the fwmark server is unavailable, it isn't an error; we proceed with the
syscall. This might help at boot time (when the server isn't ready yet) and if
we get rid of the fwmarkd socket entirely in future platform versions.

+ If the ANDROID_NO_USE_FWMARK_CLIENT environment variable is set, we don't
attempt to use the fwmark server (even if it's available). This allows apps to
sidestep unforseen issues in production at runtime.

(cherry picked from commit 0581cb455ef924f128a5c6d46bc70868b5099eec)

Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
nclude/netd_client/FwmarkCommands.h
ibnetd_client/Android.mk
ibnetd_client/FwmarkClient.cpp
ibnetd_client/FwmarkClient.h
ibnetd_client/NetdClient.cpp
12d9b8272df84a270a64269888378865e3d5148e 14-May-2014 Mark Salyzyn <salyzyn@google.com> am 4f801e60: am 3fe8afa4: Merge "fastboot: turn on -Werror"

* commit '4f801e60e309c34ef678c687160e2841432ebee5':
fastboot: turn on -Werror
6bcab9f08020acdfc7a129fa34226ebb1d46a069 14-May-2014 Mark Salyzyn <salyzyn@google.com> am ddf516f8: am 506a536b: Merge "libzipfile: turn on -Werror"

* commit 'ddf516f864c0a38be3717990216533ba49e9e3fd':
libzipfile: turn on -Werror
e38d4707141174a8c211d5cb01ff78da8ef1baff 11-May-2014 Sreeram Ramachandran <sreeram@google.com> Introduce fwmarkd: a service to set the fwmark of sockets.

(cherry picked from commit d5121e212c1f53b1cb6458ee83be892d94fdfef3)

Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
ootdir/init.rc
4f801e60e309c34ef678c687160e2841432ebee5 14-May-2014 Mark Salyzyn <salyzyn@google.com> am 3fe8afa4: Merge "fastboot: turn on -Werror"

* commit '3fe8afa404a4317807c7116fdab40f2506713396':
fastboot: turn on -Werror
ddf516f864c0a38be3717990216533ba49e9e3fd 14-May-2014 Mark Salyzyn <salyzyn@google.com> am 506a536b: Merge "libzipfile: turn on -Werror"

* commit '506a536b1ed5a6e2deacfa039a7c274d4436e682':
libzipfile: turn on -Werror
3fe8afa404a4317807c7116fdab40f2506713396 14-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "fastboot: turn on -Werror"
506a536b1ed5a6e2deacfa039a7c274d4436e682 14-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libzipfile: turn on -Werror"
b4932d592f1b6a7d44804a7aed04f1d21286ae8a 14-May-2014 Narayan Kamath <narayan@google.com> Change app_process reference to app_process32.

Required due to change 5a7ee9ad63 which makes
app_process a symlink to the primary zygote.

Change-Id: I940f6302db97f74dd57112e310014e989dc586e5
ootdir/init.zygote32_64.rc
5957c1ffe79b34d8b1859f9f11644d1007193cbc 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> fastboot: turn on -Werror

- Deal with a missing initializer issue
- Deal with some -Wunused issues
- Deal with some signed/unsigned issues
- switch to usleep from sleep to facilitate win_sdk compile

Change-Id: I64e32a5b0782aeed9582f489e866173c4df1afbf
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/protocol.c
astboot/usb_linux.c
astboot/usb_windows.c
astboot/usbtest.c
ab886745bc422e46d811a43043f7f2b2e132c15f 01-May-2014 Mark Salyzyn <salyzyn@google.com> libzipfile: turn on -Werror

- resolve some unused references

Change-Id: Ia3748c7e25963c2fd3d58e175177f0f4dd405997
ibzipfile/Android.mk
ibzipfile/centraldir.c
ibzipfile/zipfile.c
856c470192bdf9670f612df4777b16b066ff05fe 14-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 3c1c730f206d1d2dc25ac555d48513d6a3e5fb7f
d887641f64cb6395e22d8f5d7ece01c8d3d1e951 14-May-2014 Sreeram Ramachandran <sreeram@google.com> Use a function instead of a macro.

Change-Id: If5359c26a1474de0c278193fd2f09168f3184dee
ibnetd_client/NetdClient.cpp
0c2dfc3950181001e060c2b47abe967ce34b878d 14-May-2014 Sreeram Ramachandran <sreeram@google.com> Mark sockets on accept().

Change-Id: I5d09be413cf720fbed905f96313b007997ada76c
ibnetd_client/NetdClient.cpp
8f95def4192a88e54773ca9da5da0e7292671f4d 12-May-2014 Sreeram Ramachandran <sreeram@google.com> Introduce netd_client, a dynamic library that talks to netd.

This library is dynamically loaded and used by bionic, to replace selected
standard socket syscalls with versions that talk to netd.

Implement connect() by requesting that the socket be marked with the netId of
the default network and then calling through to the actual syscall.

There are two escape hatches:

+ If the fwmark server is unavailable, it isn't an error; we proceed with the
syscall. This might help at boot time (when the server isn't ready yet) and if
we get rid of the fwmarkd socket entirely in future platform versions.

+ If the ANDROID_NO_USE_FWMARK_CLIENT environment variable is set, we don't
attempt to use the fwmark server (even if it's available). This allows apps to
sidestep unforseen issues in production at runtime.

Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
nclude/netd_client/FwmarkCommands.h
ibnetd_client/Android.mk
ibnetd_client/FwmarkClient.cpp
ibnetd_client/FwmarkClient.h
ibnetd_client/NetdClient.cpp
76202a2dfaeb9ec6a23dfbc4a382b65820a52132 11-May-2014 Sreeram Ramachandran <sreeram@google.com> Introduce fwmarkd: a service to set the fwmark of sockets.

Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
ootdir/init.rc
3c1c730f206d1d2dc25ac555d48513d6a3e5fb7f 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am ca61b484: am b8cfcf3d: am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."

* commit 'ca61b484b6eb1bf92b05bc5386668ec51999e55a':
Set kernel proc files for fwmark reflection and table numbers for RAs.
ca61b484b6eb1bf92b05bc5386668ec51999e55a 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am b8cfcf3d: am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."

* commit 'b8cfcf3d9beb6ae09512941a182c326723b3ef41':
Set kernel proc files for fwmark reflection and table numbers for RAs.
b8cfcf3d9beb6ae09512941a182c326723b3ef41 14-May-2014 Sreeram Ramachandran <sreeram@google.com> am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."

* commit '32e4479d5535887d03625b43b7e3574b458dfc8d':
Set kernel proc files for fwmark reflection and table numbers for RAs.
32e4479d5535887d03625b43b7e3574b458dfc8d 14-May-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."
f8a1089ab5d3976c631cfe7b40eca8a5ed34c306 30-Apr-2014 Samuel Ortiz <sameo@linux.intel.com> Add list_add_head to libcutils

Adds a node to the head of the linked list.

Change-Id: I03fc81f348c5c4fdab8680928b6e353413e4bc3c
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
nclude/cutils/list.h
fd94922329a83c257dd8c65a4b1417a24d67db88 10-Apr-2014 Sreeram Ramachandran <sreeram@google.com> Set kernel proc files for fwmark reflection and table numbers for RAs.

(cherry picked from commit 2c2807ac1041751583e0c3b6892ca56eae423fa2)

Change-Id: I5f0d759cb9b8590555af7f5503f00d3e455ece54
ootdir/init.rc
a885d04ec8c9dd013a3dfc4434ec4f2cd23ef1ff 14-Sep-2013 Andrew Boie <andrew.p.boie@intel.com> ueventd: support by-name symlinks for PCI block devices

To ensure that well-crafted removable media can't spoof the
internal partitions, for platform devices the controller id
is inside the generated path.

We now do the same for PCI devices. The generated path has
two levels; the PCI domain/bus, and then the peripheral ID.
This lets us get by-name symlinks for PCI media, such as the
SATA controllers on PC-like hardware. The symlinks will be
created under /dev/block/pci/. For example:

/dev/block/pci/pci0000:00/0000:00:1f.2/by-name/

Change-Id: Icee3e86bef5569c2bbd94c26bc00d49028345e3b
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
nit/devices.c
22e22acbf0aa5cf11131cc8f7269fbe268fd0e9e 09-May-2014 Narayan Kamath <narayan@google.com> "stop" / "start must apply to the secondary zygote as well.

Would've been nice if we could use the sys property
observer to start and stop all services in a service
class but service classes do not appear to be fully
supported.

Change-Id: Iaf17a2dbcf913c4c646bc1e8e13adee9f952c45e
oolbox/start.c
oolbox/stop.c
910bca6850aea80bb4431aaccb2561730fe9741d 13-May-2014 Kenny Root <kroot@google.com> am 57e53ed4: am c563c38d: am 905874ab: Merge "adb: avoid compilation errors for unused results"

* commit '57e53ed4189cc49844e6afcea2a5861fd8ca93f1':
adb: avoid compilation errors for unused results
57e53ed4189cc49844e6afcea2a5861fd8ca93f1 13-May-2014 Kenny Root <kroot@google.com> am c563c38d: am 905874ab: Merge "adb: avoid compilation errors for unused results"

* commit 'c563c38d06e3af61ab8cf1c26536106985fec073':
adb: avoid compilation errors for unused results
c563c38d06e3af61ab8cf1c26536106985fec073 13-May-2014 Kenny Root <kroot@google.com> am 905874ab: Merge "adb: avoid compilation errors for unused results"

* commit '905874abe45279d7c668e590d404880dd91b1869':
adb: avoid compilation errors for unused results
905874abe45279d7c668e590d404880dd91b1869 13-May-2014 Kenny Root <kroot@google.com> Merge "adb: avoid compilation errors for unused results"
1bd41b13998b2d56359f64247695db355c48f4c6 13-May-2014 Kenny Root <kroot@google.com> adb: avoid compilation errors for unused results

The BIO_CTRL_FLUSH function for files doesn't return anything useful
from the underlying fflush call, so it is safe to ignore this.

Change-Id: If33a7efbbaaf158e3da1cd72d0a56da1d3b82fd9
db/adb_auth_host.c
57a0af93133ad0d190a79372b702653f96b99fe8 10-May-2014 Mark Salyzyn <salyzyn@google.com> init: logd: Allow Developer settings to adjust logd size

- AID_SYSTEM can set persist.logd.size
- AID_SYSTEM can issue command to /dev/socket/logd to
change the runtime global log sizes.
- Add support for ro.logd.size.* as populated by BoardConfig.mk
- Limit size to maximum ~3% of physical memory.

Bug: 14563261
Bug: 14627052
Change-Id: I606420db2e9d9d032296e71149e4a5b20cbd1137
nit/property_service.c
ogd/LogBuffer.cpp
ogd/LogCommand.cpp
4ae3866b38abbc456ee77654d43332f6aa64ab1e 13-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to e370094aedc7d529ab30d5bac8ad48b1ebe57897
e370094aedc7d529ab30d5bac8ad48b1ebe57897 13-May-2014 Ian Rogers <irogers@google.com> am e8a470cd: am e37e3301: am 09b84870: Merge "Remove declaration of unused static variable"

* commit 'e8a470cdad85fc0e50115242e6904abf8af5cc9e':
Remove declaration of unused static variable
e8a470cdad85fc0e50115242e6904abf8af5cc9e 13-May-2014 Ian Rogers <irogers@google.com> am e37e3301: am 09b84870: Merge "Remove declaration of unused static variable"

* commit 'e37e330159d1db45ce36e711dfaa90ab65dcf87b':
Remove declaration of unused static variable
e37e330159d1db45ce36e711dfaa90ab65dcf87b 13-May-2014 Ian Rogers <irogers@google.com> am 09b84870: Merge "Remove declaration of unused static variable"

* commit '09b84870d51c827cafac6220826bf497b1c622c4':
Remove declaration of unused static variable
09b84870d51c827cafac6220826bf497b1c622c4 13-May-2014 Ian Rogers <irogers@google.com> Merge "Remove declaration of unused static variable"
7fb0844174b879c717551bb086700131c5415db6 12-May-2014 Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Remove declaration of unused static variable

The declaration is useless and triggers a warning with clang 3.5 (in
code that's built with -Werror)

Change-Id: I8fc42178df264509dcce6e1f1ba318bf849307e3
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
ibmincrypt/p256.c
7571728eda457d311daacc30b3ea366687ee4e7e 12-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to d8698d739f68a201d272d2b8cc3c3ab0ad3f621b
10ad784af428f8711de7e054f84afd034075f0b9 11-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to d8698d739f68a201d272d2b8cc3c3ab0ad3f621b
8cc74270405bbca5afa989b61c76b554c5b4f5a6 30-Apr-2014 Thierry Escande <thierry.escande@linux.intel.com> Fix list_for_each_safe macro

The second macro parameter is named 'next' like listnode structure
'next' field. Since the precompiler will expand all 'next' occurrences
in the macro definition with what is passed by the caller, it is not
possible to call this macro with something else than 'next' as second
parameter.

This patch replaces the 'next' parameter with 'n' allowing use of a
next node not named 'next'.

Change-Id: I78c859caf8193f21fe0bedaeaa8342d6e89ad14b
Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
nclude/cutils/list.h
e34c57c1137e599bb8a62accc5388e77affdfd8d 10-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to d8698d739f68a201d272d2b8cc3c3ab0ad3f621b
d8698d739f68a201d272d2b8cc3c3ab0ad3f621b 10-May-2014 Christopher Ferris <cferris@google.com> am 413001aa: am 3a49aa7b: am 9428a289: Merge "Only include ucontext.h when necessary."

* commit '413001aa6cd4addcf544348020f992ebc6d3e2d4':
Only include ucontext.h when necessary.
413001aa6cd4addcf544348020f992ebc6d3e2d4 10-May-2014 Christopher Ferris <cferris@google.com> am 3a49aa7b: am 9428a289: Merge "Only include ucontext.h when necessary."

* commit '3a49aa7b19945b369221ce486778d7cd70ad066f':
Only include ucontext.h when necessary.
3a49aa7b19945b369221ce486778d7cd70ad066f 10-May-2014 Christopher Ferris <cferris@google.com> am 9428a289: Merge "Only include ucontext.h when necessary."

* commit '9428a2898c346aeff66922704d153f8bbacbcfa3':
Only include ucontext.h when necessary.
9428a2898c346aeff66922704d153f8bbacbcfa3 10-May-2014 Christopher Ferris <cferris@google.com> Merge "Only include ucontext.h when necessary."
c58287d60166ebdb1bd39fa40e5524c868c73a9b 10-May-2014 Christopher Ferris <cferris@google.com> Only include ucontext.h when necessary.

Change-Id: I29014f6c6b82e0a9797e5d76147b3c4e3d82a7f5
ibbacktrace/BacktraceImpl.cpp
ibbacktrace/BacktraceImpl.h
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindPtrace.cpp
290efd244d8af18811b2ef2dac8f30cc7a37e066 05-May-2014 Christopher Ferris <cferris@google.com> Log stack even if tombstone cannot be created.

Bug: 14498701

(cherry picked from commit c5bb49a138a78442e7326dfb6bbf85feadf0d486)

Conflicts:
debuggerd/tombstone.cpp

Change-Id: I888b3d683c3b880357b0b24f9204a9cca3e8f3be
ebuggerd/tombstone.cpp
1d0fedefbf0ce2f8b61292acf012d0e262fbe704 10-May-2014 John Reck <jreck@google.com> Merge "Add VirtualLightRefBase"
d83186c444809beaaf181b11c857bc2ab675428e 10-May-2014 John Reck <jreck@google.com> Add VirtualLightRefBase

Change-Id: I040db87d9e87ba0584e7e5bdd72f0c319a522fa1
nclude/utils/RefBase.h
dee011b42689850c7202dd200d8088d8a33a9ac3 09-May-2014 Christopher Ferris <cferris@google.com> am f4e28c39: am 0f5e9579: am b49f23ed: Merge "Fix ucontext_t forward declare for mac."

* commit 'f4e28c3956627accf2bdea96f9dd32fcd543de9c':
Fix ucontext_t forward declare for mac.
1e569c1036d061d4c9b4088292c8024e93873705 09-May-2014 Christopher Ferris <cferris@google.com> am 8ad708c5: (-s ours) am c1087e55: am bf6c2dbe: Merge "Fix mac build."

* commit '8ad708c56570d81def649911bdfc42f5c350e4b8':
Fix mac build.
ee15ddee7277bdf2208642fd86307f1464b385f4 09-May-2014 Christopher Ferris <cferris@google.com> Fix ucontext_t forward declare for mac.

(cherry picked from commit afa9c9cd725c081e7286f09937a41ae9c28853d6)

Change-Id: I6dacdfacfdff0c3ce5166207cfd60adb347ee347
nclude/backtrace/Backtrace.h
8fb224d32bd8526bbfd0a658c9e6cc1b28edffc3 09-May-2014 Christopher Ferris <cferris@google.com> Fix mac build.

Forward declare ucontext_t so that it's not necessary for ucontext.h
to be included in the global header.

(cherry picked from commit b138037b266487e79c729d9daae94ed31b93e550)

Change-Id: I0ffb5bf7c53da8467dd8770880ff412a5158d639
nclude/backtrace/Backtrace.h
f4e28c3956627accf2bdea96f9dd32fcd543de9c 09-May-2014 Christopher Ferris <cferris@google.com> am 0f5e9579: am b49f23ed: Merge "Fix ucontext_t forward declare for mac."

* commit '0f5e957963d6f455f4685772d0e1181d8f44e7bd':
Fix ucontext_t forward declare for mac.
0f5e957963d6f455f4685772d0e1181d8f44e7bd 09-May-2014 Christopher Ferris <cferris@google.com> am b49f23ed: Merge "Fix ucontext_t forward declare for mac."

* commit 'b49f23ed3198ee6129ad675e26c8d197ed984017':
Fix ucontext_t forward declare for mac.
b49f23ed3198ee6129ad675e26c8d197ed984017 09-May-2014 Christopher Ferris <cferris@google.com> Merge "Fix ucontext_t forward declare for mac."
afa9c9cd725c081e7286f09937a41ae9c28853d6 09-May-2014 Christopher Ferris <cferris@google.com> Fix ucontext_t forward declare for mac.

Change-Id: I30470f5cc25553dee25d4858f64ec5af13aa20c9
nclude/backtrace/Backtrace.h
8ad708c56570d81def649911bdfc42f5c350e4b8 09-May-2014 Christopher Ferris <cferris@google.com> am c1087e55: am bf6c2dbe: Merge "Fix mac build."

* commit 'c1087e55c63f2c206eae676fd4c237585a64e8e5':
Fix mac build.
c1087e55c63f2c206eae676fd4c237585a64e8e5 09-May-2014 Christopher Ferris <cferris@google.com> am bf6c2dbe: Merge "Fix mac build."

* commit 'bf6c2dbef5ab775f7c6af6a2776793c2af41bc40':
Fix mac build.
bf6c2dbef5ab775f7c6af6a2776793c2af41bc40 09-May-2014 Christopher Ferris <cferris@google.com> Merge "Fix mac build."
b138037b266487e79c729d9daae94ed31b93e550 09-May-2014 Christopher Ferris <cferris@google.com> Fix mac build.

Forward declare ucontext_t so that it's not necessary for ucontext.h
to be included in the global header.

Change-Id: Ic13677dd572ab1acd927f0a17b284f9b417a642f
nclude/backtrace/Backtrace.h
e49e43d4aa201e1bfcf0f6f7dd934ba69b9d18d1 09-May-2014 Christopher Ferris <cferris@google.com> am 3adbe79d: am 66e31dc5: am 3a088524: Merge "Rewrite unwind thread handling."

* commit '3adbe79d2f14665ff55a9b0db245abebc105658d':
Rewrite unwind thread handling.
3adbe79d2f14665ff55a9b0db245abebc105658d 09-May-2014 Christopher Ferris <cferris@google.com> am 66e31dc5: am 3a088524: Merge "Rewrite unwind thread handling."

* commit '66e31dc51e0d8db595cc1514527c4db6f5cdeba7':
Rewrite unwind thread handling.
66e31dc51e0d8db595cc1514527c4db6f5cdeba7 09-May-2014 Christopher Ferris <cferris@google.com> am 3a088524: Merge "Rewrite unwind thread handling."

* commit '3a088524cbd00c140c8fe043ce989ddcf28e7042':
Rewrite unwind thread handling.
3a088524cbd00c140c8fe043ce989ddcf28e7042 09-May-2014 Christopher Ferris <cferris@google.com> Merge "Rewrite unwind thread handling."
ad832859a7ccd7ba44b6f97e0933ab0b413d62b6 09-May-2014 Andrew Hsieh <andrewhsieh@google.com> Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO

With __USE_MINGW_ANSI_STDIO mingw compiler uses its own replacement
printf*/scanf* libraries instead of Microsoft's ones which aren't always
C99 compatible. Declare "archetype" of attribute format to gnu_printf
because the default "printf" in mingw follows MS standard.

One result is that "%z" (a gnu-extension) is accepted w/o warning by
mingw compiler

Change-Id: I3e92f34e2a1e8d664b4f1f55d450f7c2790671f3
nclude/android/log.h
6ebb8197715c82b657ed1088a97d3497ba928bd2 09-May-2014 JP Abgrall <jpa@google.com> am 0f072d1e: am afcd2659: am dc0ea862: Merge "libziparchive: off64_t is not int64_t (part deux)"

* commit '0f072d1ec2c98abf7a31a8b2610e8342459563f8':
libziparchive: off64_t is not int64_t (part deux)
0f072d1ec2c98abf7a31a8b2610e8342459563f8 09-May-2014 JP Abgrall <jpa@google.com> am afcd2659: am dc0ea862: Merge "libziparchive: off64_t is not int64_t (part deux)"

* commit 'afcd2659eb93ef0a6042c1639293711788878910':
libziparchive: off64_t is not int64_t (part deux)
afcd2659eb93ef0a6042c1639293711788878910 09-May-2014 JP Abgrall <jpa@google.com> am dc0ea862: Merge "libziparchive: off64_t is not int64_t (part deux)"

* commit 'dc0ea8626f9b4eb40467d6fdde5e46540130bd1d':
libziparchive: off64_t is not int64_t (part deux)
dc0ea8626f9b4eb40467d6fdde5e46540130bd1d 09-May-2014 JP Abgrall <jpa@google.com> Merge "libziparchive: off64_t is not int64_t (part deux)"
96c5c99bda0d6fec3acb32bc1aea10ebe81be017 09-May-2014 Mark Salyzyn <salyzyn@google.com> libziparchive: off64_t is not int64_t (part deux)

Change-Id: I38e78bdba338a0c40aec43d6c86f26f388cee6ab
ibziparchive/zip_archive.cc
361682fb1c2290761c50ac75a8c105700f7e385c 09-May-2014 JP Abgrall <jpa@google.com> am da2046f9: am 3d2ad1ea: am f304730c: Merge "libziparchive: off64_t is not int64_t"

* commit 'da2046f9829b87405509b52365e6747f95246458':
libziparchive: off64_t is not int64_t
da2046f9829b87405509b52365e6747f95246458 09-May-2014 JP Abgrall <jpa@google.com> am 3d2ad1ea: am f304730c: Merge "libziparchive: off64_t is not int64_t"

* commit '3d2ad1eafd6b2ea1ad92951f6f6c448760bc7895':
libziparchive: off64_t is not int64_t
3d2ad1eafd6b2ea1ad92951f6f6c448760bc7895 09-May-2014 JP Abgrall <jpa@google.com> am f304730c: Merge "libziparchive: off64_t is not int64_t"

* commit 'f304730c2893d7b5d47cfe393fb2d6d3f4fced84':
libziparchive: off64_t is not int64_t
f304730c2893d7b5d47cfe393fb2d6d3f4fced84 09-May-2014 JP Abgrall <jpa@google.com> Merge "libziparchive: off64_t is not int64_t"
56a90a08dbbbf96ef415dc6bc84bff2a409efc68 09-May-2014 Mark Salyzyn <salyzyn@google.com> libziparchive: off64_t is not int64_t

- ToDo: investigate why our system headers let us down.

Change-Id: Iada422adbbbd4fbd0fc09b51b97b3cd06ccc6374
ibziparchive/zip_archive.cc
70a532c5dd89712f1f0999b23f503467c7b3b478 09-May-2014 Mark Salyzyn <salyzyn@google.com> am 8b7bfadb: am e5bb3a3d: am 9b5f044f: Merge "libziparchive: 64 bit issues"

* commit '8b7bfadb0474f280a363a5b2955892c8e50e6f94':
libziparchive: 64 bit issues
8b7bfadb0474f280a363a5b2955892c8e50e6f94 09-May-2014 Mark Salyzyn <salyzyn@google.com> am e5bb3a3d: am 9b5f044f: Merge "libziparchive: 64 bit issues"

* commit 'e5bb3a3db3832147350ddeedef9896b503ded0d8':
libziparchive: 64 bit issues
e5bb3a3db3832147350ddeedef9896b503ded0d8 09-May-2014 Mark Salyzyn <salyzyn@google.com> am 9b5f044f: Merge "libziparchive: 64 bit issues"

* commit '9b5f044fd00f8b1d49a14c1a1faed69b3dde200b':
libziparchive: 64 bit issues
9b5f044fd00f8b1d49a14c1a1faed69b3dde200b 09-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libziparchive: 64 bit issues"
088bf90e5de251f4b2f2419187d8ee5d7b2bd831 09-May-2014 Mark Salyzyn <salyzyn@google.com> libziparchive: 64 bit issues

Change-Id: I1b53aff5b1527a3623d17deed306624707d345ef
ibziparchive/zip_archive.cc
1c95847aa35f57c126afe9502df9320ea9126842 08-May-2014 Mark Salyzyn <salyzyn@google.com> am c6d96f80: am 0e69ba70: am 113067e2: Merge "run-as: build 1161573 failure"

* commit 'c6d96f8025ad9d083e6b7a4438d8e109c7fafaf5':
run-as: build 1161573 failure
51067914d11daceb3aae7461e9f14d915f040f4d 08-May-2014 Mark Salyzyn <salyzyn@google.com> am d4d09637: am db32e788: am a2b03c4a: Merge "libsparse: turn on -Werror"

* commit 'd4d096370154492433f02df56a7508eb99f564e2':
libsparse: turn on -Werror
87f1dd5da173dcd297fa8455e0a7845572931046 08-May-2014 Mark Salyzyn <salyzyn@google.com> am af0df46d: am e6246ca6: am 01ef52e1: Merge "fs_mgr: turn on -Werror"

* commit 'af0df46d74368bb98edaadb3c09ddbc7252d3110':
fs_mgr: turn on -Werror
970f7062f50ba5056305ab8fce62d97d13f267b4 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 95d616c2: am eaba3970: am d3d8703c: Merge "libmincrypt: suppress warning messages"

* commit '95d616c2c7c87a7c34c57461cf8445a2b1e8ec70':
libmincrypt: suppress warning messages
3468898aca797099686f003a263e27c51547a4ae 08-May-2014 Mark Salyzyn <salyzyn@google.com> am c9607941: am 463e2510: am b9b50b4e: Merge "libziparchive: Turn on -Werror"

* commit 'c960794126645238897e1ab1e9456e5623b4458f':
libziparchive: Turn on -Werror
3c3a447693ee795399300b231f61169a0482603f 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 7d02541a: am e1324cd4: am 17151e4d: Merge "run-as: turn on -Werror"

* commit '7d02541ae55352afc13635aa6e8b8f5ff4081402':
run-as: turn on -Werror
42b295a05095d634ed1425ca8abf77d9747b10e4 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 5e193ebf: am d4bb3110: am 9318e4d9: Merge "liblog: set -Werror"

* commit '5e193ebf6ce8f3bf13f753c317bc929ecd99ae00':
liblog: set -Werror
a2efd3ac7abe223aa7a8ba8b5ba448216c4953b4 07-May-2014 Christopher Ferris <cferris@google.com> Rewrite unwind thread handling.

This new version doesn't require any specialized thread
implementation, it uses the Current implementation to do its job.
In addition, it runs much faster when multiple threads are trying
to unwind at the same time since the global signal lock is held for
only a small amount of time. Even running through the threads one at
a time should be faster since it no longer requires two passes through
the unwound stacks.

The new code now allows multiple simultaneous unwinds of the
same thread.

Finally, add the ability to unwind from a ucontext_t passed in. This
functionality doesn't work for remote unwinds yet.

Change-Id: I4d181d7ca5ffd2acfd1686e668e6d21e36b425cb
nclude/backtrace/Backtrace.h
ibbacktrace/Android.mk
ibbacktrace/BacktraceImpl.cpp
ibbacktrace/BacktraceImpl.h
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindCurrent.h
ibbacktrace/UnwindPtrace.cpp
ibbacktrace/UnwindPtrace.h
ibbacktrace/backtrace_test.cpp
c6d96f8025ad9d083e6b7a4438d8e109c7fafaf5 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 0e69ba70: am 113067e2: Merge "run-as: build 1161573 failure"

* commit '0e69ba70b5be26ebe0fb94b4fd2140e2277aa71e':
run-as: build 1161573 failure
0e69ba70b5be26ebe0fb94b4fd2140e2277aa71e 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 113067e2: Merge "run-as: build 1161573 failure"

* commit '113067e2161e206482e80cfa9b58eeca02e0f6b6':
run-as: build 1161573 failure
113067e2161e206482e80cfa9b58eeca02e0f6b6 08-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "run-as: build 1161573 failure"
2e6e2713fb71f7e18b782ac22a7b466545b79e89 08-May-2014 Mark Salyzyn <salyzyn@google.com> run-as: build 1161573 failure

- pointer to integer comparison.

Change-Id: I4a12c357ff5eaf2fc08c19c9efe7e2d7cb0dbe2e
un-as/package.c
d4d096370154492433f02df56a7508eb99f564e2 08-May-2014 Mark Salyzyn <salyzyn@google.com> am db32e788: am a2b03c4a: Merge "libsparse: turn on -Werror"

* commit 'db32e7889049150c965fe9103400299c9256acf1':
libsparse: turn on -Werror
af0df46d74368bb98edaadb3c09ddbc7252d3110 08-May-2014 Mark Salyzyn <salyzyn@google.com> am e6246ca6: am 01ef52e1: Merge "fs_mgr: turn on -Werror"

* commit 'e6246ca6cc48e182cc5e193510b05f8889ba9aed':
fs_mgr: turn on -Werror
95d616c2c7c87a7c34c57461cf8445a2b1e8ec70 08-May-2014 Mark Salyzyn <salyzyn@google.com> am eaba3970: am d3d8703c: Merge "libmincrypt: suppress warning messages"

* commit 'eaba3970c096c73d547bb0b72eae8284aa52cb7d':
libmincrypt: suppress warning messages
c960794126645238897e1ab1e9456e5623b4458f 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 463e2510: am b9b50b4e: Merge "libziparchive: Turn on -Werror"

* commit '463e25101e028c0ea53a17c1519debd351a17eaf':
libziparchive: Turn on -Werror
7d02541ae55352afc13635aa6e8b8f5ff4081402 08-May-2014 Mark Salyzyn <salyzyn@google.com> am e1324cd4: am 17151e4d: Merge "run-as: turn on -Werror"

* commit 'e1324cd4d80c897442902f6358f78b761e42d5ff':
run-as: turn on -Werror
5e193ebf6ce8f3bf13f753c317bc929ecd99ae00 08-May-2014 Mark Salyzyn <salyzyn@google.com> am d4bb3110: am 9318e4d9: Merge "liblog: set -Werror"

* commit 'd4bb3110623b210ac99e036f039a71548a3131d3':
liblog: set -Werror
db32e7889049150c965fe9103400299c9256acf1 08-May-2014 Mark Salyzyn <salyzyn@google.com> am a2b03c4a: Merge "libsparse: turn on -Werror"

* commit 'a2b03c4a6a8d68b0991ed64c51df59b39370d8d4':
libsparse: turn on -Werror
e6246ca6cc48e182cc5e193510b05f8889ba9aed 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 01ef52e1: Merge "fs_mgr: turn on -Werror"

* commit '01ef52e114d9ef59681f3b83f71545390611fde3':
fs_mgr: turn on -Werror
eaba3970c096c73d547bb0b72eae8284aa52cb7d 08-May-2014 Mark Salyzyn <salyzyn@google.com> am d3d8703c: Merge "libmincrypt: suppress warning messages"

* commit 'd3d8703c8acd8233653e6d33a9abe01b8b238336':
libmincrypt: suppress warning messages
463e25101e028c0ea53a17c1519debd351a17eaf 08-May-2014 Mark Salyzyn <salyzyn@google.com> am b9b50b4e: Merge "libziparchive: Turn on -Werror"

* commit 'b9b50b4e58894631c628032fd9d8c694b07288cb':
libziparchive: Turn on -Werror
e1324cd4d80c897442902f6358f78b761e42d5ff 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 17151e4d: Merge "run-as: turn on -Werror"

* commit '17151e4d0e8f01a05c7a117dabcb2f3bdd6d54d2':
run-as: turn on -Werror
d4bb3110623b210ac99e036f039a71548a3131d3 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 9318e4d9: Merge "liblog: set -Werror"

* commit '9318e4d9f88f99ead5ed039952ef68bdaf9a1b8e':
liblog: set -Werror
a2b03c4a6a8d68b0991ed64c51df59b39370d8d4 08-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libsparse: turn on -Werror"
01ef52e114d9ef59681f3b83f71545390611fde3 08-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "fs_mgr: turn on -Werror"
d3d8703c8acd8233653e6d33a9abe01b8b238336 08-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libmincrypt: suppress warning messages"
b9b50b4e58894631c628032fd9d8c694b07288cb 08-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libziparchive: Turn on -Werror"
17151e4d0e8f01a05c7a117dabcb2f3bdd6d54d2 08-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "run-as: turn on -Werror"
9318e4d9f88f99ead5ed039952ef68bdaf9a1b8e 08-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: set -Werror"
2e9a98e2f73a223bfac2d0caec344f8c9f00907a 08-May-2014 Alexander Levitskiy <sanek@google.com> am d6efe69e: am 3142bdbf: am d150618d: Merge "Revert "System: Fastboot: warning fixit, misc bugs and cleanup.""

* commit 'd6efe69e3ae88c21d0d2efb4898d5d89bbd2f9d6':
Revert "System: Fastboot: warning fixit, misc bugs and cleanup."
d2baee2f47dc5d96c913ac0d6550134bdcab9753 08-May-2014 Mark Salyzyn <salyzyn@google.com> am e7597115: am 328746da: am 129e9dad: Merge changes Idfd1a114,If725a1cb,I61211165,If9a05ccb

* commit 'e75971157c46a0fc57194a75d4dde0920f60f427':
adb: turn on -Werror
netcfg: turn on -Werror
mkbootimg: turn on -Werror
gpttool: turn on -Werror
da6a0aa0df91d7e9429c522e403a129077502df9 08-May-2014 Ying Wang <wangying@google.com> am b18da571: am 1e6cd741: am 803fb62b: Merge "Remove unused LOCAL_LDLIBS."

* commit 'b18da571f90eebedd99fe5607a6b0d7ae4e91893':
Remove unused LOCAL_LDLIBS.
cd76d223fbe52a23c3742d7fee2001c4813071f1 08-May-2014 Elliott Hughes <enh@google.com> am 43224ce3: am 78104182: am d9e3bc3f: Merge "Use bionic\'s <linux/fuse.h>."

* commit '43224ce37fcd09bb7a38e01212175eea61d2444b':
Use bionic's <linux/fuse.h>.
322d2dc2641ccb3ed2acfd6170fae0f3f92ea853 08-May-2014 Elliott Hughes <enh@google.com> am 4776e2e4: am 1f64d7e1: am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."

* commit '4776e2e4322b072d278e0ace012a770758973de8':
Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
ad3127a529a20eda5fcb8dfd02aa5406a14ccf99 08-May-2014 Sasha Levitskiy <sanek@google.com> am 40aa6967: am b59e7e6b: am a744f0a1: Merge "System: Fastboot: warning fixit, misc bugs and cleanup."

* commit '40aa6967e1be044a7ac898374f81684bb100462f':
System: Fastboot: warning fixit, misc bugs and cleanup.
663c8595133cec1f66f0dbd2e24910500194bff0 08-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 7d7f5e58db76fb2c437e6a6fb0f196004be604a8
7d7f5e58db76fb2c437e6a6fb0f196004be604a8 08-May-2014 Nick Kralevich <nnk@google.com> Make lmkd dynamically linked

Statically linked binaries cannot take advantage of ASLR,
making them less secure.

In addition, statically linked binaries consume more ram,
because shared libraries cannot be reused.

executable size before: 87728
executable size after: 13656

Change-Id: I9d02d865f9beeaaaadcd5009f64ac015931d4b11
mkd/Android.mk
8116c8c37aadd83033ffea9e4f5fc86240428e43 01-May-2014 Mark Salyzyn <salyzyn@google.com> libsparse: turn on -Werror

- Deal with some -Wunused issues

Change-Id: I9667d74c0dfbe55c625e65b9d44d7c6f861c455d
ibsparse/Android.mk
ibsparse/img2simg.c
ibsparse/output_file.c
ibsparse/sparse.c
ibsparse/sparse_read.c
86e3f22b6ae048ba8c9284b4900258c3ccd17cdf 01-May-2014 Mark Salyzyn <salyzyn@google.com> fs_mgr: turn on -Werror

- deal with some -Wunused-variable issues

Change-Id: Ie0140d4777ddf862e4bbed76142a1dbb8320c1b0
s_mgr/Android.mk
s_mgr/fs_mgr_fstab.c
s_mgr/fs_mgr_verity.c
f03f8485e7d1a5258e16e0e376229f431d2c53ac 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> libmincrypt: suppress warning messages

- deal with implict declaration issue
- deal with some -Wunused issues

Change-Id: I253f1412a696c4811ade70a931fb1c01b31c62a5
ibmincrypt/dsa_sig.c
ibmincrypt/test/ecdsa_test.c
ibmincrypt/test/rsa_test.c
51d562d39976451a3a29992b00f36ea54e06c4af 05-May-2014 Mark Salyzyn <salyzyn@google.com> libziparchive: Turn on -Werror

Change-Id: I98a93273b9e1bac0324dd210f6a8493ba780e878
ibziparchive/Android.mk
ibziparchive/zip_archive.cc
b9f5a2b9a0f4f08050dd2b88c64493836edc74dd 01-May-2014 Mark Salyzyn <salyzyn@google.com> run-as: turn on -Werror

- remove an abandoned code fragment

Change-Id: I32d4ad820772685c680d200dc00ef11d102c76bd
un-as/Android.mk
un-as/package.c
a04464adaf5b95ae953f8577632d3cf8aa2c80a3 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> liblog: set -Werror

- Deal with some -Wunused issues
- Cleanup UNUSED to __unused transition

Change-Id: Icd33808d4c974625f4fd0a126a90a2b4c90c8314
iblog/Android.mk
iblog/event_tag_map.c
iblog/fake_log_device.c
iblog/log_read.c
iblog/log_read_kern.c
iblog/logd_write.c
iblog/logd_write_kern.c
iblog/logprint.c
iblog/tests/liblog_benchmark.cpp
iblog/tests/liblog_test.cpp
d6efe69e3ae88c21d0d2efb4898d5d89bbd2f9d6 08-May-2014 Alexander Levitskiy <sanek@google.com> am 3142bdbf: am d150618d: Merge "Revert "System: Fastboot: warning fixit, misc bugs and cleanup.""

* commit '3142bdbf844e62e88b9aa64598081e702421e82d':
Revert "System: Fastboot: warning fixit, misc bugs and cleanup."
3142bdbf844e62e88b9aa64598081e702421e82d 08-May-2014 Alexander Levitskiy <sanek@google.com> am d150618d: Merge "Revert "System: Fastboot: warning fixit, misc bugs and cleanup.""

* commit 'd150618d8d31ca1b56258902c40ad5c38f1c4e31':
Revert "System: Fastboot: warning fixit, misc bugs and cleanup."
d150618d8d31ca1b56258902c40ad5c38f1c4e31 08-May-2014 Alexander Levitskiy <sanek@google.com> Merge "Revert "System: Fastboot: warning fixit, misc bugs and cleanup.""
8d7ddb35d510824e50833a9b31ae6486393b1436 08-May-2014 Alexander Levitskiy <sanek@google.com> Revert "System: Fastboot: warning fixit, misc bugs and cleanup."

This reverts commit 782111b3bc5d372afc8d66ab6023e834b7c23b88.

Change-Id: Ib66400dfaeef7f01e6461a57b9f09be08de2f1fe
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
astboot/usbtest.c
e75971157c46a0fc57194a75d4dde0920f60f427 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 328746da: am 129e9dad: Merge changes Idfd1a114,If725a1cb,I61211165,If9a05ccb

* commit '328746da8090a549e432da2358585b101e30d753':
adb: turn on -Werror
netcfg: turn on -Werror
mkbootimg: turn on -Werror
gpttool: turn on -Werror
328746da8090a549e432da2358585b101e30d753 08-May-2014 Mark Salyzyn <salyzyn@google.com> am 129e9dad: Merge changes Idfd1a114,If725a1cb,I61211165,If9a05ccb

* commit '129e9dada707d66eb3242b666b6187a031dc410a':
adb: turn on -Werror
netcfg: turn on -Werror
mkbootimg: turn on -Werror
gpttool: turn on -Werror
129e9dada707d66eb3242b666b6187a031dc410a 08-May-2014 Mark Salyzyn <salyzyn@google.com> Merge changes Idfd1a114,If725a1cb,I61211165,If9a05ccb

* changes:
adb: turn on -Werror
netcfg: turn on -Werror
mkbootimg: turn on -Werror
gpttool: turn on -Werror
b18da571f90eebedd99fe5607a6b0d7ae4e91893 08-May-2014 Ying Wang <wangying@google.com> am 1e6cd741: am 803fb62b: Merge "Remove unused LOCAL_LDLIBS."

* commit '1e6cd741fd130e5916337eb75c9ceef2152035d2':
Remove unused LOCAL_LDLIBS.
43224ce37fcd09bb7a38e01212175eea61d2444b 08-May-2014 Elliott Hughes <enh@google.com> am 78104182: am d9e3bc3f: Merge "Use bionic\'s <linux/fuse.h>."

* commit '78104182ac3ebb3239d8288a4b113b493132c3fc':
Use bionic's <linux/fuse.h>.
1e6cd741fd130e5916337eb75c9ceef2152035d2 08-May-2014 Ying Wang <wangying@google.com> am 803fb62b: Merge "Remove unused LOCAL_LDLIBS."

* commit '803fb62bb49b551afff546b4748d2d3e9ec54af1':
Remove unused LOCAL_LDLIBS.
78104182ac3ebb3239d8288a4b113b493132c3fc 08-May-2014 Elliott Hughes <enh@google.com> am d9e3bc3f: Merge "Use bionic\'s <linux/fuse.h>."

* commit 'd9e3bc3f422fcae5a800483275da9fc950ab7f7a':
Use bionic's <linux/fuse.h>.
4776e2e4322b072d278e0ace012a770758973de8 08-May-2014 Elliott Hughes <enh@google.com> am 1f64d7e1: am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."

* commit '1f64d7e14c0e6c8f5b142d6eb942608f2951f4a7':
Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
803fb62bb49b551afff546b4748d2d3e9ec54af1 08-May-2014 Ying Wang <wangying@google.com> Merge "Remove unused LOCAL_LDLIBS."
d9e3bc3f422fcae5a800483275da9fc950ab7f7a 08-May-2014 Elliott Hughes <enh@google.com> Merge "Use bionic's <linux/fuse.h>."
1f64d7e14c0e6c8f5b142d6eb942608f2951f4a7 08-May-2014 Elliott Hughes <enh@google.com> am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."

* commit 'b48661289ad5b31afd2fa6e406caa0dca1c80230':
Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
b48661289ad5b31afd2fa6e406caa0dca1c80230 08-May-2014 Elliott Hughes <enh@google.com> Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."
99d4a697c7f8968bb9b8f9dea61d7be712fc206b 08-May-2014 Elliott Hughes <enh@google.com> Fix mips debuggerd <corkscrew/ptrace.h> build breakage.

The uapi headers have everything we need, and the corkscrew
header files have been removed.

Change-Id: I274b44463638112f1ab290926094c094c9253586
ebuggerd/mips/machine.cpp
9f437d71812dd9907571d0cabd061153190ebbb9 08-May-2014 Ying Wang <wangying@google.com> Remove unused LOCAL_LDLIBS.

Change-Id: I42aeb7668183e7a06207ee063f6eee4d37d66c6e
db/Android.mk
ibbacktrace/Android.mk
ibcutils/Android.mk
iblog/Android.mk
iblog/tests/Android.mk
ibutils/Android.mk
ogcat/tests/Android.mk
be6b3ad1f00ef0741b534dcc26bd46d124cd222a 08-May-2014 Elliott Hughes <enh@google.com> am d1c807a8: am 22a289a0: am 7112e4c7: Merge "Remove the dead corkscrew header files too."

* commit 'd1c807a8807dc85ce5efe7997b440b3a5dc2e4d3':
Remove the dead corkscrew header files too.
ea2185acf3da4225bd359d6152b36e752d6da436 08-May-2014 Elliott Hughes <enh@google.com> am 91070a5e: am 5503f774: am 2c55b454: Merge "Switch to the new bionic fatal logging interface."

* commit '91070a5ef29e3ebea45e23492dae56690f5fc1bc':
Switch to the new bionic fatal logging interface.
20fcb78e5832fd63429c7f6105e32d7917975d72 07-May-2014 Greg Hackmann <ghackmann@google.com> libadf: silence false positive warning

Some versions of gcc warn that intfs may be used uninitialized

Change-Id: I3b8d7e919e9c2902ac56adeabd09a45ececfb3c4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
df/libadf/adf.c
40aa6967e1be044a7ac898374f81684bb100462f 08-May-2014 Sasha Levitskiy <sanek@google.com> am b59e7e6b: am a744f0a1: Merge "System: Fastboot: warning fixit, misc bugs and cleanup."

* commit 'b59e7e6b2165809e971a754796d766e1de2bd324':
System: Fastboot: warning fixit, misc bugs and cleanup.
b59e7e6b2165809e971a754796d766e1de2bd324 08-May-2014 Sasha Levitskiy <sanek@google.com> am a744f0a1: Merge "System: Fastboot: warning fixit, misc bugs and cleanup."

* commit 'a744f0a11a4ff2e4a84a0af8e8e98e2e38babc32':
System: Fastboot: warning fixit, misc bugs and cleanup.
a744f0a11a4ff2e4a84a0af8e8e98e2e38babc32 07-May-2014 Sasha Levitskiy <sanek@google.com> Merge "System: Fastboot: warning fixit, misc bugs and cleanup."
60281d556ded9fed3df770befb58990f7ae2e04f 07-May-2014 Elliott Hughes <enh@google.com> Use bionic's <linux/fuse.h>.

No need for an out-of-date copy of a uapi header.

Change-Id: Iec68c6ceb2bceca1ceef0c57e0b45a89a139e292
dcard/fuse.h
dcard/sdcard.c
00ff7e063699cce5194dc729df1fd20ec5230273 07-May-2014 JP Abgrall <jpa@google.com> am de9033e7: am a2f51837: am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"

* commit 'de9033e7e08622bc6e16c9a675ea7ecd7b27f3db':
fastboot: support for overriding format fs-type and size
e3019eb7d502462cf9ac6501d7e196414d34f301 07-May-2014 Mark Salyzyn <salyzyn@google.com> am 31cbd168: am 7455f988: am 9570d837: Merge "logd: logcat: Add persist.logd.size group of properties"

* commit '31cbd168fcdd577ca4cdd0e725c3d3b21e438e40':
logd: logcat: Add persist.logd.size group of properties
8261991ad41c1f8019abfcff3753f173943f48fa 07-May-2014 Mark Salyzyn <salyzyn@google.com> am fe48dbe4: am 69894109: am 5c02b276: Merge "logd: default off by-UID spam filter"

* commit 'fe48dbe40aee39deeb2d6ed67da6a73f3bc46978':
logd: default off by-UID spam filter
d1c807a8807dc85ce5efe7997b440b3a5dc2e4d3 07-May-2014 Elliott Hughes <enh@google.com> am 22a289a0: am 7112e4c7: Merge "Remove the dead corkscrew header files too."

* commit '22a289a0b6fcb1c0edc372e477c876819749addd':
Remove the dead corkscrew header files too.
91070a5ef29e3ebea45e23492dae56690f5fc1bc 07-May-2014 Elliott Hughes <enh@google.com> am 5503f774: am 2c55b454: Merge "Switch to the new bionic fatal logging interface."

* commit '5503f77495dd41f44a3d287f1f2de8fd8087198c':
Switch to the new bionic fatal logging interface.
de9033e7e08622bc6e16c9a675ea7ecd7b27f3db 07-May-2014 JP Abgrall <jpa@google.com> am a2f51837: am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"

* commit 'a2f518378a8e06eacd0fd0f71169a4b6a46ef068':
fastboot: support for overriding format fs-type and size
31cbd168fcdd577ca4cdd0e725c3d3b21e438e40 07-May-2014 Mark Salyzyn <salyzyn@google.com> am 7455f988: am 9570d837: Merge "logd: logcat: Add persist.logd.size group of properties"

* commit '7455f9885d8420d20616d524ba6bb0ae301122b0':
logd: logcat: Add persist.logd.size group of properties
fe48dbe40aee39deeb2d6ed67da6a73f3bc46978 07-May-2014 Mark Salyzyn <salyzyn@google.com> am 69894109: am 5c02b276: Merge "logd: default off by-UID spam filter"

* commit '69894109c1c706fa0daa1448ddad1b9f09dee15f':
logd: default off by-UID spam filter
e6ed68bdf39056cdb8552e10bcaa42ebdb85993a 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> lmkd: turn on -Werror

- Deal with some -Wunused issues

Change-Id: Id037c44a0ca2d00ae10a939fb001bc24a3e9410c
mkd/Android.mk
mkd/lmkd.c
ce6d46c69aad22b0e05cb4a6e130da340c06629a 06-May-2014 Mark Salyzyn <salyzyn@google.com> logd: logcat: Add persist.logd.size group of properties

- logd Add persist.logd.size (global), persist.logd.size.<logid>
- logcat report a more flexible multiplier in -g command.

Bug: 14563261
Bug: 14469172
Change-Id: Ie389caa14ad3ae3d4a3a3cc463425bb9dbc5e483
ogcat/logcat.cpp
ogd/LogBuffer.cpp
ogd/README.property
2a9d492f0218e6b55ea1158ec0778258c534efa4 06-May-2014 Mark Salyzyn <salyzyn@google.com> logd: default off by-UID spam filter

Bug: 14469172
Change-Id: I37c8dbcea0490afb994cbe6f033591fea1c58bc8
ogd/LogWhiteBlackList.cpp
782111b3bc5d372afc8d66ab6023e834b7c23b88 06-May-2014 Sasha Levitskiy <sanek@google.com> System: Fastboot: warning fixit, misc bugs and cleanup.

Change-Id: Ib8517a852977962de3f05c879ba7dce89bcef644
Signed-off-by: Sasha Levitskiy <sanek@google.com>
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
astboot/usbtest.c
22a289a0b6fcb1c0edc372e477c876819749addd 07-May-2014 Elliott Hughes <enh@google.com> am 7112e4c7: Merge "Remove the dead corkscrew header files too."

* commit '7112e4c7cb9168ddaee418c4ed4b0c54b475f99e':
Remove the dead corkscrew header files too.
7112e4c7cb9168ddaee418c4ed4b0c54b475f99e 07-May-2014 Elliott Hughes <enh@google.com> Merge "Remove the dead corkscrew header files too."
ddbdae8c3f24a6e5afb3b45bf73cdad3dae9abaa 07-May-2014 Elliott Hughes <enh@google.com> Remove the dead corkscrew header files too.

Change-Id: I0dd5cf3966994db19d98f60805211ed39099465a
nclude/corkscrew/backtrace.h
nclude/corkscrew/demangle.h
nclude/corkscrew/map_info.h
nclude/corkscrew/ptrace.h
nclude/corkscrew/symbol_table.h
92553fee5a7a25d509f8b6bc06107208472f9113 07-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 191e3b707ab96107c0e043e4fc99ad37e5eda13e
5571b1033298b9a7664d061a77a550ed532e0845 07-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 191e3b707ab96107c0e043e4fc99ad37e5eda13e
5503f77495dd41f44a3d287f1f2de8fd8087198c 07-May-2014 Elliott Hughes <enh@google.com> am 2c55b454: Merge "Switch to the new bionic fatal logging interface."

* commit '2c55b454c7a9df44ebd6128a2951187be4971702':
Switch to the new bionic fatal logging interface.
2c55b454c7a9df44ebd6128a2951187be4971702 07-May-2014 Elliott Hughes <enh@google.com> Merge "Switch to the new bionic fatal logging interface."
26864bf9cbe49892faa3a4ffd7a3cef00fa8850e 07-May-2014 Elliott Hughes <enh@google.com> Switch to the new bionic fatal logging interface.

This is more general and will work for anyone's custom logging
code, as long as they use ANDROID_LOG_FATAL priority.

Change-Id: Iaf7fc0858fce04f3af407882a58ee5a827d50ddd
iblog/logd_write.c
iblog/logd_write_kern.c
a2f518378a8e06eacd0fd0f71169a4b6a46ef068 07-May-2014 JP Abgrall <jpa@google.com> am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"

* commit '66e952e254c9bda46d5ef9614027b18d0a7a6c8e':
fastboot: support for overriding format fs-type and size
66e952e254c9bda46d5ef9614027b18d0a7a6c8e 07-May-2014 JP Abgrall <jpa@google.com> Merge "fastboot: support for overriding format fs-type and size"
60ca573e880054593ba6a286e131a3280e7e7190 06-May-2014 Mark Salyzyn <salyzyn@google.com> logd: logcat: Add persist.logd.size group of properties

- logd Add persist.logd.size (global), persist.logd.size.<logid>
- logcat report a more flexible multiplier in -g command.

Bug: 14563261
Bug: 14469172
Change-Id: Ie389caa14ad3ae3d4a3a3cc463425bb9dbc5e483
ogcat/logcat.cpp
ogd/LogBuffer.cpp
ogd/README.property
10e59e4634026e32cbbd483169b8e462eda91d13 06-May-2014 Mark Salyzyn <salyzyn@google.com> logd: default off by-UID spam filter

Bug: 14469172
Change-Id: I37c8dbcea0490afb994cbe6f033591fea1c58bc8
ogd/LogWhiteBlackList.cpp
7e85974fc2fc48a0cea7bb9bafcfcda863138eb6 07-May-2014 JP Abgrall <jpa@google.com> fastboot: support for overriding format fs-type and size

This changes allows overriding the fs-type and size that
are normally returned by the booloader.

This is in preparation for supporting other FSes.

Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
astboot/fs.c
astboot/fs.h
7455f9885d8420d20616d524ba6bb0ae301122b0 07-May-2014 Mark Salyzyn <salyzyn@google.com> am 9570d837: Merge "logd: logcat: Add persist.logd.size group of properties"

* commit '9570d8378c32873169d561d039179a1ba2f5435e':
logd: logcat: Add persist.logd.size group of properties
9570d8378c32873169d561d039179a1ba2f5435e 07-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: logcat: Add persist.logd.size group of properties"
671e343c7d9c832eca093325c0b8b934c47a83b4 06-May-2014 Mark Salyzyn <salyzyn@google.com> logd: logcat: Add persist.logd.size group of properties

- logd Add persist.logd.size (global), persist.logd.size.<logid>
- logcat report a more flexible multiplier in -g command.

Bug: 14563261
Bug: 14469172
Change-Id: Ie389caa14ad3ae3d4a3a3cc463425bb9dbc5e483
ogcat/logcat.cpp
ogd/LogBuffer.cpp
ogd/README.property
69894109c1c706fa0daa1448ddad1b9f09dee15f 06-May-2014 Mark Salyzyn <salyzyn@google.com> am 5c02b276: Merge "logd: default off by-UID spam filter"

* commit '5c02b2760e11e8b77452c345c788e4cda289f788':
logd: default off by-UID spam filter
5c02b2760e11e8b77452c345c788e4cda289f788 06-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: default off by-UID spam filter"
4141cb2391cfd7211ffff7e53841c6c52869d525 06-May-2014 Mark Salyzyn <salyzyn@google.com> logd: default off by-UID spam filter

Bug: 14469172
Change-Id: I37c8dbcea0490afb994cbe6f033591fea1c58bc8
ogd/LogWhiteBlackList.cpp
191e3b707ab96107c0e043e4fc99ad37e5eda13e 06-May-2014 JP Abgrall <jpa@google.com> am e95a90e5: am 1762dbfb: am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab

* commit 'e95a90e5995d1121080b5da09d75d53093af8818':
fastboot: Added tos as an optional image
fastboot: Fixed optional entries
fastboot: allow format on devices with small buffers
e95a90e5995d1121080b5da09d75d53093af8818 06-May-2014 JP Abgrall <jpa@google.com> am 1762dbfb: am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab

* commit '1762dbfbab7caab7f7e57aaaa5e1491e96e55d42':
fastboot: Added tos as an optional image
fastboot: Fixed optional entries
fastboot: allow format on devices with small buffers
1762dbfbab7caab7f7e57aaaa5e1491e96e55d42 06-May-2014 JP Abgrall <jpa@google.com> am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab

* commit '2d2fd4cdeac031e78a63c40d01a96a93ebb3eed8':
fastboot: Added tos as an optional image
fastboot: Fixed optional entries
fastboot: allow format on devices with small buffers
2d2fd4cdeac031e78a63c40d01a96a93ebb3eed8 06-May-2014 JP Abgrall <jpa@google.com> Merge changes Ibff1f74e,Ic82595cf,If4e01cab

* changes:
fastboot: Added tos as an optional image
fastboot: Fixed optional entries
fastboot: allow format on devices with small buffers
73a4ad288ffdabfbdac0930737def7fdcf65d07c 29-Apr-2014 Daniel Rosenberg <drosen@google.com> fastboot: Added tos as an optional image

Change-Id: Ibff1f74ee4a949501ceae0b897f896067f022763
Signed-off-by: Daniel Rosenberg <drosen@google.com>
astboot/fastboot.c
82280594ef7e9dc908aa67f3da8661ff54a96c9e 29-Apr-2014 Daniel Rosenberg <drosen@google.com> fastboot: Fixed optional entries

Previously, if an image was listed as optional, but was not found,
flashall would fail. Now it will proceed if optional images are not
present.

Change-Id: Ic82595cf0cd6ddce4c676de590f03f1a95f32040
Signed-off-by: Daniel Rosenberg <drosen@google.com>
astboot/fastboot.c
e6f3e9bd2656fe132f829ed035fdea0cb111369d 12-Mar-2014 Dmitry Grinberg <dmitrygr@google.com> fastboot: allow format on devices with small buffers

Formatting large partitions on devices with small transfer buffers did
not work before since format used a strange path through the code to
send data. It now uses the normal path. Also cleaned up a bit. FS
code now lives in a separate file and the custom path for format is
gone.

Change-Id: If4e01cabc2e250b7c02ca7ce8c268e51d49e1529
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
astboot/fs.c
astboot/fs.h
88fda250b5284551c2176b660d0b1b7eec23ad2c 06-May-2014 Ying Wang <wangying@google.com> am 08651274: am 27e3913b: am 52dd7cc0: Merge "Fix 64-bit host build."

* commit '0865127430b7651a96115999ca41a3fe0974f4e7':
Fix 64-bit host build.
0865127430b7651a96115999ca41a3fe0974f4e7 06-May-2014 Ying Wang <wangying@google.com> am 27e3913b: am 52dd7cc0: Merge "Fix 64-bit host build."

* commit '27e3913b7c95aa15061368f50aada7b6b7c71eb2':
Fix 64-bit host build.
27e3913b7c95aa15061368f50aada7b6b7c71eb2 06-May-2014 Ying Wang <wangying@google.com> am 52dd7cc0: Merge "Fix 64-bit host build."

* commit '52dd7cc0bddbe6092f818827efd584466234d67b':
Fix 64-bit host build.
52dd7cc0bddbe6092f818827efd584466234d67b 06-May-2014 Ying Wang <wangying@google.com> Merge "Fix 64-bit host build."
34030101863575aaa14e318ff0a9d9462803e736 24-Apr-2014 Ying Wang <wangying@google.com> Fix 64-bit host build.

Bug: 13751317
Change-Id: I8ba4fc9918fba0975eb61ec37a8a16b02acfa864
ibdiskconfig/diskutils.c
ibdiskconfig/write_lst.c
7a5e2bd0621ee0b1c66d8f4c21497ffb62feff42 06-May-2014 Greg Hackmann <ghackmann@google.com> adb: replace utimes() with utime()

Fix the win_sdk host build by replacing utimes() with utime(). utime()
is functionally equivalent to utimes() when dealing with non-fractional
second timestamps, and is supported by the Windows CRT.

(The Windows CRT uses the nonstandard name _utime(), but mingw creates
aliases to the POSIX names.)

Change-Id: I513c6c5de05376c34cbb0894a94259acba8ae6f1
db/file_sync_client.c
1cf23190215368b890b32178df4f76fa7cea7f2c 06-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 0e998680709729232982e7252440b19e885e2284
0e998680709729232982e7252440b19e885e2284 06-May-2014 JP Abgrall <jpa@google.com> am c2adf35c: am 6d9ae28e: am 8e26b252: Merge "Fastboot: fix fastboot timeout issue of Windows host side"

* commit 'c2adf35c3d87622929dde3e06b0a7c9643e47dd5':
Fastboot: fix fastboot timeout issue of Windows host side
c2adf35c3d87622929dde3e06b0a7c9643e47dd5 06-May-2014 JP Abgrall <jpa@google.com> am 6d9ae28e: am 8e26b252: Merge "Fastboot: fix fastboot timeout issue of Windows host side"

* commit '6d9ae28ed4ea917e3c6db12228b2b06d02489c11':
Fastboot: fix fastboot timeout issue of Windows host side
6d9ae28ed4ea917e3c6db12228b2b06d02489c11 06-May-2014 JP Abgrall <jpa@google.com> am 8e26b252: Merge "Fastboot: fix fastboot timeout issue of Windows host side"

* commit '8e26b2522267658ef996631a3a43818c1baf6fc3':
Fastboot: fix fastboot timeout issue of Windows host side
8e26b2522267658ef996631a3a43818c1baf6fc3 06-May-2014 JP Abgrall <jpa@google.com> Merge "Fastboot: fix fastboot timeout issue of Windows host side"
8a1469083db18d5cd8f468d3165a7f3052a638c3 06-May-2014 Christopher Ferris <cferris@google.com> am 0fd6750e: am fdadb420: am b52a48af: Merge "Log stack even if tombstone cannot be created."

* commit '0fd6750ed3116d29cc49cc721fbbd38b3033aa0f':
Log stack even if tombstone cannot be created.
0fd6750ed3116d29cc49cc721fbbd38b3033aa0f 06-May-2014 Christopher Ferris <cferris@google.com> am fdadb420: am b52a48af: Merge "Log stack even if tombstone cannot be created."

* commit 'fdadb420afa3419058a3be46dc797f017e7290de':
Log stack even if tombstone cannot be created.
fdadb420afa3419058a3be46dc797f017e7290de 06-May-2014 Christopher Ferris <cferris@google.com> am b52a48af: Merge "Log stack even if tombstone cannot be created."

* commit 'b52a48affc77232047a599afa3e567c0a8c01b69':
Log stack even if tombstone cannot be created.
b52a48affc77232047a599afa3e567c0a8c01b69 06-May-2014 Christopher Ferris <cferris@google.com> Merge "Log stack even if tombstone cannot be created."
7cc73694fa8e4f4187453db55b88778f2903e923 06-May-2014 Elliott Hughes <enh@google.com> am b389440c: am 54c90a14: am 752115dd: Merge "Add Silvermont architecture cache sizes"

* commit 'b389440c8bdc06fc6d3fdaad6acb8f9c124e40a7':
Add Silvermont architecture cache sizes
b389440c8bdc06fc6d3fdaad6acb8f9c124e40a7 06-May-2014 Elliott Hughes <enh@google.com> am 54c90a14: am 752115dd: Merge "Add Silvermont architecture cache sizes"

* commit '54c90a1415a5dd1bd81e3994ff586adb5cda56b2':
Add Silvermont architecture cache sizes
54c90a1415a5dd1bd81e3994ff586adb5cda56b2 06-May-2014 Elliott Hughes <enh@google.com> am 752115dd: Merge "Add Silvermont architecture cache sizes"

* commit '752115dda7cb52dd2576c6fa3197f238f89cfcdb':
Add Silvermont architecture cache sizes
c5bb49a138a78442e7326dfb6bbf85feadf0d486 05-May-2014 Christopher Ferris <cferris@google.com> Log stack even if tombstone cannot be created.

Bug: 14498701
Change-Id: I62c271bef2f73166eeb91d3fa3ce1e1b724a081f
ebuggerd/tombstone.cpp
752115dda7cb52dd2576c6fa3197f238f89cfcdb 05-May-2014 Elliott Hughes <enh@google.com> Merge "Add Silvermont architecture cache sizes"
e6fff56f2e0867f8797ed3f672f5834aaee7442a 05-May-2014 Mark Salyzyn <salyzyn@google.com> am 027e4e77: am 74088995: am f2c0f328: Merge "libcutils: win_sdk build issues"

* commit '027e4e77c26652948f43ac07ca8a738c469d39f0':
libcutils: win_sdk build issues
027e4e77c26652948f43ac07ca8a738c469d39f0 05-May-2014 Mark Salyzyn <salyzyn@google.com> am 74088995: am f2c0f328: Merge "libcutils: win_sdk build issues"

* commit '740889959f3da4c0ef61fe23f7c14af3390eb534':
libcutils: win_sdk build issues
740889959f3da4c0ef61fe23f7c14af3390eb534 05-May-2014 Mark Salyzyn <salyzyn@google.com> am f2c0f328: Merge "libcutils: win_sdk build issues"

* commit 'f2c0f32887a46c11e350465c5a2db1e3d9edec1e':
libcutils: win_sdk build issues
f2c0f32887a46c11e350465c5a2db1e3d9edec1e 05-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libcutils: win_sdk build issues"
60299dfd6a5dca059a079bc8e11d45a1fecf02d0 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> adb: turn on -Werror

- Deal with some -Wunused issues

Change-Id: Idfd1a114e68ae637978b52fde5144d0dca0ec79f
db/Android.mk
db/backup_service.c
db/commandline.c
db/file_sync_client.c
db/remount_service.c
db/sysdeps_win32.c
db/usb_windows.c
c9303f317562eb1cad5dd27a99a97f85b5acf136 01-May-2014 Mark Salyzyn <salyzyn@google.com> netcfg: turn on -Werror

- resolve unused variable reference

Change-Id: If725a1cb0ee645c6e379c9ce21ab8c40bc4cd554
etcfg/Android.mk
etcfg/netcfg.c
cc209517e45346ea30d88ce9274dbb6ff1649914 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> mkbootimg: turn on -Werror

- Deal with signedness issues

Change-Id: I61211165eb4ce0fa9a2edeebb3f97fb0ffc62d34
kbootimg/Android.mk
kbootimg/mkbootimg.c
1c00d46b2566e91be9268812dbb5d3abfea3c3a2 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> gpttool: turn on -Werror

- Deal with some -Wunused issues

Change-Id: If9a05ccbda862bbd401df0f5d5a1837abedd9b83
pttool/Android.mk
pttool/gpttool.c
02a7c3a7c3462250e853460190f3bd330105971b 05-May-2014 Mark Salyzyn <salyzyn@google.com> libcutils: win_sdk build issues

Change-Id: Ic431166f686aebfd0ee00ad3224b95237ff7a0de
ibcutils/Android.mk
ibcutils/socket_inaddr_any_server.c
ibcutils/socket_loopback_server.c
b2057f72e4d2f3c1af1fd5d194ef4667ddc711ba 05-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 999bc211ddf5bb9640509dab5731a7e45cb28d5b
1297d22bc99c26b2ad414faedd5bea73a16ecb90 24-May-2013 jzhuan5 <jin.can.zhuang@intel.com> adbd: adb root should terminate adbd only if it's debuggable

adb root command will terminate adbd when closing the socket if current
user id is not root. This works for userdebug build, as adb root causes
re-enumeration.

But for user build, adb root command won't cause re-enumeration, and if
adbd is terminated and restarted, it will be in offline state, thus it
won't send any thing to host.

Change-Id: I81216a3b3da888cd9b236060cf745175f6d93c60
Author: jzhuan5 <jin.can.zhuang@intel.com>
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
db/sockets.c
fd18127eb7f1b900beb72be35bbe9163bf95995a 04-May-2014 herman_lin <herman_lin@compal.com> Modify VID for Compal

The original definition of VENDOR_ID_COMPAL is for Compal Communications, Inc.
But Compal Communications, Inc(CCI) had been merged into Compal Electronics, Inc(CEI) at April of 2014
So VENDOR_ID_COMPAL should be changed from 0x1219(CCI's VID) to 0x04B7(CEI's VID).
And add one new definition(VENDOR_ID_COMPALCOMM) for CCI to maintain old devices that use CCI's VID.
modified: adb/usb_vendors.c

Change-Id: I9e9a96f6cc81273ff2c9353a13e7ce3b0583396b
db/usb_vendors.c
c28560a15463400a8589bae369892be9307c3fda 04-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 999bc211ddf5bb9640509dab5731a7e45cb28d5b
999bc211ddf5bb9640509dab5731a7e45cb28d5b 03-May-2014 Colin Cross <ccross@android.com> am edb76333: am e6950362: am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"

* commit 'edb763331128101871f4a5b29fee3d60ee5a4bee':
mkbootimg: fix padding calculation for 2ndstage loader
edb763331128101871f4a5b29fee3d60ee5a4bee 03-May-2014 Colin Cross <ccross@android.com> am e6950362: am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"

* commit 'e6950362ac8b82770a4ca8e974b560803ae62057':
mkbootimg: fix padding calculation for 2ndstage loader
e6950362ac8b82770a4ca8e974b560803ae62057 03-May-2014 Colin Cross <ccross@android.com> am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"

* commit '8ec42bb203d48e917d8da4d925378b448416d09e':
mkbootimg: fix padding calculation for 2ndstage loader
8ec42bb203d48e917d8da4d925378b448416d09e 03-May-2014 Colin Cross <ccross@android.com> Merge "mkbootimg: fix padding calculation for 2ndstage loader"
f3f14f72c147c2200b6a247dba366d906bbcb157 03-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to d2e4281204da89a77c9c9743e5cf54a1c3e42a4a
d2e4281204da89a77c9c9743e5cf54a1c3e42a4a 03-May-2014 JP Abgrall <jpa@google.com> am d96f05d2: am a7bf5bd1: am 3c049bbe: Merge "init: add \'enable <service>\' to negate "service <service>... disabled""

* commit 'd96f05d2a7881dbb18fc86b765a67066560b7a1a':
init: add 'enable <service>' to negate "service <service>... disabled"
d96f05d2a7881dbb18fc86b765a67066560b7a1a 03-May-2014 JP Abgrall <jpa@google.com> am a7bf5bd1: am 3c049bbe: Merge "init: add \'enable <service>\' to negate "service <service>... disabled""

* commit 'a7bf5bd104276f9c593a7e97116f08044ad176a8':
init: add 'enable <service>' to negate "service <service>... disabled"
a7bf5bd104276f9c593a7e97116f08044ad176a8 03-May-2014 JP Abgrall <jpa@google.com> am 3c049bbe: Merge "init: add \'enable <service>\' to negate "service <service>... disabled""

* commit '3c049bbe993f92af653e055e0c3241c0b7bdeb52':
init: add 'enable <service>' to negate "service <service>... disabled"
3c049bbe993f92af653e055e0c3241c0b7bdeb52 03-May-2014 JP Abgrall <jpa@google.com> Merge "init: add 'enable <service>' to negate "service <service>... disabled""
3beec7e55f1b5a840fc8fe0868b84d2238779af6 03-May-2014 JP Abgrall <jpa@google.com> init: add 'enable <service>' to negate "service <service>... disabled"

enable <servicename>
Turns a disabled service into an enabled one as if the service did not
specify disabled in the rc file.
It will also start the service if needed.

Bug: 14472973
Change-Id: Id0b49cc687a2bc74f6f92e066c617724cc94908d
Signed-off-by: JP Abgrall <jpa@google.com>
nit/builtins.c
nit/init.c
nit/init.h
nit/init_parser.c
nit/keywords.h
nit/readme.txt
6988e0e87f58b635e5ab9a5539a538ce84bfa566 03-May-2014 Mark Salyzyn <salyzyn@google.com> am 593f2040: am 174f30b1: am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"

* commit '593f2040a0c393a3ae68ffbc63be07a8db21d1f8':
logd: build breakage in git_master-nova @ 1151709
593f2040a0c393a3ae68ffbc63be07a8db21d1f8 03-May-2014 Mark Salyzyn <salyzyn@google.com> am 174f30b1: am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"

* commit '174f30b170693054abec89178e3ac7096a3cc06f':
logd: build breakage in git_master-nova @ 1151709
174f30b170693054abec89178e3ac7096a3cc06f 03-May-2014 Mark Salyzyn <salyzyn@google.com> am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"

* commit 'dc57f4d93ad2c8dbf2ea1b031328e12fa2fac401':
logd: build breakage in git_master-nova @ 1151709
dc57f4d93ad2c8dbf2ea1b031328e12fa2fac401 03-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: build breakage in git_master-nova @ 1151709"
6e2c0f7010ed7b2f8504f86e662211dea608f8f9 03-May-2014 Mark Salyzyn <salyzyn@google.com> logd: build breakage in git_master-nova @ 1151709

Change-Id: Ic7920d1b0930155c20a896720a79af62f8acacc1
ogd/LogListener.cpp
955ebf70b74b70595511294684f2ea8503081b06 03-May-2014 Mark Salyzyn <salyzyn@google.com> am 65fd5412: am fd5231d7: am ccae68e4: Merge "liblog: logcat: Move library print test into gTest"

* commit '65fd5412d7fe053cb28f8e39e7753d86c333be22':
liblog: logcat: Move library print test into gTest
988573b68da5c652bbb5db2269a4948531882e70 03-May-2014 Mark Salyzyn <salyzyn@google.com> am befbfb94: am dd910526: am 6c37d59e: Merge "logd: turn on -Werror"

* commit 'befbfb94bea6a775f40d11f2c0c58ce74035b82c':
logd: turn on -Werror
22b47f321d75af24dbb90fb7a152b9ac7e33eb97 03-May-2014 Mark Salyzyn <salyzyn@google.com> am 21852477: am 15704b1b: am d9bb6770: Merge "logd: 64-bit compile issue"

* commit '218524778a02ef53a74dcdbd17923441c3d90305':
logd: 64-bit compile issue
e49a116657d1ec303085741bbd3f80ddb0c5ad19 03-May-2014 Mark Salyzyn <salyzyn@google.com> am d007b59f: am 44bec3ad: am 6f3f7d71: Merge "debuggerd: turn on -Werror"

* commit 'd007b59ffa7800fa12e80fa3a070d6e6fe477ae0':
debuggerd: turn on -Werror
68ba4f1c189eff78a6876847f01983b4cde91655 03-May-2014 Mark Salyzyn <salyzyn@google.com> am 3c742c99: am 92c58474: am afa10292: Merge "logcat: turn on -Werror"

* commit '3c742c9995ed4bf95ff5bfcfb373c1e94326b190':
logcat: turn on -Werror
6490814836882f80e06f67234a9b178a9e7f4aa8 03-May-2014 Mark Salyzyn <salyzyn@google.com> am 7669f1c8: am 2e92fe36: am 39f2ec2f: Merge "logwrapper: turn on -Werror"

* commit '7669f1c8c447b4c66a6ad05c71bec27ff5ff3853':
logwrapper: turn on -Werror
c413e151dede74c2a877d77de4d1579b263c877a 03-May-2014 Mark Salyzyn <salyzyn@google.com> am b3eefcaa: am ce98dc70: am 1e10b661: Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"

* commit 'b3eefcaa934986f72a3daddf6ad86e276d14d476':
libcutils: Mac build pulls in __unused from sys/cdefs.h
65fd5412d7fe053cb28f8e39e7753d86c333be22 03-May-2014 Mark Salyzyn <salyzyn@google.com> am fd5231d7: am ccae68e4: Merge "liblog: logcat: Move library print test into gTest"

* commit 'fd5231d7809ce3f84d6fa554d105d5cd658714df':
liblog: logcat: Move library print test into gTest
befbfb94bea6a775f40d11f2c0c58ce74035b82c 03-May-2014 Mark Salyzyn <salyzyn@google.com> am dd910526: am 6c37d59e: Merge "logd: turn on -Werror"

* commit 'dd91052639b8c38d9fd6f3632fa4cc4243bdeeeb':
logd: turn on -Werror
fd5231d7809ce3f84d6fa554d105d5cd658714df 03-May-2014 Mark Salyzyn <salyzyn@google.com> am ccae68e4: Merge "liblog: logcat: Move library print test into gTest"

* commit 'ccae68e47857170843934c38839c3f0323c65027':
liblog: logcat: Move library print test into gTest
dd91052639b8c38d9fd6f3632fa4cc4243bdeeeb 03-May-2014 Mark Salyzyn <salyzyn@google.com> am 6c37d59e: Merge "logd: turn on -Werror"

* commit '6c37d59eac5684990612258808a8d6d487e53c07':
logd: turn on -Werror
ccae68e47857170843934c38839c3f0323c65027 02-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: logcat: Move library print test into gTest"
6c37d59eac5684990612258808a8d6d487e53c07 02-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: turn on -Werror"
218524778a02ef53a74dcdbd17923441c3d90305 02-May-2014 Mark Salyzyn <salyzyn@google.com> am 15704b1b: am d9bb6770: Merge "logd: 64-bit compile issue"

* commit '15704b1bdfc7ddf080d50f7a5cf478dfb6608962':
logd: 64-bit compile issue
15704b1bdfc7ddf080d50f7a5cf478dfb6608962 02-May-2014 Mark Salyzyn <salyzyn@google.com> am d9bb6770: Merge "logd: 64-bit compile issue"

* commit 'd9bb677036f875e91d6bfd295226c0a65b24c056':
logd: 64-bit compile issue
d007b59ffa7800fa12e80fa3a070d6e6fe477ae0 02-May-2014 Mark Salyzyn <salyzyn@google.com> am 44bec3ad: am 6f3f7d71: Merge "debuggerd: turn on -Werror"

* commit '44bec3ade845afa0eae3e8c25f39d349af836424':
debuggerd: turn on -Werror
3c742c9995ed4bf95ff5bfcfb373c1e94326b190 02-May-2014 Mark Salyzyn <salyzyn@google.com> am 92c58474: am afa10292: Merge "logcat: turn on -Werror"

* commit '92c584740ec5a0df04bfab456e735db0302e5052':
logcat: turn on -Werror
7669f1c8c447b4c66a6ad05c71bec27ff5ff3853 02-May-2014 Mark Salyzyn <salyzyn@google.com> am 2e92fe36: am 39f2ec2f: Merge "logwrapper: turn on -Werror"

* commit '2e92fe36ffdb9ffeeeea00f111336a61a65b40f7':
logwrapper: turn on -Werror
44bec3ade845afa0eae3e8c25f39d349af836424 02-May-2014 Mark Salyzyn <salyzyn@google.com> am 6f3f7d71: Merge "debuggerd: turn on -Werror"

* commit '6f3f7d71c57940d281ae4a54c4cc33a8688c148d':
debuggerd: turn on -Werror
92c584740ec5a0df04bfab456e735db0302e5052 02-May-2014 Mark Salyzyn <salyzyn@google.com> am afa10292: Merge "logcat: turn on -Werror"

* commit 'afa102924a97a8d2636d8c093565adcf34832e9a':
logcat: turn on -Werror
2e92fe36ffdb9ffeeeea00f111336a61a65b40f7 02-May-2014 Mark Salyzyn <salyzyn@google.com> am 39f2ec2f: Merge "logwrapper: turn on -Werror"

* commit '39f2ec2f8191aebf4e96b5b9b5c359f8d3b8598e':
logwrapper: turn on -Werror
d9bb677036f875e91d6bfd295226c0a65b24c056 02-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: 64-bit compile issue"
6f3f7d71c57940d281ae4a54c4cc33a8688c148d 02-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "debuggerd: turn on -Werror"
afa102924a97a8d2636d8c093565adcf34832e9a 02-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: turn on -Werror"
39f2ec2f8191aebf4e96b5b9b5c359f8d3b8598e 02-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logwrapper: turn on -Werror"
5045f575252ce3d25304ba26cec299395c02152c 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> liblog: logcat: Move library print test into gTest

Change-Id: Icd33808d4c974625f4fd0a126a90a2b4c90c8315
iblog/logprint.c
iblog/tests/liblog_test.cpp
ogcat/logcat.cpp
c61895ac3a9717dac6b24ce210aab0ccae6747f4 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: turn on -Werror

- Deal with some -Wunused / -Wunused-variable issues

Change-Id: Ic86cd7b0680868ad0536198b71a34cb19134fc21
ogd/Android.mk
ogd/CommandListener.cpp
ogd/tests/logd_test.cpp
3cb54987857690fa5b73f0192cc052eb55b562f7 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: 64-bit compile issue

- ULONG_MAX is used against an uint32
- Add tv_sec_max and tv_nsec_max constants to log_time

Change-Id: Ic86cd7b0680868ad0536198b71a34cb19134fc22
nclude/log/log_read.h
ogd/LogStatistics.cpp
f1a8dfa0ebfc233e569ffa83e21e37d0a829b94c 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> debuggerd: turn on -Werror

- Deal with some -Wunused / -Wunused-variable issues

Change-Id: I39849fe30170f69d1cab7d4ad2629b3a49e14ee7
ebuggerd/Android.mk
ebuggerd/arm64/machine.cpp
ebuggerd/crasher.c
b149e245c8ccd90b52227f3d07ab572080afac53 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> logcat: turn on -Werror

- Deal with some -Wunused issues

Change-Id: Ic4ab9a49f13e156a73d40266e413dee3e6396178
ogcat/Android.mk
ogcat/logcat.cpp
ogcat/tests/logcat_test.cpp
5254c4a448c88bb0056eafe41cef03026a1ebb19 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> logwrapper: turn on -Werror

- Deal with some -Wunused / -Wunused-variable issues

Change-Id: I27a99ffb962289ebbf04b40870b9404842030d2f
ogwrapper/Android.mk
ogwrapper/logwrap.c
b3eefcaa934986f72a3daddf6ad86e276d14d476 02-May-2014 Mark Salyzyn <salyzyn@google.com> am ce98dc70: am 1e10b661: Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"

* commit 'ce98dc70b91b38f9a10224a39af2ff7491745e92':
libcutils: Mac build pulls in __unused from sys/cdefs.h
ce98dc70b91b38f9a10224a39af2ff7491745e92 02-May-2014 Mark Salyzyn <salyzyn@google.com> am 1e10b661: Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"

* commit '1e10b661cc5cc58e76540e271e463e94f53c0db8':
libcutils: Mac build pulls in __unused from sys/cdefs.h
1e10b661cc5cc58e76540e271e463e94f53c0db8 02-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"
edc70938beecf7390f5f9b0dee4f6c31a68e1f0a 02-May-2014 Mark Salyzyn <salyzyn@google.com> libcutils: Mac build pulls in __unused from sys/cdefs.h

Change-Id: I2da8a52e07cef0b749f7e60709536e98bd96660e
ibcutils/ashmem-host.c
de8ff4adcaa487259f9ddcd0eab4d1117d1cca71 19-Apr-2013 Lajos Molnar <lajos@google.com> adb: added support for adb pull -a to preserve time stamps and mode

Added -a flag to adb pull that preserves time and mode. Mode is
subjected to umask for security. We only receive modification
time from adb server, so creation time will be set to the modification
time as well.

Change-Id: I37c0b94741ed464f19025d25dea3ff2f6ac43e7f
Signed-off-by: Lajos Molnar <lajos@google.com>
db/commandline.c
db/file_sync_client.c
db/file_sync_service.h
b8f86480a28b8a57628383a49d7fc63a4f1d5971 02-May-2014 Mark Salyzyn <salyzyn@google.com> am a0a461d3: am 82e1b89f: am a32e01d2: Merge "libcutils: turn on -Werror"

* commit 'a0a461d3b7d85484c10db64f078427a5be3da189':
libcutils: turn on -Werror
a0a461d3b7d85484c10db64f078427a5be3da189 02-May-2014 Mark Salyzyn <salyzyn@google.com> am 82e1b89f: am a32e01d2: Merge "libcutils: turn on -Werror"

* commit '82e1b89f22a2f088ff38f1ff094f22d7b31327b6':
libcutils: turn on -Werror
82e1b89f22a2f088ff38f1ff094f22d7b31327b6 02-May-2014 Mark Salyzyn <salyzyn@google.com> am a32e01d2: Merge "libcutils: turn on -Werror"

* commit 'a32e01d2f4292974c55d612819ef028d95dcf831':
libcutils: turn on -Werror
a32e01d2f4292974c55d612819ef028d95dcf831 02-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libcutils: turn on -Werror"
12717169a51335f4b20b7c78a63b9ab66a81a366 30-Apr-2014 Mark Salyzyn <salyzyn@google.com> libcutils: turn on -Werror

- Deal with some -Wunused / -Wunused-variable issues

Change-Id: I28c23fb213382a392ec30935749fb359e072d664
ibcutils/Android.mk
ibcutils/ashmem-host.c
ibcutils/cpu_info.c
ibcutils/dlmalloc_stubs.c
ibcutils/iosched_policy.c
ibcutils/partition_utils.c
ibcutils/process_name.c
ibcutils/qtaguid.c
ibcutils/sched_policy.c
ibcutils/socket_inaddr_any_server.c
ibcutils/socket_local_client.c
ibcutils/socket_loopback_client.c
ibcutils/socket_loopback_server.c
ibcutils/socket_network_client.c
ibcutils/sockets.c
ibcutils/str_parms.c
ibcutils/threads.c
ibcutils/trace.c
585ca2a3de439751999eedb2d8ede2ce5cf59a0e 02-May-2014 JP Abgrall <jpa@google.com> am 0a90004b: am cae898ac: am 3754791d: Merge "libusbhost: Fix issue of multiple inotify event at same time."

* commit '0a90004be8aba909391b25643ba943db76660fe4':
libusbhost: Fix issue of multiple inotify event at same time.
0a90004be8aba909391b25643ba943db76660fe4 02-May-2014 JP Abgrall <jpa@google.com> am cae898ac: am 3754791d: Merge "libusbhost: Fix issue of multiple inotify event at same time."

* commit 'cae898acba04beec2d3d702ba38a940995f98d28':
libusbhost: Fix issue of multiple inotify event at same time.
cae898acba04beec2d3d702ba38a940995f98d28 02-May-2014 JP Abgrall <jpa@google.com> am 3754791d: Merge "libusbhost: Fix issue of multiple inotify event at same time."

* commit '3754791dd5415c2e99d3bfd6599d414a202cbfc3':
libusbhost: Fix issue of multiple inotify event at same time.
3754791dd5415c2e99d3bfd6599d414a202cbfc3 02-May-2014 JP Abgrall <jpa@google.com> Merge "libusbhost: Fix issue of multiple inotify event at same time."
16401748204a2088aaba68e16d9b1e4d96b5c67d 02-May-2014 Daniel Rosenberg <drosen@google.com> Merge changes Ibff1f74e,Ic82595cf

* changes:
fastboot: Added tos as an optional image
fastboot: Fixed optional entries
be338f10f4d002023b0c1acc3d8db8687f068c27 01-May-2014 Mohamad Ayyash <mkayyash@google.com> am 53d29ed1: am 2293904c: am e455814c: Merge "fastboot: Make tags_offset a command line option."

* commit '53d29ed155c0db7110f5d610d012b9b94d325ed7':
fastboot: Make tags_offset a command line option.
53d29ed155c0db7110f5d610d012b9b94d325ed7 01-May-2014 Mohamad Ayyash <mkayyash@google.com> am 2293904c: am e455814c: Merge "fastboot: Make tags_offset a command line option."

* commit '2293904c2c1331735534eab11a903bd2cd0d1d2c':
fastboot: Make tags_offset a command line option.
2293904c2c1331735534eab11a903bd2cd0d1d2c 01-May-2014 Mohamad Ayyash <mkayyash@google.com> am e455814c: Merge "fastboot: Make tags_offset a command line option."

* commit 'e455814ca0d25786357f88ab76cc6e47298e8ac0':
fastboot: Make tags_offset a command line option.
e455814ca0d25786357f88ab76cc6e47298e8ac0 01-May-2014 Mohamad Ayyash <mkayyash@google.com> Merge "fastboot: Make tags_offset a command line option."
9bc1c49db5caa095c3935eecde645cd5b7227a8d 01-May-2014 Mark Salyzyn <salyzyn@google.com> am f1db961f: am 9c234a90: am 4f651d42: Merge "libsysutil: turn on -Werror (part deux)"

* commit 'f1db961ffcd130b461f6bb7c183a5fb5e32dbb93':
libsysutil: turn on -Werror (part deux)
2069d5d6bd3c7c11d363ca05da0e221f0170c9a8 01-May-2014 Mark Salyzyn <salyzyn@google.com> am fdfec2a1: am 2c3d095a: am 7627f105: Merge "init: 64-bit build issue"

* commit 'fdfec2a1614608b915aa412d515c86db95ecfd8b':
init: 64-bit build issue
130637b7a6e59b27d0a2dc39012e1a21387545a8 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 48c30db1: am 16897d6b: am ebd35b67: Merge "logd: oneline statistics does not report PID gone"

* commit '48c30db138af63f747552e020bbc3c1739f6171b':
logd: oneline statistics does not report PID gone
f1db961ffcd130b461f6bb7c183a5fb5e32dbb93 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 9c234a90: am 4f651d42: Merge "libsysutil: turn on -Werror (part deux)"

* commit '9c234a90aedfed31ec6e8afc7b5ff8d60e682cb8':
libsysutil: turn on -Werror (part deux)
9c234a90aedfed31ec6e8afc7b5ff8d60e682cb8 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 4f651d42: Merge "libsysutil: turn on -Werror (part deux)"

* commit '4f651d426d58dfc2cf8aea74cb97711b885bb325':
libsysutil: turn on -Werror (part deux)
fdfec2a1614608b915aa412d515c86db95ecfd8b 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 2c3d095a: am 7627f105: Merge "init: 64-bit build issue"

* commit '2c3d095ac1297a003c0fb3dfd33acee7aa732aef':
init: 64-bit build issue
48c30db138af63f747552e020bbc3c1739f6171b 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 16897d6b: am ebd35b67: Merge "logd: oneline statistics does not report PID gone"

* commit '16897d6b31b883a8719ff3c40dc6e13f4014ceb9':
logd: oneline statistics does not report PID gone
4f651d426d58dfc2cf8aea74cb97711b885bb325 01-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libsysutil: turn on -Werror (part deux)"
2c3d095ac1297a003c0fb3dfd33acee7aa732aef 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 7627f105: Merge "init: 64-bit build issue"

* commit '7627f105c028ab65a1edc5a60e3e21ac2c626edd':
init: 64-bit build issue
16897d6b31b883a8719ff3c40dc6e13f4014ceb9 01-May-2014 Mark Salyzyn <salyzyn@google.com> am ebd35b67: Merge "logd: oneline statistics does not report PID gone"

* commit 'ebd35b6716fa30e84b5324d666daacdb34d6905b':
logd: oneline statistics does not report PID gone
7627f105c028ab65a1edc5a60e3e21ac2c626edd 01-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "init: 64-bit build issue"
ebd35b6716fa30e84b5324d666daacdb34d6905b 01-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: oneline statistics does not report PID gone"
29fd7b1f4f86e4955cf78156a9de174c5b7233c1 15-Jan-2014 Mohamad Ayyash <mkayyash@google.com> fastboot: Make tags_offset a command line option.

cherry picked from commit bdf513c5f25b3c2051af737c37a7734c4559208e

Change-Id: I4ceca528f88cc8ede5742f8a67bec972e41eebe7
astboot/fastboot.c
80f63d4b2c45bd609cbda78bcd016baf0138a5d3 01-May-2014 Mark Salyzyn <salyzyn@google.com> libsysutil: turn on -Werror (part deux)

- x86_64 format warnings

Change-Id: I81c2702f564bcada946f6a10f34bbf34c90f766b
ibsysutils/Android.mk
ibsysutils/src/NetlinkEvent.cpp
ebf49f3e875981e9037ce36eddcab3ccb5925ebf 01-May-2014 Mark Salyzyn <salyzyn@google.com> init: 64-bit build issue

(cherry pick from Icc5344abc184adf4247175d85b2da08af4636e49)

Change-Id: I88b0c9b20720ac62ebae8359ded4ab77b4ebcdde
nit/property_service.c
f74cb9534914bd0cb99573b976bead9e3689216c 01-May-2014 Ruchi Kandoi <kandoiruchi@google.com> am 57569b3d: am 1abf4918: am c7580819: Merge "ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq"

* commit '57569b3d3cea0b2096a15e8d25b41df9f836fd08':
ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
57569b3d3cea0b2096a15e8d25b41df9f836fd08 01-May-2014 Ruchi Kandoi <kandoiruchi@google.com> am 1abf4918: am c7580819: Merge "ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq"

* commit '1abf49180acece56ff7573d53b65c6a28d2a4cb2':
ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
1abf49180acece56ff7573d53b65c6a28d2a4cb2 01-May-2014 Ruchi Kandoi <kandoiruchi@google.com> am c7580819: Merge "ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq"

* commit 'c7580819934b85e93f58001f9b59b12712bb61b8':
ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
c7580819934b85e93f58001f9b59b12712bb61b8 01-May-2014 Ruchi Kandoi <kandoiruchi@google.com> Merge "ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq"
75b287b771b302c99797d812122b72f83d2f56f9 30-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> ueventd: Ueventd changes the permission of sysfs files for max/min
cpufreq

The owner and permissions for the sysfs file
/sys/devices/system/cpu*/cpufreq/scaling_max/min_freq is changed.
This would allow the PowerHAL to change the max/min cpufreq even after
the associated CPU's are hotplugged out and back in.

Change-Id: Ibe0b4aaf3db555ed48e89a7fcd0c5fd3a18cf233
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
nit/devices.c
ootdir/ueventd.rc
fdabe7287609af29793bb6ca15712582ba082521 21-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: oneline statistics does not report PID gone

- oneline, add check for gone
- Add pidGone() method, which caches the gone status

Change-Id: I8f03daeafb58583c2b08ec6b540486c05da0872d
ogd/LogStatistics.cpp
ogd/LogStatistics.h
2b38c00464018d33194fb63f23a0e70d855ddc4b 01-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 68831f852e5eed79c0f4ef83895e5f62e4fb138f
68831f852e5eed79c0f4ef83895e5f62e4fb138f 01-May-2014 Christopher Ferris <cferris@google.com> am 7e250b00: am fbd2a506: am 9ed86eff: Merge "Use real time signal for threads instead of SIGURG."

* commit '7e250b002b5a28a3919bc704e9bc6610b3a4096f':
Use real time signal for threads instead of SIGURG.
50bc186c75eb8bdcc4248d7ce229014cb8276b04 01-May-2014 Natalie Silvanovich <natashenka@google.com> Merge "NULL check in registerListener"
7e250b002b5a28a3919bc704e9bc6610b3a4096f 01-May-2014 Christopher Ferris <cferris@google.com> am fbd2a506: am 9ed86eff: Merge "Use real time signal for threads instead of SIGURG."

* commit 'fbd2a506fbe1375395e9af8ae857140c14c2fbb1':
Use real time signal for threads instead of SIGURG.
fa9cc91e7bb587fc53a6bd1ec6ca6c85b97e3c29 01-May-2014 Mark Salyzyn <salyzyn@google.com> am b6c8f240: am 09af7041: am f8eb56b2: Merge "libsysutil: turn off -Werror"

* commit 'b6c8f2409b438a70676bcf318102998fd9a5c95c':
libsysutil: turn off -Werror
fbd2a506fbe1375395e9af8ae857140c14c2fbb1 01-May-2014 Christopher Ferris <cferris@google.com> am 9ed86eff: Merge "Use real time signal for threads instead of SIGURG."

* commit '9ed86eff8890446f0d0b281a26a71c233f95f4c0':
Use real time signal for threads instead of SIGURG.
b6c8f2409b438a70676bcf318102998fd9a5c95c 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 09af7041: am f8eb56b2: Merge "libsysutil: turn off -Werror"

* commit '09af704149c4e886e83557cd5e423ef5834b915a':
libsysutil: turn off -Werror
9ed86eff8890446f0d0b281a26a71c233f95f4c0 01-May-2014 Christopher Ferris <cferris@google.com> Merge "Use real time signal for threads instead of SIGURG."
09af704149c4e886e83557cd5e423ef5834b915a 01-May-2014 Mark Salyzyn <salyzyn@google.com> am f8eb56b2: Merge "libsysutil: turn off -Werror"

* commit 'f8eb56b2c0ed519f2e3b45f507eade619ad571b2':
libsysutil: turn off -Werror
f8eb56b2c0ed519f2e3b45f507eade619ad571b2 01-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libsysutil: turn off -Werror"
03b00f33655608afb1d263677681957f5762f0b6 01-May-2014 Mark Salyzyn <salyzyn@google.com> libsysutil: turn off -Werror

temporary to work out issue with git_mirror-asop-master build

Change-Id: Ie65c65abb0a70dc134fded15db8b9d98e1701edd
ibsysutils/Android.mk
a8a8b853bbaf4565ddca16c2aad46826a26afbe1 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 94f3da9d: am 03801212: am a2723e0f: Merge "libsysutils: turn on -Werror"

* commit '94f3da9db691d2e7721da280d78efe8f372358c3':
libsysutils: turn on -Werror
aa63d9f980f95718fc28ca7e222c1e8d7ca9e778 29-Apr-2014 Christopher Ferris <cferris@google.com> Use real time signal for threads instead of SIGURG.

This guarantees that any application is not also using this signal
for some other purpose.

Change-Id: I7c9bbb0ec8bb4e13322ecda951bcd43c6bf6ee1a
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
ibbacktrace/backtrace_test.cpp
2a25d991d698e210611865ee95ba02ed1d40b1c7 29-Apr-2014 Daniel Rosenberg <drosen@google.com> fastboot: Added tos as an optional image

Change-Id: Ibff1f74ee4a949501ceae0b897f896067f022763
Signed-off-by: Daniel Rosenberg <drosen@google.com>
astboot/fastboot.c
94f3da9db691d2e7721da280d78efe8f372358c3 01-May-2014 Mark Salyzyn <salyzyn@google.com> am 03801212: am a2723e0f: Merge "libsysutils: turn on -Werror"

* commit '038012129f90c3c5b4187d20924c6a3b4fdcc007':
libsysutils: turn on -Werror
038012129f90c3c5b4187d20924c6a3b4fdcc007 01-May-2014 Mark Salyzyn <salyzyn@google.com> am a2723e0f: Merge "libsysutils: turn on -Werror"

* commit 'a2723e0f7faee831ebc85e092768ee1417ae60f1':
libsysutils: turn on -Werror
a2723e0f7faee831ebc85e092768ee1417ae60f1 01-May-2014 Mark Salyzyn <salyzyn@google.com> Merge "libsysutils: turn on -Werror"
3e6d3319b2b131ebdeb831f248dbb8dc72e68c83 30-Apr-2014 Natalie Silvanovich <natashenka@google.com> NULL check in registerListener

Prevents crash in batteryproperties. Now with two times as much NULL checking.

Bug: 13730158
Change-Id: Ica083da60c6543431c2d82d46aed48eaccc3b4b4
ealthd/BatteryPropertiesRegistrar.cpp
747de5bdaafc051be7bfcb98dc9a0e98e09f2df4 30-Apr-2014 Rom Lemarchand <romlem@google.com> Merge changes Id163902d,I44f837e8,I11131e3f

* changes:
Remove AUDIO_CHANNEL_OUT_SURROUND
Add AUDIO_CHANNEL_OUT_5POINT1_SIDE and AUDIO_CHANNEL_OUT_QUAD_SIDE
Rename AUDIO_CHANNEL_OUT_QUAD and AUDIO_CHANNEL_OUT_5POINT1
a50b652184630d247a8acb1a52db7fbaaca374c2 30-Apr-2014 Bill Yi <byi@google.com> am 9f791ad8: am 1333e012: Merge commit \'4102af05a86aae36d2560fd8b3f740a52399342c\' into HEAD

* commit '9f791ad809b3dcdd6e7186493fb9d01d7ad5c124':
9418fd1821d5f31e6004a6f70cb14f59735dc589 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> libsysutils: turn on -Werror

- Deal with some -Wunused / -Wunused-variable issues

Change-Id: I428a0032a8743c68c97f528d5f305ba63fee1d29
ibsysutils/Android.mk
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/NetlinkEvent.cpp
a9eead7da5d9b99d62f3d67c64f80a14717f2ea3 30-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to de4dea765aeddf8629dd8da8414bc85bb0451e0e
9f791ad809b3dcdd6e7186493fb9d01d7ad5c124 30-Apr-2014 Bill Yi <byi@google.com> am 1333e012: Merge commit \'4102af05a86aae36d2560fd8b3f740a52399342c\' into HEAD

* commit '1333e012ee65fef59f5f43f33744230574dfc2a2':
1333e012ee65fef59f5f43f33744230574dfc2a2 30-Apr-2014 Bill Yi <byi@google.com> Merge commit '4102af05a86aae36d2560fd8b3f740a52399342c' into HEAD
7a4ef48e407415293bc978e204ea020502a390f6 29-Apr-2014 Daniel Rosenberg <drosen@google.com> fastboot: Fixed optional entries

Previously, if an image was listed as optional, but was not found,
flashall would fail. Now it will proceed if optional images are not
present.

Change-Id: Ic82595cf0cd6ddce4c676de590f03f1a95f32040
Signed-off-by: Daniel Rosenberg <drosen@google.com>
astboot/fastboot.c
de4dea765aeddf8629dd8da8414bc85bb0451e0e 29-Apr-2014 Nick Kralevich <nnk@google.com> am bd0070cf: am a4fe7ddc: am f3661cc2: Merge "Add prefx to netlink failure and dispatchCommand overflow logs."

* commit 'bd0070cf5558de92076e0c4035403e5bdd5078d4':
Add prefx to netlink failure and dispatchCommand overflow logs.
bd0070cf5558de92076e0c4035403e5bdd5078d4 29-Apr-2014 Nick Kralevich <nnk@google.com> am a4fe7ddc: am f3661cc2: Merge "Add prefx to netlink failure and dispatchCommand overflow logs."

* commit 'a4fe7ddc4a6c91a6f0a1c3657a8ec4858390423f':
Add prefx to netlink failure and dispatchCommand overflow logs.
a4fe7ddc4a6c91a6f0a1c3657a8ec4858390423f 29-Apr-2014 Nick Kralevich <nnk@google.com> am f3661cc2: Merge "Add prefx to netlink failure and dispatchCommand overflow logs."

* commit 'f3661cc2f124bb7ca38285f156c624dda974b4c5':
Add prefx to netlink failure and dispatchCommand overflow logs.
f3661cc2f124bb7ca38285f156c624dda974b4c5 29-Apr-2014 Nick Kralevich <nnk@google.com> Merge "Add prefx to netlink failure and dispatchCommand overflow logs."
28fa45858edbf6fd7b784c40de9187f7ca499a1d 21-Apr-2014 William Luh <williamluh@google.com> Add prefx to netlink failure and dispatchCommand overflow logs.

Prefix ensures proper user-consent filter.

(cherry picked from commit 564244cd3809aee58c7e18114970bb88bce9e9e9)

Bug:5848002
Change-Id: Iee7287773f0af52c225a821ee0e9d643c83cc060
ibsysutils/EventLogTags.logtags
84d6d93a2c741e751ca50754bb832d5aa90b0417 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 7892131e: am 596f9b1e: am 4f17e530: Merge "logd: add logd.auditd property"

* commit '7892131e3cee999a9eb9b0a5cf9d90869c42fd45':
logd: add logd.auditd property
7892131e3cee999a9eb9b0a5cf9d90869c42fd45 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 596f9b1e: am 4f17e530: Merge "logd: add logd.auditd property"

* commit '596f9b1e8ed217ed766751c26be34f017ea011cd':
logd: add logd.auditd property
596f9b1e8ed217ed766751c26be34f017ea011cd 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 4f17e530: Merge "logd: add logd.auditd property"

* commit '4f17e530f9dc785b6552f8e51d2d6de832a4a992':
logd: add logd.auditd property
4f17e530f9dc785b6552f8e51d2d6de832a4a992 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: add logd.auditd property"
873dc35b74e83c6b9326d3a90e4c64a612212143 29-Apr-2014 Christopher Ferris <cferris@google.com> am c79e511d: am 481b551a: am 0b0e0eae: Merge "Small cleanup of duplicated test values."

* commit 'c79e511d828cd3dfdd79af40ce5be556a4c2ff9b':
Small cleanup of duplicated test values.
c79e511d828cd3dfdd79af40ce5be556a4c2ff9b 29-Apr-2014 Christopher Ferris <cferris@google.com> am 481b551a: am 0b0e0eae: Merge "Small cleanup of duplicated test values."

* commit '481b551a95d662653e1e6c594ba9617a50f81034':
Small cleanup of duplicated test values.
fbb9f993a09a6805b7c17769d8661cb3b289a559 29-Apr-2014 Glenn Kasten <gkasten@google.com> Remove AUDIO_CHANNEL_OUT_SURROUND

Change-Id: Id163902dd2c83200201012ffb704d338e81ea471
nclude/system/audio.h
481b551a95d662653e1e6c594ba9617a50f81034 29-Apr-2014 Christopher Ferris <cferris@google.com> am 0b0e0eae: Merge "Small cleanup of duplicated test values."

* commit '0b0e0eae8cbe3406dfbf14d42eb1229037cc30df':
Small cleanup of duplicated test values.
ee7c17b7fc816393afcc7e8dbe751c55a512495b 29-Apr-2014 Glenn Kasten <gkasten@google.com> Add AUDIO_CHANNEL_OUT_5POINT1_SIDE and AUDIO_CHANNEL_OUT_QUAD_SIDE

for use by downmix effect

Also add documentation about platform convention for interleaving.

Change-Id: I44f837e876c6e8f5f70a726d797631ffa556cf9f
nclude/system/audio.h
0b0e0eae8cbe3406dfbf14d42eb1229037cc30df 29-Apr-2014 Christopher Ferris <cferris@google.com> Merge "Small cleanup of duplicated test values."
b8d59396dfb3b9135bb6dc869aa723ca618bd95d 29-Apr-2014 Glenn Kasten <gkasten@google.com> Rename AUDIO_CHANNEL_OUT_QUAD and AUDIO_CHANNEL_OUT_5POINT1

to AUDIO_CHANNEL_OUT_QUAD_BACK and AUDIO_CHANNEL_OUT_5POINT1_BACK
respectively, for consistency with terminology used in downmix effect

For the time being, preserve the old names to avoid changing existing code.

Change-Id: I11131e3f66087090a590c93921092ca4fc78cf1c
nclude/system/audio.h
e0fa291e898b451dc198ed52cebac3ffefac066e 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: add logd.auditd property

- permit us a mechanism to disable auditd
- standardize property boolean

Bug: 14275676
Change-Id: I76f245c6aee511ed44274159e0ea55915b484dda
ogd/LogAudit.cpp
ogd/LogListener.cpp
ogd/README.property
ogd/main.cpp
cf6221be548523b990309287386777a9889937b7 29-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to a4a5ad73c349adaeb25e9428216c9aae7d74676b
3094f82a8a4d4b8d2725df85a6af9d306b9f8800 25-Apr-2014 Robin Lee <rgl@google.com> Create world-searchable /data/misc/user directory

installd will create a separate subdirectory for each user.

Change-Id: I95ec09169ea70f35443bbb3209237611e174ca29
ootdir/init.rc
b3ef03951cecf4515d0cba759fb1b94c34111adc 25-Apr-2014 Robin Lee <rgl@google.com> Add new AID shared by all apps in a profile

Automatically assigned as a GID to all apps running under the same
Android profile. Used for exposing to or sharing files with apps
running in a specific profile.

Analogous to AID_SHARED_GID only the sharing is between processes with
the same userId rather than with the same appId.

The name to be displayed for uids/gids with this AID is 'u*_everyone'.

Change-Id: I46efb749f74cb86868c5609a0ce1a6aab2f9e9c9
nclude/private/android_filesystem_config.h
11b5fcb9f1e17806aa9854046dbf0bd90a392613 29-Apr-2014 Christopher Ferris <cferris@google.com> Small cleanup of duplicated test values.

A few flags were duplicates of flags already passed when using the TEST
targets.

Change-Id: I8f0d09915f5b830050fe25635a0852e8536e3aca
ibbacktrace/Android.mk
a4a5ad73c349adaeb25e9428216c9aae7d74676b 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 04ed6282: am 04acf347: am 40958531: Merge "logd: add thread setname"

* commit '04ed6282408a50c9ac601fae40390086f7bc1549':
logd: add thread setname
04ed6282408a50c9ac601fae40390086f7bc1549 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 04acf347: am 40958531: Merge "logd: add thread setname"

* commit '04acf3475b0eca8c9d86ffb85c6cce86693e2bea':
logd: add thread setname
04acf3475b0eca8c9d86ffb85c6cce86693e2bea 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 40958531: Merge "logd: add thread setname"

* commit '4095853133745ddaa1e37b46f9e7d4e8a2cdee28':
logd: add thread setname
4095853133745ddaa1e37b46f9e7d4e8a2cdee28 29-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: add thread setname"
8daa9af02dc0e63ce220e3fa95bf5fe4d6b7a99a 28-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: add thread setname

- permits easier determination of logd thread at
fault in a stack trace from debuggerd.

Bug: 14275676
Change-Id: Iac2c523147e2bcce34ab7ddcecd02582c5fa7cc0
ogd/CommandListener.cpp
ogd/LogAudit.cpp
ogd/LogListener.cpp
ogd/LogReader.cpp
ogd/LogTimes.cpp
03daf05dcfbdbf4ed6175afb2f4676e59dd74aa3 18-Mar-2014 Robert Craig <rpcraig@tycho.ncsc.mil> SELinux changes to check policy versions during a reload.

When deciding on which property_contexts policy to load
during a reload, an initial call is made to libselinux to
grab the correct policy index. This policy index represents
whether the /data/security or the rootfs version will
be used.

Change-Id: I4716039bb0f5ba1e961977a18350347a67969dca
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
nit/init.c
216fe16cb76648f24d8377be9308fe7383f9c9bd 10-Apr-2014 Jeff Sharkey <jsharkey@android.com> Let system UID define build fingerprint.

Some devices leave "ro.build.fingerprint" undefined at build time,
since they need to build it from the components at runtime.

Bug: 13340779
Change-Id: I033ff7600e68edffdea101fec30246135646b4b2
nit/property_service.c
72cba4736efd562374a0370dd66c6bf1ae7a6ed3 28-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 84a445b4f53408444dec82146728a0a57054a492
05b434f09c882d8114b7fbfddfc2eb0209078057 27-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 84a445b4f53408444dec82146728a0a57054a492
646a95de37c062adc1553f07c5ca313de49b8fd4 26-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 84a445b4f53408444dec82146728a0a57054a492
84a445b4f53408444dec82146728a0a57054a492 26-Apr-2014 Elliott Hughes <enh@google.com> am 29941ec8: am f8db4afb: am ab3d49b0: Merge "Use the si_code value bionic passes us."

* commit '29941ec81705bdcad2b43f0059e1288304c523e8':
Use the si_code value bionic passes us.
29941ec81705bdcad2b43f0059e1288304c523e8 26-Apr-2014 Elliott Hughes <enh@google.com> am f8db4afb: am ab3d49b0: Merge "Use the si_code value bionic passes us."

* commit 'f8db4afb703e0005eca7207bfdcc989c6cf66f1a':
Use the si_code value bionic passes us.
f8db4afb703e0005eca7207bfdcc989c6cf66f1a 26-Apr-2014 Elliott Hughes <enh@google.com> am ab3d49b0: Merge "Use the si_code value bionic passes us."

* commit 'ab3d49b03527d5fc65664f66ddb78c98450c8c84':
Use the si_code value bionic passes us.
ab3d49b03527d5fc65664f66ddb78c98450c8c84 26-Apr-2014 Elliott Hughes <enh@google.com> Merge "Use the si_code value bionic passes us."
855fcc3114c20ff9fd286fe1723d1413fec9685a 26-Apr-2014 Elliott Hughes <enh@google.com> Use the si_code value bionic passes us.

Bionic needs to re-raise various signals, which means the si_code
debuggerd sees has been clobbered. If bionic sends us the original
si_code value, we can use that instead of the one we see when the
ptrace the crashed process' siginfo.

Change-Id: If116a6bc667d55a6fb39b74f96673292af4e4c8c
ebuggerd/crasher.c
ebuggerd/debuggerd.cpp
ebuggerd/tombstone.cpp
ebuggerd/tombstone.h
nclude/cutils/debugger.h
ibcutils/debugger.c
94cb6e57a5f928b1774d78817fd1f43a782b5c98 26-Apr-2014 Colin Cross <ccross@android.com> Merge "append2simg: write to temporary file"
8439e3249e26385579c3f518fd1785e0fafe941a 26-Apr-2014 Christopher Ferris <cferris@google.com> am 2d3bccde: am 61af820e: am 2317287d: Merge "Remove libcorkscrew."

* commit '2d3bccdedc058e2f9e10d507c43e1da51d32260f':
Remove libcorkscrew.
cb41e9bc0a67530f118b0c7498ab60d560d91c2e 26-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 07dc2a9b: am fbf85ad8: am da7409da: Merge "logd: enable UID spam filter and test"

* commit '07dc2a9b53c669bf69982caf5f87ca07b47a5923':
logd: enable UID spam filter and test
602008f2168b7795a0dae86f279c614851622201 26-Apr-2014 Mark Salyzyn <salyzyn@google.com> am e4a36181: am c3aff21a: am 1ab0cf4d: Merge "logd: Statistics improvements"

* commit 'e4a36181e5a692ad43c2f8d34edc0ff774bd1758':
logd: Statistics improvements
a84fbf743f8a808eab85e8ef6697f9b6c886e490 26-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 73e5dbe5: am 3a56eff8: am 72db489c: Merge "liblog: test bionic libc_logging.cpp"

* commit '73e5dbe57d5381eccf0c8e7770502715fed3cb66':
liblog: test bionic libc_logging.cpp
8f36be3cdbc3a200ddd6d2d00a3f4ca48d10a6d6 26-Apr-2014 Christopher Ferris <cferris@google.com> am e3615230: am 8c526578: am 4a5966b9: Merge "Change sprintf to snprintf calls."

* commit 'e36152308da6b1e67b05ad790081bc7e4424ae4e':
Change sprintf to snprintf calls.
0e3f47e4827a067b9b9795a3ae7297b51c9f0776 25-Apr-2014 Colin Cross <ccross@android.com> append2simg: write to temporary file

append2simg causes libsparse to write mmapped data from a file
back to that same file. On btrfs, this sometimes causes a page
of zeroes to be written instead of the file data. Work around
the issue by writing the output to a temporary file and then
renaming it over the original file.

Change-Id: Ia194b6ba0ddb8548747b63292b523756f544706a
ibsparse/Android.mk
ibsparse/append2simg.c
2d3bccdedc058e2f9e10d507c43e1da51d32260f 25-Apr-2014 Christopher Ferris <cferris@google.com> am 61af820e: am 2317287d: Merge "Remove libcorkscrew."

* commit '61af820e3d7febdb272fdb7f10ec45728828ec21':
Remove libcorkscrew.
07dc2a9b53c669bf69982caf5f87ca07b47a5923 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am fbf85ad8: am da7409da: Merge "logd: enable UID spam filter and test"

* commit 'fbf85ad8d90c6e598a33037368709f4ec1ddf2f2':
logd: enable UID spam filter and test
e4a36181e5a692ad43c2f8d34edc0ff774bd1758 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am c3aff21a: am 1ab0cf4d: Merge "logd: Statistics improvements"

* commit 'c3aff21a66381dad97f497bb3f5539296492d354':
logd: Statistics improvements
61af820e3d7febdb272fdb7f10ec45728828ec21 25-Apr-2014 Christopher Ferris <cferris@google.com> am 2317287d: Merge "Remove libcorkscrew."

* commit '2317287d18fae3f9ae0f3beb7748a804f06b5720':
Remove libcorkscrew.
fbf85ad8d90c6e598a33037368709f4ec1ddf2f2 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am da7409da: Merge "logd: enable UID spam filter and test"

* commit 'da7409da7e6259b663b54d59a8efaeb2e1254cd0':
logd: enable UID spam filter and test
c3aff21a66381dad97f497bb3f5539296492d354 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 1ab0cf4d: Merge "logd: Statistics improvements"

* commit '1ab0cf4d34ea8c4a8064b53634034293940f78f0':
logd: Statistics improvements
2317287d18fae3f9ae0f3beb7748a804f06b5720 25-Apr-2014 Christopher Ferris <cferris@google.com> Merge "Remove libcorkscrew."
da7409da7e6259b663b54d59a8efaeb2e1254cd0 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: enable UID spam filter and test"
1ab0cf4d34ea8c4a8064b53634034293940f78f0 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Statistics improvements"
73e5dbe57d5381eccf0c8e7770502715fed3cb66 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 3a56eff8: am 72db489c: Merge "liblog: test bionic libc_logging.cpp"

* commit '3a56eff8d7099b00173234c3017d611c51dd2100':
liblog: test bionic libc_logging.cpp
e36152308da6b1e67b05ad790081bc7e4424ae4e 25-Apr-2014 Christopher Ferris <cferris@google.com> am 8c526578: am 4a5966b9: Merge "Change sprintf to snprintf calls."

* commit '8c526578f4c54eb295635f0e9f4620fb41296f44':
Change sprintf to snprintf calls.
3a56eff8d7099b00173234c3017d611c51dd2100 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 72db489c: Merge "liblog: test bionic libc_logging.cpp"

* commit '72db489c9ee0a460a22d39389b42339f20b99b58':
liblog: test bionic libc_logging.cpp
72db489c9ee0a460a22d39389b42339f20b99b58 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: test bionic libc_logging.cpp"
8c526578f4c54eb295635f0e9f4620fb41296f44 25-Apr-2014 Christopher Ferris <cferris@google.com> am 4a5966b9: Merge "Change sprintf to snprintf calls."

* commit '4a5966b9a2bff4d92a166f2ed9f0231fc7d72ca8':
Change sprintf to snprintf calls.
688a8a7232ff1f1be1ab077072deadb6f4c71eef 25-Apr-2014 Christopher Ferris <cferris@google.com> Remove libcorkscrew.

All unwinding is now done through libunwind.

Change-Id: I93ba6f5bd5ad41eeb5f6a93113b7894f842cc8e0
ibbacktrace/Android.mk
ibbacktrace/Corkscrew.cpp
ibbacktrace/Corkscrew.h
ibcorkscrew/Android.mk
ibcorkscrew/MODULE_LICENSE_APACHE2
ibcorkscrew/NOTICE
ibcorkscrew/arch-arm/backtrace-arm.c
ibcorkscrew/arch-arm/ptrace-arm.c
ibcorkscrew/arch-mips/backtrace-mips.c
ibcorkscrew/arch-mips/dwarf.h
ibcorkscrew/arch-mips/ptrace-mips.c
ibcorkscrew/arch-x86/backtrace-x86.c
ibcorkscrew/arch-x86/dwarf.h
ibcorkscrew/arch-x86/ptrace-x86.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
ibcorkscrew/test.cpp
4a5966b9a2bff4d92a166f2ed9f0231fc7d72ca8 25-Apr-2014 Christopher Ferris <cferris@google.com> Merge "Change sprintf to snprintf calls."
e821dace4161c5fdf19d8af036381b850d0fb988 09-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: enable UID spam filter and test

Change-Id: Ie9c7a744e341e6e64afa14973d4d095717c97933
ogd/LogWhiteBlackList.cpp
ogd/tests/logd_test.cpp
d2e3747e70a79406cd74aa3633d52530fb486a99 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> liblog: test bionic libc_logging.cpp

Change-Id: Ia778c43513a28c85ae54e96926ee9ed56717d527
iblog/tests/Android.mk
iblog/tests/libc_test.cpp
c8a576c637ae00577273b778498019dd609fcd15 05-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: Statistics improvements

- Drop in-place sorting.
- Add fast-track for uid sizes and elements.
- Add sort() for per-uid and per-pid statistics.

Change-Id: Ib8655d4cc0b3bd4e87534522987bcc7fc7a5251a
ogd/LogBuffer.cpp
ogd/LogStatistics.cpp
ogd/LogStatistics.h
bbb7981e49048a657d724bfda9465cdfe7c03a87 07-Aug-2012 Jiebing Li <jiebing.li@intel.com> Fastboot: fix fastboot timeout issue of Windows host side

Normally fastboot follows the procedure that host sends a command
to device and device sends back response after the command
is executed.

But sometimes device spends too long time to execute the command
so that timeout error occurs before host receives the response.

This patch fixes the issue by aligning with the solution of ADB.
ADB commit id: 1c4b760a5d41de3196572d50d1404e453174cf9a

Change-Id: I50e6bf428ea38219b64cca6ab82db22af28e0264
Author: Jiebing Li <jiebing.li@intel.com>
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
astboot/usb_windows.c
3c1d7b34c151ec1669e0d190a0839718242682c9 21-Jan-2014 Bo Huang <bo.b.huang@intel.com> libusbhost: Fix issue of multiple inotify event at same time.

libusbhost can handle multiple inotify events at same time on Kit kat.
In original implementation, the function-level ret is assigned with
length of read and used for while loop.
if want to add a new watch for subdirectory,inotify_add_watch will
update the function-level ret with watch descriptor.
It impact on while loop to do exit.

Add local result to avoid it.

Change-Id: I101041ccfd54eaac14969a45e90ab2e49bdff578
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
ibusbhost/usbhost.c
f66bd0a0795b89a3596451dde8572b8c70b37d61 25-Apr-2014 Andrew Boie <andrew.p.boie@intel.com> mkbootimg: fix padding calculation for 2ndstage loader

Change-Id: I8db844cbc52896e51886b725fb86fd1b0fa57899
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
kbootimg/mkbootimg.c
9fdc8156ca8fb3449859bebf080a477fa3bcff5c 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 64231be7: am 524f8533: am 72031ab8: Merge "logd: liblog: ALOG silently drops excessively long messages"

* commit '64231be7975782db84f38c57ee700492445fbf2f':
logd: liblog: ALOG silently drops excessively long messages
a92330c7e2d6c3b436bcb62564d6603220a2b387 25-Apr-2014 Elliott Hughes <enh@google.com> am b791f04c: am e5d38ad8: am dc5442c0: Merge "Add missing si_code values to debuggerd."

* commit 'b791f04c02af8ae7058b8d597d601e4e94ceb8e0':
Add missing si_code values to debuggerd.
b8c72957f072a687a4fb99dd7f2423d3f86e70d2 18-Apr-2014 Christopher Ferris <cferris@google.com> Change sprintf to snprintf calls.

Change-Id: I8893246fcd541d97b02a1a4cac81c53c6cd2e394
ibbacktrace/BacktraceMap.cpp
64231be7975782db84f38c57ee700492445fbf2f 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 524f8533: am 72031ab8: Merge "logd: liblog: ALOG silently drops excessively long messages"

* commit '524f8533528146a3b3327627751bec2a0446486b':
logd: liblog: ALOG silently drops excessively long messages
b791f04c02af8ae7058b8d597d601e4e94ceb8e0 25-Apr-2014 Elliott Hughes <enh@google.com> am e5d38ad8: am dc5442c0: Merge "Add missing si_code values to debuggerd."

* commit 'e5d38ad8cb313c8e38d2d6d061e13b426c797c2c':
Add missing si_code values to debuggerd.
524f8533528146a3b3327627751bec2a0446486b 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 72031ab8: Merge "logd: liblog: ALOG silently drops excessively long messages"

* commit '72031ab8780ddbdfad84ea4a02ba7fe87566ee50':
logd: liblog: ALOG silently drops excessively long messages
e5d38ad8cb313c8e38d2d6d061e13b426c797c2c 25-Apr-2014 Elliott Hughes <enh@google.com> am dc5442c0: Merge "Add missing si_code values to debuggerd."

* commit 'dc5442c0376d6e46f3d0e0c45f6f11988855cf92':
Add missing si_code values to debuggerd.
72031ab8780ddbdfad84ea4a02ba7fe87566ee50 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: liblog: ALOG silently drops excessively long messages"
dc5442c0376d6e46f3d0e0c45f6f11988855cf92 25-Apr-2014 Elliott Hughes <enh@google.com> Merge "Add missing si_code values to debuggerd."
8444eb81b37991ce0fc4ae1d8d79b01688a02426 24-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: ALOG silently drops excessively long messages

Bug: 14280914
Change-Id: Idddd29784625094e54144953c29f64692a88eee9
iblog/logd_write.c
iblog/tests/liblog_test.cpp
ogd/LogListener.cpp
4f1df099603744457a1f44f1c18792e72b2be0c0 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 1c3aa3d2: am ab3150e9: am b674c0fd: Merge "logd: Add README.property"

* commit '1c3aa3d28de78c66df698a41f9c4af298df41c92':
logd: Add README.property
1c3aa3d28de78c66df698a41f9c4af298df41c92 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am ab3150e9: am b674c0fd: Merge "logd: Add README.property"

* commit 'ab3150e9301280f27f6550d888e3581f11e8cba9':
logd: Add README.property
ab3150e9301280f27f6550d888e3581f11e8cba9 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am b674c0fd: Merge "logd: Add README.property"

* commit 'b674c0fdf7a1b6dd539f100d939db4ee79806eac':
logd: Add README.property
b674c0fdf7a1b6dd539f100d939db4ee79806eac 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Add README.property"
aba03c0b7a7a94f437b786a6fa755c6c297a6a2e 25-Apr-2014 Rom Lemarchand <romlem@android.com> am d2674cba: am 0a04c556: am 19759a08: Merge "audio: fix audio_is_bluetooth_sco_device()"

* commit 'd2674cbad9dac54ae23d1bbcdf137d75d582258f':
audio: fix audio_is_bluetooth_sco_device()
d2674cbad9dac54ae23d1bbcdf137d75d582258f 25-Apr-2014 Rom Lemarchand <romlem@android.com> am 0a04c556: am 19759a08: Merge "audio: fix audio_is_bluetooth_sco_device()"

* commit '0a04c556947e4fb8e12cd73b9aded27318002336':
audio: fix audio_is_bluetooth_sco_device()
0a04c556947e4fb8e12cd73b9aded27318002336 25-Apr-2014 Rom Lemarchand <romlem@android.com> am 19759a08: Merge "audio: fix audio_is_bluetooth_sco_device()"

* commit '19759a08053e18bc8efc4aa73f9a0cb8a88608fb':
audio: fix audio_is_bluetooth_sco_device()
19759a08053e18bc8efc4aa73f9a0cb8a88608fb 25-Apr-2014 Rom Lemarchand <romlem@android.com> Merge "audio: fix audio_is_bluetooth_sco_device()"
7260a5c348424d759f98c5adfe23b77d1d6e06c9 21-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: Add README.property

Change-Id: I89da10a73470b037f1811a9890d959cae186f257
ogd/README.property
b526630ab843f9a405be23618d5808d8e65755f3 24-Apr-2014 Eric Laurent <elaurent@google.com> audio: fix audio_is_bluetooth_sco_device()

Bug: 14268964
Change-Id: Ia2a185c5e0939930c5114209651a1e0db6c36ef3
nclude/system/audio.h
bd395b9a142209228ec8c03d3eb3f3e97a89f9b5 24-Apr-2014 Elliott Hughes <enh@google.com> Add missing si_code values to debuggerd.

Also add static_asserts so we'll be notified if any more new ones show up.

Change-Id: I3a502dd4da35354e1ac65865191d31ccdacef298
ebuggerd/tombstone.cpp
cef3eff0d903e49ad8b02ca1eab0d7c483eb3739 24-Apr-2014 Elliott Hughes <enh@google.com> am 6d7a2ee4: am b1bcd9c3: am 6798914b: Merge "Improve liblog\'s fatal logging."

* commit '6d7a2ee4e8b590071042ae424a3e8c951f198a8f':
Improve liblog's fatal logging.
6d7a2ee4e8b590071042ae424a3e8c951f198a8f 24-Apr-2014 Elliott Hughes <enh@google.com> am b1bcd9c3: am 6798914b: Merge "Improve liblog\'s fatal logging."

* commit 'b1bcd9c3ae89f9060fcd8468d5a04f3710e2b1a6':
Improve liblog's fatal logging.
b1bcd9c3ae89f9060fcd8468d5a04f3710e2b1a6 24-Apr-2014 Elliott Hughes <enh@google.com> am 6798914b: Merge "Improve liblog\'s fatal logging."

* commit '6798914b6fc93d6a9964129b734ec7d7be88d99b':
Improve liblog's fatal logging.
6798914b6fc93d6a9964129b734ec7d7be88d99b 24-Apr-2014 Elliott Hughes <enh@google.com> Merge "Improve liblog's fatal logging."
da6b2e2fd79c9aac12127b2c2f512e9555fdd06d 23-Apr-2014 Elliott Hughes <enh@google.com> Improve liblog's fatal logging.

This makes LOG_ALWAYS_FATAL and LOG_ALWAYS_FATAL_IF as good as regular
assert(3).

Change-Id: I0666684d30cae7baf23c64b33d35c1e43f81acf0
ebuggerd/crasher.c
nclude/android/log.h
iblog/logd_write.c
iblog/logd_write_kern.c
c0fb957404636259f6eb3693cb3831853c7dbffb 24-Apr-2014 Ying Wang <wangying@google.com> Merge "Fix 64-bit host build."
f648e35105c2e488d113c43bbc43d23e3c3b6645 24-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to f4362ccdd513c0c2b6d3bb17a50b0ef114d59557
9d4c76f15249432c7bfdef1dca29597bcd90ac97 24-Apr-2014 Ying Wang <wangying@google.com> Fix 64-bit host build.

Bug: 13751317
Change-Id: I8ba4fc9918fba0975eb61ec37a8a16b02acfa864
ibdiskconfig/diskutils.c
ibdiskconfig/write_lst.c
f4362ccdd513c0c2b6d3bb17a50b0ef114d59557 24-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> Fix build problems caused by commit:
422852ef5c0c2b0b5e031f80f480486df3d185a0 for non-linux hosts.

Change-Id: I00b9c99b9d9d072f19549b3a9970a27e75cd49b7
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
ibcutils/sched_policy.c
422852ef5c0c2b0b5e031f80f480486df3d185a0 23-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> Set timer slack value according to thread foreground/background state.

Change-Id: Ia998f349129acf4602b767d1ff94839607fdbdbd
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
ibcutils/sched_policy.c
00b8972062fb32dd02bcac7821a6612ce27ebd86 18-Apr-2014 Paul McLean <pmclean@google.com> Usb Capture Implementation

Change-Id: I0b5166cc380419455373d590b9a6c4b21bf6634c
nclude/system/audio.h
70c7d5af8715099b9c8f3d42779cb6aa580988ea 23-Apr-2014 Igor Murashkin <iam@google.com> Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled"
9a3e96e318f94964da51a9f268a9f268e5710134 23-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
8f94e6204d994aa67e7483c9434834345fe338ce 22-Apr-2014 Mark Salyzyn <salyzyn@google.com> am afee47e7: am 35b55649: am 0607e104: Merge "liblog: Statistics truncated to 16384 bytes"

* commit 'afee47e7704abdf0aec470d4262a5123178de70a':
liblog: Statistics truncated to 16384 bytes
afee47e7704abdf0aec470d4262a5123178de70a 22-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 35b55649: am 0607e104: Merge "liblog: Statistics truncated to 16384 bytes"

* commit '35b55649feabd91c68f7ed6a22f30af046099b27':
liblog: Statistics truncated to 16384 bytes
35b55649feabd91c68f7ed6a22f30af046099b27 22-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 0607e104: Merge "liblog: Statistics truncated to 16384 bytes"

* commit '0607e104c2db2a3e115fd9b49ea85cbc03dbcd1f':
liblog: Statistics truncated to 16384 bytes
0607e104c2db2a3e115fd9b49ea85cbc03dbcd1f 22-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: Statistics truncated to 16384 bytes"
ac2fddb6619f9d55ba0bbfec1addcd874b744104 22-Apr-2014 Paul Lawrence <paullawrence@google.com> Merge "Make Volantis devices encryptable"
04c5192ff526c7e6518bad5421ae3a55dead120f 22-Apr-2014 Christopher Ferris <cferris@google.com> am 3af88bc6: am e87dab14: am 07fa0433: Merge "Remove the arm64 special case."

* commit '3af88bc6377f50904ad3172b06f76d95ceda9cda':
Remove the arm64 special case.
3af88bc6377f50904ad3172b06f76d95ceda9cda 22-Apr-2014 Christopher Ferris <cferris@google.com> am e87dab14: am 07fa0433: Merge "Remove the arm64 special case."

* commit 'e87dab14ee2914308b96488c8a2b1d22a25473aa':
Remove the arm64 special case.
e87dab14ee2914308b96488c8a2b1d22a25473aa 22-Apr-2014 Christopher Ferris <cferris@google.com> am 07fa0433: Merge "Remove the arm64 special case."

* commit '07fa043341ad057ea79ca973089609965ba6c4f9':
Remove the arm64 special case.
c2093264cb9c8845369d7ce45e1327ee2e69b9d5 22-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
07fa043341ad057ea79ca973089609965ba6c4f9 22-Apr-2014 Christopher Ferris <cferris@google.com> Merge "Remove the arm64 special case."
04fd4389fb2cd92e50d725e1edbf5538aafc414b 19-Apr-2014 Christopher Ferris <cferris@google.com> Remove the arm64 special case.

The stack-protector option is handled by the global makefiles.

Change-Id: I99c4a1624e72ad91ac10eef27c0e3758fe9af8ba
ibbacktrace/Android.mk
696817d3524e2fb8bbbcc2ec3526f4383f789163 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> liblog: Statistics truncated to 16384 bytes

- if network read/write broken up, reassemble the pieces.
- Use a 20ms poll to check if a new fragment has been
sent by the other side.
- fixup logd-unit-tests to take a (simplified) fragment
from the liblog changes.

Bug: 14164765
Change-Id: I98ff87888c119e1e8349717646d0f733e8971bc8
iblog/log_read.c
ogd/tests/logd_test.cpp
0aee64f614d5eae0e50f5e24a1c790dd172b663f 17-Apr-2014 Paul Lawrence <paullawrence@google.com> Make Volantis devices encryptable

Volantis SurfaceFlinger holds open a file on data partition.
SurfaceFlinger is not running when we trigger_default_encryption
but if we start it before starting defaultcrypto it locks open
data, so we can't unmount it.

It will start anyway when main starts, so not starting it here
is safe - it will just cause a 1-2 second delay in the graphics
appearing.

Change-Id: Idd546a578e62a24f999367b1407b37ad0f00f3a2
ootdir/init.rc
564244cd3809aee58c7e18114970bb88bce9e9e9 21-Apr-2014 William Luh <williamluh@google.com> Add prefx to netlink failure and dispatchCommand overflow logs.

Prefix ensures proper user-consent filter.

Bug:5848002
Change-Id: Iee7287773f0af52c225a821ee0e9d643c83cc060
ibsysutils/EventLogTags.logtags
265a1d285e4dc39fd5b20f210269121893ba19f8 21-Apr-2014 Elliott Hughes <enh@google.com> am 0888e52f: am afe5bbef: am a67914e4: Merge "Fix top(1) SIGPIPE behavior."

* commit '0888e52fa8141acdcf62eff1b14059d9aab17382':
Fix top(1) SIGPIPE behavior.
0888e52fa8141acdcf62eff1b14059d9aab17382 21-Apr-2014 Elliott Hughes <enh@google.com> am afe5bbef: am a67914e4: Merge "Fix top(1) SIGPIPE behavior."

* commit 'afe5bbefac2cd09a2a2e46777f6bba7afa9c2966':
Fix top(1) SIGPIPE behavior.
afe5bbefac2cd09a2a2e46777f6bba7afa9c2966 21-Apr-2014 Elliott Hughes <enh@google.com> am a67914e4: Merge "Fix top(1) SIGPIPE behavior."

* commit 'a67914e4d656b8375cfba17739f9c97e900c8328':
Fix top(1) SIGPIPE behavior.
36143af288b469db7d847d4e2a950f2b994cfc0f 19-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
a67914e4d656b8375cfba17739f9c97e900c8328 19-Apr-2014 Elliott Hughes <enh@google.com> Merge "Fix top(1) SIGPIPE behavior."
5922d3b5be786d768515043a818413f890814094 19-Apr-2014 Elliott Hughes <enh@google.com> Fix top(1) SIGPIPE behavior.

Bug: 14166609
Change-Id: I4aad1e0db2e875735405d094fb0d1a36862b5b19
oolbox/Android.mk
oolbox/top.c
b0cb721fb3f8c8019705da99f7ac727aab474209 18-Apr-2014 Colin Cross <ccross@android.com> am 37d39eba: am 0cb82da2: am 958235bd: Merge "libsparse: allow including from C++"

* commit '37d39eba0b3da124be747dd6a014332817135264':
libsparse: allow including from C++
37d39eba0b3da124be747dd6a014332817135264 18-Apr-2014 Colin Cross <ccross@android.com> am 0cb82da2: am 958235bd: Merge "libsparse: allow including from C++"

* commit '0cb82da25475d30f8cddbf60764400f3040809ae':
libsparse: allow including from C++
0cb82da25475d30f8cddbf60764400f3040809ae 18-Apr-2014 Colin Cross <ccross@android.com> am 958235bd: Merge "libsparse: allow including from C++"

* commit '958235bdc1d9d421cff24a8af415959ec5282c46':
libsparse: allow including from C++
958235bdc1d9d421cff24a8af415959ec5282c46 18-Apr-2014 Colin Cross <ccross@android.com> Merge "libsparse: allow including from C++"
099824cce31853a0680723e70151d866416a5c78 18-Apr-2014 Colin Cross <ccross@android.com> libsparse: allow including from C++

Change-Id: I3788fd07e2b52430a410f85fb79dc886c6a07fea
ibsparse/include/sparse/sparse.h
e29590b08bce1667c6bddebeb80991b7d16344c4 18-Apr-2014 JP Abgrall <jpa@google.com> am 46e6b4f7: am b0397d55: am 9bb44b41: Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"

* commit '46e6b4f7fd5f6488d0ba06a26d67888136b3ee3e':
rootdir: init.rc: update max TCP window sizes for mobile networks
99886266c256190cc8a1e3eec6ff90b8da12ba75 18-Apr-2014 Colin Cross <ccross@android.com> am 4726ba24: am 40d49a02: am e99e5474: Merge "Sync persist property immediately,in case of suddenly remove the battery."

* commit '4726ba24087e83c841e0d0058df61dc908f01978':
Sync persist property immediately,in case of suddenly remove the battery.
46e6b4f7fd5f6488d0ba06a26d67888136b3ee3e 18-Apr-2014 JP Abgrall <jpa@google.com> am b0397d55: am 9bb44b41: Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"

* commit 'b0397d55a2ff4b3c6664c9545be18ba88c07dea4':
rootdir: init.rc: update max TCP window sizes for mobile networks
4726ba24087e83c841e0d0058df61dc908f01978 18-Apr-2014 Colin Cross <ccross@android.com> am 40d49a02: am e99e5474: Merge "Sync persist property immediately,in case of suddenly remove the battery."

* commit '40d49a02928e5b9a357915e0c73c764932a84f28':
Sync persist property immediately,in case of suddenly remove the battery.
b0397d55a2ff4b3c6664c9545be18ba88c07dea4 18-Apr-2014 JP Abgrall <jpa@google.com> am 9bb44b41: Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"

* commit '9bb44b41da7a9ef2e0c29ed9c0a41c06685f5127':
rootdir: init.rc: update max TCP window sizes for mobile networks
40d49a02928e5b9a357915e0c73c764932a84f28 18-Apr-2014 Colin Cross <ccross@android.com> am e99e5474: Merge "Sync persist property immediately,in case of suddenly remove the battery."

* commit 'e99e5474e101034e2d6e095ebdca011cb62b9386':
Sync persist property immediately,in case of suddenly remove the battery.
9bb44b41da7a9ef2e0c29ed9c0a41c06685f5127 18-Apr-2014 JP Abgrall <jpa@google.com> Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"
ce898489e4ff2567b297c8f8776504b9924f432a 24-Mar-2014 Narayan Reddy <narayanr@nvidia.com> rootdir: init.rc: update max TCP window sizes for mobile networks

GRPS: RTT=600ms, max tput=80kbps (class 12 GMSK 4+1)
EDGE: RTT=300ms, max tput=236kbps (class 12 8PSK)
UMTS: RTT=200ms, max tput=384kbps (R99)
HSDPA: RTT=75ms, max tput=14Mbps (cat 10)
HSUPA: RTT=50ms, max tput=14Mbps
HSPA: RTT=50ms, max tput=14Mbps
HSPA+: RTT=50ms, max tput=42Mbps (cat 20)
LTE: RTT=20ms, max tput=100Mbps (class 3)

bug 67569

Change-Id: I9d62359bbd11dc68e3649a7ea2295d0d4e25e3f2
Signed-off-by: Narayan Reddy <narayanr@nvidia.com>
Signed-off-by: Steve Lin <stlin@nvidia.com>
ootdir/init.rc
e99e5474e101034e2d6e095ebdca011cb62b9386 18-Apr-2014 Colin Cross <ccross@android.com> Merge "Sync persist property immediately,in case of suddenly remove the battery."
c27a444e54d531f8a0cd33e67dc46ff7c763cc4b 15-Jan-2014 Henrik Smiding <henrik.smiding@intel.com> Add Silvermont architecture cache sizes

Adds Silvermont specific cache sizes for memset16/32 SSE optimization.

Change-Id: Ib5ea086d57544e74ac384ee1ef516b8511392f70
Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
ibcutils/arch-x86/cache_wrapper.S
ab4d2a503f1a8d0e9f1fc32fdd40767d41c2b30f 18-Apr-2014 Colin Cross <ccross@android.com> am 48858b21: am c33702dd: am 4785ea60: Merge "adb: Add USB vendor ID for Prestigio"

* commit '48858b21b2609831bfc105fb937ea322daedb9e9':
adb: Add USB vendor ID for Prestigio
48858b21b2609831bfc105fb937ea322daedb9e9 18-Apr-2014 Colin Cross <ccross@android.com> am c33702dd: am 4785ea60: Merge "adb: Add USB vendor ID for Prestigio"

* commit 'c33702dd92da5f41d17ee9a64a8a0ff67f6e9d1b':
adb: Add USB vendor ID for Prestigio
c33702dd92da5f41d17ee9a64a8a0ff67f6e9d1b 18-Apr-2014 Colin Cross <ccross@android.com> am 4785ea60: Merge "adb: Add USB vendor ID for Prestigio"

* commit '4785ea6074b78f195711a9743c214fcc738c3709':
adb: Add USB vendor ID for Prestigio
4785ea6074b78f195711a9743c214fcc738c3709 18-Apr-2014 Colin Cross <ccross@android.com> Merge "adb: Add USB vendor ID for Prestigio"
297c19d75f81558d326aad16d6b49004214cf61a 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am f7770d59: am 19697f3e: am 3ad0af6d: Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"

* commit 'f7770d59dfdc5b3b6fe94f167636b75c1c5d4a81':
logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH
0b8710ff8e9703fc964f5f1e0586905296e2f624 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 4f7e54f3: am fe545b9c: am 0516aded: Merge "logd: libsysutils: logd startup outside init environment"

* commit '4f7e54f32d256e285c400a0f8cfa56bff9d5a8fa':
logd: libsysutils: logd startup outside init environment
b16d1be55718363feb5d69affea0aa646b6b6b2c 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 2898a4ad: am 7fb0ff53: am 25f07f77: Merge changes I487ebe67,Ie7a0aeb2

* commit '2898a4ad5ede1fa3d42b4b2bd54a4b91b61bcc2b':
libutils: FileMap styling adjustments
libutils: FileMap 64 bit compile issues
f7770d59dfdc5b3b6fe94f167636b75c1c5d4a81 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 19697f3e: am 3ad0af6d: Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"

* commit '19697f3e1eaf9c54b612e42f93619658194707cd':
logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH
4f7e54f32d256e285c400a0f8cfa56bff9d5a8fa 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am fe545b9c: am 0516aded: Merge "logd: libsysutils: logd startup outside init environment"

* commit 'fe545b9cb7188036d5fe8c433c7c87dd1b364c2b':
logd: libsysutils: logd startup outside init environment
2898a4ad5ede1fa3d42b4b2bd54a4b91b61bcc2b 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 7fb0ff53: am 25f07f77: Merge changes I487ebe67,Ie7a0aeb2

* commit '7fb0ff53e87115d98af7272368348bbc270516ae':
libutils: FileMap styling adjustments
libutils: FileMap 64 bit compile issues
19697f3e1eaf9c54b612e42f93619658194707cd 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 3ad0af6d: Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"

* commit '3ad0af6d0422b1659ad6912802693cffd45be3b9':
logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH
fe545b9cb7188036d5fe8c433c7c87dd1b364c2b 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 0516aded: Merge "logd: libsysutils: logd startup outside init environment"

* commit '0516aded0e3006272ec390fd418d311e06b1d328':
logd: libsysutils: logd startup outside init environment
3ad0af6d0422b1659ad6912802693cffd45be3b9 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"
0516aded0e3006272ec390fd418d311e06b1d328 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: libsysutils: logd startup outside init environment"
7fb0ff53e87115d98af7272368348bbc270516ae 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 25f07f77: Merge changes I487ebe67,Ie7a0aeb2

* commit '25f07f77eceba32a5085a6ff9b70081352d3fdb9':
libutils: FileMap styling adjustments
libutils: FileMap 64 bit compile issues
25f07f77eceba32a5085a6ff9b70081352d3fdb9 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge changes I487ebe67,Ie7a0aeb2

* changes:
libutils: FileMap styling adjustments
libutils: FileMap 64 bit compile issues
cf100c9b85f9fd7043fcd3b5afd5de4d3fa51554 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 270abd69: am ca242b49: am 280b7d40: Merge "libutils: BlobCache 64 bit compile issues"

* commit '270abd69448a1cae78649127aa43750b4067192f':
libutils: BlobCache 64 bit compile issues
270abd69448a1cae78649127aa43750b4067192f 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> am ca242b49: am 280b7d40: Merge "libutils: BlobCache 64 bit compile issues"

* commit 'ca242b497daa152f517f2b74037d5e2765f3ad2d':
libutils: BlobCache 64 bit compile issues
ca242b497daa152f517f2b74037d5e2765f3ad2d 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 280b7d40: Merge "libutils: BlobCache 64 bit compile issues"

* commit '280b7d40f5d0478bf92470f1d6b0bce917712dcc':
libutils: BlobCache 64 bit compile issues
b618576ff1dc0cf66e985a6204f83438c1dbcca0 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> libutils: FileMap styling adjustments

Change-Id: I487ebe67a46a7b8f680e722141dd216bbd396f3e
ibutils/FileMap.cpp
15085a6a2cc958a45035d6ec1aa6669a743ada70 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> libutils: FileMap 64 bit compile issues

Change-Id: Ie7a0aeb2a7e2d2a90aa2b97c657ea7ec566bf793
ibutils/FileMap.cpp
280b7d40f5d0478bf92470f1d6b0bce917712dcc 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "libutils: BlobCache 64 bit compile issues"
dfc47e86858ea67c72f1df2fdb97094b8e8248f2 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: libsysutils: logd startup outside init environment

Change-Id: I3426b6c3eebdd0c8258e966dcaaaa2825d7a23d1
nclude/sysutils/FrameworkListener.h
ibsysutils/src/FrameworkListener.cpp
ogd/CommandListener.cpp
ogd/CommandListener.h
ogd/LogListener.cpp
ogd/LogReader.cpp
ogd/LogReader.h
ogd/main.cpp
387c561300ea6bd7e75f4cbe823a515e1b7e42a8 17-Apr-2014 Mark Salyzyn <salyzyn@google.com> libutils: BlobCache 64 bit compile issues

Change-Id: I60e9bddfff04f19834b83bdc26a83ca7173363c3
ibutils/BlobCache.cpp
99f47a9e7c4374f2bbfc18e4a97aa7848245ea33 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH

Change-Id: Iea453764a1a4fc1661f461f10c641c30150e4d20
ebuggerd/utility.cpp
nclude/log/log.h
iblog/log_read.c
iblog/log_read_kern.c
iblog/logd_write.c
iblog/logd_write_kern.c
ogcat/logcat.cpp
ogd/LogBuffer.cpp
ogd/tests/logd_test.cpp
31baf25e4dde5b7494a5bbf7af70d011d1119f38 16-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
76b526a2cad8f42717c48ad5d451dfc09d5a6d6f 15-Apr-2014 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for Prestigio

Change-Id: Ib9e79043961b9b1fa27d87f5bc815000e7965706
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
db/usb_vendors.c
8efea957beb3af682095c0bd6aa4c68ad531c7da 16-Apr-2014 Igor Murashkin <iam@google.com> libcutils: Fix warnings in properties.c when verbose logging is enabled

Change-Id: I07c5eb59b9395734ad3fc25eba753564c0f096a0
ibcutils/properties.c
ibcutils/tests/Android.mk
efae3a7fa06ad6a4d23b06c838d91b2ed633baec 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am f00a30e5: am 6a044d46: am 26bb9970: Merge "logd: Add logd_test"

* commit 'f00a30e54e7fe2dbd974631a028be79bc9aa32dc':
logd: Add logd_test
c0ce334f09557e87e17fb984f3324f725eb1e8bf 16-Apr-2014 Christopher Ferris <cferris@google.com> am 34a73716: am 049b8ab1: am 64e71a7c: Merge "Avoid logging functions from signal handler."

* commit '34a73716353b17c7d69eb8333aec01a658072dc2':
Avoid logging functions from signal handler.
2ca6a1a7eb08a9f46745308d13663ecb93d7b68a 16-Apr-2014 Jeff Brown <jeffbrown@google.com> am 83ec0010: am a77bef47: Document the adb install -d option.

* commit '83ec00108676fa66cec470e886b87384bdf1e6a2':
Document the adb install -d option.
f00a30e54e7fe2dbd974631a028be79bc9aa32dc 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 6a044d46: am 26bb9970: Merge "logd: Add logd_test"

* commit '6a044d4614d9e91347d83707c2751dcfa2b32cbd':
logd: Add logd_test
6a044d4614d9e91347d83707c2751dcfa2b32cbd 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 26bb9970: Merge "logd: Add logd_test"

* commit '26bb9970c463eb1209803d833799f128484864ac':
logd: Add logd_test
26bb9970c463eb1209803d833799f128484864ac 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Add logd_test"
8481765738b404053ad52dcbfb567e813d587043 16-Apr-2014 Igor Murashkin <iam@google.com> Merge "libutils: Clarify Condition::signal wakes up exactly one thread"
db4193833c9f4f45d5627a6cefc730af9b8e5b5a 16-Apr-2014 Igor Murashkin <iam@google.com> libutils: Clarify Condition::signal wakes up exactly one thread

Contrary to POSIX pthread_cond_signal guarantees, bionic will wake up
either zero or one threads.

Change-Id: I628fcd4d5bd8d5290104506f86caa82c54142230
nclude/utils/Condition.h
34a73716353b17c7d69eb8333aec01a658072dc2 15-Apr-2014 Christopher Ferris <cferris@google.com> am 049b8ab1: am 64e71a7c: Merge "Avoid logging functions from signal handler."

* commit '049b8ab1cae5f420c079905c95a5bdd107404253':
Avoid logging functions from signal handler.
049b8ab1cae5f420c079905c95a5bdd107404253 15-Apr-2014 Christopher Ferris <cferris@google.com> am 64e71a7c: Merge "Avoid logging functions from signal handler."

* commit '64e71a7c2efb5783744335e8df45e5da152a65da':
Avoid logging functions from signal handler.
64e71a7c2efb5783744335e8df45e5da152a65da 15-Apr-2014 Christopher Ferris <cferris@google.com> Merge "Avoid logging functions from signal handler."
c9cc643f8b0de8acd365c0caa2a8380c1ca26c1a 15-Apr-2014 Narayan Kamath <narayan@google.com> am 48030e68: am e7ddcad8: am 0f4575db: Merge "HAVE_POSIX_CLOCKS doesn\'t imply CLOCK_BOOTTIME."

* commit '48030e68e5d2d763ab9c1ca88036837e1e4f3c08':
HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.
83ec00108676fa66cec470e886b87384bdf1e6a2 15-Apr-2014 Jeff Brown <jeffbrown@google.com> am a77bef47: Document the adb install -d option.

* commit 'a77bef47decf2c0818397aced983999e235aa82f':
Document the adb install -d option.
a77bef47decf2c0818397aced983999e235aa82f 15-Apr-2014 Jeff Brown <jeffbrown@google.com> Document the adb install -d option.

Change-Id: Ife0da42c22e4408dc5c07ac0f20e0ecbbde20832
db/commandline.c
17224d57fbc690051fbfecdc95140ead21305ba3 11-Apr-2014 Christopher Ferris <cferris@google.com> Avoid logging functions from signal handler.

(cherry picked from commit 9007677fcbcd7cf01725e155920a8abfcb323c56)

Change-Id: Ic0163f43308c6a281ab3757d90933e5127843fed
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindCurrent.h
d3ba665020b3fd1923c1b9ab1d63cb3dc21430ac 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: Add logd_test

* Test statistics output, all four main log id types
are checked to be present, and output is properly
formatted with header (ascii new-line terminated
byte count) and trailer (newline formfeed) frames.
* On dev build test dgram_qlen, circumvent if
liblog benchmarks executed first though.
* Test if kernel and user space loggers are
present, and if any content has leaked to both.
* test benchmark and use it to verify worst UID pruning

Change-Id: I890c89f64825956f40108de806ed750b0170ac6c
ogd/Android.mk
ogd/tests/Android.mk
ogd/tests/logd_test.cpp
e3fc4f2c41e77f81a09f3663f38a53bb897be0f2 15-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
48030e68e5d2d763ab9c1ca88036837e1e4f3c08 15-Apr-2014 Narayan Kamath <narayan@google.com> am e7ddcad8: am 0f4575db: Merge "HAVE_POSIX_CLOCKS doesn\'t imply CLOCK_BOOTTIME."

* commit 'e7ddcad89f2950d58b4022b55f2cf693daac2e19':
HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.
e7ddcad89f2950d58b4022b55f2cf693daac2e19 15-Apr-2014 Narayan Kamath <narayan@google.com> am 0f4575db: Merge "HAVE_POSIX_CLOCKS doesn\'t imply CLOCK_BOOTTIME."

* commit '0f4575dbbd6587023229c87bcd385557a96830ae':
HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.
0f4575dbbd6587023229c87bcd385557a96830ae 15-Apr-2014 Narayan Kamath <narayan@google.com> Merge "HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME."
0ef87a44f8135b6802ed726ff706aaa5d7a6393d 14-Apr-2014 Igor Murashkin <iam@google.com> Merge "cutils: Add property_get_bool, _get_int32, _get_int64"
8af196c1f5f9f8133384df8607f7addbaa697a42 14-Apr-2014 John Reck <jreck@google.com> Merge "Add a peekOldestValue"
8d56ff5d12548ac463877fa8dc3554d02a145f97 14-Apr-2014 Narayan Kamath <narayan@google.com> am c5aff686: am cda31324: am 4706320e: Merge "Include 64bit valgrind in the android_filesystem_config."

* commit 'c5aff68693dee788a28a0d0256782cc8521aa2a5':
Include 64bit valgrind in the android_filesystem_config.
c5aff68693dee788a28a0d0256782cc8521aa2a5 14-Apr-2014 Narayan Kamath <narayan@google.com> am cda31324: am 4706320e: Merge "Include 64bit valgrind in the android_filesystem_config."

* commit 'cda31324afdc3e9d1bc5d2e9ee45985cf1fb8819':
Include 64bit valgrind in the android_filesystem_config.
cda31324afdc3e9d1bc5d2e9ee45985cf1fb8819 14-Apr-2014 Narayan Kamath <narayan@google.com> am 4706320e: Merge "Include 64bit valgrind in the android_filesystem_config."

* commit '4706320eb30812b301675b15a35036190a1c87b6':
Include 64bit valgrind in the android_filesystem_config.
4706320eb30812b301675b15a35036190a1c87b6 14-Apr-2014 Narayan Kamath <narayan@google.com> Merge "Include 64bit valgrind in the android_filesystem_config."
dd8e1bbbb061644fa7eb4995cc754ac8794fce87 14-Apr-2014 Colin Cross <ccross@android.com> am 8d57b79c: am bf66e448: am a1551e9b: Merge "Fix buffer overflow in syren utility"

* commit '8d57b79c26c9618ec50d3ee304e9abba41bfe4c9':
Fix buffer overflow in syren utility
8d57b79c26c9618ec50d3ee304e9abba41bfe4c9 13-Apr-2014 Colin Cross <ccross@android.com> am bf66e448: am a1551e9b: Merge "Fix buffer overflow in syren utility"

* commit 'bf66e4486d1ded51da45d69548e138ab7a75967d':
Fix buffer overflow in syren utility
bf66e4486d1ded51da45d69548e138ab7a75967d 13-Apr-2014 Colin Cross <ccross@android.com> am a1551e9b: Merge "Fix buffer overflow in syren utility"

* commit 'a1551e9b4c586d654224810100f15e8a46c64a7e':
Fix buffer overflow in syren utility
a1551e9b4c586d654224810100f15e8a46c64a7e 13-Apr-2014 Colin Cross <ccross@android.com> Merge "Fix buffer overflow in syren utility"
3967f81b561cb989ee957aa7e3996e543e20d524 12-Apr-2014 nks <nks@sixserv.org> Fix buffer overflow in syren utility

Patch for https://code.google.com/p/android/issues/detail?id=68268

A length check for the argv[2] was added in order to prevent buffer
overflow. Also replace strcpy with strlcpy.

Signed-off-by: nks <nks@sixserv.org>
Change-Id: If65b83e9b658315c672e684f64e3ae00e69fac31
oolbox/syren.c
f91264bc25558133b738250f39c6cf447a1c2666 12-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
6b7ab90ca9e67324c4f07bfc46e1b6ed86c741c5 12-Apr-2014 Narayan Kamath <narayan@google.com> Include 64bit valgrind in the android_filesystem_config.

Required so that we set the exectuable bit correctly.

Change-Id: If59bd0ff47d2b4b2b8f92a1c007b4ba414ea1876
nclude/private/android_filesystem_config.h
02c9460a0a05f27e0501f9e64cdf24091e7d3579 12-Apr-2014 Andreas Gampe <agampe@google.com> BitSet32 64b compatibility fix

Using __builtin_c{l,t}zl fails on 64b systems as unsigned long is
8B there. However, unsigned int is only guaranteed to be 2B. Introduce
a check that should be optimized away by the compiler.

Change-Id: I854d0817c6bb5ae13c257241240664bf8f1a7c8a
nclude/utils/BitSet.h
9d8707c75aba22c637bb0f9d61f5126fc55816df 12-Apr-2014 John Reck <jreck@google.com> Add a peekOldestValue

Change-Id: I89d8ea14c8ac02653d9c0e1fe24a4b17bb9c87f5
nclude/utils/LruCache.h
d4507e9246e4855c5431cac5c3d1a9155caebc87 08-Apr-2014 Igor Murashkin <iam@google.com> cutils: Add property_get_bool, _get_int32, _get_int64

* Read out system properties with same syntax as SystemProperties.java
* Also adds unit test suite to validate correctness of properties
* Also fixes buffer overrun in property_get

Change-Id: Ifd42911f93e17da09e6ff1298e8875e02f3b6608
nclude/cutils/properties.h
ibcutils/properties.c
ibcutils/tests/Android.mk
ibcutils/tests/PropertiesTest.cpp
e2acb82a9449d0bbf993cda270f3519862ec571a 12-Apr-2014 Sasha Levitskiy <sanek@google.com> am 43cb7ae6: am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."

* commit '43cb7ae6c31ced8cd518eab59dfea31ab1ade812':
Cleanup: warning fixit.
43cb7ae6c31ced8cd518eab59dfea31ab1ade812 12-Apr-2014 Sasha Levitskiy <sanek@google.com> am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."

* commit '4f362e438c6ee5688c4f2f444203ed7acffa566b':
Cleanup: warning fixit.
4f362e438c6ee5688c4f2f444203ed7acffa566b 12-Apr-2014 Sasha Levitskiy <sanek@google.com> am 835526fd: Merge "Cleanup: warning fixit."

* commit '835526fdc035cad6d712a7098d0eae37b3995d2c':
Cleanup: warning fixit.
835526fdc035cad6d712a7098d0eae37b3995d2c 12-Apr-2014 Sasha Levitskiy <sanek@google.com> Merge "Cleanup: warning fixit."
c5543320b024596c86fcb7b05b0b0f9ff609a9d1 12-Apr-2014 Ben Cheng <bccheng@google.com> am 7acecec4: am 3c29e66e: am 2f365509: Merge "Fix signed vs unsigned comparison."

* commit '7acecec433b396405279c3fa35359636dbcc7d47':
Fix signed vs unsigned comparison.
7acecec433b396405279c3fa35359636dbcc7d47 12-Apr-2014 Ben Cheng <bccheng@google.com> am 3c29e66e: am 2f365509: Merge "Fix signed vs unsigned comparison."

* commit '3c29e66eaa683fcd1412f618f9da1e7c2e2b52aa':
Fix signed vs unsigned comparison.
3c29e66eaa683fcd1412f618f9da1e7c2e2b52aa 12-Apr-2014 Ben Cheng <bccheng@google.com> am 2f365509: Merge "Fix signed vs unsigned comparison."

* commit '2f365509eb8a3696feb8063ba8e17ebd12beb7ff':
Fix signed vs unsigned comparison.
2f365509eb8a3696feb8063ba8e17ebd12beb7ff 12-Apr-2014 Ben Cheng <bccheng@google.com> Merge "Fix signed vs unsigned comparison."
1bafa52172d430d134c46e0519d0eb53f4a10d5d 12-Apr-2014 Ben Cheng <bccheng@google.com> Fix signed vs unsigned comparison.

Change-Id: I4011607858f3a82acc04509c9f795f960496ed69
iblog/tests/liblog_test.cpp
89fe3ac1a8768fc4b71c5dc401baa70b80d070d7 12-Apr-2014 Christopher Ferris <cferris@google.com> Merge "Avoid logging functions from signal handler."
cdc1cfb3e51f3caddc1f290b46dc789c036f22ed 11-Apr-2014 Sasha Levitskiy <sanek@google.com> Cleanup: warning fixit.

bootable/recovery has a dependent commit: I9adb470b04e4301989d128c9c3097b21b4dea431

Change-Id: Icf23e659265d71d5226d527c2b40cfbc132320ee
Signed-off-by: Sasha Levitskiy <sanek@google.com>
s_mgr/fs_mgr_fstab.c
s_mgr/fs_mgr_main.c
s_mgr/include/fs_mgr.h
ealthd/healthd_board_default.cpp
ibpixelflinger/codeflinger/disassem.c
ibpixelflinger/codeflinger/disassem.h
ibsuspend/autosuspend_earlysuspend.c
ibutils/tests/BasicHashtable_test.cpp
ibutils/tests/LruCache_test.cpp
5a2bd684fb6d45dce0c8b40ca8acefbbbe1d1ac9 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 3559d98c: am eef9f1da: am ba419940: Merge "logcat: Better help message for white and black list"

* commit '3559d98c267a6302618c9708e1fae298de2fcc1b':
logcat: Better help message for white and black list
3559d98c267a6302618c9708e1fae298de2fcc1b 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am eef9f1da: am ba419940: Merge "logcat: Better help message for white and black list"

* commit 'eef9f1da0b93e542aa25c5db6e5041609aaff77d':
logcat: Better help message for white and black list
eef9f1da0b93e542aa25c5db6e5041609aaff77d 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am ba419940: Merge "logcat: Better help message for white and black list"

* commit 'ba419940f75d93ac4aacef695da0570b1591f140':
logcat: Better help message for white and black list
ba419940f75d93ac4aacef695da0570b1591f140 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: Better help message for white and black list"
bbbe14f758d7b9f147daf82a59b317b087631c01 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> logcat: Better help message for white and black list

Change-Id: Ia739260b4e0fcf8062ad9166fd65b1d6e7bb446c
ogcat/logcat.cpp
9007677fcbcd7cf01725e155920a8abfcb323c56 11-Apr-2014 Christopher Ferris <cferris@google.com> Avoid logging functions from signal handler.

Change-Id: Ic61f7054ced223631f95efb519fa1825fb3e1010
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindCurrent.h
391224c807d2e28e55817b53ff3a30e57d08e996 11-Apr-2014 Paul Lawrence <paullawrence@google.com> Merge "Fix forceencrypt"
ae1f0094309b9bad62ff7de32820c78f66f2c07a 31-Mar-2014 Bao Haojun <baohaojun@gmail.com> Add Smartisan usb config

Change-Id: Ifd921f1dc0d2163230337805c3cf726f371300b0
Signed-off-by: Bao Haojun <baohaojun@gmail.com>
db/usb_vendors.c
7bd273e04e77a60598d26a358861568fe11f8efc 11-Apr-2014 Narayan Kamath <narayan@google.com> am d85efaa0: am a73f7e92: am 822b1a02: Merge "Add a config for dual mode zygote."

* commit 'd85efaa068708b19db3cc647ba62c0a2feb7da23':
Add a config for dual mode zygote.
d85efaa068708b19db3cc647ba62c0a2feb7da23 11-Apr-2014 Narayan Kamath <narayan@google.com> am a73f7e92: am 822b1a02: Merge "Add a config for dual mode zygote."

* commit 'a73f7e924abb8e7b1aa3f0d64d0177ce7d1c58e6':
Add a config for dual mode zygote.
a73f7e924abb8e7b1aa3f0d64d0177ce7d1c58e6 11-Apr-2014 Narayan Kamath <narayan@google.com> am 822b1a02: Merge "Add a config for dual mode zygote."

* commit '822b1a024d058641be9aefa14da794f09755ce35':
Add a config for dual mode zygote.
822b1a024d058641be9aefa14da794f09755ce35 11-Apr-2014 Narayan Kamath <narayan@google.com> Merge "Add a config for dual mode zygote."
f24aab7d744b708a897e70e2cbdb76a81bc069b7 10-Apr-2014 Paul Lawrence <paullawrence@google.com> Fix forceencrypt

When changing vdc cryptfs enablecrypto inplace default in
https://googleplex-android-review.git.corp.google.com/#/c/445001/
forgot to change init.rc

Change-Id: I2a937d3c302ab8eab4829a36101145d6fe726ab1
ootdir/init.rc
ea659643ee1b0c46e473619034cd130440405ac4 10-Apr-2014 Narayan Kamath <narayan@google.com> HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.

HAVE_POSIX_CLOCKS imples clock_gettime,settime and
CLOCK_REALTIME / CLOCK_MONOTONIC.

CLOCK_BOOTTIME appears only on newer versions of glibc
and might only be supported on newer kernels.

Change-Id: I66e724a3593538c3b80de2c5f81a964d3fa96eaf
ibutils/Timers.cpp
cf805481bf951df177c0b63ae7f319308cba1f4a 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 202a990f: am 97ea695a: am 032f5f23: Merge "logd: Statistics: Add up to 10 chattiest clients"

* commit '202a990f20828d6a11d6c616078746f7210d24a9':
logd: Statistics: Add up to 10 chattiest clients
202a990f20828d6a11d6c616078746f7210d24a9 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 97ea695a: am 032f5f23: Merge "logd: Statistics: Add up to 10 chattiest clients"

* commit '97ea695af71ea6301b423700e363b13289279366':
logd: Statistics: Add up to 10 chattiest clients
97ea695af71ea6301b423700e363b13289279366 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 032f5f23: Merge "logd: Statistics: Add up to 10 chattiest clients"

* commit '032f5f23005d8c5d4558618c5c46d3a92752b408':
logd: Statistics: Add up to 10 chattiest clients
032f5f23005d8c5d4558618c5c46d3a92752b408 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Statistics: Add up to 10 chattiest clients"
8e72c5384b288bc11af60e12686a44e502633e3d 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: Statistics: Add up to 10 chattiest clients

- embellish pid name
- >1% of the logs
- fix PID gone detection (EPERM)
- some ? : cleanup

Change-Id: Iba3b306e1fee43e53931165819a398693910514b
ogd/LogStatistics.cpp
07d29fffff3d0c7001552ec15c3686cd733f9640 10-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
468b37c106e3a0efa926de24c2690d6db2819bc0 02-Apr-2014 Narayan Kamath <narayan@google.com> Add a config for dual mode zygote.

Note that init.zygote64.rc, which supports a "pure"
64 bit zygote is around only for testing.

The life cycles of both zygotes are controlled by init,
and the assumption here is that they will be available
always. We start the system_server in 32 bit mode.

Note that the distinction between "primary" and "secondary"
simply defines the order in which ABI support is queried,
there's no real requirement that the primary zygote supports
the primary ABI of the device.

bug: 13647418

Change-Id: Id0be001ea6f934c3c2022d89a63aae9fae66cc38
ootdir/init.zygote32_64.rc
fb59398dc696246da8d95405a74364b8c71a12e3 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 63a14ed7: am ae3ba0b3: am 472e04f2: Merge "logd: liblog: logcat: enable prune features for user"

* commit '63a14ed7fc728f84f9496fc99bc1df01b5bc8b16':
logd: liblog: logcat: enable prune features for user
63a14ed7fc728f84f9496fc99bc1df01b5bc8b16 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> am ae3ba0b3: am 472e04f2: Merge "logd: liblog: logcat: enable prune features for user"

* commit 'ae3ba0b339e7a768fe58f179fdab55f273419e1e':
logd: liblog: logcat: enable prune features for user
ae3ba0b339e7a768fe58f179fdab55f273419e1e 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 472e04f2: Merge "logd: liblog: logcat: enable prune features for user"

* commit '472e04f2b4b1870f8be789a3f16c2abb664b731a':
logd: liblog: logcat: enable prune features for user
472e04f2b4b1870f8be789a3f16c2abb664b731a 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: liblog: logcat: enable prune features for user"
11673a03e05c21bd254868466e6736b02ef1097e 09-Apr-2014 dcashman <dcashman@google.com> am 8b4ea5a4: am 39a5b812: am 2baf2886: Merge "Enable world-readable selinuxfs policy binary."

* commit '8b4ea5a49dda2767af87604713053e1bc418e96f':
Enable world-readable selinuxfs policy binary.
8b4ea5a49dda2767af87604713053e1bc418e96f 09-Apr-2014 dcashman <dcashman@google.com> am 39a5b812: am 2baf2886: Merge "Enable world-readable selinuxfs policy binary."

* commit '39a5b812904ec13390d6261bafccf823729ae21d':
Enable world-readable selinuxfs policy binary.
39a5b812904ec13390d6261bafccf823729ae21d 09-Apr-2014 dcashman <dcashman@google.com> am 2baf2886: Merge "Enable world-readable selinuxfs policy binary."

* commit '2baf2886826db1a137fa765a991f30a3937e7c4d':
Enable world-readable selinuxfs policy binary.
2baf2886826db1a137fa765a991f30a3937e7c4d 09-Apr-2014 dcashman <dcashman@google.com> Merge "Enable world-readable selinuxfs policy binary."
8d176e6bdd9b83df104b56838443df76d2e2899f 09-Apr-2014 Paul Lawrence <paullawrence@google.com> Merge "Add force_encrypt flag to fstab to force encryption on appropriate devices"
d0ba8966a009d9ab2ba589552a061a15705b49b6 08-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
2be33e08e96d4cb5bc9207c633dba707a4d5628a 08-Apr-2014 Greg Hackmann <ghackmann@google.com> am 7b6a8cba: am 679e2c25: am 9101878d: Merge "logd: fix LogStatistics::format freeing wrong pointer"

* commit '7b6a8cbae956de544f01c43ec0814130aea1f846':
logd: fix LogStatistics::format freeing wrong pointer
7b6a8cbae956de544f01c43ec0814130aea1f846 08-Apr-2014 Greg Hackmann <ghackmann@google.com> am 679e2c25: am 9101878d: Merge "logd: fix LogStatistics::format freeing wrong pointer"

* commit '679e2c252274a7072c65471d6799a962261e1883':
logd: fix LogStatistics::format freeing wrong pointer
679e2c252274a7072c65471d6799a962261e1883 08-Apr-2014 Greg Hackmann <ghackmann@google.com> am 9101878d: Merge "logd: fix LogStatistics::format freeing wrong pointer"

* commit '9101878dd06a74cedeadca3fec3b3db68cba8bf0':
logd: fix LogStatistics::format freeing wrong pointer
9101878dd06a74cedeadca3fec3b3db68cba8bf0 08-Apr-2014 Greg Hackmann <ghackmann@google.com> Merge "logd: fix LogStatistics::format freeing wrong pointer"
241d5aa3d2891c7161ed0b685426046a8a695b83 08-Apr-2014 Elliott Hughes <enh@google.com> am 8f2a205f: am 1a09a804: am 47d374ec: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."

* commit '8f2a205f34bfad9eddbd62a073d1ca492276d538':
Move date off the non-portable bionic32 'strtotimeval'.
8f2a205f34bfad9eddbd62a073d1ca492276d538 08-Apr-2014 Elliott Hughes <enh@google.com> am 1a09a804: am 47d374ec: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."

* commit '1a09a804ba0c96182e8193cb5e96090893ad9a7c':
Move date off the non-portable bionic32 'strtotimeval'.
1a09a804ba0c96182e8193cb5e96090893ad9a7c 08-Apr-2014 Elliott Hughes <enh@google.com> am 47d374ec: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."

* commit '47d374ec27af7bc431a86a592822fbb15ff6ba3c':
Move date off the non-portable bionic32 'strtotimeval'.
47d374ec27af7bc431a86a592822fbb15ff6ba3c 08-Apr-2014 Elliott Hughes <enh@google.com> Merge "Move date off the non-portable bionic32 'strtotimeval'."
e25a6413d381fc1f35def9ddfa2fbdcf199c09ff 08-Apr-2014 Elliott Hughes <enh@google.com> Move date off the non-portable bionic32 'strtotimeval'.

Change-Id: Ib706d3a536c409810cfbc47270448c6375314506
oolbox/date.c
239605ef64d34ced82c97870e3f3f5c4145be58c 07-Apr-2014 Greg Hackmann <ghackmann@google.com> logd: fix LogStatistics::format freeing wrong pointer

Fixes a leak and use-after-free if a client passes in an
already-allocated target buffer (currently none do)

Change-Id: Ie20c30bd5ba31e1b6db73885bd9d2ebd7e40dc27
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ogd/LogStatistics.cpp
4854a36e2a26afb248304fde9738fa6009c14190 08-Apr-2014 Tim Murray <timmurray@google.com> am 1f87d3ab: am 83fd6375: am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."

* commit '1f87d3ab8c384d03d1496c63f7faad15bd5eeba9':
Add guards to prevent typedefs when C++11 is available.
1f87d3ab8c384d03d1496c63f7faad15bd5eeba9 08-Apr-2014 Tim Murray <timmurray@google.com> am 83fd6375: am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."

* commit '83fd6375f6d9016afe9bb03453d39b8c41cda548':
Add guards to prevent typedefs when C++11 is available.
83fd6375f6d9016afe9bb03453d39b8c41cda548 08-Apr-2014 Tim Murray <timmurray@google.com> am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."

* commit '31631861647aadc28d6311a211419be79c34c7b0':
Add guards to prevent typedefs when C++11 is available.
31631861647aadc28d6311a211419be79c34c7b0 07-Apr-2014 Tim Murray <timmurray@google.com> Merge "Add guards to prevent typedefs when C++11 is available."
ae83f84548ef3878625c5df9bf50b7f991852430 07-Apr-2014 Tim Murray <timmurray@google.com> Add guards to prevent typedefs when C++11 is available.

char32_t and char16_t are both defined in C++11.

Change-Id: I44fe8f4f05f230c18a1b77fa21b6a40c8f8ecc2d
nclude/utils/Unicode.h
5822a4af8406fb6e9ecc675297af19852b378ca0 26-Mar-2014 dcashman <dcashman@google.com> Enable world-readable selinuxfs policy binary.

Change-Id: I1eefb457cea1164a8aa9eeb7683b3d99ee56ca99
ootdir/init.rc
3b9e3a10f94c5d4d1f6d9b7ca4054400cf3d2c85 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 7af3b47d: am 21ad8b4b: am 6b91fefd: Merge "logd: Turn off default prune by worst UID"

* commit '7af3b47d24ea7ad9bfcbf98d6d250d34c6725d52':
logd: Turn off default prune by worst UID
7af3b47d24ea7ad9bfcbf98d6d250d34c6725d52 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 21ad8b4b: am 6b91fefd: Merge "logd: Turn off default prune by worst UID"

* commit '21ad8b4b2c2eb4efa9b1ad0f86b6bed989c64438':
logd: Turn off default prune by worst UID
21ad8b4b2c2eb4efa9b1ad0f86b6bed989c64438 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 6b91fefd: Merge "logd: Turn off default prune by worst UID"

* commit '6b91fefdb22b33d7cdebe10fab4db834f5f8784d':
logd: Turn off default prune by worst UID
6b91fefdb22b33d7cdebe10fab4db834f5f8784d 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Turn off default prune by worst UID"
0bb5288c0e64917d28a16d8dffd9e7bf46dd6f4c 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: Turn off default prune by worst UID

- Algorithm places too much weight on stack dumps

Change-Id: Ibb31a59892870397b780965ec791f47a4ce87eaf
ogd/LogWhiteBlackList.cpp
78886a6dfcd574a5afe41bb578e26dc97a759803 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am ce2a0ecf: am ffd72150: am 3e73a99f: Merge "logd: auditd: add logd.auditd.dmesg property"

* commit 'ce2a0ecf29fadbd63ea2397b2d87a02b27a2d20f':
logd: auditd: add logd.auditd.dmesg property
7ddea01bbf5470fce61f0d1865cc8c26fdf59dd5 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 219ed707: am 4336d13c: am 85010465: Merge "logd: selinux auditd initial commit"

* commit '219ed7079abb6ffb9545ca8457a644ca3d0af872':
logd: selinux auditd initial commit
a12e8ad4b6872c2fc472ceccff57d86093cea78a 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am c3679233: am 236d6a81: am 44853351: Merge "logd: Add pidToUid helper"

* commit 'c36792338849e0e93599b723afa4621c82068edd':
logd: Add pidToUid helper
baf80026cf43d86409bd6886d08354acb60d8b4d 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am b1e678d9: am cfb2f579: am ebdf9778: Merge "logd: Add pidToName helper"

* commit 'b1e678d98f601a1dc6d4b0042ce6b5dc0de0186e':
logd: Add pidToName helper
ce2a0ecf29fadbd63ea2397b2d87a02b27a2d20f 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am ffd72150: am 3e73a99f: Merge "logd: auditd: add logd.auditd.dmesg property"

* commit 'ffd721502e00e787ea0f89d6d537de52d4fc4542':
logd: auditd: add logd.auditd.dmesg property
219ed7079abb6ffb9545ca8457a644ca3d0af872 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 4336d13c: am 85010465: Merge "logd: selinux auditd initial commit"

* commit '4336d13cb12a8e779d4c56c45dc6d7a47c0b7898':
logd: selinux auditd initial commit
c36792338849e0e93599b723afa4621c82068edd 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 236d6a81: am 44853351: Merge "logd: Add pidToUid helper"

* commit '236d6a814396e2678f17487c761f30f7481e5f3b':
logd: Add pidToUid helper
b1e678d98f601a1dc6d4b0042ce6b5dc0de0186e 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am cfb2f579: am ebdf9778: Merge "logd: Add pidToName helper"

* commit 'cfb2f57916818701097e0d08b2b6193ba43d2274':
logd: Add pidToName helper
ffd721502e00e787ea0f89d6d537de52d4fc4542 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 3e73a99f: Merge "logd: auditd: add logd.auditd.dmesg property"

* commit '3e73a99ff28a0fc0765ad3fc899cfb15f5c230f8':
logd: auditd: add logd.auditd.dmesg property
4336d13cb12a8e779d4c56c45dc6d7a47c0b7898 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 85010465: Merge "logd: selinux auditd initial commit"

* commit '8501046553ac99a278f10377c2ccf9ee6d82eeb1':
logd: selinux auditd initial commit
236d6a814396e2678f17487c761f30f7481e5f3b 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 44853351: Merge "logd: Add pidToUid helper"

* commit '448533515002d8836f00d5b7127a814df370c125':
logd: Add pidToUid helper
cfb2f57916818701097e0d08b2b6193ba43d2274 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> am ebdf9778: Merge "logd: Add pidToName helper"

* commit 'ebdf9778a08c8ff23d4e4aab3041c7642c74aa89':
logd: Add pidToName helper
3e73a99ff28a0fc0765ad3fc899cfb15f5c230f8 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: auditd: add logd.auditd.dmesg property"
8501046553ac99a278f10377c2ccf9ee6d82eeb1 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: selinux auditd initial commit"
448533515002d8836f00d5b7127a814df370c125 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Add pidToUid helper"
ebdf9778a08c8ff23d4e4aab3041c7642c74aa89 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Add pidToName helper"
e9bebd0eb1845f0c6009ce2edc5aeb47bf89e397 03-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: auditd: add logd.auditd.dmesg property

Change-Id: If4a579c2221eec99cf3f6acf59ead8c2d5230517
ogd/LogAudit.cpp
ogd/LogAudit.h
ogd/main.cpp
29d238d2a8e12c131a4cfbccb912e525cca6b10d 08-Feb-2013 William Roberts <w.roberts@sta.samsung.com> logd: selinux auditd initial commit

Initial commit for an audit daemon that writes kernel audit
messages to the Android logger. The daemon searches dmesg
for all lines that contain "audit" and writes them. Then
receiving the messages from the netlink socket.

It also formats the messages so they are compatable with
ausearch (type=<t> <m> format)

Modified: Mark Salyzyn <salyzyn@google.com>

- do not start auditd
- merge into logd, stripping unnecessary file logging.
- Convert headers and code to support C++
- Fix bugs in libaudit
- squash timestamp (replace with 0.0) due to duplication
- squash pid due to duplication
- squash comm due to duplication

Change-Id: I421bcf33e7e670d596628b1b5c7c25536ce2d3fe
ogd/Android.mk
ogd/LogAudit.cpp
ogd/LogAudit.h
ogd/README.auditd
ogd/libaudit.c
ogd/libaudit.h
ogd/main.cpp
4ba0387af5acc52e43e4004ccb4c46b8bc700349 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: Add pidToUid helper

Change-Id: I23ebae1957c027bff6cbc2573a227bf0c44c08a2
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
9a03863e88da99ba010342c874252089dd771f7f 07-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: Add pidToName helper

Change-Id: Idd8e804ab65feb8dc432150ae701464de1ad5302
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
ba9c8f77da732cf2e9c03485605897f6626ac6aa 05-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
0eaa515e82f2b311be5e1abd477f6e3dda7986ff 04-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: transitory reader thread create should be detached

Bug: 13692914
Change-Id: Ia7306e6e844ae9f17c6f594bf6b25f3148652570
ogd/LogTimes.cpp
499809ab6cbfcb891e94c81432ba16936a6ab3f3 04-Apr-2014 Mark Salyzyn <salyzyn@google.com> am c2dd26d1: am 113efaae: am d1d2c15d: Merge "logd: transitory reader thread create should be detached"

* commit 'c2dd26d1b33d74c5b7774850dd7dbc2f6882cb87':
logd: transitory reader thread create should be detached
c2dd26d1b33d74c5b7774850dd7dbc2f6882cb87 04-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 113efaae: am d1d2c15d: Merge "logd: transitory reader thread create should be detached"

* commit '113efaaeec1b0197d43cce64a73cbc1a5b5cbc94':
logd: transitory reader thread create should be detached
113efaaeec1b0197d43cce64a73cbc1a5b5cbc94 04-Apr-2014 Mark Salyzyn <salyzyn@google.com> am d1d2c15d: Merge "logd: transitory reader thread create should be detached"

* commit 'd1d2c15de8ea09989e8072d197c22020860f1461':
logd: transitory reader thread create should be detached
d1d2c15de8ea09989e8072d197c22020860f1461 04-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: transitory reader thread create should be detached"
765f7828918b0eebe70ab9b16c31a2587969fc7e 04-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: transitory reader thread create should be detached

Bug: 13692914
Change-Id: Ia7306e6e844ae9f17c6f594bf6b25f3148652570
ogd/LogTimes.cpp
2e5ae0a4f90ad7a2a1aa9382abb97d9450209c50 04-Apr-2014 Paul Lawrence <paullawrence@google.com> Add force_encrypt flag to fstab to force encryption on appropriate devices

forceencrypt= will encrypt the drive at boot if it is not encrypted. This change
will not have an impact until we set this flag in appropirate fstabs.

Bug: 11985952

Change-Id: I6c65eda7f109e4936aa160da50f871703aefb351
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
s_mgr/fs_mgr_priv.h
7962e4acc735c7083ea060661b847e818d0a79a7 04-Apr-2014 Christopher Ferris <cferris@google.com> am 6a8c3164: am e35cba9a: am a97798af: Merge "Create an UnwindMapLocal object."

* commit '6a8c316438032c72ffdd2988cc1eb2717f477254':
Create an UnwindMapLocal object.
6a8c316438032c72ffdd2988cc1eb2717f477254 04-Apr-2014 Christopher Ferris <cferris@google.com> am e35cba9a: am a97798af: Merge "Create an UnwindMapLocal object."

* commit 'e35cba9af02004d30033826638e00ba5fdcdd013':
Create an UnwindMapLocal object.
e35cba9af02004d30033826638e00ba5fdcdd013 04-Apr-2014 Christopher Ferris <cferris@google.com> am a97798af: Merge "Create an UnwindMapLocal object."

* commit 'a97798afc9105668a80b775516a7cc4db341a62e':
Create an UnwindMapLocal object.
a97798afc9105668a80b775516a7cc4db341a62e 04-Apr-2014 Christopher Ferris <cferris@google.com> Merge "Create an UnwindMapLocal object."
0693c5848d1af5c21af171f7e98fedfc24b6afb9 04-Apr-2014 Elliott Hughes <enh@google.com> am 4fe18615: am 56d57e88: am 5f130216: Merge "Handle errno properly to avoid corrupt str_parms"

* commit '4fe186159386a75ce17ca0b7ba6ace4294187cb2':
Handle errno properly to avoid corrupt str_parms
4fe186159386a75ce17ca0b7ba6ace4294187cb2 04-Apr-2014 Elliott Hughes <enh@google.com> am 56d57e88: am 5f130216: Merge "Handle errno properly to avoid corrupt str_parms"

* commit '56d57e88c6ccda0043e879b1a56a7445af8a886f':
Handle errno properly to avoid corrupt str_parms
e29609106033a48a6128664668d22bf4fb42a7ee 08-Mar-2014 Christopher Ferris <cferris@google.com> Create an UnwindMapLocal object.

The way libunwind handles local unwinds is different from remote unwinds,
so create a new map object to handle the differences.

Add new test to verify the map data is being generated correctly.

Add new tests to check for leaks.

Refactor the BACK_LOGW code into a single header file.

Change-Id: I01f3cbfc4b927646174ea1b614fa25d23b9b3427
nclude/backtrace/BacktraceMap.h
ibbacktrace/Android.mk
ibbacktrace/BacktraceImpl.cpp
ibbacktrace/BacktraceImpl.h
ibbacktrace/BacktraceLog.h
ibbacktrace/BacktraceThread.cpp
ibbacktrace/Corkscrew.cpp
ibbacktrace/GetPss.cpp
ibbacktrace/GetPss.h
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindMap.cpp
ibbacktrace/UnwindMap.h
ibbacktrace/UnwindPtrace.cpp
ibbacktrace/backtrace_test.cpp
ed31529f2f1810fdf7a9900024c69c726a012f33 03-Apr-2014 Geremy Condra <gcondra@google.com> Merge "fs_mgr: disable verified partitions on debuggable devices."
56d57e88c6ccda0043e879b1a56a7445af8a886f 03-Apr-2014 Elliott Hughes <enh@google.com> am 5f130216: Merge "Handle errno properly to avoid corrupt str_parms"

* commit '5f130216762278331b5d97eaf1fb549680143c85':
Handle errno properly to avoid corrupt str_parms
5f130216762278331b5d97eaf1fb549680143c85 03-Apr-2014 Elliott Hughes <enh@google.com> Merge "Handle errno properly to avoid corrupt str_parms"
d3c8d5b8d4ade074129b65199a8048c81089ee0e 06-Mar-2014 Jens Gulin <jens.gulin@sonymobile.com> Handle errno properly to avoid corrupt str_parms

A normal sequence of calls is as follows:
str_parms_create_str, str_parms_add_str, str_parms_destroy.
In some cases the destroy caused double free.

str_parms_add_str will clone the input and send it to hashmapPut
for storage. If hashmapPut did not store the strings it will raise
errno = ENOMEM and leave caller with ownership of the strings.
In any of these cases it will be safe to destroy the str_parms.

But what if it wasn't hashmapPut that said NOMEM? What if there
was a stale NOMEM already before a successful hashmapPut?
In that case the strings will be successfully added to the list
(if new), but when str_parms_add_str sees the NOMEM it will free
them anyway, leaving dangling pointers in the str_parms!!

It is the responsibility of the caller to clear errno before any
interesting call. This patch makes sure that str_parms_add_str
reacts only on errno emmitted from hashmapPut.

Change-Id: If87e4bcc482f09e1c66133d33517b152ebdac65f
ibcutils/Android.mk
ibcutils/str_parms.c
1a26866809af6a8e192e248a4a68f8a7017ad2f8 03-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
cd642fc0b5ab4c17428bc35b670815e037a3a0af 02-Apr-2014 Geremy Condra <gcondra@google.com> fs_mgr: disable verified partitions on debuggable devices.

This checks ro.debuggable to determine whether a device is in the
debuggable state or not, disabling verification if it is.

Eventually we'd like to narrow this down to only devices which
need to disable it, but we aren't there yet.

Change-Id: I06a329fe5449deab6bae595877dbb1f200850241
s_mgr/fs_mgr.c
1c950479393d42d18829d4009dbdb3a7f03acbb7 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: logcat: enable prune features for user

- Enable whitelist, blacklist and logsize tuneables for user

Change-Id: Id0c283844c71c5263a8cfbebf2e550f7ac415858
nclude/log/logger.h
iblog/Android.mk
iblog/log_read.c
iblog/log_read_kern.c
ogcat/Android.mk
ogcat/logcat.cpp
ogcat/tests/Android.mk
ogcat/tests/logcat_test.cpp
ogd/Android.mk
ogd/CommandListener.cpp
ogd/CommandListener.h
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogWhiteBlackList.cpp
9b26aecdc4d44d461b129a6ee220ec1bd42e55e9 02-Apr-2014 Narayan Kamath <narayan@google.com> am f84b61b3: am b5e13749: am 223fc42b: Merge "Add CleanSpec for zygote changes."

* commit 'f84b61b377c0acf2ad97fdb132b24762cb599bd8':
Add CleanSpec for zygote changes.
f84b61b377c0acf2ad97fdb132b24762cb599bd8 02-Apr-2014 Narayan Kamath <narayan@google.com> am b5e13749: am 223fc42b: Merge "Add CleanSpec for zygote changes."

* commit 'b5e137493998de960313c62d1824dfc581fb5327':
Add CleanSpec for zygote changes.
b5e137493998de960313c62d1824dfc581fb5327 02-Apr-2014 Narayan Kamath <narayan@google.com> am 223fc42b: Merge "Add CleanSpec for zygote changes."

* commit '223fc42b5e289e882f67c893374ffbef595a6901':
Add CleanSpec for zygote changes.
223fc42b5e289e882f67c893374ffbef595a6901 02-Apr-2014 Narayan Kamath <narayan@google.com> Merge "Add CleanSpec for zygote changes."
3010751f706cc490135d516398af453fad1d435f 02-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
346ccaf6d7ef1ac60ff96b886cd588dcfef6aee4 02-Apr-2014 Narayan Kamath <narayan@google.com> Add CleanSpec for zygote changes.

default.prop is generated out of several makefile variables,
and it isn't possible to neatly express a dependency on those
variables (except perhaps by adding every possible makefile that
could define them to the deps list).

Change-Id: I93ea45c956aa22922f2389f735c058700621f674
leanSpec.mk
94404eef653dd509785b8292d05023e74aeac72d 02-Apr-2014 Wonsik Kim <wonsik@google.com> Merge "Clarify ownership for NativeHandle::mHandle"
136317b1314521924cdab52ef1ed780095de3096 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 990cdb14: am eb69b9a5: am 075828b8: Merge "logd: build breakage in user"

* commit '990cdb149e39e5b4fbac40680ea60cf18beae1a2':
logd: build breakage in user
990cdb149e39e5b4fbac40680ea60cf18beae1a2 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> am eb69b9a5: am 075828b8: Merge "logd: build breakage in user"

* commit 'eb69b9a5020b15e97b448245b63cfa7a6171cd2b':
logd: build breakage in user
eb69b9a5020b15e97b448245b63cfa7a6171cd2b 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 075828b8: Merge "logd: build breakage in user"

* commit '075828b83bd903465442dc5021004266d56e075c':
logd: build breakage in user
075828b83bd903465442dc5021004266d56e075c 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: build breakage in user"
f15b45a7db801143b0d016c4aceab246d568c014 02-Apr-2014 Igor Murashkin <iam@google.com> am cb6daaaf: am 9d379a1e: am dfdbb64f: Merge "Fix stack trace logging in RefBase."

* commit 'cb6daaafa45c81c3c304eac947d2e2fca15f3171':
Fix stack trace logging in RefBase.
d89c68e217d5f0a93cb2e82924bba8276c94dcbc 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 022fa5cc: am 7f92f390: am 5b0ad963: Merge "init: unused paramter warning messages"

* commit '022fa5cc85f80f828c203f344617365d867b9137':
init: unused paramter warning messages
ca4c63d7994e66b45e9ebeb62e417b7da904b87c 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> logd: build breakage in user

build breakage in branch: git_klp-dev-gpl @ 1101951

Change-Id: I4c9681bf4c97368ec19f5a79fef134aba937f337
ogd/LogBuffer.cpp
cb6daaafa45c81c3c304eac947d2e2fca15f3171 02-Apr-2014 Igor Murashkin <iam@google.com> am 9d379a1e: am dfdbb64f: Merge "Fix stack trace logging in RefBase."

* commit '9d379a1e02f25cbc06db55952d981b0dbba75b5c':
Fix stack trace logging in RefBase.
9d379a1e02f25cbc06db55952d981b0dbba75b5c 02-Apr-2014 Igor Murashkin <iam@google.com> am dfdbb64f: Merge "Fix stack trace logging in RefBase."

* commit 'dfdbb64ff79df937e939f78ff70d5501f17e57d3':
Fix stack trace logging in RefBase.
dfdbb64ff79df937e939f78ff70d5501f17e57d3 02-Apr-2014 Igor Murashkin <iam@google.com> Merge "Fix stack trace logging in RefBase."
022fa5cc85f80f828c203f344617365d867b9137 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 7f92f390: am 5b0ad963: Merge "init: unused paramter warning messages"

* commit '7f92f390039227cabac45c8ea1de6ff9d4ee7dde':
init: unused paramter warning messages
7f92f390039227cabac45c8ea1de6ff9d4ee7dde 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 5b0ad963: Merge "init: unused paramter warning messages"

* commit '5b0ad96351dfda6ed09fefed1ab24e514be27012':
init: unused paramter warning messages
5b0ad96351dfda6ed09fefed1ab24e514be27012 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "init: unused paramter warning messages"
322445ce6d928f59ceaaaa303ceb606df750ba38 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> init: unused paramter warning messages

Change-Id: I1667371106be4b230ac3850e9819e4549eea2973
nit/Android.mk
0ecf6a842acea63a1f268e9a6533c926aeb6fe06 02-Apr-2014 Mark Salyzyn <salyzyn@google.com> am b3d94f0a: am c76e38ba: am e7f3cce7: Merge "logd: Add minimum time bucket statistics"

* commit 'b3d94f0ab88aa22d8eec60fe979670674251df13':
logd: Add minimum time bucket statistics
55e0f1c8bdb5d7299ba0c79e084b7ac749eb4c3b 01-Apr-2014 Ian McKellar <ianloic@google.com> Fix stack trace logging in RefBase.

This was broken about 5 months ago in change I78435ed49aa196a0efb45bf9b2d58b62c41737d3.
See: https://goto.google.com/jhtss

Change-Id: Icc32993552efed3015bc1b79a7bd872d7510e020
ibutils/RefBase.cpp
b3d94f0ab88aa22d8eec60fe979670674251df13 01-Apr-2014 Mark Salyzyn <salyzyn@google.com> am c76e38ba: am e7f3cce7: Merge "logd: Add minimum time bucket statistics"

* commit 'c76e38bafacb63f7b13606de940079499f2d5fdd':
logd: Add minimum time bucket statistics
c76e38bafacb63f7b13606de940079499f2d5fdd 01-Apr-2014 Mark Salyzyn <salyzyn@google.com> am e7f3cce7: Merge "logd: Add minimum time bucket statistics"

* commit 'e7f3cce7aa1e51f904f80df02d8d0fe5fe85e14e':
logd: Add minimum time bucket statistics
e7f3cce7aa1e51f904f80df02d8d0fe5fe85e14e 01-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Add minimum time bucket statistics"
e457b74ce6ee6d799812dc2ec5e4b8b18bcd3e91 20-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: Add minimum time bucket statistics

* Only enabled for dev builds because halves performance.
- Used to establish if /proc/sys/net/unix/max_dgram_qlen
is appropriate for the platform
(see logd/LogStatistics.cpp comments)
- enabled if logd.dgram_qlen.statistics is not zero/empty

Change-Id: Ib8ecfeb75b6f0f954c099a6b1032b8afb5efcbd4
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
ogd/main.cpp
dc9af896f011698949cf9237094e52eaec9d4e8e 01-Apr-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 6a949b45 to master

Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
6a949b45e9166bcd4fc4b18e795085126a937c7b 01-Apr-2014 Narayan Kamath <narayan@google.com> am ffca173c: am 5da2dbbc: Merge "Move zygote init config to its own file."

* commit 'ffca173c853a2e312610d87f40957f696ac8364a':
Move zygote init config to its own file.
ffca173c853a2e312610d87f40957f696ac8364a 01-Apr-2014 Narayan Kamath <narayan@google.com> am 5da2dbbc: Merge "Move zygote init config to its own file."

* commit '5da2dbbc935356f526cdfb0b522b332fc8b95fc7':
Move zygote init config to its own file.
5da2dbbc935356f526cdfb0b522b332fc8b95fc7 01-Apr-2014 Narayan Kamath <narayan@google.com> Merge "Move zygote init config to its own file."
89086df24f7d8533369529fc016c5d7e04b62a32 01-Apr-2014 Paul McLean <pmclean@google.com> Merge "Adding a handy predicate function (str_parms_has_key()"
7265d361636a62f916093071efb3aedae42c24e2 01-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
d9354b20c660341e489701ae4e80db97459dea9f 31-Mar-2014 Greg Hackmann <ghackmann@google.com> am 05b0d848: am 5b98e049: rootdir: reduce permissions on /dev/rtc0

* commit '05b0d848b890181e5782b39988a167eda7558554':
rootdir: reduce permissions on /dev/rtc0
05b0d848b890181e5782b39988a167eda7558554 31-Mar-2014 Greg Hackmann <ghackmann@google.com> am 5b98e049: rootdir: reduce permissions on /dev/rtc0

* commit '5b98e0499a6cdd09b72445ceb88b1d32a5e82fd1':
rootdir: reduce permissions on /dev/rtc0
788b27226851160170ee28f7f833dd21b10222e4 31-Mar-2014 Greg Hackmann <ghackmann@google.com> am ae66fbbe: am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"

* commit 'ae66fbbe0e747cb2485bac0fa47c9223268a2fc9':
rootdir: reduce permissions on /dev/rtc0
ae66fbbe0e747cb2485bac0fa47c9223268a2fc9 31-Mar-2014 Greg Hackmann <ghackmann@google.com> am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"

* commit '697bdc604e8f266ebd6c94fc84eb5057b1a700e3':
rootdir: reduce permissions on /dev/rtc0
697bdc604e8f266ebd6c94fc84eb5057b1a700e3 31-Mar-2014 Greg Hackmann <ghackmann@google.com> am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"

* commit 'a740b3bb409c9acdf4cf6a829b982e57a89d08de':
rootdir: reduce permissions on /dev/rtc0
5b98e0499a6cdd09b72445ceb88b1d32a5e82fd1 27-Mar-2014 Greg Hackmann <ghackmann@google.com> rootdir: reduce permissions on /dev/rtc0

Remove world-readable, reduce group permissions to readable by system
daemons

Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ootdir/ueventd.rc
a740b3bb409c9acdf4cf6a829b982e57a89d08de 31-Mar-2014 Greg Hackmann <ghackmann@google.com> Merge "rootdir: reduce permissions on /dev/rtc0"
4456a55ce69cd5b8ad39349ed55d3efc3512bffa 31-Mar-2014 Narayan Kamath <narayan@google.com> Move zygote init config to its own file.

This allows us to choose different configs depending on
whether or not the target is 64 capable, and what its preferred
default is.

bug: 13647418
Change-Id: Ie1ce4245a3add7544c87d27c635ee390f4062523
ootdir/init.rc
ootdir/init.zygote32.rc
ootdir/init.zygote64.rc
de73a0cfdfe4e175b12da1cf38dd5d3f7c1b8d9a 28-Mar-2014 OPPO <wangjimin@oppo.com> Sync persist property immediately,in case of suddenly remove the battery.

Change-Id: I83c5812c69db532f4675f5dbfa508e55999c8dfe
nit/property_service.c
2f1c45c31609d5aeda629d35b7238f409f7611bb 29-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
b34fed34afbc3288d22dad92226650f600d15f71 27-Mar-2014 Greg Hackmann <ghackmann@google.com> rootdir: reduce permissions on /dev/rtc0

Remove world-readable, reduce group permissions to readable by system
daemons

Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ootdir/ueventd.rc
66d479767308d8a74c4b88b4fd3cf3902a6d32f4 27-Mar-2014 Colin Cross <ccross@android.com> am 47de0060: am bd514144: am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"

* commit '47de0060757b90737f1a409acd99fa4372efbf07':
debuggerd: use LOCAL_MULTILIB
47de0060757b90737f1a409acd99fa4372efbf07 27-Mar-2014 Colin Cross <ccross@android.com> am bd514144: am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"

* commit 'bd514144ad5254e4e2c08e17affe6e178bb49074':
debuggerd: use LOCAL_MULTILIB
bd514144ad5254e4e2c08e17affe6e178bb49074 27-Mar-2014 Colin Cross <ccross@android.com> am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"

* commit '47770b7396186d6700688fd039320283e5b68501':
debuggerd: use LOCAL_MULTILIB
47770b7396186d6700688fd039320283e5b68501 27-Mar-2014 Colin Cross <ccross@android.com> Merge "debuggerd: use LOCAL_MULTILIB"
42648705aaf78cb4ebd55c89f712f088ecab2475 27-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
ad3b38dfa86bddeabe32b77a42dfc6a009dadc21 27-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 509b1983: am a43bb3a4: am e644664f: Merge "liblog: deal with restart of logd"

* commit '509b198388b857236ab8f687a4b14dc1d326b875':
liblog: deal with restart of logd
509b198388b857236ab8f687a4b14dc1d326b875 27-Mar-2014 Mark Salyzyn <salyzyn@google.com> am a43bb3a4: am e644664f: Merge "liblog: deal with restart of logd"

* commit 'a43bb3a4d0093a45a3203c3511257116f6029f49':
liblog: deal with restart of logd
a43bb3a4d0093a45a3203c3511257116f6029f49 27-Mar-2014 Mark Salyzyn <salyzyn@google.com> am e644664f: Merge "liblog: deal with restart of logd"

* commit 'e644664f1cbc4add3cc56981bab007380859853a':
liblog: deal with restart of logd
e644664f1cbc4add3cc56981bab007380859853a 27-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: deal with restart of logd"
87a6b1d7992cfacd085e5d88e421ffdad3e1106d 22-Mar-2014 Colin Cross <ccross@android.com> debuggerd: use LOCAL_MULTILIB

Use LOCAL_MULTILIB to build multiple versions of executables
instead of manually creating two build rules.

Change-Id: I1a993ff7b5f527a88735f46eec9822bb97d16490
ebuggerd/Android.mk
ebuggerd/debuggerd.mk
bbb2d489900c9d7d5efeed036cb3971fe0769726 26-Mar-2014 Michael Wright <michaelwr@google.com> am a45ff0f5: (-s ours) am df33e8b5: Add BitSet64. DO NOT MERGE

* commit 'a45ff0f586a609974d5897bdf735d68831d2fcb7':
Add BitSet64. DO NOT MERGE
a45ff0f586a609974d5897bdf735d68831d2fcb7 26-Mar-2014 Michael Wright <michaelwr@google.com> am df33e8b5: Add BitSet64. DO NOT MERGE

* commit 'df33e8b544c457e4b08e8fa0b8a3eaf5eaf8fc2e':
Add BitSet64. DO NOT MERGE
eea2bec3f42a4ff116cad84d8be47597c95a002a 26-Mar-2014 Colin Cross <ccross@android.com> am d3113afc: am 707f5b40: am 6940bc08: Merge "adb: Add USB vendor ID for Intermec Technologies Corp."

* commit 'd3113afc4775495ce1b89b031f0b26ac7d0e7cbc':
adb: Add USB vendor ID for Intermec Technologies Corp.
d3113afc4775495ce1b89b031f0b26ac7d0e7cbc 26-Mar-2014 Colin Cross <ccross@android.com> am 707f5b40: am 6940bc08: Merge "adb: Add USB vendor ID for Intermec Technologies Corp."

* commit '707f5b401ec354851c0e1b22c8ddb6aba45fba66':
adb: Add USB vendor ID for Intermec Technologies Corp.
707f5b401ec354851c0e1b22c8ddb6aba45fba66 26-Mar-2014 Colin Cross <ccross@android.com> am 6940bc08: Merge "adb: Add USB vendor ID for Intermec Technologies Corp."

* commit '6940bc08e2932ede027a846ee4c2084782be2f4b':
adb: Add USB vendor ID for Intermec Technologies Corp.
6940bc08e2932ede027a846ee4c2084782be2f4b 26-Mar-2014 Colin Cross <ccross@android.com> Merge "adb: Add USB vendor ID for Intermec Technologies Corp."
487136d3b9b4f8b30ffc518edb26ba36a58e530f 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> am e594b20d: am 1f25d816: am 7ce5c714: Merge "logcat: test arbitrary time to tail"

* commit 'e594b20d5f18055b3af424f35020b59ab64c1e87':
logcat: test arbitrary time to tail
fa5b77501658302a6ef3295906b01967aaaa8715 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> am f909d9a5: am bdb7445d: am 62f624b6: Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"

* commit 'f909d9a5374c1c3b22fb4aa48d5d073a145759f8':
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
e594b20d5f18055b3af424f35020b59ab64c1e87 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 1f25d816: am 7ce5c714: Merge "logcat: test arbitrary time to tail"

* commit '1f25d81686410a2119aae51fa554b8d4f8758f97':
logcat: test arbitrary time to tail
f909d9a5374c1c3b22fb4aa48d5d073a145759f8 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> am bdb7445d: am 62f624b6: Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"

* commit 'bdb7445d5c435383179d23ef3afaae70076b5345':
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
1f25d81686410a2119aae51fa554b8d4f8758f97 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 7ce5c714: Merge "logcat: test arbitrary time to tail"

* commit '7ce5c714f11b97ac1cbeb47014546462e68e3465':
logcat: test arbitrary time to tail
bdb7445d5c435383179d23ef3afaae70076b5345 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 62f624b6: Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"

* commit '62f624b697fd97a5c7ad82963def157819ca3498':
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
7ce5c714f11b97ac1cbeb47014546462e68e3465 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: test arbitrary time to tail"
62f624b697fd97a5c7ad82963def157819ca3498 26-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"
ef7c411ac384665fba6209f6b26d83932f9de576 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> logcat: test arbitrary time to tail

- Add tail_time
- Use EXPECT instead of ASSERT to provide more coverage
- Use EXPECT_TRUE/ASSERT_TRUE when comparing NULL
- Itemize order complaints in sorted_order test

Change-Id: I55a7543fa3300c0a9524fac70111e680c2877eea
ogcat/tests/logcat_test.cpp
8196be3032674c10571451ef355f6782d41c2329 19-Mar-2014 Mark Salyzyn <salyzyn@google.com> liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance

- Add max_payload test
- Add dual_reader test
- Switch to EXPECT from ASSERT to increase test coverage

Bug: 13514601
Change-Id: I0e1c273e0ec430c0461e424731dbf166f2a3ce1b
iblog/tests/liblog_test.cpp
8245af1ffd1509d9b7cc391f8ed61b6d19105646 25-Mar-2014 Mark Salyzyn <salyzyn@google.com> liblog: deal with restart of logd

- API change, return -errno on failure for log writing
- ENOTCONN results in a reconnection and a retry of the write

Change-Id: Ib0a90b730edeaa7e3a3c9797e4e1b0c81b6adb0a
iblog/logd_write.c
iblog/logd_write_kern.c
2b6612ff96eaf4ad5debda7af5d2a9bdb04c417d 26-Mar-2014 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for Intermec Technologies Corp.

Change-Id: I6429bca087523829a13f905ae9dfa5f43b7abf8b
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
db/usb_vendors.c
55c640704152694dca1f19bf2a0b86fa2efa99d1 20-Dec-2013 Paul McLean <pmclean@google.com> Adding a handy predicate function (str_parms_has_key()

Change-Id: I1af5c260a1a820b65f0850ea9adb38b01fcb183c
nclude/cutils/str_parms.h
ibcutils/str_parms.c
c35553c6ddde38315c73d9e2f316c879a2825773 25-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
df33e8b544c457e4b08e8fa0b8a3eaf5eaf8fc2e 19-Mar-2014 Michael Wright <michaelwr@google.com> Add BitSet64. DO NOT MERGE

Change-Id: Idf3e21dfaa9f90f4dcb1b4d41eed3891dda99561
nclude/utils/BitSet.h
ibutils/tests/BitSet_test.cpp
65ea3cc9077befd29e6a677d833a271ecfeafe62 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am a2b2acd4: am f48c687f: am 3e1f5ba6: am c66607a8: Merge "logd: compile warning message"

* commit 'a2b2acd4b967640f9610209ae24435ab29f99213':
logd: compile warning message
9a7627d3dcb89f95f363ecf597ab5c6c094824dc 24-Mar-2014 Colin Cross <ccross@android.com> am 739354f6: (-s ours) am 6c34c5da: am 55dd7d75: (-s ours) am c388b9f2: (-s ours) Merge "DO NOT MERGE: Revert "delete libnl_2""

* commit '739354f666ef5fa982d6f0e0100fec8149f2e351':
DO NOT MERGE: Revert "delete libnl_2"
fb231453d27fe16761d6f1ebb20485ddec4facc0 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 433aabc7: am ca3292bf: am bd0962c2: Merge "logcat: timed tests fail under load"

* commit '433aabc707aa6761e9c5bdaa9d640cad04fe3b74':
logcat: timed tests fail under load
4ab9c1ae343a01b35a3a301c1c4afea1bd996056 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 14e0dc7d: am 8aa8d1ef: am e148b7eb: Merge "logcat: white and blacklist failure"

* commit '14e0dc7d5bf31497a1c708327e36f550a1898156':
logcat: white and blacklist failure
5c789b8a31a1924a346b1485410b692b82781406 24-Mar-2014 Paul Lawrence <paullawrence@google.com> Merge "Auto-encrypt drive at startup"
a2b2acd4b967640f9610209ae24435ab29f99213 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am f48c687f: am 3e1f5ba6: am c66607a8: Merge "logd: compile warning message"

* commit 'f48c687f6ce0463af6d489c1c117ee1278ee3a86':
logd: compile warning message
4102af05a86aae36d2560fd8b3f740a52399342c 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 3e1f5ba6: am c66607a8: Merge "logd: compile warning message"

* commit '3e1f5ba67e0f2403da9278a6226e9f8979f975b7':
logd: compile warning message
f48c687f6ce0463af6d489c1c117ee1278ee3a86 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 3e1f5ba6: am c66607a8: Merge "logd: compile warning message"

* commit '3e1f5ba67e0f2403da9278a6226e9f8979f975b7':
logd: compile warning message
166fa3de7060198252b43a4a9ddd841fb6d65cf7 03-Feb-2014 Paul Lawrence <paullawrence@google.com> Auto-encrypt drive at startup

Modify fs_mgr to unmount encryptable drives after test mounting them and
then trigger an auto-encrypt via the init script

Needs matching vold changes from
https://googleplex-android-review.googlesource.com/#/c/414200/

Feature is limited to list of serial numbers with this change

Bug: 11985952
Change-Id: I84f85a258b6a7e9809467c9149249302e203c41b
s_mgr/fs_mgr.c
nit/builtins.c
ootdir/init.rc
3e1f5ba67e0f2403da9278a6226e9f8979f975b7 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am c66607a8: Merge "logd: compile warning message"

* commit 'c66607a8aa50da898d85a6c94b0bf8b5f172893e':
logd: compile warning message
c66607a8aa50da898d85a6c94b0bf8b5f172893e 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: compile warning message"
739354f666ef5fa982d6f0e0100fec8149f2e351 24-Mar-2014 Colin Cross <ccross@android.com> am 6c34c5da: am 55dd7d75: (-s ours) am c388b9f2: (-s ours) Merge "DO NOT MERGE: Revert "delete libnl_2""

* commit '6c34c5da4921c21e645b657cf1d48b0a208621c4':
DO NOT MERGE: Revert "delete libnl_2"
a3d63492100d1b264ea6bafb1dd287fa3b10273f 24-Mar-2014 Colin Cross <ccross@android.com> am 55dd7d75: (-s ours) am c388b9f2: (-s ours) Merge "DO NOT MERGE: Revert "delete libnl_2""

* commit '55dd7d758d69a10a5edef6cc50c67520e53a2109':
DO NOT MERGE: Revert "delete libnl_2"
6c34c5da4921c21e645b657cf1d48b0a208621c4 24-Mar-2014 Colin Cross <ccross@android.com> am 55dd7d75: (-s ours) am c388b9f2: (-s ours) Merge "DO NOT MERGE: Revert "delete libnl_2""

* commit '55dd7d758d69a10a5edef6cc50c67520e53a2109':
DO NOT MERGE: Revert "delete libnl_2"
55dd7d758d69a10a5edef6cc50c67520e53a2109 24-Mar-2014 Colin Cross <ccross@android.com> am c388b9f2: (-s ours) Merge "DO NOT MERGE: Revert "delete libnl_2""

* commit 'c388b9f241bfd6495ba074ed1e59f93844d4bcd0':
DO NOT MERGE: Revert "delete libnl_2"
c388b9f241bfd6495ba074ed1e59f93844d4bcd0 24-Mar-2014 Colin Cross <ccross@android.com> Merge "DO NOT MERGE: Revert "delete libnl_2""
433aabc707aa6761e9c5bdaa9d640cad04fe3b74 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am ca3292bf: am bd0962c2: Merge "logcat: timed tests fail under load"

* commit 'ca3292bf71240c61b87b5077f55ad6a178e99ddc':
logcat: timed tests fail under load
551c13e6cb536903c81806ce110c92a2afc5e5a5 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am bd0962c2: Merge "logcat: timed tests fail under load"

* commit 'bd0962c2d390d87d336f21d1862dcb01b84d1a82':
logcat: timed tests fail under load
ca3292bf71240c61b87b5077f55ad6a178e99ddc 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am bd0962c2: Merge "logcat: timed tests fail under load"

* commit 'bd0962c2d390d87d336f21d1862dcb01b84d1a82':
logcat: timed tests fail under load
bd0962c2d390d87d336f21d1862dcb01b84d1a82 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: timed tests fail under load"
5fef7b6e31c22657dbd0294f0455d6adc6762ade 19-Mar-2014 Mark Salyzyn <salyzyn@google.com> logcat: timed tests fail under load

Change-Id: Ic1cdf0509617720eef7a3ad0b17a3b6f88c9d87e
ogcat/tests/logcat_test.cpp
14e0dc7d5bf31497a1c708327e36f550a1898156 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 8aa8d1ef: am e148b7eb: Merge "logcat: white and blacklist failure"

* commit '8aa8d1efc1eee663502e68e04a05f87ae1d3fd0f':
logcat: white and blacklist failure
5e207f16ec7317beb511f2c1c3a0c6590ee6067d 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am e148b7eb: Merge "logcat: white and blacklist failure"

* commit 'e148b7ebd0d4f0ba38eb0ed4ae0ed36d53e66562':
logcat: white and blacklist failure
8aa8d1efc1eee663502e68e04a05f87ae1d3fd0f 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am e148b7eb: Merge "logcat: white and blacklist failure"

* commit 'e148b7ebd0d4f0ba38eb0ed4ae0ed36d53e66562':
logcat: white and blacklist failure
e148b7ebd0d4f0ba38eb0ed4ae0ed36d53e66562 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: white and blacklist failure"
bd28bb69c7e52f44743745562f10573c1814ff3c 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am b5f9e65a: am 0a0cc719: init.rc: Add lmkd service back

* commit 'b5f9e65ad127261df2f7c9ed40d73b9024f492f6':
init.rc: Add lmkd service back
44983ace850dd47384fa7698c362b4cfc9ca7f4c 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 68b9d5f0: am bdef5499: resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp

* commit '68b9d5f07a443b44d81e09f65a45fea8c8f4984b':
logd: core requirement
978786e8b79f1178307b7211938db51414a19f63 24-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 8096a0dd: am abf08537: am ee212d00: Merge "logd: liblog: Thread IDs missing from logcat -v thread"

* commit '8096a0dd4c0f6d17e51726a69050c49a75cf098a':
logd: liblog: Thread IDs missing from logcat -v thread
c4cc584bbd031b94c37912d8c5e340b24ff31b57 20-Mar-2014 Wonsik Kim <wonsik@google.com> Clarify ownership for NativeHandle::mHandle

Change-Id: I0835278df1aa78f10d5493d7ef2c9e4a15c0fee9
nclude/utils/NativeHandle.h
ibutils/NativeHandle.cpp
366f96bd89bd377c6e625bd61224fb28768cda30 22-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
b5f9e65ad127261df2f7c9ed40d73b9024f492f6 22-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 0a0cc719: init.rc: Add lmkd service back

* commit '0a0cc7192e1081acff483ae4f455c3aad6370546':
init.rc: Add lmkd service back
0a0cc7192e1081acff483ae4f455c3aad6370546 22-Mar-2014 Mark Salyzyn <salyzyn@google.com> init.rc: Add lmkd service back

- not impressed with conflict for merge f8f0531b

Change-Id: I5b9a1a93ea0cf7eda4ced8dcfc9d0ad70f7aa6c8
ootdir/init.rc
68b9d5f07a443b44d81e09f65a45fea8c8f4984b 22-Mar-2014 Mark Salyzyn <salyzyn@google.com> am bdef5499: resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp

* commit 'bdef5499d4eb0c4f5e6853471373acd610798c7c':
logd: core requirement
a63a9ec8085f43a9eb49ada8d50cac1431944b18 22-Mar-2014 Colin Cross <ccross@android.com> DO NOT MERGE: Revert "delete libnl_2"

This reverts commit 7097f052d946bc9fbe298c7a88e1d943f54f684e.

libnl_2 needs to stay in AOSP for now for compatibility with
GPL test builds.
ibnl_2/.gitignore
ibnl_2/Android.mk
ibnl_2/README
ibnl_2/attr.c
ibnl_2/cache.c
ibnl_2/dbg.c
ibnl_2/genl/family.c
ibnl_2/genl/genl.c
ibnl_2/handlers.c
ibnl_2/msg.c
ibnl_2/netlink.c
ibnl_2/object.c
ibnl_2/socket.c
bdef5499d4eb0c4f5e6853471373acd610798c7c 22-Mar-2014 Mark Salyzyn <salyzyn@google.com> resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp

Change-Id: I87228aa0dbd0b909437c85812f2404ca8be39f38
9a305cd168abea5d0eaad0f1b1e65466b9a823c9 22-Mar-2014 Mark Salyzyn <salyzyn@google.com> am f8f0531b: Merge "logd: core requirement"

* commit 'f8f0531bb69a90e87f1bafa875e665e3935610b1':
logd: core requirement
f8f0531bb69a90e87f1bafa875e665e3935610b1 22-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: core requirement"
3c253dc88f3e1decb055340c84fd6234b422c409 22-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: core requirement

- has no dependency on /data, switch from main to core

Change-Id: I4bfe3e67d4cbd31e943c609f5626e533857a27a9
ootdir/init.rc
dbb708a0a14733736e0f5f2274fd6b00d753985d 21-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: compile warning message

Change-Id: I7ddd010031299395cad96f1743d7a7e6a6866b4c
ogd/LogListener.cpp
22e287df0dfbc6e10c02f570d2fc0c42a2a6b7aa 21-Mar-2014 Mark Salyzyn <salyzyn@google.com> logcat: white and blacklist failure

- logcat improperly squashes out count
- logcat test enhanced to catch failure
- logd places entries in ascending sorted order

Change-Id: If39d8e2c40852b520c98e7840034ab63c2538e5d
ogcat/logcat.cpp
ogcat/tests/logcat_test.cpp
ogd/LogListener.cpp
ogd/LogWhiteBlackList.cpp
8096a0dd4c0f6d17e51726a69050c49a75cf098a 21-Mar-2014 Mark Salyzyn <salyzyn@google.com> am abf08537: am ee212d00: Merge "logd: liblog: Thread IDs missing from logcat -v thread"

* commit 'abf0853702e8604eb2063c56ada27232d7a3e67d':
logd: liblog: Thread IDs missing from logcat -v thread
abf0853702e8604eb2063c56ada27232d7a3e67d 21-Mar-2014 Mark Salyzyn <salyzyn@google.com> am ee212d00: Merge "logd: liblog: Thread IDs missing from logcat -v thread"

* commit 'ee212d0053c6c8801dbd382d24c776040c4f8f0e':
logd: liblog: Thread IDs missing from logcat -v thread
f529d49df31bbca65203be92c4fba0e9c03314ce 21-Mar-2014 Mark Salyzyn <salyzyn@google.com> am ee212d00: Merge "logd: liblog: Thread IDs missing from logcat -v thread"

* commit 'ee212d0053c6c8801dbd382d24c776040c4f8f0e':
logd: liblog: Thread IDs missing from logcat -v thread
ee212d0053c6c8801dbd382d24c776040c4f8f0e 21-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: liblog: Thread IDs missing from logcat -v thread"
b992d0d7d34bed62fd16151a68d60d58cc8003ef 21-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: Thread IDs missing from logcat -v thread

- stuff caller's thread id into the packet.

Bug: 13568206
Change-Id: I02d0cdf9b1d9e839ff8969f591db42dfe6e4cc95
iblog/logd_write.c
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogBufferElement.cpp
ogd/LogBufferElement.h
ogd/LogListener.cpp
347c8de285454af2d3cba3d9b43d3bf23b20babb 19-Mar-2014 Paul Lawrence <paullawrence@google.com> healthd: Add battery capacity to getProperty

Add support for BATTERY_PROP_CAPACITY property in getProperty

Bug: 11985952
Change-Id: I905cda68f990fa96138a16a11c55f2d902d0bbc1
ealthd/BatteryMonitor.cpp
2eb5d85b023253af8f56eab6a79ad34e6a2b0878 21-Mar-2014 Colin Cross <ccross@android.com> resolved conflicts for merge of 9cb33f6a to master

Change-Id: I26a2c7371706917d261eae8eca5658cdc61000d7
f25d6bf237e5a5caf027ea7cd3ede3a7967c9ad2 21-Mar-2014 JP Abgrall <jpa@google.com> am ce18445c: am ff66a068: am 4db6ce8e: Merge "Adding documentation on the sync part of the adb protocol previously missing."

* commit 'ce18445cb727c446f1d53d69cae4e0454a5d27c1':
Adding documentation on the sync part of the adb protocol previously missing.
2583dec08c3cf23896d873bfb56f781e2d536a9b 20-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 3f4855c1: am 46f3ebba: am 28171447: Merge "cutils: trace 64-bit compile issues"

* commit '3f4855c11889470691673c15f05361df61ea95b2':
cutils: trace 64-bit compile issues
9cb33f6acd604eeec3c6352a9aba812929b305d0 20-Mar-2014 Colin Cross <ccross@android.com> am dd4720d6: am 5ad986ab: Merge "delete libnl_2"

* commit 'dd4720d65800764efdd138f8572bf2917880d9fc':
delete libnl_2
ce18445cb727c446f1d53d69cae4e0454a5d27c1 20-Mar-2014 JP Abgrall <jpa@google.com> am ff66a068: am 4db6ce8e: Merge "Adding documentation on the sync part of the adb protocol previously missing."

* commit 'ff66a06851828e3e5afaf14dc29526e09ca534e4':
Adding documentation on the sync part of the adb protocol previously missing.
dd4720d65800764efdd138f8572bf2917880d9fc 20-Mar-2014 Colin Cross <ccross@android.com> am 5ad986ab: Merge "delete libnl_2"

* commit '5ad986ab5690291422f86c03c3fe71a1c50faf40':
delete libnl_2
2d6d8161613e7d9f2ef2827b6ecd179f18ffba98 20-Mar-2014 Colin Cross <ccross@android.com> am 5ad986ab: Merge "delete libnl_2"

* commit '5ad986ab5690291422f86c03c3fe71a1c50faf40':
delete libnl_2
5a5ab405cd796eeb08ae94b201eb297d68f09bd8 20-Mar-2014 JP Abgrall <jpa@google.com> am 4db6ce8e: Merge "Adding documentation on the sync part of the adb protocol previously missing."

* commit '4db6ce8e353458de751394102084bb3a304a7ff6':
Adding documentation on the sync part of the adb protocol previously missing.
ff66a06851828e3e5afaf14dc29526e09ca534e4 20-Mar-2014 JP Abgrall <jpa@google.com> am 4db6ce8e: Merge "Adding documentation on the sync part of the adb protocol previously missing."

* commit '4db6ce8e353458de751394102084bb3a304a7ff6':
Adding documentation on the sync part of the adb protocol previously missing.
5ad986ab5690291422f86c03c3fe71a1c50faf40 20-Mar-2014 Colin Cross <ccross@android.com> Merge "delete libnl_2"
4db6ce8e353458de751394102084bb3a304a7ff6 20-Mar-2014 JP Abgrall <jpa@google.com> Merge "Adding documentation on the sync part of the adb protocol previously missing."
8d0d00aad0e4e58ea991ba2c7f2abad42cb5e921 20-Mar-2014 Alex Ray <aray@google.com> am c7cd0007: am 64aef64b: am 60357975: Merge "fastbootd: build static binary instead of dynamic"

* commit 'c7cd0007125a41dea218531c1b5ad377c00b65ab':
fastbootd: build static binary instead of dynamic
3f4855c11889470691673c15f05361df61ea95b2 20-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 46f3ebba: am 28171447: Merge "cutils: trace 64-bit compile issues"

* commit '46f3ebba31d5820a08d0a638c9e261fbcea907a0':
cutils: trace 64-bit compile issues
75a863e327ebdfaf5b79956471ecbf9a1f73e03b 20-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 28171447: Merge "cutils: trace 64-bit compile issues"

* commit '28171447f8b02f85878d3f67920cf941a133c642':
cutils: trace 64-bit compile issues
46f3ebba31d5820a08d0a638c9e261fbcea907a0 20-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 28171447: Merge "cutils: trace 64-bit compile issues"

* commit '28171447f8b02f85878d3f67920cf941a133c642':
cutils: trace 64-bit compile issues
28171447f8b02f85878d3f67920cf941a133c642 20-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "cutils: trace 64-bit compile issues"
7097f052d946bc9fbe298c7a88e1d943f54f684e 20-Mar-2014 Colin Cross <ccross@android.com> delete libnl_2

libnl_2 has been replaced by external/libnl

Change-Id: I1fa964f4fdc24511f497ebadcb4aa3e786fc8456
ibnl_2/.gitignore
ibnl_2/Android.mk
ibnl_2/README
ibnl_2/attr.c
ibnl_2/cache.c
ibnl_2/dbg.c
ibnl_2/genl/family.c
ibnl_2/genl/genl.c
ibnl_2/handlers.c
ibnl_2/msg.c
ibnl_2/netlink.c
ibnl_2/object.c
ibnl_2/socket.c
a459d0b0e28d2e7026d9bb9f6e123de3768dfb51 20-Mar-2014 Mark Salyzyn <salyzyn@google.com> cutils: trace 64-bit compile issues

- switch format to PRId64 for int64_t
- switch format to PRId32 for int32_t

Change-Id: I1e66db06810000936d584ed49234550abd96cdff
nclude/cutils/trace.h
912d5dddf81da3c5485d17480fb6b773334bf7eb 20-Mar-2014 Samuel Carlsson <samuel.carlsson@gmail.com> Adding documentation on the sync part of the adb protocol previously missing.

In the SERVICES.TXT a missing documentation file is mentioned - SYNC.TXT. This file is supposed to contain all the godie bits of the adb protocol for pushing and pulling files. I've read the source code and documented this in the file SYNC.TXT. I've used my own documentation to create a java implementation to verify the documentation here: https://github.com/vidstige/jadb

Added line breaks at 78 characters. Added comments about remote files might be deleted.

Change-Id: I48c87c2a9fb5b59b85c72679124dfbbfa9a701bc
Signed-off-by: Samuel Carlsson <samuel.carlsson@gmail.com>
db/SYNC.TXT
c7cd0007125a41dea218531c1b5ad377c00b65ab 20-Mar-2014 Alex Ray <aray@google.com> am 64aef64b: am 60357975: Merge "fastbootd: build static binary instead of dynamic"

* commit '64aef64b221223ceaff11572eb7a6b8a95f9cd8a':
fastbootd: build static binary instead of dynamic
64aef64b221223ceaff11572eb7a6b8a95f9cd8a 20-Mar-2014 Alex Ray <aray@google.com> am 60357975: Merge "fastbootd: build static binary instead of dynamic"

* commit '603579758661aea4e48853e6caf0b60b2f9d47e4':
fastbootd: build static binary instead of dynamic
1d3709384ed7187fb48ea01f556905f6ee351345 20-Mar-2014 Alex Ray <aray@google.com> am 60357975: Merge "fastbootd: build static binary instead of dynamic"

* commit '603579758661aea4e48853e6caf0b60b2f9d47e4':
fastbootd: build static binary instead of dynamic
603579758661aea4e48853e6caf0b60b2f9d47e4 20-Mar-2014 Alex Ray <aray@google.com> Merge "fastbootd: build static binary instead of dynamic"
7d9c628fcdf052559bec98f65d43c445e6d03d8c 20-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
a2910877a6781f57a7ef3eea7343fa46bc3e1bd0 20-Mar-2014 Michael Wright <michaelwr@google.com> Merge "Add static methods to BitSet."
17ab45450104c18155ae43440a9dda6f89840847 19-Mar-2014 Alex Ray <aray@google.com> fastbootd: build static binary instead of dynamic

This removes the requirement to hunt down dynamic libs for building an image,
and switches the normal vendor_trigger HAL to a static HAL.

Change-Id: Ifb603f1ee91fbbbff04ddbe66a1bf38a3c22be9e
astbootd/Android.mk
astbootd/include/vendor_trigger.h
astbootd/other/vendor_trigger.c
astbootd/trigger.c
astbootd/trigger.h
astbootd/vendor_trigger.h
astbootd/vendor_trigger_default.c
597998e60471bccb870c0f61d43c5220b5cfeccf 19-Mar-2014 Alex Ray <aray@google.com> am 18ad82e0: am 9e3b7723: am 3fcd9ed6: Merge "ueventd: fix klog debug typo"

* commit '18ad82e03a3b7ae54a246085c10b7b0815ea4e32':
ueventd: fix klog debug typo
18ad82e03a3b7ae54a246085c10b7b0815ea4e32 19-Mar-2014 Alex Ray <aray@google.com> am 9e3b7723: am 3fcd9ed6: Merge "ueventd: fix klog debug typo"

* commit '9e3b7723d43ac01f34c8b3e49e9ed8f3c84207e7':
ueventd: fix klog debug typo
31240efb974a45f3489bc400cd8341cd66fc9b50 19-Mar-2014 Alex Ray <aray@google.com> am 3fcd9ed6: Merge "ueventd: fix klog debug typo"

* commit '3fcd9ed6e3c8f68c59d290f70c09dfb91e167328':
ueventd: fix klog debug typo
9e3b7723d43ac01f34c8b3e49e9ed8f3c84207e7 19-Mar-2014 Alex Ray <aray@google.com> am 3fcd9ed6: Merge "ueventd: fix klog debug typo"

* commit '3fcd9ed6e3c8f68c59d290f70c09dfb91e167328':
ueventd: fix klog debug typo
3fcd9ed6e3c8f68c59d290f70c09dfb91e167328 19-Mar-2014 Alex Ray <aray@google.com> Merge "ueventd: fix klog debug typo"
eb6ffc765b4a2919bbabd3132bf2bd68a4966415 19-Mar-2014 Alex Ray <aray@google.com> ueventd: fix klog debug typo

Change-Id: Ib0acece15145cc0e868452ede8f3acbab419b965
nit/ueventd.c
72ea19436bbe6f1dd87889a48c7e4f2342085afe 19-Mar-2014 Colin Cross <ccross@android.com> am 299b2eec: am 12e3639a: am c383c6d1: Merge "Add "import" support to system property files."

* commit '299b2eecc58d8b3a50cb52e61a61b28aa7f1c038':
Add "import" support to system property files.
299b2eecc58d8b3a50cb52e61a61b28aa7f1c038 19-Mar-2014 Colin Cross <ccross@android.com> am 12e3639a: am c383c6d1: Merge "Add "import" support to system property files."

* commit '12e3639a6e1cdd77af0964e10081311430fd065c':
Add "import" support to system property files.
73f85af5502509f2db6aec707e47e3317b448094 19-Mar-2014 Colin Cross <ccross@android.com> am c383c6d1: Merge "Add "import" support to system property files."

* commit 'c383c6d1d8b0541d18924c3ef63df9061ee5bd8f':
Add "import" support to system property files.
12e3639a6e1cdd77af0964e10081311430fd065c 19-Mar-2014 Colin Cross <ccross@android.com> am c383c6d1: Merge "Add "import" support to system property files."

* commit 'c383c6d1d8b0541d18924c3ef63df9061ee5bd8f':
Add "import" support to system property files.
c383c6d1d8b0541d18924c3ef63df9061ee5bd8f 19-Mar-2014 Colin Cross <ccross@android.com> Merge "Add "import" support to system property files."
06f8c09542ba6c84d5102866435c06623430d59a 06-Mar-2014 Jeff Sharkey <jsharkey@android.com> Add "import" support to system property files.

During boot, allow a property file to import properties from another
file. Supports importing the entire file, a specific key, or any
keys matching a specific prefix. Here's some example syntax:

import /oem/oem.prop
import /oem/oem.prop foo.*
import /oem/oem.prop foo.bar

Bug: 13340779
Change-Id: I867f9a10ca09684326675d9f051f5cf2ae171617
nit/property_service.c
36fb5fed1f4f2fea5dd2a8cd62f036f54e270f8a 19-Mar-2014 Jeff Sharkey <jsharkey@android.com> Merge "Add "import" support to system property files."
f96b044551d7db8aaef9314e9a217f709749817f 06-Mar-2014 Jeff Sharkey <jsharkey@android.com> Add "import" support to system property files.

During boot, allow a property file to import properties from another
file. Supports importing the entire file, a specific key, or any
keys matching a specific prefix. Here's some example syntax:

import /oem/oem.prop
import /oem/oem.prop foo.*
import /oem/oem.prop foo.bar

Bug: 13340779
Change-Id: I867f9a10ca09684326675d9f051f5cf2ae171617
nit/property_service.c
8c40dc90c50b202be57be30f297a5ff3c7dc710f 19-Mar-2014 Geremy Condra <gcondra@google.com> Merge changes Ibea4c13a,I27215a3d

* changes:
init: Add "partition.*.verified" properties to the property service.
fs_mgr: Set the 'partition.*.verified' property for verified partitions.
2ec064597ce1cfa5f8bf5f480c90644d57d8d2c5 19-Mar-2014 Michael Wright <michaelwr@google.com> Add static methods to BitSet.

Also, moar testing.

Change-Id: I512b337a1a85a0794445fc6249af7ca39ba7c381
nclude/utils/BitSet.h
ibutils/tests/BitSet_test.cpp
5b00375f54eb7de072b0a206c6015d449141892e 19-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
0621d702a12c5f6d3f89452d3ffc01d8bd8d1e69 19-Mar-2014 Geremy Condra <gcondra@google.com> init: Add "partition.*.verified" properties to the property service.

These are intended to be used by the rest of the system as weak
indicators that the corresponding partition is verified. For
instance, if the "partition.system.verified" property is set then
using `adb remount` would be unwise.

These should not be used as the basis for security decisions.

Change-Id: Ibea4c13abd54f46537e2a406774412c25918b24d
nit/property_service.c
05699b3e3e05b976a3de50a634b18a6f5109cf95 17-Mar-2014 Geremy Condra <gcondra@google.com> fs_mgr: Set the 'partition.*.verified' property for verified partitions.

This modifies fs_mgr to set the partition.*.verified properties.
Each of these should be used as a weak indicator that a given partition
is verified. For instance, if the 'partition.system.verified' property
is set to '1', this could indicate that the system partition is verified
and therefore should not be modified by, e.g., adb sync.

Note that these properties can be mutated by the system, and so
should not be used as the basis for security decisions.

Change-Id: I27215a3d3628a1b1e184df9eaad90541b9d8b841
s_mgr/fs_mgr_verity.c
4b33d3bbe0bed6505b412bd6375116004ddea119 19-Mar-2014 Michael Wright <michaelwr@google.com> Merge "Add traits to BitSet64, not 32."
74e2538b48658d0912fc8566c381fbb8be095c8a 19-Mar-2014 Michael Wright <michaelwr@google.com> Add traits to BitSet64, not 32.

Change-Id: I3d41bbe47f5b02c610f69fc7824e416436d086b1
nclude/utils/BitSet.h
52a186b798e68605e1db316ac71aeeb552866336 19-Mar-2014 Michael Wright <michaelwr@google.com> Merge "Add BitSet64"
bab6ea0bb70dd6d093a0765befc7d6893e2312bf 19-Mar-2014 Michael Wright <michaelwr@google.com> Add BitSet64

Change-Id: Ia0039aae00316f42a8306a9fb8ad37269180b58c
nclude/utils/BitSet.h
ibutils/tests/BitSet_test.cpp
8e1943b4fcf0cdcf7488ea2d191737d0447b966c 19-Mar-2014 Mark Salyzyn <salyzyn@google.com> am cf4ddc77: am eb8f6b8a: am 208dae2e: Merge "logd: Logging is truncated"

* commit 'cf4ddc77117c9ca30180c6f76e29945df4708399':
logd: Logging is truncated
cf4ddc77117c9ca30180c6f76e29945df4708399 19-Mar-2014 Mark Salyzyn <salyzyn@google.com> am eb8f6b8a: am 208dae2e: Merge "logd: Logging is truncated"

* commit 'eb8f6b8aa595a6c8f7098c9f706aeb16cff8e716':
logd: Logging is truncated
eb8f6b8aa595a6c8f7098c9f706aeb16cff8e716 19-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 208dae2e: Merge "logd: Logging is truncated"

* commit '208dae2ee875e6f63ffbe7f32d84b825b93890a6':
logd: Logging is truncated
eeb61b03b9a3d2113ed470cebe5633895e0ac777 19-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 208dae2e: Merge "logd: Logging is truncated"

* commit '208dae2ee875e6f63ffbe7f32d84b825b93890a6':
logd: Logging is truncated
208dae2ee875e6f63ffbe7f32d84b825b93890a6 19-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Logging is truncated"
b059cf53c9185702e99345b7319bcb075ffc5bee 18-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: Logging is truncated

- stack buffer undersized

Bug: 13514601
Change-Id: I3e5dda2daa7531ddcacece33dfdecaa28dcca765
ogd/LogListener.cpp
aae5d5cb306f058265ffec82c648e7fa4086d421 18-Mar-2014 Mark Salyzyn <salyzyn@google.com> am f8c9ccf3: am 6c0cd1dd: am 6c92369c: Merge "logcat: improve error messages"

* commit 'f8c9ccf3bd73937be740a8ce63e7ee9a62b7c6ec':
logcat: improve error messages
f8c9ccf3bd73937be740a8ce63e7ee9a62b7c6ec 18-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 6c0cd1dd: am 6c92369c: Merge "logcat: improve error messages"

* commit '6c0cd1dd4a0a9093540a694a6725ce5e8fbea0e8':
logcat: improve error messages
21ffc448242e9936d21e0247dd61c7ca2a1e9159 18-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 6c92369c: Merge "logcat: improve error messages"

* commit '6c92369cbea460fded7e85f9751c6938000f504a':
logcat: improve error messages
6c0cd1dd4a0a9093540a694a6725ce5e8fbea0e8 18-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 6c92369c: Merge "logcat: improve error messages"

* commit '6c92369cbea460fded7e85f9751c6938000f504a':
logcat: improve error messages
6c92369cbea460fded7e85f9751c6938000f504a 18-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: improve error messages"
fff04e3014f3ba516544be4ed345ddcf8ddac7fb 17-Mar-2014 Mark Salyzyn <salyzyn@google.com> logcat: improve error messages

Bug: 13464830
Change-Id: Ia8783fa2422e444bcdfca8d0153cf6e7634612bb
ogcat/logcat.cpp
9eb1820a0e5596aa7e33d4c39ba37e2418919e50 18-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
c5089cfc614bb3785c7cb55ccdee99c6da5e743f 18-Mar-2014 Doug Zongker <dougz@google.com> am 80fef2c0: am 4633073d: am 2beed941: Merge "update minui library call"

* commit '80fef2c037b41755f3aa49bf1ff3185cb63afe4c':
update minui library call
80fef2c037b41755f3aa49bf1ff3185cb63afe4c 18-Mar-2014 Doug Zongker <dougz@google.com> am 4633073d: am 2beed941: Merge "update minui library call"

* commit '4633073d7c07df972e5a9618548b96129ccd5041':
update minui library call
da5c264c618a030951297699ab005397c9f7c023 18-Mar-2014 Doug Zongker <dougz@google.com> am 2beed941: Merge "update minui library call"

* commit '2beed9419443021d340690a0f36eea9baca44fec':
update minui library call
4633073d7c07df972e5a9618548b96129ccd5041 18-Mar-2014 Doug Zongker <dougz@google.com> am 2beed941: Merge "update minui library call"

* commit '2beed9419443021d340690a0f36eea9baca44fec':
update minui library call
2f10b6bc23e092df9eace913794a5b5fa1bd3ca2 18-Mar-2014 Doug Zongker <dougz@google.com> am 706d57b2: am 769c6452: update minui library call

* commit '706d57b2948cc2eec22dc16394cf5582586b4237':
update minui library call
706d57b2948cc2eec22dc16394cf5582586b4237 18-Mar-2014 Doug Zongker <dougz@google.com> am 769c6452: update minui library call

* commit '769c645286436cd909371452cb7bcc2c9f77cd2a':
update minui library call
769c645286436cd909371452cb7bcc2c9f77cd2a 17-Mar-2014 Doug Zongker <dougz@google.com> update minui library call

The names of the res_create_* functions have changed.

Change-Id: I9990bb4f6e6dc2d7c62e2cb9e0831532c83b2bb9
harger/charger.c
5f24f5de721a01596ddaf6611104b01fe237d5dc 18-Mar-2014 Greg Hackmann <ghackmann@google.com> am 027987e6: am b7d18a0d: am 998e0227: Merge "liblog: improve errno handling on read failure"

* commit '027987e64b82b76f9ca8c8679690d35938aa3537':
liblog: improve errno handling on read failure
2beed9419443021d340690a0f36eea9baca44fec 17-Mar-2014 Doug Zongker <dougz@google.com> Merge "update minui library call"
027987e64b82b76f9ca8c8679690d35938aa3537 17-Mar-2014 Greg Hackmann <ghackmann@google.com> am b7d18a0d: am 998e0227: Merge "liblog: improve errno handling on read failure"

* commit 'b7d18a0db1b6a8b3ea602c02dee7df0f5b3c85cc':
liblog: improve errno handling on read failure
b7d18a0db1b6a8b3ea602c02dee7df0f5b3c85cc 17-Mar-2014 Greg Hackmann <ghackmann@google.com> am 998e0227: Merge "liblog: improve errno handling on read failure"

* commit '998e022748876bc36905ba39e4825a4b634dc9d7':
liblog: improve errno handling on read failure
452f391b24938088e5896a3d72a24507439feea8 17-Mar-2014 Greg Hackmann <ghackmann@google.com> am 998e0227: Merge "liblog: improve errno handling on read failure"

* commit '998e022748876bc36905ba39e4825a4b634dc9d7':
liblog: improve errno handling on read failure
998e022748876bc36905ba39e4825a4b634dc9d7 17-Mar-2014 Greg Hackmann <ghackmann@google.com> Merge "liblog: improve errno handling on read failure"
8084a53897b424ee751599c36c587f8463759516 17-Mar-2014 Greg Hackmann <ghackmann@google.com> liblog: improve errno handling on read failure

1. socket() failures should skip close(), since sock is not an open fd
2. on other I/O related failures, preserve errno around the close() call
3. set errno to a meaningful value on check_log_success() failure

Change-Id: I0fb9e726ae5fee2f7b84344aa925e5159d57c360
Signed-off-by: Greg Hackmann <ghackmann@google.com>
iblog/log_read.c
0709917e25eac1e460085f38af315be15221c671 17-Mar-2014 Doug Zongker <dougz@google.com> update minui library call

The names of the res_create_* functions have changed.

Change-Id: I9990bb4f6e6dc2d7c62e2cb9e0831532c83b2bb9
harger/charger.c
914eec761f53f2b0c7855cd8ffc8a79016b52622 17-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 8299ff70: Merge "init: 64-bit build issue" into klp-volantis-dev

* commit '8299ff701b66caf513e6cc8807b413bf44b8c2f6':
init: 64-bit build issue
8299ff701b66caf513e6cc8807b413bf44b8c2f6 17-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "init: 64-bit build issue" into klp-volantis-dev
0aff05eb8c23eefb770eb1ecd93e1d39dbab52f5 17-Mar-2014 Mark Salyzyn <salyzyn@google.com> init: 64-bit build issue

Change-Id: Icc5344abc184adf4247175d85b2da08af4636e49
nit/property_service.c
c8e20472a77b41546157caa71b6bd6478ca1985d 15-Mar-2014 Brian Carlstrom <bdc@google.com> am a4961e66: am d84869fb: am a0915abd: Merge "Fix build some more"

* commit 'a4961e66b539d69b7656d93db05371b20efc8f3b':
Fix build some more
a4961e66b539d69b7656d93db05371b20efc8f3b 15-Mar-2014 Brian Carlstrom <bdc@google.com> am d84869fb: am a0915abd: Merge "Fix build some more"

* commit 'd84869fbb8589430981ba19d2d1cbc9ef58b8df3':
Fix build some more
cfe686659038d1658637c2672dad48644075eb78 15-Mar-2014 Brian Carlstrom <bdc@google.com> am a0915abd: Merge "Fix build some more"

* commit 'a0915abd2fb57113bc46e8d8fe5013ca4a9ef6e8':
Fix build some more
d84869fbb8589430981ba19d2d1cbc9ef58b8df3 15-Mar-2014 Brian Carlstrom <bdc@google.com> am a0915abd: Merge "Fix build some more"

* commit 'a0915abd2fb57113bc46e8d8fe5013ca4a9ef6e8':
Fix build some more
a0915abd2fb57113bc46e8d8fe5013ca4a9ef6e8 15-Mar-2014 Brian Carlstrom <bdc@google.com> Merge "Fix build some more"
5a6b8d15ea7fa8e4facf256f5cdedf2be900ec72 14-Mar-2014 Christopher Tate <ctate@google.com> Fix build some more

Missed one.

(cherry picked from commit f7f080ce62a4a448ef7ac6cc9bddfd55e615710a)

Change-Id: I33bf8bcc651330b9bc434da02c47c29bc0d54369
iblog/Android.mk
287b32b7f0981279b1177b2744a62d48e2f5624a 15-Mar-2014 Brian Carlstrom <bdc@google.com> am ccd830ad: am 1ba8eb6b: am 8e012107: Merge "Fix the build"

* commit 'ccd830adad7c1723331b6f3d2122b910088dd377':
Fix the build
ccd830adad7c1723331b6f3d2122b910088dd377 15-Mar-2014 Brian Carlstrom <bdc@google.com> am 1ba8eb6b: am 8e012107: Merge "Fix the build"

* commit '1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8':
Fix the build
1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8 15-Mar-2014 Brian Carlstrom <bdc@google.com> am 8e012107: Merge "Fix the build"

* commit '8e01210767493ceb8f264c1bef7a635f0aa32222':
Fix the build
4d48927de52b47f08a71c2969e10c5d51bccbd0c 15-Mar-2014 Brian Carlstrom <bdc@google.com> am 8e012107: Merge "Fix the build"

* commit '8e01210767493ceb8f264c1bef7a635f0aa32222':
Fix the build
8e01210767493ceb8f264c1bef7a635f0aa32222 15-Mar-2014 Brian Carlstrom <bdc@google.com> Merge "Fix the build"
dc507769b5ee3eeac8d2948ea98f6d53857e9d1a 14-Mar-2014 Christopher Tate <ctate@google.com> Fix the build

(cherry-picked from commit 296dc446376e19d2ce995ae7bc886560523eca2d)

Change-Id: I924f4796fbb70a0f45cc23a852e26e634c5b0e0e
iblog/Android.mk
018c2ff713eff05c89428fc9aa579e046ba1a6f0 15-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
a0934327c2c1db63a9ca175274dd602c3c61fafa 15-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 22377569: am 092e3d55: am 7ad09634: Merge "libziparchive: 64 bit compile issues"

* commit '22377569bbac6621a47a478856799588c5f5a3b6':
libziparchive: 64 bit compile issues
22377569bbac6621a47a478856799588c5f5a3b6 15-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 092e3d55: am 7ad09634: Merge "libziparchive: 64 bit compile issues"

* commit '092e3d5537996d1fb0af715cceb95fd28026025e':
libziparchive: 64 bit compile issues
139effbb765dcaf9c25a52542e66e665e16fd28d 15-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 7ad09634: Merge "libziparchive: 64 bit compile issues"

* commit '7ad096340fd5170267b12a6bd577e9d30353564f':
libziparchive: 64 bit compile issues
092e3d5537996d1fb0af715cceb95fd28026025e 15-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 7ad09634: Merge "libziparchive: 64 bit compile issues"

* commit '7ad096340fd5170267b12a6bd577e9d30353564f':
libziparchive: 64 bit compile issues
7ad096340fd5170267b12a6bd577e9d30353564f 15-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "libziparchive: 64 bit compile issues"
f7f080ce62a4a448ef7ac6cc9bddfd55e615710a 14-Mar-2014 Christopher Tate <ctate@google.com> Fix build some more

Missed one.

Change-Id: Ic014efd927beb2df63657951e6b0f15d94e927f8
iblog/Android.mk
99ef9914be1e39276e2e077670368927a1221921 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> libziparchive: 64 bit compile issues

- All within LOG messages.

Change-Id: I52e81b49e8127276359c62febd4cc1d8d69102d9
ibziparchive/zip_archive.cc
362bdf4041fe6f7b3c0051db9fd4ebaf578155f3 14-Mar-2014 Christopher Tate <ctate@google.com> Merge "Fix the build"
296dc446376e19d2ce995ae7bc886560523eca2d 14-Mar-2014 Christopher Tate <ctate@google.com> Fix the build

Change-Id: I924f4796fbb70a0f45cc23a852e26e634c5b0e0e
iblog/Android.mk
731e24e99f28a52bc73d1603d2934f5eeb443b5d 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am fd0f4d9a: am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"

* commit 'fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8':
toolbox: ls: 64 bit compile warnings
fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"

* commit '8b8974ef566599aebfc4d8614bc8d18ecffad652':
toolbox: ls: 64 bit compile warnings
ac3b2753b721ac7af0986e614362a9c0762408f2 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"

* commit '31fa96047404496e902217b2d701b9ab4ac3a6f7':
toolbox: ls: 64 bit compile warnings
8b8974ef566599aebfc4d8614bc8d18ecffad652 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"

* commit '31fa96047404496e902217b2d701b9ab4ac3a6f7':
toolbox: ls: 64 bit compile warnings
31fa96047404496e902217b2d701b9ab4ac3a6f7 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "toolbox: ls: 64 bit compile warnings"
4727c7711ea93dd670b3cd5882ce01ff6debf2a6 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> toolbox: ls: 64 bit compile warnings

Change-Id: Ia538c7177f8d5cf2c1f0efb5b575da6527c13968
oolbox/ls.c
c5036da72c1436000bbc764fecd7693ff1c293e6 14-Mar-2014 David 'Digit' Turner <digit@google.com> am 176bf95b: am 111c882b: am ee223d50: Merge "adb: Increase the max number of emulator instances to 64"

* commit '176bf95b4e37413d143fbdcf709605b8d6fb7990':
adb: Increase the max number of emulator instances to 64
176bf95b4e37413d143fbdcf709605b8d6fb7990 14-Mar-2014 David 'Digit' Turner <digit@google.com> am 111c882b: am ee223d50: Merge "adb: Increase the max number of emulator instances to 64"

* commit '111c882b3ca61a3a3c069d0ad69b64053f991e15':
adb: Increase the max number of emulator instances to 64
111c882b3ca61a3a3c069d0ad69b64053f991e15 14-Mar-2014 David 'Digit' Turner <digit@google.com> am ee223d50: Merge "adb: Increase the max number of emulator instances to 64"

* commit 'ee223d50a009af39be577c30cc35257c751f05a1':
adb: Increase the max number of emulator instances to 64
7cb1504e8a234fa8aaa110912c75fb221307ad17 14-Mar-2014 David 'Digit' Turner <digit@google.com> am ee223d50: Merge "adb: Increase the max number of emulator instances to 64"

* commit 'ee223d50a009af39be577c30cc35257c751f05a1':
adb: Increase the max number of emulator instances to 64
ee223d50a009af39be577c30cc35257c751f05a1 14-Mar-2014 David 'Digit' Turner <digit@google.com> Merge "adb: Increase the max number of emulator instances to 64"
8e45a18a7ec3311cf1eda606fe48f2fbe229e5ab 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 92c2beb5: am 85629953: am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"

* commit '92c2beb56306797c362286d866262f16569b258e':
liblog: Build Breakage in sdk(linux)
92c2beb56306797c362286d866262f16569b258e 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 85629953: am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"

* commit '85629953f54603d660f932bebf2c26a009aec380':
liblog: Build Breakage in sdk(linux)
3890c01f85284311ec337fcc2c347490b5abff1f 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"

* commit '3b8de6705bb5c77b6f459fd6dd394ef606228a05':
liblog: Build Breakage in sdk(linux)
85629953f54603d660f932bebf2c26a009aec380 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"

* commit '3b8de6705bb5c77b6f459fd6dd394ef606228a05':
liblog: Build Breakage in sdk(linux)
3b8de6705bb5c77b6f459fd6dd394ef606228a05 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: Build Breakage in sdk(linux)"
c0626fdcaf8e035421939a45c159c0c6a2f2f50a 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> liblog: Build Breakage in sdk(linux)

- Build Breakage in branch: aosp-idea133 @ 1072786

Change-Id: I36da253b69a66977ec568a5f96d38b970c25fe3e
iblog/Android.mk
6b9096b4541f6d3a5d69e800fd76ff4f89846160 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am e42e9db3: am 19bbf92d: am fc204a96: Merge changes Ia9509ad0,I4e815d74,I10e8d92c

* commit 'e42e9db3143f819e19684d4f882ef3834454a44d':
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
e42e9db3143f819e19684d4f882ef3834454a44d 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 19bbf92d: am fc204a96: Merge changes Ia9509ad0,I4e815d74,I10e8d92c

* commit '19bbf92de92ad9dbfb26b3a94025bf6e6cb72cee':
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
a0f97dc804d19d176a1856a9abce07e3ea2b627c 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am fc204a96: Merge changes Ia9509ad0,I4e815d74,I10e8d92c

* commit 'fc204a966f953867367f54bda126a2e7d7d98814':
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
19bbf92de92ad9dbfb26b3a94025bf6e6cb72cee 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am fc204a96: Merge changes Ia9509ad0,I4e815d74,I10e8d92c

* commit 'fc204a966f953867367f54bda126a2e7d7d98814':
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
850c4b7fa298b71bb4aecc0575bd99ec41273d31 14-Mar-2014 JP Abgrall <jpa@google.com> am 62488ba3: am d94ed2c8: am 7283db6d: am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60

* commit '62488ba3df2fdca2adb311254ad526e4707713e3':
init.rc: prep tcp_default_init_rwnd, set the default to 60
fc204a966f953867367f54bda126a2e7d7d98814 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge changes Ia9509ad0,I4e815d74,I10e8d92c

* changes:
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
bbfef6eda83ecc34a8a4efb70e06ade8cf29d0fb 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am e726e1ba: am f37986e2: am 6ab10a1c: Merge "libdiskconfig: 64-bit issues"

* commit 'e726e1ba20385574450ab62b77cbfa97019aa98e':
libdiskconfig: 64-bit issues
95cfc7b8e2e6e5c6cdc97989563e49208915a583 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> logcat: test White Black list

Change-Id: Ia9509ad09dd86e4d9169ed7d0b33911f1ca9eec6
ogcat/tests/Android.mk
ogcat/tests/logcat_test.cpp
a1c60cf80d0d1002576a6cf8aa395b295c6a272e 19-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: Find log time for arbitrary time to tail

- prototype to evaluate the increase in complexity or
performance impact.

Change-Id: I4e815d74c023092fbb75055d260f75de57ad6522
ogd/LogReader.cpp
fa3716b2501ccddc8e0cd30f6343692b8deb7639 15-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: logcat: Arbitrary time to tail

Change-Id: I10e8d92c933e31ee11e78d2d1114261a30c4be0e
nclude/log/log_read.h
nclude/log/logger.h
iblog/Android.mk
iblog/log_read.c
iblog/log_read_kern.c
iblog/log_time.cpp
ogcat/logcat.cpp
ogd/FlushCommand.cpp
ogd/FlushCommand.h
ogd/LogBufferElement.cpp
ogd/LogReader.cpp
ogd/LogTimes.cpp
ogd/LogTimes.h
ed6178976d51a74449dfa0a5c377e60f82cb11a0 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 713aedd7: am 9e38da5f: am 1a379899: Merge "toolbox: schedtop 64 bit build issue"

* commit '713aedd74a9e7bf81929ccd8225d2784afcbb9c9':
toolbox: schedtop 64 bit build issue
62488ba3df2fdca2adb311254ad526e4707713e3 14-Mar-2014 JP Abgrall <jpa@google.com> am d94ed2c8: am 7283db6d: am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60

* commit 'd94ed2c8fea4733684e4ebbf55c112828562b7a7':
init.rc: prep tcp_default_init_rwnd, set the default to 60
d94ed2c8fea4733684e4ebbf55c112828562b7a7 14-Mar-2014 JP Abgrall <jpa@google.com> am 7283db6d: am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60

* commit '7283db6d2694c8deae644a0d815cf292309a6176':
init.rc: prep tcp_default_init_rwnd, set the default to 60
7283db6d2694c8deae644a0d815cf292309a6176 14-Mar-2014 JP Abgrall <jpa@google.com> am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60

* commit 'efbf36f2dad8f083de6f48dbb682461d7cfa9781':
init.rc: prep tcp_default_init_rwnd, set the default to 60
032964f22893e81e91a7f7f04bdcfbbdf4ccc188 14-Mar-2014 Dmitry Grinberg <dmitrygr@google.com> am cae42a9b: am c08496a6: am 0d4a4cb8: fastboot: allow format on devices with small buffers

* commit 'cae42a9bb90c111891acc674fe339ced1873fb6f':
fastboot: allow format on devices with small buffers
60b7b413222524eb860b732135502dd5e7a431b2 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am ba1987fb: am 77eed05b: am f3dcda5f: Merge changes I1572338c,I39965007,I521753b1

* commit 'ba1987fb30635ccc26dc6bbb6c2e52d2264e3929':
logd: liblog: logcat: Add LogWhiteBlackList
logd: prune by worst offending UID
logd: liblog: logcat: Add Statistics
10f229d4291da55c379ce7ae0e87b1a1878199e8 14-Mar-2014 JP Abgrall <jpa@google.com> am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60

* commit 'efbf36f2dad8f083de6f48dbb682461d7cfa9781':
init.rc: prep tcp_default_init_rwnd, set the default to 60
e726e1ba20385574450ab62b77cbfa97019aa98e 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am f37986e2: am 6ab10a1c: Merge "libdiskconfig: 64-bit issues"

* commit 'f37986e26bdf562196c4fc624a4f9d99aa171203':
libdiskconfig: 64-bit issues
0fd9db1f5bda4720408dcfa6502f09a50d05645f 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 6ab10a1c: Merge "libdiskconfig: 64-bit issues"

* commit '6ab10a1c17d048e88f929d35293d266b6480f6d6':
libdiskconfig: 64-bit issues
f37986e26bdf562196c4fc624a4f9d99aa171203 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 6ab10a1c: Merge "libdiskconfig: 64-bit issues"

* commit '6ab10a1c17d048e88f929d35293d266b6480f6d6':
libdiskconfig: 64-bit issues
6ab10a1c17d048e88f929d35293d266b6480f6d6 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "libdiskconfig: 64-bit issues"
1874e6557cbaf36e6893e502d4cdd7c645444b8f 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> libdiskconfig: 64-bit issues

Change-Id: Ie5e790c36395ec2f844294b91241a8f8ba3834b8
ibdiskconfig/diskconfig.c
ibdiskconfig/diskutils.c
713aedd74a9e7bf81929ccd8225d2784afcbb9c9 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 9e38da5f: am 1a379899: Merge "toolbox: schedtop 64 bit build issue"

* commit '9e38da5fd2daa02aff6adf5e1b95b056d4b7e0d0':
toolbox: schedtop 64 bit build issue
ecb9f30c3e0824a7a5a4450067796947d4ee909b 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 1a379899: Merge "toolbox: schedtop 64 bit build issue"

* commit '1a3798996b710370091419fd30b954bec5127e29':
toolbox: schedtop 64 bit build issue
9e38da5fd2daa02aff6adf5e1b95b056d4b7e0d0 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 1a379899: Merge "toolbox: schedtop 64 bit build issue"

* commit '1a3798996b710370091419fd30b954bec5127e29':
toolbox: schedtop 64 bit build issue
1a3798996b710370091419fd30b954bec5127e29 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "toolbox: schedtop 64 bit build issue"
161b55fc5d103159046467a782b3cb8c953ac981 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> toolbox: schedtop 64 bit build issue

Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
oolbox/schedtop.c
cae42a9bb90c111891acc674fe339ced1873fb6f 14-Mar-2014 Dmitry Grinberg <dmitrygr@google.com> am c08496a6: am 0d4a4cb8: fastboot: allow format on devices with small buffers

* commit 'c08496a69ad486c09a9d49d79b8a6bf0f06c10ae':
fastboot: allow format on devices with small buffers
c08496a69ad486c09a9d49d79b8a6bf0f06c10ae 14-Mar-2014 Dmitry Grinberg <dmitrygr@google.com> am 0d4a4cb8: fastboot: allow format on devices with small buffers

* commit '0d4a4cb8aa16fdb3897eaa89a62cb055d8dcbdf9':
fastboot: allow format on devices with small buffers
33b98e97338a03b8cb6f8aa3d85494b7bef88da2 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am f3dcda5f: Merge changes I1572338c,I39965007,I521753b1

* commit 'f3dcda5f8573033d2be31343cdd0e3c65269c4a4':
logd: liblog: logcat: Add LogWhiteBlackList
logd: prune by worst offending UID
logd: liblog: logcat: Add Statistics
0d4a4cb8aa16fdb3897eaa89a62cb055d8dcbdf9 12-Mar-2014 Dmitry Grinberg <dmitrygr@google.com> fastboot: allow format on devices with small buffers

Formatting large partitions on devices with small transfer buffers did
not work before since format used a strange path through the code to
send data. It now uses the normal path. Also cleaned up a bit. FS
code now lives in a separate file and the custom path for format is
gone.

Change-Id: If4e01cabc2e250b7c02ca7ce8c268e51d49e1529
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
astboot/fs.c
astboot/fs.h
ba1987fb30635ccc26dc6bbb6c2e52d2264e3929 13-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 77eed05b: am f3dcda5f: Merge changes I1572338c,I39965007,I521753b1

* commit '77eed05b7ca44cfa013223fdb6f30dc0cc2e2760':
logd: liblog: logcat: Add LogWhiteBlackList
logd: prune by worst offending UID
logd: liblog: logcat: Add Statistics
77eed05b7ca44cfa013223fdb6f30dc0cc2e2760 13-Mar-2014 Mark Salyzyn <salyzyn@google.com> am f3dcda5f: Merge changes I1572338c,I39965007,I521753b1

* commit 'f3dcda5f8573033d2be31343cdd0e3c65269c4a4':
logd: liblog: logcat: Add LogWhiteBlackList
logd: prune by worst offending UID
logd: liblog: logcat: Add Statistics
f3dcda5f8573033d2be31343cdd0e3c65269c4a4 13-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge changes I1572338c,I39965007,I521753b1

* changes:
logd: liblog: logcat: Add LogWhiteBlackList
logd: prune by worst offending UID
logd: liblog: logcat: Add Statistics
dfa7a07f5be656cfafdb4e75916bc9dcd9e592e7 11-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: logcat: Add LogWhiteBlackList

- liblog android_logger_get_log_size and android_logger_get_readable_size
adjusted to return long instead of int because of -G flag extending range

NB: ifdef'd only for userdebug and eng builds

- liblog Add android_logger_[sg]et_prune_list and android_logger_set_log_size
- logcat Add -P, -p and -G flags
- logd Add LogWhiteBlackList and configurable log size

(cherry picked from commit 18a5432158ad43b8faefe4950b30e760200ce0b4)

Change-Id: I1572338c1b34bd968ad7867857ef708156ec3b6a
nclude/log/logger.h
iblog/Android.mk
iblog/log_read.c
iblog/log_read_kern.c
ogcat/Android.mk
ogcat/logcat.cpp
ogd/Android.mk
ogd/CommandListener.cpp
ogd/CommandListener.h
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
ogd/LogWhiteBlackList.cpp
ogd/LogWhiteBlackList.h
64d6fe936253b336049c285369a56cf139bd002f 07-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: prune by worst offending UID

(cherry picked from commit 3c4919e4748d32d7f3e147ab57f4fafee28c7447)

Change-Id: I39965007569123ff5eebe01b5bfa555bbcb2dfe7
ogd/LogBuffer.cpp
34facab86b0fe7ec613de92b46b637f864fb0682 06-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: logcat: Add Statistics

- logd add statistical collection and formatting
- liblog add android_logger_get_statistics call
- logcat add -S flag
- logcat add -b all

(cherry picked from commit 51a29c8dc445e4fb89860561933e54a231e6ffb4)

Change-Id: I521753b1969ecd4590c956aeeb1557d101059d67
nclude/log/logger.h
iblog/log_read.c
iblog/log_read_kern.c
ogcat/logcat.cpp
ogd/Android.mk
ogd/CommandListener.cpp
ogd/CommandListener.h
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
512e9525ecd8a47ddae47a12e6f8a70f8b0abfd1 13-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge changes I1572338c,I39965007

* changes:
logd: liblog: logcat: Add LogWhiteBlackList
logd: prune by worst offending UID
d9e5827140a5ba9af8de04f0f923c0a2585a6659 13-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: liblog: logcat: Add Statistics"
ecc479490bcc76b5286dfcdae166f479560bab17 13-Mar-2014 Mohamad Ayyash <mkayyash@google.com> Merge "fs_mgr: fix mount_all when handling already mounted encryptable fs."
3ce26fa7d4ed5bfa1a3b546ea6772a964d5f476e 13-Mar-2014 Nick Kralevich <nnk@google.com> am 897d345b: Merge "don\'t load property_contexts from /data"

* commit '897d345b1f2672480346e5dc8971a4626f3f1b8b':
don't load property_contexts from /data
c0c2a612fecf64fdfda273ae7ba4da5409b3d3ff 13-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 939a5b09: Merge "logd: default user space logger"

* commit '939a5b09b8f8fd416a07e903310a37248aebaee4':
logd: default user space logger
648f4113bcd82e00f4ef1ba80d1928ee0d8d7685 13-Mar-2014 JP Abgrall <jpa@google.com> am 5fb1a34a: Merge "Added transfer progress reporting for push and pull commands."

* commit '5fb1a34af4128bfe7332b02e31b146a82bc2872d':
Added transfer progress reporting for push and pull commands.
242668d5e608e7e50524e135017ab0ca1e5f81ef 13-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
094fd86b1423fbb4f4c421447ddf6d10a5027c7b 13-Mar-2014 David 'Digit' Turner <digit@google.com> adb: Increase the max number of emulator instances to 64

When the ADB server starts, it probes the localhost ports to find
existing emulator instances, starting from 5555 with increments of
2, and stopping after ADB_LOCAL_TRANSPORT_MAX tries, which was
set to 16.

This means that the ADB server could not detect on startup more
than 16 existing emulator instances.

This increases the limit to 64, to match a corresponding change
on the emulator side.

See https://android-review.googlesource.com/#/c/83553/

Change-Id: I35c69f8017298c3e5797bd396b8d788d44eaa00f
db/transport_local.c
611f5e960c24961dfa2b3ad236aba43fd84d89cb 12-Mar-2014 Mohamad Ayyash <mkayyash@google.com> fs_mgr: fix mount_all when handling already mounted encryptable fs.

Since 38afe5f4ba5fd834a221a636e63d311fa5a17c8a
fs_mgr_mount_all() will try to behave more like "mount -a"

So prevent inaccessible or busy (already mounted) encryptable filesystems
from mounting tmpfs in their mount points.


Change-Id: I32e5b3e26f2138d1e4d9ef8ba01c1466f8051d39
s_mgr/fs_mgr.c
26d5f53c72f8876b9f384f332442fc8605c40f66 13-Mar-2014 Greg Hackmann <ghackmann@google.com> am 28e41cce: Merge "libadfhwc: use %zu for logging size_t"

* commit '28e41cce803f0f9e45344a060444f8575a417409':
libadfhwc: use %zu for logging size_t
6ea32f135552149599223ec6a10cc5db5072e9e5 13-Mar-2014 Doug Zongker <dougz@android.com> am cb0bb7c5: Merge "remove pixelflinger from healthd"

* commit 'cb0bb7c5f48d4441902282a1ceaf32c5defd10db':
remove pixelflinger from healthd
efbf36f2dad8f083de6f48dbb682461d7cfa9781 21-Feb-2014 JP Abgrall <jpa@google.com> init.rc: prep tcp_default_init_rwnd, set the default to 60

The kernel's default is between 4~20.

Prepare for javaland to modify the value at runtime.

It can be done via
setprop sys.sysctl.tcp_def_init_rwnd <value>


Bug: 12020135
Change-Id: Id34194b085206fd02e316401c0fbbb9eb52522d2
(cherry picked from commit 7c862c8b5e59cbe216a5bc092c01f1ecba8e9de4)
ootdir/init.rc
18a5432158ad43b8faefe4950b30e760200ce0b4 11-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: logcat: Add LogWhiteBlackList

- liblog android_logger_get_log_size and android_logger_get_readable_size
adjusted to return long instead of int because of -G flag extending range

NB: ifdef'd only for userdebug and eng builds

- liblog Add android_logger_[sg]et_prune_list and android_logger_set_log_size
- logcat Add -P, -p and -G flags
- logd Add LogWhiteBlackList and configurable log size

Change-Id: I1572338c1b34bd968ad7867857ef708156ec3b6a
nclude/log/logger.h
iblog/Android.mk
iblog/log_read.c
iblog/log_read_kern.c
ogcat/Android.mk
ogcat/logcat.cpp
ogd/Android.mk
ogd/CommandListener.cpp
ogd/CommandListener.h
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
ogd/LogWhiteBlackList.cpp
ogd/LogWhiteBlackList.h
3c4919e4748d32d7f3e147ab57f4fafee28c7447 07-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: prune by worst offending UID

Change-Id: I39965007569123ff5eebe01b5bfa555bbcb2dfe7
ogd/LogBuffer.cpp
51a29c8dc445e4fb89860561933e54a231e6ffb4 06-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: logcat: Add Statistics

- logd add statistical collection and formatting
- liblog add android_logger_get_statistics call
- logcat add -S flag
- logcat add -b all

Change-Id: I521753b1969ecd4590c956aeeb1557d101059d67
nclude/log/logger.h
iblog/log_read.c
iblog/log_read_kern.c
ogcat/logcat.cpp
ogd/Android.mk
ogd/CommandListener.cpp
ogd/CommandListener.h
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogStatistics.cpp
ogd/LogStatistics.h
ffcbc3f1d49191fe924a2b0237c5d92d0d80af0d 13-Mar-2014 Nick Kralevich <nnk@google.com> am d11f76a5: am f4c1abcb: am 897d345b: Merge "don\'t load property_contexts from /data"

* commit 'd11f76a5860802ea21f46993ce094d613214a40d':
don't load property_contexts from /data
381edf5ecb66494b6eb35c571a69dded4074cd1b 13-Mar-2014 Mark Salyzyn <salyzyn@google.com> am af9f065b: am 8ff765a8: am 939a5b09: Merge "logd: default user space logger"

* commit 'af9f065b2bfdf347bbfa5fce5227975fd4e060c3':
logd: default user space logger
f1ddbbfa5d84a1ba2dc464dfee584e6d61b856c1 13-Mar-2014 Doug Zongker <dougz@google.com> am de7194b2: (-s ours) Revert "Revert "remove pixelflinger from healthd""

* commit 'de7194b208e95047af61eb6ae4fc9fca51655be3':
Revert "Revert "remove pixelflinger from healthd""
d11f76a5860802ea21f46993ce094d613214a40d 12-Mar-2014 Nick Kralevich <nnk@google.com> am f4c1abcb: am 897d345b: Merge "don\'t load property_contexts from /data"

* commit 'f4c1abcbce012a80a1bd32e5a83ab24aa2a6807d':
don't load property_contexts from /data
f4c1abcbce012a80a1bd32e5a83ab24aa2a6807d 12-Mar-2014 Nick Kralevich <nnk@google.com> am 897d345b: Merge "don\'t load property_contexts from /data"

* commit '897d345b1f2672480346e5dc8971a4626f3f1b8b':
don't load property_contexts from /data
897d345b1f2672480346e5dc8971a4626f3f1b8b 12-Mar-2014 Nick Kralevich <nnk@google.com> Merge "don't load property_contexts from /data"
af9f065b2bfdf347bbfa5fce5227975fd4e060c3 12-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 8ff765a8: am 939a5b09: Merge "logd: default user space logger"

* commit '8ff765a814af55784e81bc6479a198fbd2120927':
logd: default user space logger
8ff765a814af55784e81bc6479a198fbd2120927 12-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 939a5b09: Merge "logd: default user space logger"

* commit '939a5b09b8f8fd416a07e903310a37248aebaee4':
logd: default user space logger
939a5b09b8f8fd416a07e903310a37248aebaee4 12-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: default user space logger"
de7194b208e95047af61eb6ae4fc9fca51655be3 12-Mar-2014 Doug Zongker <dougz@google.com> Revert "Revert "remove pixelflinger from healthd""

This reverts commit 67ac9f3e42d81bceafd145e29a7a495569924f34.
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_5.png
harger/images/battery_charge.png
harger/images/battery_fail.png
harger/images/battery_scale.png
ddda762616768639aa9fa14c0fda2420b39fb629 12-Mar-2014 JP Abgrall <jpa@google.com> am 0c748e11: am 73690b24: am 5fb1a34a: Merge "Added transfer progress reporting for push and pull commands."

* commit '0c748e11c2faab0dff99bb855d7e6acf903a0ef8':
Added transfer progress reporting for push and pull commands.
b744e6d1fd1b642bac77c56dac24bfed948f4c27 12-Mar-2014 Mohamad Ayyash <mkayyash@google.com> Merge "fs_mgr: Ensure mount_all will process all fstab entries despite logging errors."
99ff9469c5900ca04b259f0edfc0a1f7fd46f3c0 12-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: default user space logger

Change-Id: I16825c26f098241376d4014f3a8e93174387dbcf
iblog/Android.mk
7a47bc58664fa6655de24c1170ae53a2c0dfb61e 12-Mar-2014 Brian Carlstrom <bdc@google.com> am 67ac9f3e: (-s ours) Revert "remove pixelflinger from healthd"

* commit '67ac9f3e42d81bceafd145e29a7a495569924f34':
Revert "remove pixelflinger from healthd"
029bca38b194d35f465921d08049bc82dba192d9 12-Mar-2014 Greg Hackmann <ghackmann@google.com> am 9a7ba149: am e8e0daae: am 28e41cce: Merge "libadfhwc: use %zu for logging size_t"

* commit '9a7ba149d3495e0a0976de1159c5bcac424483fb':
libadfhwc: use %zu for logging size_t
b0f8e0141a21f94ee38b512b1a8006402bf37915 12-Mar-2014 Doug Zongker <dougz@android.com> am 884a2a65: (-s ours) am dcbf0a40: am cb0bb7c5: Merge "remove pixelflinger from healthd"

* commit '884a2a65ae8d3224c3debe3e35196811462d6b24':
remove pixelflinger from healthd
38afe5f4ba5fd834a221a636e63d311fa5a17c8a 10-Mar-2014 Mohamad Ayyash <mkayyash@google.com> fs_mgr: Ensure mount_all will process all fstab entries despite logging errors.

Change-Id: I0d58dd17d979b749a9ac03567cf2d395f9782f10
s_mgr/fs_mgr.c
d454841ccdfa34e1d78b206e4204d9a6d08226ec 12-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
de151571a4512491bc11f94e60c60c8fa84893f3 19-Jan-2014 Nick Kralevich <nnk@google.com> don't load property_contexts from /data

Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
(cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf)
nit/init.c
0c748e11c2faab0dff99bb855d7e6acf903a0ef8 12-Mar-2014 JP Abgrall <jpa@google.com> am 73690b24: am 5fb1a34a: Merge "Added transfer progress reporting for push and pull commands."

* commit '73690b24c64bdd96db5316eead079d03b7dcd8ea':
Added transfer progress reporting for push and pull commands.
73690b24c64bdd96db5316eead079d03b7dcd8ea 12-Mar-2014 JP Abgrall <jpa@google.com> am 5fb1a34a: Merge "Added transfer progress reporting for push and pull commands."

* commit '5fb1a34af4128bfe7332b02e31b146a82bc2872d':
Added transfer progress reporting for push and pull commands.
5fb1a34af4128bfe7332b02e31b146a82bc2872d 12-Mar-2014 JP Abgrall <jpa@google.com> Merge "Added transfer progress reporting for push and pull commands."
76f2a93b18e0d321d527cb64c2b2c4281e1cf70f 12-Mar-2014 Mark Lindner <mlindner@google.com> Added transfer progress reporting for push and pull commands.

Added a new '-p' switch to the 'push' and 'pull' commands that outputs
the file transfer progress (bytes transmitted, total bytes, and % done).
This provides useful feedback when transferring large files, and also
makes it possible for other tools to easily monitor the progress of a
forked push/pull command.

Change-Id: Iee6f42f5bd41292e5bc80fba779f526f0072e356
db/commandline.c
db/file_sync_client.c
db/file_sync_service.h
67ac9f3e42d81bceafd145e29a7a495569924f34 12-Mar-2014 Brian Carlstrom <bdc@google.com> Revert "remove pixelflinger from healthd"

This reverts commit 0280f278f6e2d095e6579deba61fe96bfa649d4f.
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_5.png
harger/images/battery_charge.png
harger/images/battery_fail.png
harger/images/battery_scale.png
9a7ba149d3495e0a0976de1159c5bcac424483fb 12-Mar-2014 Greg Hackmann <ghackmann@google.com> am e8e0daae: am 28e41cce: Merge "libadfhwc: use %zu for logging size_t"

* commit 'e8e0daaefa9de2ffc12d131c2fcaef1794a095db':
libadfhwc: use %zu for logging size_t
884a2a65ae8d3224c3debe3e35196811462d6b24 12-Mar-2014 Doug Zongker <dougz@android.com> am dcbf0a40: am cb0bb7c5: Merge "remove pixelflinger from healthd"

* commit 'dcbf0a40c965bd6264607f4515269477fe229363':
remove pixelflinger from healthd
e8e0daaefa9de2ffc12d131c2fcaef1794a095db 12-Mar-2014 Greg Hackmann <ghackmann@google.com> am 28e41cce: Merge "libadfhwc: use %zu for logging size_t"

* commit '28e41cce803f0f9e45344a060444f8575a417409':
libadfhwc: use %zu for logging size_t
dcbf0a40c965bd6264607f4515269477fe229363 12-Mar-2014 Doug Zongker <dougz@android.com> am cb0bb7c5: Merge "remove pixelflinger from healthd"

* commit 'cb0bb7c5f48d4441902282a1ceaf32c5defd10db':
remove pixelflinger from healthd
28e41cce803f0f9e45344a060444f8575a417409 11-Mar-2014 Greg Hackmann <ghackmann@google.com> Merge "libadfhwc: use %zu for logging size_t"
cb0bb7c5f48d4441902282a1ceaf32c5defd10db 11-Mar-2014 Doug Zongker <dougz@android.com> Merge "remove pixelflinger from healthd"
0280f278f6e2d095e6579deba61fe96bfa649d4f 11-Mar-2014 Doug Zongker <dougz@android.com> remove pixelflinger from healthd

The minui library has changed to no longer use libpixelflinger. It
also offers a more efficient way of storing and loading frames of
animation; use it to represent the battery-full state images.

Also removes the unused battery_charge.png image.

Bug: 12131110
Change-Id: I6cc8b19f36a806c99cda30cc47b5968daf6b333b

Conflicts:
charger/charger.c
charger/images/battery_0.png
charger/images/battery_1.png
charger/images/battery_2.png
charger/images/battery_3.png
charger/images/battery_4.png
charger/images/battery_5.png
charger/images/battery_charge.png
healthd/Android.mk
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_5.png
harger/images/battery_charge.png
harger/images/battery_fail.png
harger/images/battery_scale.png
18b712784558747a16dcf200818b9a48ffc606a2 11-Mar-2014 Greg Hackmann <ghackmann@google.com> libadfhwc: use %zu for logging size_t

Change-Id: Ica75935a194509f9d85d8e577b81f9de03aaaea4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
df/libadfhwc/adfhwc.cpp
ee6ef15e677fd3168b4a0d221175fbf0ecd96ff5 11-Mar-2014 Doug Zongker <dougz@android.com> remove pixelflinger from healthd

The minui library has changed to no longer use libpixelflinger. It
also offers a more efficient way of storing and loading frames of
animation; use it to represent the battery-full state images.

Also removes the unused battery_charge.png image.

Bug: 12131110
Change-Id: I6cc8b19f36a806c99cda30cc47b5968daf6b333b
ealthd/Android.mk
ealthd/healthd_mode_charger.cpp
ealthd/images/battery_0.png
ealthd/images/battery_1.png
ealthd/images/battery_2.png
ealthd/images/battery_3.png
ealthd/images/battery_4.png
ealthd/images/battery_5.png
ealthd/images/battery_charge.png
ealthd/images/battery_fail.png
ealthd/images/battery_scale.png
66146c40f7bb9ae3fba4db905634d41684b81279 11-Mar-2014 JP Abgrall <jpa@google.com> am 44390474: Merge "adb: Don\'t unlink special files on sync failure."

* commit '443904746301e4d519e51075487ea4c8b9a860e3':
adb: Don't unlink special files on sync failure.
8a00ce939aca70aaba4138391441e6b4047ff12d 11-Mar-2014 JP Abgrall <jpa@google.com> am b2c34ece: Merge "adb: Don\'t clobber block devices during push"

* commit 'b2c34ece647c212baa30c474394c498a2d6dd61f':
adb: Don't clobber block devices during push
269fcd66e6cab1b8f90f4081b97fb6decf7a9a0c 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 0c3d19ff: Merge "libcutils: 64-bit compile issues"

* commit '0c3d19ff3db7b04081a7a729a81642c5903f741a':
libcutils: 64-bit compile issues
88a9b526f22d1a11b91610075f5fdff21b81c6fc 11-Mar-2014 Alex Ray <aray@google.com> am 9f4d558e: Merge "ueventd: easier debug logging"

* commit '9f4d558e0c80602aa8707ec9d0bdd33a93aa4f16':
ueventd: easier debug logging
55e5bcb2f14731734b02039ebc4cd4b346a4f7d0 11-Mar-2014 Alex Ray <aray@google.com> am 33e86e00: Merge "libcutils: add method to get klog level"

* commit '33e86e004037765ef97a1d7f4017a7bdb6312bcf':
libcutils: add method to get klog level
40b735f9b952fd00d890a3c0689b0f694fc9211b 11-Mar-2014 JP Abgrall <jpa@google.com> am 1367854a: Merge "adb: fix windows build after "forward --list" fix."

* commit '1367854a891090d1be1edfb12515691b20b350cf':
adb: fix windows build after "forward --list" fix.
a4a9e64668ce1980e7c39e476aee89b106f6517a 11-Mar-2014 JP Abgrall <jpa@google.com> am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"

* commit '66e95d76c47a3a099931bbebe7f4a0af4d3f7fbb':
Fix adb forward --list when forwarding a lot
1c297349d5322ae83529e229e5dff249da7b4878 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am bb0fbdbe: Merge "logd: liblog: 64-bit issues"

* commit 'bb0fbdbefd7079859e4df45f1b75ad6c48839a50':
logd: liblog: 64-bit issues
a60891fbc60cd400bbb93e582885303918d29124 11-Mar-2014 Colin Cross <ccross@android.com> am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"

* commit '0a8a56361e2b54d0e2a9e2c2f7a7ab47dc76c650':
Fix the build for NEON in libpixelflinger
00ef9212e86faac60a8b07c5b8351083acf1c25e 11-Mar-2014 Mathieu Chartier <mathieuc@google.com> am 51ebffd8: Merge "Add free to CloseArchive."

* commit '51ebffd8a5536af09b60950bf7cf6f020c962f8a':
Add free to CloseArchive.
9d5cb013ff85f32fc3482d549bf6845636503fb9 11-Mar-2014 Colin Cross <ccross@android.com> am 87a56eb6: Merge "Use the getopt function in compliance with the standard."

* commit '87a56eb6cc616150d536ed0e70cf8e69e1d5edf6':
Use the getopt function in compliance with the standard.
9b4d2d5f8b68dcf5b20b9cdafadbda9c9acf200f 11-Mar-2014 Dmitriy Ivanov <dimitry@google.com> am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly"

* commit '2a16a5847a2811626a108f8cbd7606680647df86':
fix: making lsof show devies and loaded .so file names correctly
f447c1b3ae6d467392500a985e3974facb1b095f 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"

* commit '858d0dd1e529575181abd8de607e46f7b273cc9d':
set /proc/sys/net/unix/max_dgram_qlen to large value
eb78ba8094a61f5af2e0454ffea97c19817b3cb0 11-Mar-2014 Jesse Hall <jessehall@google.com> am ba23d539: Merge "Fix the handling of CodeCache return codes in pixelflinger"

* commit 'ba23d539328af36b2040a5bcbdcc840810a4df51':
Fix the handling of CodeCache return codes in pixelflinger
0bd05c130ed71d02aa586db8f46531f498de8db6 11-Mar-2014 Elliott Hughes <enh@google.com> am a0e4d164: Merge "Declare (and simplify) uid_from_user."

* commit 'a0e4d1643cc74748c3b5b05da0d41b7dbcda23e5':
Declare (and simplify) uid_from_user.
9b95b5e40d9fd1f8804add14f8fc67f446b9e69c 11-Mar-2014 Elliott Hughes <enh@google.com> am fbcdf6f9: Merge "Switch to BSD chown (for -R, primarily)."

* commit 'fbcdf6f9fe9212154b7b4bf3a4e6f16ad69ca994':
Switch to BSD chown (for -R, primarily).
d054cb8122ece6bd796dc8971c11600f7ac881a1 11-Mar-2014 Elliott Hughes <enh@google.com> am 54bb1d3b: Merge "Fix grep -f."

* commit '54bb1d3b98075316e0cd1289f218470cb70227ce':
Fix grep -f.
b20bf3425a79791a896b0c13b0f92258978301d9 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 1a1c42fd: Merge "logd: Always build logd"

* commit '1a1c42fda7ec6087355529337573dd3ec5e85d91':
logd: Always build logd
34e2eb92799ecb0d141bb0820348f379f8cea068 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am a69270db: Merge "liblog: enable logging to logd."

* commit 'a69270db05cea27bf185e60af46dd46e938c7e99':
liblog: enable logging to logd.
119fc377d15a3155a277315d0c927556f1fad3a9 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am ea1b1d48: Merge "logd: institute getGroups for socket credentials"

* commit 'ea1b1d483a9cc6ab748a84fd15536278e4d359e5':
logd: institute getGroups for socket credentials
73474330a58f7512c7a37d096eca9fcb56f3baca 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 0577a067: Merge "libsparse: deal with build warning messages"

* commit '0577a0679a90f1f286512f8dba3c6759fc9d5b7d':
libsparse: deal with build warning messages
6a9d5e3f3b08a74006ff2715a6fba190211761ea 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am b7a4868e: Merge "logd: Remove include."

* commit 'b7a4868e1cad6a878c94077bc48b414c965cb516':
logd: Remove $(KERNEL_HEADERS) include.
05733a2e698e07c846280f6d2b3e76770259aa78 11-Mar-2014 Narayan Kamath <narayan@google.com> am 26fa5cd3: Merge "AArch64: Use negative values in error enumeration"

* commit '26fa5cd39d39c2954d4c9abd866e39bf1d8d39ae':
AArch64: Use negative values in error enumeration
f2692c34473c5d2b69a2ba5d85f3d568d31233f7 11-Mar-2014 Christopher Ferris <cferris@google.com> am 62f12bd9: Merge "Enable libunwind for mips."

* commit '62f12bd9b134a7a991d1d80bda563e870cb56e8e':
Enable libunwind for mips.
9509103cd4f28cf05a9fc6c5b6fd97504875097c 11-Mar-2014 Nick Kralevich <nnk@google.com> am 9453bce4: Merge "Apply restorecon_recursive to all of /data."

* commit '9453bce4cff952aab5c90f5b30c6c12d3e1521e5':
Apply restorecon_recursive to all of /data.
0c7d71a022cf1a7b25b14d5496ebf10c1bea4300 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 78617a08: Merge changes Id25cdef0,I80685cdc,I929dddc7

* commit '78617a0875ccf5662dc69a6fbcc72a7a39ab42a3':
logd: Add SCHED_BATCH to reduce priority
logd: Adjust to match defacto coding style
logd: prune more aggressively when over the top
01c5199665cfa5c6631696d410c077c3dceb871e 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am e9c8fb90: Merge "logd: initial checkin."

* commit 'e9c8fb900a460699201208870ce9997a734261cc':
logd: initial checkin.
adad825dbb68fbd419fbdd866ca6697cb3da45be 11-Mar-2014 Mark Salyzyn <salyzyn@google.com> am ca1e3438: Merge "logcat: test: add clear and blocking check"

* commit 'ca1e34385706b954e6974094285924d8ff59f860':
logcat: test: add clear and blocking check
03e567ad07ed6f8e72778ee79285cddb615d76e6 11-Mar-2014 Elliott Hughes <enh@google.com> am ecb5dd69: Merge "Fix undefined args access for x86_64."

* commit 'ecb5dd697ca72828079bf40f932abf9f9ee7b7db':
Fix undefined args access for x86_64.
738eeb6ff051e83c035255343befaf6cd44cd8c1 11-Mar-2014 Elliott Hughes <enh@google.com> am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags"

* commit '431735f005af79407e01a68995ac6dde7ff4b815':
libcutils: Socket type might contain bitwise OR flags
4179ed2f45e3b9c42308a711857e29e7c0fb6893 11-Mar-2014 David 'Digit' Turner <digit@google.com> am ebb46d76: Merge "fs_mgr: Don\'t run e2fsck inside SDK system images."

* commit 'ebb46d76e4bf4ee4f34b42709ea69cce07e3e322':
fs_mgr: Don't run e2fsck inside SDK system images.
e8663e35549e0ff0d315f8f4c21bc3b6dc016975 11-Mar-2014 Elliott Hughes <enh@google.com> am d7590650: Merge "Remove an unused #include of <asm/page.h>."

* commit 'd7590650dc7b36557efde7f63a6e904878572e12':
Remove an unused #include of <asm/page.h>.
bdd6537b95852ebf8c1445888ae74ece2ccbb0d5 11-Mar-2014 Elliott Hughes <enh@google.com> am 410f51a8: Merge "Remove unused #includes of <asm/page.h>."

* commit '410f51a88cc40977ddc2d99ae72d429550715e13':
Remove unused #includes of <asm/page.h>.
9152989b135d5552532fa4f20727a50b02bde907 11-Mar-2014 Colin Cross <ccross@android.com> am deb3eecd: Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"

* commit 'deb3eecd061e8a3a5f19ef5e10296f248f247881':
Fix the definition of LOCAL_PATH in libusbhost/Android.mk
ba39a38b30858f5cf37f7f13b06aed3232d8f634 08-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
0631bf3ddbc850d8a21795ac9b35b6cc21ec2c66 08-Mar-2014 JP Abgrall <jpa@google.com> am 7e463719: am b4f1b3ca: am 44390474: Merge "adb: Don\'t unlink special files on sync failure."

* commit '7e463719c9fb559a164ace78743da6d439a6ed9f':
adb: Don't unlink special files on sync failure.
4700f296e6ed2bbd418973d6d23ef718b3e07d05 08-Mar-2014 JP Abgrall <jpa@google.com> am beea8a77: am 270ebefc: am b2c34ece: Merge "adb: Don\'t clobber block devices during push"

* commit 'beea8a77a1ee191346302315659b7914eefe0d8e':
adb: Don't clobber block devices during push
d9c798335ca41c59001ce95d9da375ddbb888e0e 08-Mar-2014 Mark Salyzyn <salyzyn@google.com> am a4d7f8d4: am c1790a0b: am 0c3d19ff: Merge "libcutils: 64-bit compile issues"

* commit 'a4d7f8d4191cc4a74ef99596b19c084c93c58571':
libcutils: 64-bit compile issues
5103ac8a5299dbedbf581b5b2a2eec67eaef97b7 08-Mar-2014 Alex Ray <aray@google.com> am 27514f6d: am f2d09863: am 9f4d558e: Merge "ueventd: easier debug logging"

* commit '27514f6de9d2ad039a187e5584f296ec05a4ef18':
ueventd: easier debug logging
665902ee5abd1a6f3523432cd137befffed3b976 08-Mar-2014 Alex Ray <aray@google.com> am db480f75: am 6a58c4f3: am 33e86e00: Merge "libcutils: add method to get klog level"

* commit 'db480f7516977123a0c5c6f6705b282d2e55ab89':
libcutils: add method to get klog level
7e463719c9fb559a164ace78743da6d439a6ed9f 08-Mar-2014 JP Abgrall <jpa@google.com> am b4f1b3ca: am 44390474: Merge "adb: Don\'t unlink special files on sync failure."

* commit 'b4f1b3ca6502041bd5350b211f894928790d214d':
adb: Don't unlink special files on sync failure.
beea8a77a1ee191346302315659b7914eefe0d8e 08-Mar-2014 JP Abgrall <jpa@google.com> am 270ebefc: am b2c34ece: Merge "adb: Don\'t clobber block devices during push"

* commit '270ebefc6c0c7937e8bef112a257b25509a1c2b7':
adb: Don't clobber block devices during push
a4d7f8d4191cc4a74ef99596b19c084c93c58571 08-Mar-2014 Mark Salyzyn <salyzyn@google.com> am c1790a0b: am 0c3d19ff: Merge "libcutils: 64-bit compile issues"

* commit 'c1790a0b99bd55ec1eb2201e60e8c2167a334c7c':
libcutils: 64-bit compile issues
27514f6de9d2ad039a187e5584f296ec05a4ef18 08-Mar-2014 Alex Ray <aray@google.com> am f2d09863: am 9f4d558e: Merge "ueventd: easier debug logging"

* commit 'f2d09863204fc04c7f030ce7adf51deb5de952ce':
ueventd: easier debug logging
db480f7516977123a0c5c6f6705b282d2e55ab89 08-Mar-2014 Alex Ray <aray@google.com> am 6a58c4f3: am 33e86e00: Merge "libcutils: add method to get klog level"

* commit '6a58c4f342fa104fbabcd195561b90966f227a76':
libcutils: add method to get klog level
b4f1b3ca6502041bd5350b211f894928790d214d 08-Mar-2014 JP Abgrall <jpa@google.com> am 44390474: Merge "adb: Don\'t unlink special files on sync failure."

* commit '443904746301e4d519e51075487ea4c8b9a860e3':
adb: Don't unlink special files on sync failure.
270ebefc6c0c7937e8bef112a257b25509a1c2b7 08-Mar-2014 JP Abgrall <jpa@google.com> am b2c34ece: Merge "adb: Don\'t clobber block devices during push"

* commit 'b2c34ece647c212baa30c474394c498a2d6dd61f':
adb: Don't clobber block devices during push
c1790a0b99bd55ec1eb2201e60e8c2167a334c7c 08-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 0c3d19ff: Merge "libcutils: 64-bit compile issues"

* commit '0c3d19ff3db7b04081a7a729a81642c5903f741a':
libcutils: 64-bit compile issues
f2d09863204fc04c7f030ce7adf51deb5de952ce 08-Mar-2014 Alex Ray <aray@google.com> am 9f4d558e: Merge "ueventd: easier debug logging"

* commit '9f4d558e0c80602aa8707ec9d0bdd33a93aa4f16':
ueventd: easier debug logging
6a58c4f342fa104fbabcd195561b90966f227a76 08-Mar-2014 Alex Ray <aray@google.com> am 33e86e00: Merge "libcutils: add method to get klog level"

* commit '33e86e004037765ef97a1d7f4017a7bdb6312bcf':
libcutils: add method to get klog level
443904746301e4d519e51075487ea4c8b9a860e3 08-Mar-2014 JP Abgrall <jpa@google.com> Merge "adb: Don't unlink special files on sync failure."
b2c34ece647c212baa30c474394c498a2d6dd61f 08-Mar-2014 JP Abgrall <jpa@google.com> Merge "adb: Don't clobber block devices during push"
55b6c843a6166fbbf57aa4afba8b2c2b3e87cfea 08-Mar-2014 JP Abgrall <jpa@google.com> adb: Don't unlink special files on sync failure.

adb push some_disk_image /dev/block/mmcblk0p9
should not unlink the dev just because adb was ctrl-c'd.

Change-Id: I1b6669e8dba1f80fc1438b8deb618180b7e9a1b2
Signed-off-by: JP Abgrall <jpa@google.com>
db/file_sync_service.c
4ce2f838e78592d0b93776b73ca4de855a423dde 03-Dec-2013 JP Abgrall <jpa@google.com> adb: Don't clobber block devices during push

In the past, an adb push would ALWAYS unlink the target path.
Now, we only links and regular files (and links).
This allows the following to work:

adb shell ls -l /dev/block/mmcblk0p8
# brw------- root root 179, 8 2013-11-28 07:43 mmcblk0p8
adb push n7.jpa.mda.post_jb_encryption.raw /dev/block/mmcblk0p8

Bug: 11984121
Change-Id: I982c7a1cd87986621f2bebdcb41c4e281f67f772
db/file_sync_service.c
0c3d19ff3db7b04081a7a729a81642c5903f741a 08-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "libcutils: 64-bit compile issues"
0425b64e0b72f0a77a496e35635e0bcb8083f535 08-Mar-2014 Mark Salyzyn <salyzyn@google.com> libcutils: 64-bit compile issues

- Use inttypes.h to print uint64_t values.

Change-Id: Ia10a3b67cadcce282563467a464ec07066cc2051
ibcutils/qtaguid.c
733aebd398c5ea553373ed716d8c23fbb9ac5bdb 08-Mar-2014 Dianne Hackborn <hackbod@google.com> Merge "Add ability to have a callback when wakeups happen."
e48d8aff02861912eb78d1626da519addcc81682 08-Mar-2014 Elliott Hughes <enh@google.com> am 536dce31: Merge "Fix compiler warnings in libpixelflinger"

* commit '536dce31d35e9411c03102d6abd837cd4d54ce55':
Fix compiler warnings in libpixelflinger
6bd7474f867827e6ea3007840cd9868c753498e6 07-Mar-2014 Nick Kralevich <nnk@google.com> am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."

* commit '783eb1689871850c082e0b6ccadeeccbaa81a5d2':
Add -D option to restorecon for relabeling /data/data.
8a0836cfb415e003e5151ac4e347c0d465522c76 07-Mar-2014 Elliott Hughes <enh@google.com> am acc0a23a: Merge "Remove dead code."

* commit 'acc0a23a20bf5e5db985661b2c8a8259d9e94498':
Remove dead code.
9f4d558e0c80602aa8707ec9d0bdd33a93aa4f16 07-Mar-2014 Alex Ray <aray@google.com> Merge "ueventd: easier debug logging"
33e86e004037765ef97a1d7f4017a7bdb6312bcf 07-Mar-2014 Alex Ray <aray@google.com> Merge "libcutils: add method to get klog level"
18ccc1b8ee8f74ec9dde20782948c78e8ba2667f 07-Mar-2014 Alex Ray <aray@google.com> ueventd: easier debug logging

Move ueventd debug flag into the Android.mk.
Boost klog level if event logging enabled.

Change-Id: Iae48edbc43c487092c2424023576af29c76ff401
nit/Android.mk
nit/log.h
nit/ueventd.c
157e1b645ab278d5aaaa09939088b8f8e9d00085 07-Mar-2014 Alex Ray <aray@google.com> libcutils: add method to get klog level

Change-Id: I55e8311bae97703be26e57b415a8ab0a6d9b4361
nclude/cutils/klog.h
ibcutils/klog.c
45b9581fc9884da4bf60203ece1563e29aac8c96 07-Mar-2014 Glenn Kasten <gkasten@google.com> audio_is_valid_format is true for all PCM formats

Change-Id: I733f3208315816575f6d4f7722e906ab50b161af
nclude/system/audio.h
493b76c31edc9bce0b084b4a582dce1304243442 07-Mar-2014 JP Abgrall <jpa@google.com> am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"

* commit '912373005b53e70803cdae61dd63a18fa73a5e3e':
Handle FUSE_FSYNCDIR as FUSE_FSYNC
3ea6d6c40fa77a07889a4aacfc3e01bfdbf165a7 07-Mar-2014 JP Abgrall <jpa@google.com> am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"

* commit '3b0c24e28d7538ff5b49a98eee99bac85c8e687b':
sdcard: direct I/O file access write buffer alignment
1ce4c5313628f60105b4a58ee78c92066eb59b6a 07-Mar-2014 Nick Kralevich <nnk@google.com> am 223e0798: Merge "Enable building init with -Wall -Werror."

* commit '223e07983718e1515f2a54542b9b0163a8f508ed':
Enable building init with -Wall -Werror.
dfda9b0b4703329745fc873a78034868937921ea 07-Mar-2014 Colin Cross <ccross@android.com> am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"

* commit '27fd413d6d02a53c453cf926717b67e9a8d1eb32':
Start debuggerd64 for 64-bit processes
566aa4788f04742573040efd5adf00040707eb84 07-Mar-2014 JP Abgrall <jpa@google.com> am f7cf1a06: Merge "sdcard: direct I/O file access fix"

* commit 'f7cf1a062ef27b6579b9afb876d635a307b3d5d3':
sdcard: direct I/O file access fix
224fd992691d51a5d2b3351a45cfdc0aad60cca0 07-Mar-2014 Colin Cross <ccross@android.com> am d0307bee: Merge "charger: add locale global variable"

* commit 'd0307beeef57b9db06b82f1ffba746c5decb0b72':
charger: add locale global variable
77306ee2656fd195c44699b002d8735b79f487f1 07-Mar-2014 Colin Cross <ccross@android.com> am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"

* commit 'a6b770566e62196f2fff8ab25952c33deed90ea8':
build debuggerd and debuggerd64 on 64-bit architectures
8f672edfa4d46b385f8a37dc985bcc754bf01c21 07-Mar-2014 JP Abgrall <jpa@google.com> am d4148e94: am ecac99b5: am 1367854a: Merge "adb: fix windows build after "forward --list" fix."

* commit 'd4148e94e97c6abe402e819f6164276575a91936':
adb: fix windows build after "forward --list" fix.
9552cdf434ac1c9ff8730f5492d649845ad4f86c 07-Mar-2014 Dianne Hackborn <hackbod@google.com> Add ability to have a callback when wakeups happen.

Change-Id: I02ff0e035bf8a97bd1a3b6b1699181fc3a137d79
ibsuspend/autosuspend_wakeup_count.c
ibsuspend/include/suspend/autosuspend.h
076a4bfd806c7f75d24212d42ed96d44bbbea1e4 07-Mar-2014 JP Abgrall <jpa@google.com> am 9d6abbda: am 9f573bb3: am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"

* commit '9d6abbdaccd520055fc47b6b3b36232cf23897fd':
Fix adb forward --list when forwarding a lot
173f4995b075e67abdb1874da9f6e83fd7324a5e 07-Mar-2014 Andy Hung <hunga@google.com> Update audio_bytes_per_sample for PCM 24 bit packed

Change-Id: Ic79f604893f5c4f2e8e35189d6638b5b160435ed
Signed-off-by: Andy Hung <hunga@google.com>
nclude/system/audio.h
d4148e94e97c6abe402e819f6164276575a91936 07-Mar-2014 JP Abgrall <jpa@google.com> am ecac99b5: am 1367854a: Merge "adb: fix windows build after "forward --list" fix."

* commit 'ecac99b54ce704f282ff6706f8cfada48f41b35c':
adb: fix windows build after "forward --list" fix.
ecac99b54ce704f282ff6706f8cfada48f41b35c 07-Mar-2014 JP Abgrall <jpa@google.com> am 1367854a: Merge "adb: fix windows build after "forward --list" fix."

* commit '1367854a891090d1be1edfb12515691b20b350cf':
adb: fix windows build after "forward --list" fix.
1367854a891090d1be1edfb12515691b20b350cf 07-Mar-2014 JP Abgrall <jpa@google.com> Merge "adb: fix windows build after "forward --list" fix."
5b0bb4898c61e5b5b7dc95c185b2e46b65f60d00 07-Mar-2014 JP Abgrall <jpa@google.com> adb: fix windows build after "forward --list" fix.

EWOULDBLOCK is not there on windows.
It gets translated by the adb_write() wrapper into EGAIN.
But the Linux one does not translate EWOULDBLOCK into EGAIN.
Without EWOULDBLOCK, it works just fine.

Change-Id: Ic293be392aa4364637428ea94ef87890ffa09b9b
Signed-off-by: JP Abgrall <jpa@google.com>
db/transport.c
9d6abbdaccd520055fc47b6b3b36232cf23897fd 07-Mar-2014 JP Abgrall <jpa@google.com> am 9f573bb3: am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"

* commit '9f573bb362c3716c54df77d85a0285897daa242a':
Fix adb forward --list when forwarding a lot
9f573bb362c3716c54df77d85a0285897daa242a 07-Mar-2014 JP Abgrall <jpa@google.com> am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"

* commit '66e95d76c47a3a099931bbebe7f4a0af4d3f7fbb':
Fix adb forward --list when forwarding a lot
318900ad802871f2bf7f2c2f38b4c519193db519 07-Mar-2014 Mark Salyzyn <salyzyn@google.com> am d01c257f: am 8f632327: am bb0fbdbe: Merge "logd: liblog: 64-bit issues"

* commit 'd01c257f0f19a30178a6d5ec9d6d00d6b702fed3':
logd: liblog: 64-bit issues
0f43cf073099945628ee5f3eb0920121e0915e99 07-Mar-2014 Colin Cross <ccross@android.com> am e4980725: am 9690230a: am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"

* commit 'e4980725dc14c913978a3bdb30dd1844781bbd27':
Fix the build for NEON in libpixelflinger
66e95d76c47a3a099931bbebe7f4a0af4d3f7fbb 07-Mar-2014 JP Abgrall <jpa@google.com> Merge "Fix adb forward --list when forwarding a lot"
6e94c5764b1775a0e4f122cf3925c46815029ccb 07-Mar-2014 Nick Kralevich <nnk@google.com> am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '2e7347d617b02b13d227bb4cecf6bd69b7b20fa9':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
a8a427d1803c4cd99e4c125a5bd8c1e093d4c546 07-Mar-2014 Colin Cross <ccross@android.com> am dc97eec0: Merge "pixelflinger: support multilib builds"

* commit 'dc97eec05232a5d64b6425043b48eafaf63cef7f':
pixelflinger: support multilib builds
1140ae776a1d83c02ab539678c1a7436f80ee199 07-Mar-2014 Elliott Hughes <enh@google.com> am 1c1bd845: Merge "x86_64: Add atomic funtions"

* commit '1c1bd8454915fde50b27db56739c34501f138937':
x86_64: Add atomic funtions
470910d1016ae9c15a4e37f9757947e214f220b8 07-Mar-2014 Colin Cross <ccross@android.com> am 7419498c: Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"

* commit '7419498cb5fa53427d8aec95c4ad27e82cfec156':
pixelflinger: use __builtin___clear_cache instead of cacheflush
e6108b84b8a0d658d171bc6f65f28568f3c22d75 07-Mar-2014 Colin Cross <ccross@android.com> am 85516e9d: Merge "log: add compile-time checking when ALOGV is disabled"

* commit '85516e9d019a7f5af0e394ea767185c12ffbcd42':
log: add compile-time checking when ALOGV is disabled
09e395048d3bb4180df0b8c23f56ecfa48d9dca2 07-Mar-2014 Christopher Ferris <cferris@google.com> am 4207df11: Merge "Use stat structure to keep oldest mtime."

* commit '4207df11c5c09969b576324b4eea93a4c4e1ee99':
Use stat structure to keep oldest mtime.
f571a7ca3798c4aa0e573967db7126a0fdba41de 07-Mar-2014 Elliott Hughes <enh@google.com> am 829ae5be: Merge "Remove a pre-uapi hack from nandread."

* commit '829ae5befa16efbd2ca4e974d702c2eaac3eab02':
Remove a pre-uapi hack from nandread.
56521f882a2c36948d2aa8bd2f6cb8f77b878b30 07-Mar-2014 Colin Cross <ccross@android.com> am 13274a26: Merge "Fix logging errors inside ALOGV"

* commit '13274a2661eeb9aa4b2f82db6fd11edc22af1d8a':
Fix logging errors inside ALOGV
22e14c34760e8e65c5cb73804bf2c9ed4c0ca8b7 07-Mar-2014 Elliott Hughes <enh@google.com> am 136a9619: Merge "Use socklen_t instead of int in debuggerd."

* commit '136a961980f4c31da44fa496e0474754d42624e1':
Use socklen_t instead of int in debuggerd.
91875e2f39eb2b8178752a724750472ef7f3eeae 07-Mar-2014 Nick Kralevich <nnk@google.com> am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."

* commit '71de56a08cac3353334c2253748fdf8c37ec4aa1':
Unify toolbox restorecon and libselinux restorecon implementations.
56542de43d02b264e519dfa52754881f3c53c7d6 07-Mar-2014 Elliott Hughes <enh@google.com> am 68835ee8: Merge "system/core LP64 cleanup."

* commit '68835ee88b146f654fe3ce007f07ace71266e876':
system/core LP64 cleanup.
fa97a57eaef3b1480b14efab35bf33d36e2a2d55 07-Mar-2014 Elliott Hughes <enh@google.com> am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""

* commit 'eaba2bedf529eeb21351c8bf6365107cb6a4e8b6':
Revert "Move to the canonical UniquePtr.h."
9f4fd60d590725d8137b6ecff66a6c4be09f0009 07-Mar-2014 Elliott Hughes <enh@google.com> am 345fc625: Merge "Move to the canonical UniquePtr.h."

* commit '345fc6252a3e5c6113be893638f4746a54173489':
Move to the canonical UniquePtr.h.
87bb3fb7d81599b5dc3129d9ca859932c081af3c 07-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"

* commit '5931ea864599fc3ce29ed3b1ff8d4ff65413a168':
libsysutil: frequent native crash /system/bin/vold
c1f1eb374e3153e71419b50e8e9642a0ffaaea1e 07-Mar-2014 Nick Kralevich <nnk@google.com> am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."

* commit 'ba023b063d25b73923f2df536b6258967f756ff6':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
6f4bf03917dde69c43659ac55a22ed8a280ed733 07-Mar-2014 Christopher Ferris <cferris@google.com> am 3faf86c0: Merge "Call a specialized local map set."

* commit '3faf86c0d4b98e7d26edbe8d1c8a8a231c86a234':
Call a specialized local map set.
7f9060fa179600850cd1090d4742e6ee7da29af9 07-Mar-2014 Christopher Ferris <cferris@google.com> am c47aa3bd: Merge "Fix mips build."

* commit 'c47aa3bd2acde49f858b21bcafd750b2981df7c0':
Fix mips build.
11dd948e85e5a6fb642e757699208d2887eda4f2 07-Mar-2014 Elliott Hughes <enh@google.com> am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."

* commit 'cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509':
Fix debuggerd's symbol offset output.
69ecf52d60b21534316632f4e51573c8ccfaaab8 07-Mar-2014 Elliott Hughes <enh@google.com> am 434edbe6: Merge "LP64 should have debuggerd and debuggerd64."

* commit '434edbe6fffb9445316567ac6de3f407c005b37b':
LP64 should have debuggerd and debuggerd64.
2b23abe0dd8c8c4aa142242dc1c183e280ada709 07-Mar-2014 Elliott Hughes <enh@google.com> am 1bc6169f: Merge "Remove dead code that looked like part of debuggerd."

* commit '1bc6169f80fb02957695351ce8b4f49d0c019382':
Remove dead code that looked like part of debuggerd.
f38b6e3036100288920fe9583a1b0dfa43a2ddc1 07-Mar-2014 Christopher Ferris <cferris@google.com> am 0fdf0dc7: Merge "Refactor makefile."

* commit '0fdf0dc725a130b39a4232262b77c17ff053ef23':
Refactor makefile.
c7084e63dae96c56bf8301afe70685c9619cacda 07-Mar-2014 Elliott Hughes <enh@google.com> am 51c4d4c4: Merge "AArch64: Port debuggerd"

* commit '51c4d4c431dbbabe6db1cea5bb21822c69b7546c':
AArch64: Port debuggerd
52af69e17098880c68daad88d07c6bdfe8a1d80c 07-Mar-2014 Elliott Hughes <enh@google.com> am e94985a2: Merge "Increase the scope of other reused definitions."

* commit 'e94985a2514312e7103fbb6a6a45e473031cb6c0':
Increase the scope of other reused definitions.
07a7d20ae26287e4dfed30af363801d47aa19a37 07-Mar-2014 Elliott Hughes <enh@google.com> am 5434bf66: Merge "LP64: Enable debuggerd/libbacktrace/libunwind."

* commit '5434bf6640af7145986d63968846ba7168dab406':
LP64: Enable debuggerd/libbacktrace/libunwind.
bde72e302536d6623fe5f7b14794229c6a26605a 07-Mar-2014 Elliott Hughes <enh@google.com> am 469f1533: Merge "Fix build by defining LOCAL_PATH early enough."

* commit '469f15339dd2ea7458d12bcdff802d26dcffbcd7':
Fix build by defining LOCAL_PATH early enough.
25e389080c5ce6fe53917b9adbb8f54e281d2e33 07-Mar-2014 Elliott Hughes <enh@google.com> am 525155ac: Merge "Allow the host libcorkscrew to build."

* commit '525155ac49bae98e9f50ce667609c32eeccc80be':
Allow the host libcorkscrew to build.
3f9acb8f3212cc54920af992a6d380c3dee5fbec 07-Mar-2014 Elliott Hughes <enh@google.com> am e97dad0d: Merge "debuggerd: a few generic improvements"

* commit 'e97dad0d95ae1305686bf4294029da947fc2dcf2':
debuggerd: a few generic improvements
953e84a93c636051a82f34164a0f3b230f1b8b3d 07-Mar-2014 Elliott Hughes <enh@google.com> am 8623972d: Merge "Don\'t try to build libcorkscrew for LP64."

* commit '8623972dc0055ae878df24cf93a663e60a6787f1':
Don't try to build libcorkscrew for LP64.
d91088b41509d5f76c116b969a3b4dde183ee291 06-Mar-2014 Elliott Hughes <enh@google.com> am caefe564: Merge "x86: Enable libunwind"

* commit 'caefe564a4b05e717a3baec155b8968ad36e58b6':
x86: Enable libunwind
460525847718ce77ad1495a7df4cd0bf05aedd8d 06-Mar-2014 Christopher Ferris <cferris@google.com> am 7957529d: Merge "Clean up UnwindCurrent.cpp\'s use of ucontext.h."

* commit '7957529d4419fa92928daebfdc5f5bb1ee50120a':
Clean up UnwindCurrent.cpp's use of ucontext.h.
d01c257f0f19a30178a6d5ec9d6d00d6b702fed3 06-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 8f632327: am bb0fbdbe: Merge "logd: liblog: 64-bit issues"

* commit '8f63232712e318da88d2f543fe29066c26d39c32':
logd: liblog: 64-bit issues
e4980725dc14c913978a3bdb30dd1844781bbd27 06-Mar-2014 Colin Cross <ccross@android.com> am 9690230a: am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"

* commit '9690230a3c22977be24006d24ea35dd3efadc362':
Fix the build for NEON in libpixelflinger
8f63232712e318da88d2f543fe29066c26d39c32 06-Mar-2014 Mark Salyzyn <salyzyn@google.com> am bb0fbdbe: Merge "logd: liblog: 64-bit issues"

* commit 'bb0fbdbefd7079859e4df45f1b75ad6c48839a50':
logd: liblog: 64-bit issues
9690230a3c22977be24006d24ea35dd3efadc362 06-Mar-2014 Colin Cross <ccross@android.com> am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"

* commit '0a8a56361e2b54d0e2a9e2c2f7a7ab47dc76c650':
Fix the build for NEON in libpixelflinger
ef901c26f3547f6a09c4c70ba7b29e99ddc4047f 06-Mar-2014 Colin Cross <ccross@android.com> am 1686784a: Merge changes I6bffe1cd,I0984ba01

* commit '1686784a37848fa985258f3f87cf6835f1c8cf0e':
fs_mgr: split fstab parsing into separate file
fs_mgr: update ext4_parse_sb to match change in ext4_utils
664ccd4fb619a4727f66a4be55dd02ad4b11e216 06-Mar-2014 Elliott Hughes <enh@google.com> am 710f6634: Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."

* commit '710f66342591c889b0bf545ff3c578731f112a6b':
Switch mips libcorkscrew over to <sys/ucontext.h>.
e218b31d510091be2a41843aa87643f28de6c5fa 06-Mar-2014 Ian Rogers <irogers@google.com> am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."

* commit '1ca10eabd84e13e2c71d56ef48218bc981f79497':
Avoid redefinition of __STDC_FORMAT_MACROS.
aa9b2c53b3e1a51133532761b0074d8909599372 06-Mar-2014 Elliott Hughes <enh@google.com> am 59b5294f: Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."

* commit '59b5294f0ead4f50dbd3b45b6602d145cf9d3afd':
Switch arm libcorkscrew over to <sys/ucontext.h>.
c2e7ce01a3e171b70084d3515ad18edd542e2724 06-Mar-2014 Elliott Hughes <enh@google.com> am b99d5294: Merge "Switch x86 libcorkscrew over to <ucontext.h>."

* commit 'b99d52944f61aebdac427a490bfed2ae8cccbc10':
Switch x86 libcorkscrew over to <ucontext.h>.
7d2998ea18f099eb24027a546cff6093516de7e5 06-Mar-2014 Jesse Hall <jessehall@google.com> Merge "Add NativeHandle, a refcounted C++ wrapper around a native_handle_t*"
bb0fbdbefd7079859e4df45f1b75ad6c48839a50 06-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: liblog: 64-bit issues"
0a8a56361e2b54d0e2a9e2c2f7a7ab47dc76c650 06-Mar-2014 Colin Cross <ccross@android.com> Merge "Fix the build for NEON in libpixelflinger"
d82b2a3eb4f4d2385ec508515a95ff9f339ab74f 06-Mar-2014 Kévin PETIT <kevin.petit@arm.com> Fix the build for NEON in libpixelflinger

ARCH_ARM_HAVE_NEON is only ever defined to true, so test for that.
For the NEON function to be used, the file has to include
machine/cpu-features.h so that __ARM_HAVE_NEON is defined.

Change-Id: I0db196b39c493092415859e009531fcff6fc1e8b
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ibpixelflinger/Android.mk
ibpixelflinger/scanline.cpp
2289b2848e07e9ea860d16b261a7f5952ea40834 06-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
29cc9ce49a10883c370c6bd428cdd81baae1f945 03-Mar-2014 Jesse Hall <jessehall@google.com> Add NativeHandle, a refcounted C++ wrapper around a native_handle_t*

Change-Id: I232dfa2ad2e4a463a39e2e901e4097dffe278cc3
nclude/utils/NativeHandle.h
ibutils/Android.mk
ibutils/NativeHandle.cpp
7e2f83c0bcc3ad8a2840a48be14d302ed79d671c 05-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: liblog: 64-bit issues

- structure packing
- move towards log_time from struct timespec
- extend log_time to cover differences between
log_time and struct timespec

Change-Id: I106ed0b609917306d170044054b5b32645f2a295
nclude/log/log_read.h
nclude/log/logger.h
iblog/logd_write.c
iblog/tests/liblog_benchmark.cpp
iblog/tests/liblog_test.cpp
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogBufferElement.cpp
ogd/LogBufferElement.h
fa810f4c4e14fe5947d0152c4b016bf5cc153c1f 05-Mar-2014 Mathieu Chartier <mathieuc@google.com> am d8ed565f: am f27f9e10: am 51ebffd8: Merge "Add free to CloseArchive."

* commit 'd8ed565f1541ccda63254f236064fa22be9ecbf9':
Add free to CloseArchive.
d8ed565f1541ccda63254f236064fa22be9ecbf9 05-Mar-2014 Mathieu Chartier <mathieuc@google.com> am f27f9e10: am 51ebffd8: Merge "Add free to CloseArchive."

* commit 'f27f9e10f50a015ec2d76a2f3579a5d11932965e':
Add free to CloseArchive.
f27f9e10f50a015ec2d76a2f3579a5d11932965e 05-Mar-2014 Mathieu Chartier <mathieuc@google.com> am 51ebffd8: Merge "Add free to CloseArchive."

* commit '51ebffd8a5536af09b60950bf7cf6f020c962f8a':
Add free to CloseArchive.
51ebffd8a5536af09b60950bf7cf6f020c962f8a 05-Mar-2014 Mathieu Chartier <mathieuc@google.com> Merge "Add free to CloseArchive."
8e5adf688ba52a650905f38ba0a56375f9bee703 05-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
6f26891d67a55515b46c3da38d63c4d41c3cfefc 04-Mar-2014 Todd Poynor <toddpoynor@google.com> libsuspend: use wakeup count interface for system suspend

Use the wakeup count interface for requesting suspend, instead of
autosleep, to allow userspace to collect stats on suspend/resume
activity.

Change-Id: I44b5ef031b2bdc5b09c904fb2adbbe16370c2984
ibsuspend/autosuspend.c
d030033a39196bf377a70ceb0ade7d40fa917664 05-Mar-2014 Colin Cross <ccross@android.com> am 933f0b88: am f21b6b92: am 87a56eb6: Merge "Use the getopt function in compliance with the standard."

* commit '933f0b88e4232f58f171b8217d7871f97a927c57':
Use the getopt function in compliance with the standard.
933f0b88e4232f58f171b8217d7871f97a927c57 05-Mar-2014 Colin Cross <ccross@android.com> am f21b6b92: am 87a56eb6: Merge "Use the getopt function in compliance with the standard."

* commit 'f21b6b9217efc86ae753e5c57a05ff05e631bd3e':
Use the getopt function in compliance with the standard.
5f98b12640af0fd937c1cd5929248f8f01779922 05-Mar-2014 Mathieu Chartier <mathieuc@google.com> Add free to CloseArchive.

Currently CloseArchive doesn't call free and call sites don't appear
to either. I could not find any call sites which manually freed the
archive by deleting the handle. This fixes several memory leaks.

Change-Id: I21f187dde60fd87e6e54bde06de9e76fd0791104
ibziparchive/zip_archive.cc
f21b6b9217efc86ae753e5c57a05ff05e631bd3e 05-Mar-2014 Colin Cross <ccross@android.com> am 87a56eb6: Merge "Use the getopt function in compliance with the standard."

* commit '87a56eb6cc616150d536ed0e70cf8e69e1d5edf6':
Use the getopt function in compliance with the standard.
87a56eb6cc616150d536ed0e70cf8e69e1d5edf6 05-Mar-2014 Colin Cross <ccross@android.com> Merge "Use the getopt function in compliance with the standard."
6e681af519980ba9ca928c962ac79d57d3218e67 04-Mar-2014 Nick Kralevich <nnk@google.com> am 71ca8381: am 6783d7cf: am 93412622: am 726beb6c: am 6941a83c: don\'t load property_contexts from /data

* commit '71ca8381b880d6402e273dc1c9a10a25e5b82572':
don't load property_contexts from /data
71ca8381b880d6402e273dc1c9a10a25e5b82572 04-Mar-2014 Nick Kralevich <nnk@google.com> am 6783d7cf: am 93412622: am 726beb6c: am 6941a83c: don\'t load property_contexts from /data

* commit '6783d7cf166feb943a5cdcd74c8da1f7a160fc2d':
don't load property_contexts from /data
6783d7cf166feb943a5cdcd74c8da1f7a160fc2d 04-Mar-2014 Nick Kralevich <nnk@google.com> am 93412622: am 726beb6c: am 6941a83c: don\'t load property_contexts from /data

* commit '93412622859014cc8bd39c30101096d03300845c':
don't load property_contexts from /data
fbbc85ea8e2f0142e03a7e50c3f106a0a76d6c0b 04-Mar-2014 Dmitriy Ivanov <dimitry@google.com> am 6bb6372b: am 508240c3: am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly"

* commit '6bb6372b3ee930e2e8517262ec7db4f057a50725':
fix: making lsof show devies and loaded .so file names correctly
6bb6372b3ee930e2e8517262ec7db4f057a50725 04-Mar-2014 Dmitriy Ivanov <dimitry@google.com> am 508240c3: am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly"

* commit '508240c3798799e5d177d03604798f38366a4a4a':
fix: making lsof show devies and loaded .so file names correctly
508240c3798799e5d177d03604798f38366a4a4a 04-Mar-2014 Dmitriy Ivanov <dimitry@google.com> am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly"

* commit '2a16a5847a2811626a108f8cbd7606680647df86':
fix: making lsof show devies and loaded .so file names correctly
2a16a5847a2811626a108f8cbd7606680647df86 04-Mar-2014 Dmitriy Ivanov <dimitry@google.com> Merge "fix: making lsof show devies and loaded .so file names correctly"
da56648374473c88e8aa29a09ad4bb63feb6783b 04-Mar-2014 Nick Kralevich <nnk@google.com> am be2dfb68: am f773d127: resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aosp

* commit 'be2dfb684caf760937bae61b79c7dfe390be04d0':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
be2dfb684caf760937bae61b79c7dfe390be04d0 04-Mar-2014 Nick Kralevich <nnk@google.com> am f773d127: resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aosp

* commit 'f773d127849b25838df032bced80ecf9f98a0633':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
93412622859014cc8bd39c30101096d03300845c 04-Mar-2014 Nick Kralevich <nnk@google.com> am 726beb6c: am 6941a83c: don\'t load property_contexts from /data

* commit '726beb6c4a02d14cc4637ec61cba09dbe097a149':
don't load property_contexts from /data
f773d127849b25838df032bced80ecf9f98a0633 04-Mar-2014 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aosp

Change-Id: I20b005efaa84d86d22f6af7a81ade36a606a1d21
726beb6c4a02d14cc4637ec61cba09dbe097a149 04-Mar-2014 Nick Kralevich <nnk@google.com> am 6941a83c: don\'t load property_contexts from /data

* commit '6941a83c2dd34df606df13972576fbc23172c3c5':
don't load property_contexts from /data
7c1fc0ed42609c6c44d6738e0d8ef1d4425a6758 04-Mar-2014 Dmitriy Ivanov <dimitry@google.com> fix: making lsof show devies and loaded .so file names correctly

Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
oolbox/lsof.c
6941a83c2dd34df606df13972576fbc23172c3c5 19-Jan-2014 Nick Kralevich <nnk@google.com> don't load property_contexts from /data

Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
(cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf)
nit/init.c
4bf3bb679a37f4aa77a51f452b37cf9a3d142f13 04-Mar-2014 Daniel Cashman <dcashman@google.com> Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file." into klp-modular-dev
9b40cb9f08fba7f89786b480018efe13be913819 04-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
dcc4a31da96804c76aebd942f0fdd1ac83ad376b 04-Mar-2014 Nick Kralevich <nnk@google.com> am 3e36cbb0: am 7cd7ad52: am 5e96d89a: am 3530b9cd: am 02916aa2: Remove obsolete vdc call.

* commit '3e36cbb096ea6334e136446821fc2897a2e0c64e':
Remove obsolete vdc call.
3e36cbb096ea6334e136446821fc2897a2e0c64e 04-Mar-2014 Nick Kralevich <nnk@google.com> am 7cd7ad52: am 5e96d89a: am 3530b9cd: am 02916aa2: Remove obsolete vdc call.

* commit '7cd7ad5216d4c4946ebbefc78382ef78d510afc1':
Remove obsolete vdc call.
7cd7ad5216d4c4946ebbefc78382ef78d510afc1 04-Mar-2014 Nick Kralevich <nnk@google.com> am 5e96d89a: am 3530b9cd: am 02916aa2: Remove obsolete vdc call.

* commit '5e96d89aa5da72fdd20c719cd35eff36e27ecab2':
Remove obsolete vdc call.
5e96d89aa5da72fdd20c719cd35eff36e27ecab2 04-Mar-2014 Nick Kralevich <nnk@google.com> am 3530b9cd: am 02916aa2: Remove obsolete vdc call.

* commit '3530b9cd4675a5e0c5c02dd765450b84ace67401':
Remove obsolete vdc call.
3530b9cd4675a5e0c5c02dd765450b84ace67401 04-Mar-2014 Nick Kralevich <nnk@google.com> am 02916aa2: Remove obsolete vdc call.

* commit '02916aa20e3ffbe4b738bb12dc1607a7ec6a8c37':
Remove obsolete vdc call.
02916aa20e3ffbe4b738bb12dc1607a7ec6a8c37 15-Jan-2014 Nick Kralevich <nnk@google.com> Remove obsolete vdc call.

Since ca8e66a8b0f843812014a28d49208f9f6f64ecbc, init has
been handling reboots and filesystem unmounts. Remove obsolete
call to vdc.

Bug: 12504045
Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
(cherry picked from commit 225459a5da21e9397ca49b0d9af7d5fe3462706b)
db/adb.c
db/services.c
1d39c53e29a9c56893d170f1eac3d720076e0e55 04-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 00eaae3a: am 556c9c24: am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"

* commit '00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37':
set /proc/sys/net/unix/max_dgram_qlen to large value
00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37 04-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 556c9c24: am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"

* commit '556c9c245de257efe8bda09ff23d2c4f7add5e49':
set /proc/sys/net/unix/max_dgram_qlen to large value
556c9c245de257efe8bda09ff23d2c4f7add5e49 04-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"

* commit '858d0dd1e529575181abd8de607e46f7b273cc9d':
set /proc/sys/net/unix/max_dgram_qlen to large value
858d0dd1e529575181abd8de607e46f7b273cc9d 04-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"
581edc1b6c3799238cfb674dfddb97db44f2818e 20-Nov-2013 Mark Salyzyn <salyzyn@google.com> set /proc/sys/net/unix/max_dgram_qlen to large value

- init: set /proc/sys/net/unix/max_dgram_qlen to 300
- libsysutils: Add listen backlog argument to startListener
- logd: set listen backlog to 300

Change-Id: Id6d37d6c937ba2d221e76258d89c9516619caeec
nclude/sysutils/SocketListener.h
ibsysutils/src/SocketListener.cpp
ogd/main.cpp
ootdir/init.rc
3a436c1c3c5d1b669732e6f5eaaa6986118ab306 03-Mar-2014 Lajos Molnar <lajos@google.com> Merge "Adding opus to list of audio formats"
a4c673e9af8148eed70a5fab54eaefb8506a3ab3 03-Mar-2014 Jesse Hall <jessehall@google.com> am b497340c: am a27fcee6: am ba23d539: Merge "Fix the handling of CodeCache return codes in pixelflinger"

* commit 'b497340cb1c36b92fb298c52f041e1f9bdd990f2':
Fix the handling of CodeCache return codes in pixelflinger
b497340cb1c36b92fb298c52f041e1f9bdd990f2 03-Mar-2014 Jesse Hall <jessehall@google.com> am a27fcee6: am ba23d539: Merge "Fix the handling of CodeCache return codes in pixelflinger"

* commit 'a27fcee621b5b680702ff5c30c858dbc5e287c51':
Fix the handling of CodeCache return codes in pixelflinger
a27fcee621b5b680702ff5c30c858dbc5e287c51 03-Mar-2014 Jesse Hall <jessehall@google.com> am ba23d539: Merge "Fix the handling of CodeCache return codes in pixelflinger"

* commit 'ba23d539328af36b2040a5bcbdcc840810a4df51':
Fix the handling of CodeCache return codes in pixelflinger
ba23d539328af36b2040a5bcbdcc840810a4df51 03-Mar-2014 Jesse Hall <jessehall@google.com> Merge "Fix the handling of CodeCache return codes in pixelflinger"
1c3cb91f72a9745f2956c160729887488e2806ed 02-Mar-2014 David Gumberg <davidzgumberg@gmail.com> Use the getopt function in compliance with the standard.

This is a simple change to the use of getopt in reboot.c, as per the standard,
getopt does NOT return an EOF, it returns a -1, (this was done to remove
getopt's dependence on stdio.h), and since the standard does not guarantee
that EOF is -1, and the documentation tells us that getopt returns -1,
in my judgement it would be best to test for -1, rather than EOF.

Change-Id: I63a3bb7011eb60753eb910221bbe8ce0a71e6679
Signed-off-by: David Gumberg <davidzgumberg@gmail.com>
eboot/reboot.c
80aa668109f9a0239cc4d64ccdb455f0cd4bde5b 01-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
6a732d423f8f7a72276c4d7e594afc167ec23258 01-Mar-2014 Elliott Hughes <enh@google.com> am 2ae567c8: am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) uid_from_user."

* commit '2ae567c82ee34fb7e51e797fce140313de34338b':
Declare (and simplify) uid_from_user.
2ae567c82ee34fb7e51e797fce140313de34338b 01-Mar-2014 Elliott Hughes <enh@google.com> am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) uid_from_user."

* commit '1a5bc28faed5e2060a6f3e1b8135fe82dc2cb319':
Declare (and simplify) uid_from_user.
1a5bc28faed5e2060a6f3e1b8135fe82dc2cb319 01-Mar-2014 Elliott Hughes <enh@google.com> am a0e4d164: Merge "Declare (and simplify) uid_from_user."

* commit 'a0e4d1643cc74748c3b5b05da0d41b7dbcda23e5':
Declare (and simplify) uid_from_user.
a0e4d1643cc74748c3b5b05da0d41b7dbcda23e5 01-Mar-2014 Elliott Hughes <enh@google.com> Merge "Declare (and simplify) uid_from_user."
e12311fcb2184462c8d916d27b03302e58623347 01-Mar-2014 Elliott Hughes <enh@google.com> am f767e9c9: am 7c5a9d24: am fbcdf6f9: Merge "Switch to BSD chown (for -R, primarily)."

* commit 'f767e9c97a0719b342e91c7770885c108a66e02f':
Switch to BSD chown (for -R, primarily).
f767e9c97a0719b342e91c7770885c108a66e02f 01-Mar-2014 Elliott Hughes <enh@google.com> am 7c5a9d24: am fbcdf6f9: Merge "Switch to BSD chown (for -R, primarily)."

* commit '7c5a9d24aa173e9ee5e7133be43b9c98c8112ab7':
Switch to BSD chown (for -R, primarily).
3f6b63e74d78ab259b55513a933bab3c5c1cc165 01-Mar-2014 Elliott Hughes <enh@google.com> Declare (and simplify) uid_from_user.

uid_from_user doesn't need to cope with numeric ids in the BSD code
like it did with the old Android code; the caller now handles those.

Also explain what SUPPORT_DOT is for.

Change-Id: I185c9f02b7039795069aa30545563b8a6ef54cd5
oolbox/Android.mk
oolbox/bsd-compatibility.h
oolbox/uid_from_user.c
7c5a9d24aa173e9ee5e7133be43b9c98c8112ab7 01-Mar-2014 Elliott Hughes <enh@google.com> am fbcdf6f9: Merge "Switch to BSD chown (for -R, primarily)."

* commit 'fbcdf6f9fe9212154b7b4bf3a4e6f16ad69ca994':
Switch to BSD chown (for -R, primarily).
7bc97484201a024ecc2921e13b0f2983c116f32a 01-Mar-2014 Elliott Hughes <enh@google.com> am 1f570812: am d262b2a8: am 54bb1d3b: Merge "Fix grep -f."

* commit '1f57081216a2eae81672dadd67c94476b27fbf63':
Fix grep -f.
1f57081216a2eae81672dadd67c94476b27fbf63 01-Mar-2014 Elliott Hughes <enh@google.com> am d262b2a8: am 54bb1d3b: Merge "Fix grep -f."

* commit 'd262b2a886a5674fe428ecbfd3a10dfc5efe8e85':
Fix grep -f.
fbcdf6f9fe9212154b7b4bf3a4e6f16ad69ca994 01-Mar-2014 Elliott Hughes <enh@google.com> Merge "Switch to BSD chown (for -R, primarily)."
d262b2a886a5674fe428ecbfd3a10dfc5efe8e85 01-Mar-2014 Elliott Hughes <enh@google.com> am 54bb1d3b: Merge "Fix grep -f."

* commit '54bb1d3b98075316e0cd1289f218470cb70227ce':
Fix grep -f.
54bb1d3b98075316e0cd1289f218470cb70227ce 01-Mar-2014 Elliott Hughes <enh@google.com> Merge "Fix grep -f."
0b024677ec64ebbf298de810929292a693436ad6 01-Mar-2014 Elliott Hughes <enh@google.com> Switch to BSD chown (for -R, primarily).

Change-Id: I45381b8a04f4cb651123a2d43860418e06df6e65
oolbox/Android.mk
oolbox/chown.c
oolbox/uid_from_user.c
4014501d79d060f0855b919ee20fa9db5448cfdf 01-Mar-2014 Elliott Hughes <enh@google.com> Fix grep -f.

bionic has getline now.

Change-Id: I5e4ee137768ab3113dbe8a07406fa39f4b6546af
oolbox/grep/grep.c
7ec0e122d94c00b76cf0d5c213170eff8999e7a2 01-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 53a3b3f5: am ab41b689: am 1a1c42fd: Merge "logd: Always build logd"

* commit '53a3b3f56ab53da0e657a8fa670f8f30b80bb4c9':
logd: Always build logd
53a3b3f56ab53da0e657a8fa670f8f30b80bb4c9 01-Mar-2014 Mark Salyzyn <salyzyn@google.com> am ab41b689: am 1a1c42fd: Merge "logd: Always build logd"

* commit 'ab41b68968e133bd625ee24e45b2582067ca00be':
logd: Always build logd
ab41b68968e133bd625ee24e45b2582067ca00be 01-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 1a1c42fd: Merge "logd: Always build logd"

* commit '1a1c42fda7ec6087355529337573dd3ec5e85d91':
logd: Always build logd
1a1c42fda7ec6087355529337573dd3ec5e85d91 01-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Always build logd"
4381d43848060984e7e57a146ed3219b36e6e3e9 01-Mar-2014 Mark Salyzyn <salyzyn@google.com> logd: Always build logd

- build breakage aosp-idea133 @ 1049092

Change-Id: Iabac6009567926137f455044b33ab5d67924896d
ogd/Android.mk
dc179fd2bf0db8247646e891ee96a7735f9bf09b 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 7be31bbf: am b0eaeb42: am a69270db: Merge "liblog: enable logging to logd."

* commit '7be31bbf67e9b8b7e53948472535b54b3d27a693':
liblog: enable logging to logd.
7be31bbf67e9b8b7e53948472535b54b3d27a693 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am b0eaeb42: am a69270db: Merge "liblog: enable logging to logd."

* commit 'b0eaeb42cea7e3ee36e03ef461532b5b8556a26e':
liblog: enable logging to logd.
b0eaeb42cea7e3ee36e03ef461532b5b8556a26e 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am a69270db: Merge "liblog: enable logging to logd."

* commit 'a69270db05cea27bf185e60af46dd46e938c7e99':
liblog: enable logging to logd.
a69270db05cea27bf185e60af46dd46e938c7e99 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: enable logging to logd."
caad5bb35925963398f67444558d1fd6cccdc602 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am da13962c: am a931cf07: am ea1b1d48: Merge "logd: institute getGroups for socket credentials"

* commit 'da13962c2ed1503512f4407c5d9a5d15a5af5e27':
logd: institute getGroups for socket credentials
da13962c2ed1503512f4407c5d9a5d15a5af5e27 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am a931cf07: am ea1b1d48: Merge "logd: institute getGroups for socket credentials"

* commit 'a931cf072af0eeb668559f140a8a25558d2e7e14':
logd: institute getGroups for socket credentials
a931cf072af0eeb668559f140a8a25558d2e7e14 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am ea1b1d48: Merge "logd: institute getGroups for socket credentials"

* commit 'ea1b1d483a9cc6ab748a84fd15536278e4d359e5':
logd: institute getGroups for socket credentials
ea1b1d483a9cc6ab748a84fd15536278e4d359e5 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: institute getGroups for socket credentials"
154f4608aac6218af0e25c98b71d0803278c047e 20-Feb-2014 Mark Salyzyn <salyzyn@google.com> liblog: enable logging to logd.

* Modify liblog to send all messages to the new syslog user
space daemon.

Original-Change-Id: I0ce439738cd921efb2db4c1d6a289a96bdbc8bc2
Original-Change-Id: If4eb0d09409f7e9be3eb4bb7017073dc7e931ab4
Signed-off-by: Nick Kralevich <nnk@google.com>

* Add a TARGET_USES_LOGD make flag for BoardConfig.mk to manage
whether logd is enabled for use or not.
* rename syslog to logd to avert confusion with bionic syslog
* Add fake log support back in
* prefilter for logging messages from logd
* Fill in timestamps at logging source
* update abstract log reader
* switch from using suffix for id to v3 format
* log a message when creating devices that a deprecated interface
is being utilized.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

(cherry pick from commit 099e2c1f6f706a8600c1cef74cce9066fc315480)

Change-Id: I47929a5432977a1d7235267a435cec0a7d6bd440
nclude/log/logger.h
nit/devices.c
iblog/Android.mk
iblog/log_read.c
iblog/log_read_kern.c
iblog/logd_write.c
iblog/logd_write_kern.c
ogd/Android.mk
1114f1806521b2a6447b7c68934e4f3c29b60cb5 21-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: institute getGroups for socket credentials

(cherry pick from commit 4d851290fc81eb36d2fcf76e6f06213a28b877f5)

Change-Id: Ib8be84d2a3f873e91fb1495df439a498f395c137
ogd/CommandListener.cpp
ogd/FlushCommand.cpp
ogd/LogCommand.cpp
ogd/LogCommand.h
8c3fd9b797051cf2376dc8b71e98fd1476b2bea3 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: enable logging to logd."
7e3d6df7c5a8d788cd9ad8ea89515010a0d1966d 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: institute getGroups for socket credentials"
5c3c77ed7855d262645c44b7e239476d9b66393d 29-Jan-2014 Stephen Smalley <sds@tycho.nsa.gov> Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.

mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed
in the various device-specific init*.rc files but seems generic.
Move it to the main init.rc file.

Drop the separate chown for /data/misc/dhcp as this is handled by mkdir
built-in if the directory already exists.

Add a restorecon_recursive /data/misc/wifi/sockets.

Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
470185211b09472ef11f826c5bf0d154c541040a 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am d9f1702a: am 2b6791d0: am 0577a067: Merge "libsparse: deal with build warning messages"

* commit 'd9f1702a10541b59cfc9582762360d3347712e09':
libsparse: deal with build warning messages
d9f1702a10541b59cfc9582762360d3347712e09 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 2b6791d0: am 0577a067: Merge "libsparse: deal with build warning messages"

* commit '2b6791d0e526828e1e36a7f18f940afa6b278a4a':
libsparse: deal with build warning messages
2b6791d0e526828e1e36a7f18f940afa6b278a4a 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 0577a067: Merge "libsparse: deal with build warning messages"

* commit '0577a0679a90f1f286512f8dba3c6759fc9d5b7d':
libsparse: deal with build warning messages
0577a0679a90f1f286512f8dba3c6759fc9d5b7d 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "libsparse: deal with build warning messages"
031a748b2a9bf6dcfd3983d8f0f616718fcddd88 28-Feb-2014 Mark Salyzyn <salyzyn@google.com> libsparse: deal with build warning messages

- mostly unused parameters, added defs.h to hold __unused macro
- read_all prototype not included, added output_file.h to acquire

Change-Id: Ib7ee00614acab53a6bd6a64f7e26a8c13dbe6297
ibsparse/defs.h
ibsparse/output_file.c
ibsparse/sparse.c
ibsparse/sparse_read.c
17947103154ad16a47333655b02546df306e819a 20-Feb-2014 Mark Salyzyn <salyzyn@google.com> liblog: enable logging to logd.

* Modify liblog to send all messages to the new syslog user
space daemon.

Original-Change-Id: I0ce439738cd921efb2db4c1d6a289a96bdbc8bc2
Original-Change-Id: If4eb0d09409f7e9be3eb4bb7017073dc7e931ab4
Signed-off-by: Nick Kralevich <nnk@google.com>

* Add a TARGET_USES_LOGD make flag for BoardConfig.mk to manage
whether logd is enabled for use or not.
* rename syslog to logd to avert confusion with bionic syslog
* Add fake log support back in
* prefilter for logging messages from logd
* Fill in timestamps at logging source
* update abstract log reader
* switch from using suffix for id to v3 format
* log a message when creating devices that a deprecated interface
is being utilized.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: I47929a5432977a1d7235267a435cec0a7d6bd440
nclude/log/logger.h
nit/devices.c
iblog/Android.mk
iblog/log_read.c
iblog/log_read_kern.c
iblog/logd_write.c
iblog/logd_write_kern.c
ogd/Android.mk
3d8b467e5a38f9935e581a34b3be3b7c7d5b106f 21-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: institute getGroups for socket credentials

Change-Id: Ib8be84d2a3f873e91fb1495df439a498f395c137
ogd/CommandListener.cpp
ogd/FlushCommand.cpp
ogd/LogCommand.cpp
ogd/LogCommand.h
128a26bf7bbc3479b3413d6119efc5bb0f540b3d 27-Feb-2014 Mark Salyzyn <salyzyn@google.com> am f45f30d1: am 9d345aac: am b7a4868e: Merge "logd: Remove include."

* commit 'f45f30d10d8d17a403ca82d2cb2291a450c1c128':
logd: Remove $(KERNEL_HEADERS) include.
f45f30d10d8d17a403ca82d2cb2291a450c1c128 27-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 9d345aac: am b7a4868e: Merge "logd: Remove include."

* commit '9d345aacf45d111b25a2bdc2a949c149628e8295':
logd: Remove $(KERNEL_HEADERS) include.
9d345aacf45d111b25a2bdc2a949c149628e8295 27-Feb-2014 Mark Salyzyn <salyzyn@google.com> am b7a4868e: Merge "logd: Remove include."

* commit 'b7a4868e1cad6a878c94077bc48b414c965cb516':
logd: Remove $(KERNEL_HEADERS) include.
b7a4868e1cad6a878c94077bc48b414c965cb516 27-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Remove $(KERNEL_HEADERS) include."
89343c1113e15f37dbcf89d064e638ebf9f44b30 25-Feb-2014 Martijn Coenen <maco@google.com> logd: Remove $(KERNEL_HEADERS) include.

Points to wrong kernel-headers dir in multi-arch
builds.

(cherry picked from commit 920a5629ff91ee0f5decaaf4f16a8fb3af752496)

Change-Id: I5055bf5cd80119a34f0a6b0872ffb0a422a06baf
ogd/Android.mk
3ed8e54a06a0bd66eda2af893eb52fd1075bfa02 27-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
665b0bb4f930c451904dff86a434c59f1ca4c9b0 27-Feb-2014 Narayan Kamath <narayan@google.com> am bfed1360: am 1ed1d341: am 26fa5cd3: Merge "AArch64: Use negative values in error enumeration"

* commit 'bfed136068feb299b3ca8a07d6eaf5d93e3ff2a3':
AArch64: Use negative values in error enumeration
bfed136068feb299b3ca8a07d6eaf5d93e3ff2a3 27-Feb-2014 Narayan Kamath <narayan@google.com> am 1ed1d341: am 26fa5cd3: Merge "AArch64: Use negative values in error enumeration"

* commit '1ed1d341baaba1d1453dbd061476d4263f17aa28':
AArch64: Use negative values in error enumeration
1ed1d341baaba1d1453dbd061476d4263f17aa28 27-Feb-2014 Narayan Kamath <narayan@google.com> am 26fa5cd3: Merge "AArch64: Use negative values in error enumeration"

* commit '26fa5cd39d39c2954d4c9abd866e39bf1d8d39ae':
AArch64: Use negative values in error enumeration
26fa5cd39d39c2954d4c9abd866e39bf1d8d39ae 27-Feb-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use negative values in error enumeration"
dc6d9241dec3db9d8989df5e7cebfee21ce88190 26-Feb-2014 Christopher Ferris <cferris@google.com> am a6631bb3: am 3bcefc66: am 62f12bd9: Merge "Enable libunwind for mips."

* commit 'a6631bb38fbf77415592c10734710df8afa0deab':
Enable libunwind for mips.
d7ce27e8ae637b9bbaf0a31cd469a461b6651ab0 26-Feb-2014 Nick Kralevich <nnk@google.com> am e6fb169f: am e570fd3a: am 9453bce4: Merge "Apply restorecon_recursive to all of /data."

* commit 'e6fb169fd69bfa6775737f37d45041c5b229321c':
Apply restorecon_recursive to all of /data.
daaee0ae3aca94cbac252a8f1506ab6ab8812bd7 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 08c349af: am 8dd3ad12: am 78617a08: Merge changes Id25cdef0,I80685cdc,I929dddc7

* commit '08c349af44b821a7e43f6c587a7d3326ee810e5b':
logd: Add SCHED_BATCH to reduce priority
logd: Adjust to match defacto coding style
logd: prune more aggressively when over the top
7300e6474d05bdf2cc034d6e070817bb7484dbe1 26-Feb-2014 Nick Kralevich <nnk@google.com> am edc1abf1: (-s ours) am 1bb3489e: resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp

* commit 'edc1abf1bb2659be2a3bd811e050f0c23181a24a':
logd: initial checkin.
a6631bb38fbf77415592c10734710df8afa0deab 26-Feb-2014 Christopher Ferris <cferris@google.com> am 3bcefc66: am 62f12bd9: Merge "Enable libunwind for mips."

* commit '3bcefc661347ec6424403fca664fc7caacc7e7fb':
Enable libunwind for mips.
e6fb169fd69bfa6775737f37d45041c5b229321c 26-Feb-2014 Nick Kralevich <nnk@google.com> am e570fd3a: am 9453bce4: Merge "Apply restorecon_recursive to all of /data."

* commit 'e570fd3a32a3a3525a2e6a069d2b69c6184db56e':
Apply restorecon_recursive to all of /data.
08c349af44b821a7e43f6c587a7d3326ee810e5b 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 8dd3ad12: am 78617a08: Merge changes Id25cdef0,I80685cdc,I929dddc7

* commit '8dd3ad1281aacdff9b404eb7bc2266131c4dd1ff':
logd: Add SCHED_BATCH to reduce priority
logd: Adjust to match defacto coding style
logd: prune more aggressively when over the top
edc1abf1bb2659be2a3bd811e050f0c23181a24a 26-Feb-2014 Nick Kralevich <nnk@google.com> am 1bb3489e: resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp

* commit '1bb3489e600876979146a6222ac5bb2a684702bf':
logd: initial checkin.
3bcefc661347ec6424403fca664fc7caacc7e7fb 26-Feb-2014 Christopher Ferris <cferris@google.com> am 62f12bd9: Merge "Enable libunwind for mips."

* commit '62f12bd9b134a7a991d1d80bda563e870cb56e8e':
Enable libunwind for mips.
e570fd3a32a3a3525a2e6a069d2b69c6184db56e 26-Feb-2014 Nick Kralevich <nnk@google.com> am 9453bce4: Merge "Apply restorecon_recursive to all of /data."

* commit '9453bce4cff952aab5c90f5b30c6c12d3e1521e5':
Apply restorecon_recursive to all of /data.
8dd3ad1281aacdff9b404eb7bc2266131c4dd1ff 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 78617a08: Merge changes Id25cdef0,I80685cdc,I929dddc7

* commit '78617a0875ccf5662dc69a6fbcc72a7a39ab42a3':
logd: Add SCHED_BATCH to reduce priority
logd: Adjust to match defacto coding style
logd: prune more aggressively when over the top
1bb3489e600876979146a6222ac5bb2a684702bf 26-Feb-2014 Nick Kralevich <nnk@google.com> resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp

Change-Id: I9ee9908a915258937b343de90dce5774d914f03a
62f12bd9b134a7a991d1d80bda563e870cb56e8e 26-Feb-2014 Christopher Ferris <cferris@google.com> Merge "Enable libunwind for mips."
c29a1345a08dbb911347f817026140589f0357ff 26-Feb-2014 Christopher Ferris <cferris@google.com> Enable libunwind for mips.

Change-Id: Ib1d7bea0cb7ac09a9e15c7f429ecfd944649fc87
ibbacktrace/Android.mk
45c075148e7a18ca204b8d31e0c5b5fe12dc41a1 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> am ce72e6c4: am 785fff48: am ca1e3438: Merge "logcat: test: add clear and blocking check"

* commit 'ce72e6c43f69a5368fafe730e0cb83cb1cc3c5b1':
logcat: test: add clear and blocking check
11d9b26e993fa151c6f148ada94fc64fc99458db 26-Feb-2014 Elliott Hughes <enh@google.com> am c8c336bd: am e2c0bc40: am ecb5dd69: Merge "Fix undefined args access for x86_64."

* commit 'c8c336bd11543aa0207a0344632c7a200732f97f':
Fix undefined args access for x86_64.
ce72e6c43f69a5368fafe730e0cb83cb1cc3c5b1 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 785fff48: am ca1e3438: Merge "logcat: test: add clear and blocking check"

* commit '785fff484474114e3b4f9ade6f1ad555eec10198':
logcat: test: add clear and blocking check
c8c336bd11543aa0207a0344632c7a200732f97f 26-Feb-2014 Elliott Hughes <enh@google.com> am e2c0bc40: am ecb5dd69: Merge "Fix undefined args access for x86_64."

* commit 'e2c0bc40954daaed2683eb30d1eba3f9aac62bb0':
Fix undefined args access for x86_64.
9453bce4cff952aab5c90f5b30c6c12d3e1521e5 26-Feb-2014 Nick Kralevich <nnk@google.com> Merge "Apply restorecon_recursive to all of /data."
785fff484474114e3b4f9ade6f1ad555eec10198 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> am ca1e3438: Merge "logcat: test: add clear and blocking check"

* commit 'ca1e34385706b954e6974094285924d8ff59f860':
logcat: test: add clear and blocking check
e2c0bc40954daaed2683eb30d1eba3f9aac62bb0 26-Feb-2014 Elliott Hughes <enh@google.com> am ecb5dd69: Merge "Fix undefined args access for x86_64."

* commit 'ecb5dd697ca72828079bf40f932abf9f9ee7b7db':
Fix undefined args access for x86_64.
78617a0875ccf5662dc69a6fbcc72a7a39ab42a3 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge changes Id25cdef0,I80685cdc,I929dddc7

* changes:
logd: Add SCHED_BATCH to reduce priority
logd: Adjust to match defacto coding style
logd: prune more aggressively when over the top
e9c8fb900a460699201208870ce9997a734261cc 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: initial checkin."
ca1e34385706b954e6974094285924d8ff59f860 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: test: add clear and blocking check"
ecb5dd697ca72828079bf40f932abf9f9ee7b7db 26-Feb-2014 Elliott Hughes <enh@google.com> Merge "Fix undefined args access for x86_64."
1154f12d2cb6de41f7c556771897e037783550ed 26-Feb-2014 Elliott Hughes <enh@google.com> am b155b976: am 8828994d: am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags"

* commit 'b155b976c7e5b0588de39c08d7f6bc7ad1b3e336':
libcutils: Socket type might contain bitwise OR flags
b155b976c7e5b0588de39c08d7f6bc7ad1b3e336 26-Feb-2014 Elliott Hughes <enh@google.com> am 8828994d: am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags"

* commit '8828994d05572552da893db4663efd6e1e77948e':
libcutils: Socket type might contain bitwise OR flags
8828994d05572552da893db4663efd6e1e77948e 26-Feb-2014 Elliott Hughes <enh@google.com> am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags"

* commit '431735f005af79407e01a68995ac6dde7ff4b815':
libcutils: Socket type might contain bitwise OR flags
431735f005af79407e01a68995ac6dde7ff4b815 26-Feb-2014 Elliott Hughes <enh@google.com> Merge "libcutils: Socket type might contain bitwise OR flags"
a7e2e7634c4242a9ab2fa7c8031a5745beac613f 26-Feb-2014 Paul Kocialkowski <contact@paulk.fr> libcutils: Socket type might contain bitwise OR flags

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Change-Id: Ia5c8f136793a989fc1d71c61292afe4e5cf169fa
ibcutils/socket_local_server.c
b1814fbf491d90bd7bcf405f289cc0e0b5bf94c5 26-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
882f856668331488d9bbaec429de7aac5d7978c9 27-Dec-2013 Mark Salyzyn <salyzyn@google.com> logd: Add SCHED_BATCH to reduce priority

(cherry picked from commit 85620a1bfff1824687fd1cb14c8e1a9b2683c061)

Change-Id: Id25cdef0dd7f8c5e154a0da2db2dd0554849babc
ogd/main.cpp
c03e72cc1c155ff668df8df1caec363b07347d0d 18-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: Adjust to match defacto coding style

(cherry picked from commit c46f77bd2ad01f3a695416c4cf22d6a9738bb7b8)

Change-Id: I80685cdc7116e10c5a5a77abe856fd96804f9117
ogd/FlushCommand.cpp
ogd/LogBuffer.cpp
ogd/LogCommand.cpp
ogd/LogTimes.cpp
ogd/LogTimes.h
740f9b4f97d6311b29fa885e86413d51d8c92d53 14-Jan-2014 Mark Salyzyn <salyzyn@google.com> logd: prune more aggressively when over the top

(cherry picked from commit 63c15d50615a4c9e9ad25f601ef9dcb1161d8990)

Change-Id: I929dddc7da048c032fb791c7af23f215f8856bf3
ogd/LogBuffer.cpp
0175b0747a1f55329109e84c9a1322dcb95e2848 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: initial checkin.

* Create a new userspace log daemon for handling logging messages.

Original-Change-Id: I75267df16359684490121e6c31cca48614d79856
Signed-off-by: Nick Kralevich <nnk@google.com>

* Merge conflicts
* rename new syslog daemon to logd to prevent confusion with bionic syslog
* replace racy getGroups call with KISS call to client->getGid()
* Timestamps are filed at logging source
* insert entries into list in timestamp order
* Added LogTimeEntry tail filtration handling
* Added region locking around LogWriter list
* separate threads for each writer
* /dev/socket/logd* permissions

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

(cherry picked from commit 3e76e0a49760c4970b7cda6153e51026af98e4f3)

Author: Nick Kralevich <nnk@google.com>
Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
nclude/log/log_read.h
nclude/log/logger.h
nclude/private/android_filesystem_config.h
ogd/Android.mk
ogd/CommandListener.cpp
ogd/CommandListener.h
ogd/FlushCommand.cpp
ogd/FlushCommand.h
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogBufferElement.cpp
ogd/LogBufferElement.h
ogd/LogCommand.cpp
ogd/LogCommand.h
ogd/LogListener.cpp
ogd/LogListener.h
ogd/LogReader.cpp
ogd/LogReader.h
ogd/LogTimes.cpp
ogd/LogTimes.h
ogd/main.cpp
ootdir/init.rc
9b986497e7f19a7fde9e35eb73d765f4a09dee07 22-Jan-2014 Mark Salyzyn <salyzyn@google.com> logcat: test: add clear and blocking check

(cherry picked from commit 1beb2ab6f6f7cec157b25a2e728c6de8c6be58c4)

Change-Id: I243b1338c4a5935a297a0519c03697fd828e47e6
ogcat/tests/logcat_test.cpp
fff9d11be528ad8f581cc7223b879c55009d7396 26-Feb-2014 Fengwei Yin <fengwei.yin@intel.com> Fix undefined args access for x86_64.

From libc manual for vsnprintf:
The functions vprintf(), vfprintf(), vsprintf(), vsnprintf()
are equivalent to the functions printf(), fprintf(), sprintf(), snprintf(),
respectively, except that they are called with a va_list instead of a
variable number of arguments. These functions do not call the va_end macro.
Because they invoke the va_arg macro, the value of ap is undefined after the call.

We need to allocate/end new va_list for each vsnprintf.

Change-Id: I66ec058033be1cb918e7b2bc84ca546800da226b
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
ibutils/String8.cpp
9a1dc8b3e31e78ec7102c18111b5876dcdd15f24 26-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
c2659e72d7723f8dcb8659a1cb1d8ff3d6edae88 24-Feb-2014 Kévin PETIT <kevin.petit@arm.com> Fix the handling of CodeCache return codes in pixelflinger

The error condition was not correctly detected: an error was
reported by checking that the index returned by CodeCache::cache
was non-zero. This did not work because this function can return
a positive value on success.

Change-Id: I1f90125ee62ab277b80da4dfb341733cd6e8e86a
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ibpixelflinger/scanline.cpp
e8b68f69f02adcb2ececa99ce7a146aabd712d55 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Add SCHED_BATCH to reduce priority"
f5e0c7c51edb46acffa1353872d489c6046833ca 26-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "logd: Adjust to match defacto coding style"
28ad3542dd598b75e8294ffb3e8e71bc8251cd76 25-Feb-2014 Martijn Coenen <maco@google.com> Merge "Remove $(KERNEL_HEADERS) include."
e82b6911261ce6a1a5082652b6a1966c1f9c5d96 25-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
aea0899b0e9fa0f01c22f42a09dae03861e06eda 25-Feb-2014 David 'Digit' Turner <digit@google.com> am 5296ee8e: am f936f66c: am ebb46d76: Merge "fs_mgr: Don\'t run e2fsck inside SDK system images."

* commit '5296ee8e0b4b73727126a6ac6319750d7b187545':
fs_mgr: Don't run e2fsck inside SDK system images.
5296ee8e0b4b73727126a6ac6319750d7b187545 25-Feb-2014 David 'Digit' Turner <digit@google.com> am f936f66c: am ebb46d76: Merge "fs_mgr: Don\'t run e2fsck inside SDK system images."

* commit 'f936f66c2abf132dff883f6d31f4cc0b8d20f984':
fs_mgr: Don't run e2fsck inside SDK system images.
f936f66c2abf132dff883f6d31f4cc0b8d20f984 25-Feb-2014 David 'Digit' Turner <digit@google.com> am ebb46d76: Merge "fs_mgr: Don\'t run e2fsck inside SDK system images."

* commit 'ebb46d76e4bf4ee4f34b42709ea69cce07e3e322':
fs_mgr: Don't run e2fsck inside SDK system images.
ebb46d76e4bf4ee4f34b42709ea69cce07e3e322 25-Feb-2014 David 'Digit' Turner <digit@google.com> Merge "fs_mgr: Don't run e2fsck inside SDK system images."
85620a1bfff1824687fd1cb14c8e1a9b2683c061 27-Dec-2013 Mark Salyzyn <salyzyn@google.com> logd: Add SCHED_BATCH to reduce priority

Change-Id: Id25cdef0dd7f8c5e154a0da2db2dd0554849babc
ogd/main.cpp
c46f77bd2ad01f3a695416c4cf22d6a9738bb7b8 18-Feb-2014 Mark Salyzyn <salyzyn@google.com> logd: Adjust to match defacto coding style

Change-Id: I80685cdc7116e10c5a5a77abe856fd96804f9117
ogd/FlushCommand.cpp
ogd/LogBuffer.cpp
ogd/LogCommand.cpp
ogd/LogTimes.cpp
ogd/LogTimes.h
74c490ccf70584217383662e5cd3a86be9588543 25-Feb-2014 Elliott Hughes <enh@google.com> am c80c9dea: am 4ce33738: am d7590650: Merge "Remove an unused #include of <asm/page.h>."

* commit 'c80c9dea161dc1cd951a25caa9cebdf4c12d4b64':
Remove an unused #include of <asm/page.h>.
c80c9dea161dc1cd951a25caa9cebdf4c12d4b64 25-Feb-2014 Elliott Hughes <enh@google.com> am 4ce33738: am d7590650: Merge "Remove an unused #include of <asm/page.h>."

* commit '4ce337385f1cfd54809ba78e4d1d80fbb73b2c43':
Remove an unused #include of <asm/page.h>.
4ce337385f1cfd54809ba78e4d1d80fbb73b2c43 25-Feb-2014 Elliott Hughes <enh@google.com> am d7590650: Merge "Remove an unused #include of <asm/page.h>."

* commit 'd7590650dc7b36557efde7f63a6e904878572e12':
Remove an unused #include of <asm/page.h>.
d7590650dc7b36557efde7f63a6e904878572e12 25-Feb-2014 Elliott Hughes <enh@google.com> Merge "Remove an unused #include of <asm/page.h>."
dc3dd44c027ea5701d0f47aeac8f9745496bfb7c 25-Feb-2014 Elliott Hughes <enh@google.com> am 51437ed2: am 56ae6b68: am 410f51a8: Merge "Remove unused #includes of <asm/page.h>."

* commit '51437ed26565f4bc55e516b73b7e9cafef8e012f':
Remove unused #includes of <asm/page.h>.
51437ed26565f4bc55e516b73b7e9cafef8e012f 25-Feb-2014 Elliott Hughes <enh@google.com> am 56ae6b68: am 410f51a8: Merge "Remove unused #includes of <asm/page.h>."

* commit '56ae6b687d93cd0e6275cc575f0a55f5a1546232':
Remove unused #includes of <asm/page.h>.
56ae6b687d93cd0e6275cc575f0a55f5a1546232 25-Feb-2014 Elliott Hughes <enh@google.com> am 410f51a8: Merge "Remove unused #includes of <asm/page.h>."

* commit '410f51a88cc40977ddc2d99ae72d429550715e13':
Remove unused #includes of <asm/page.h>.
763bfce0b1d17ed1d8d5a5c8d27b2d13365feb6b 25-Feb-2014 Elliott Hughes <enh@google.com> Remove an unused #include of <asm/page.h>.

Change-Id: I000aead8c82ec11151f69e6ce439dd09b0f0b4f4
nit/devices.c
410f51a88cc40977ddc2d99ae72d429550715e13 25-Feb-2014 Elliott Hughes <enh@google.com> Merge "Remove unused #includes of <asm/page.h>."
2f77bb6931e1660919d7fb9944c7d3f301cacdf8 25-Feb-2014 Elliott Hughes <enh@google.com> Remove unused #includes of <asm/page.h>.

(<asm/page.h> is going away.)

Change-Id: Id0d7ad0eb791cd47490c48458f9f8a6468ddf5c9
oolbox/mkswap.c
oolbox/swapoff.c
oolbox/swapon.c
920a5629ff91ee0f5decaaf4f16a8fb3af752496 25-Feb-2014 Martijn Coenen <maco@google.com> Remove $(KERNEL_HEADERS) include.

Points to wrong kernel-headers dir in multi-arch
builds.

Change-Id: I5055bf5cd80119a34f0a6b0872ffb0a422a06baf
ogd/Android.mk
28483d7ec497e06850be1d8f87d7fa522c8ab9d4 17-Feb-2014 David 'Digit' Turner <digit@google.com> fs_mgr: Don't run e2fsck inside SDK system images.

These images do not have GPL-ed binaries like /system/bin/e2fsck so
avoid running the program when we detect that we're running inside
one of them.

Note that this does not affect other emulator-based build products
(e..g full-eng instead of sdk-eng), which do have the binaries.

BUG=13057123

Change-Id: Ia42f1d02a3845fbf4b2f9d95818f35d760711a12
s_mgr/fs_mgr.c
7ef0f747a5c69519ba1ab35b667cba21d63a8b2b 24-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
de864c2f7dfd52fd9832fedb1c89ddfaabafdbfd 22-Feb-2014 Colin Cross <ccross@android.com> am 74a41f5a: am b659ffd7: am deb3eecd: Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"

* commit '74a41f5adf10fcd6211d2933ada30fe08cd894c5':
Fix the definition of LOCAL_PATH in libusbhost/Android.mk
74a41f5adf10fcd6211d2933ada30fe08cd894c5 22-Feb-2014 Colin Cross <ccross@android.com> am b659ffd7: am deb3eecd: Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"

* commit 'b659ffd77d8495e5ac13c4fa3b6717c9945f7b9f':
Fix the definition of LOCAL_PATH in libusbhost/Android.mk
b659ffd77d8495e5ac13c4fa3b6717c9945f7b9f 22-Feb-2014 Colin Cross <ccross@android.com> am deb3eecd: Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"

* commit 'deb3eecd061e8a3a5f19ef5e10296f248f247881':
Fix the definition of LOCAL_PATH in libusbhost/Android.mk
deb3eecd061e8a3a5f19ef5e10296f248f247881 22-Feb-2014 Colin Cross <ccross@android.com> Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"
c2729741c284f1e1b368aa64fecfec33b3e39199 22-Feb-2014 Alex Ray <aray@google.com> am 4fc8231c: Merge "graphics: Add colorspace definitions" into klp-volantis-dev

* commit '4fc8231c187f3bc96e4633ee055efe5b10590d79':
graphics: Add colorspace definitions
4fc8231c187f3bc96e4633ee055efe5b10590d79 22-Feb-2014 Alex Ray <aray@google.com> Merge "graphics: Add colorspace definitions" into klp-volantis-dev
68ced4359b7d364495cbbb86268f26c4cfe6c58f 21-Feb-2014 JP Abgrall <jpa@google.com> Merge "init.rc: prep tcp_default_init_rwnd, set the default to 60"
7c862c8b5e59cbe216a5bc092c01f1ecba8e9de4 21-Feb-2014 JP Abgrall <jpa@google.com> init.rc: prep tcp_default_init_rwnd, set the default to 60

The kernel's default is between 4~20.

Prepare for javaland to modify the value at runtime.

It can be done via
setprop sys.sysctl.tcp_def_init_rwnd <value>


Bug: 12020135
Change-Id: Id34194b085206fd02e316401c0fbbb9eb52522d2
ootdir/init.rc
2264e7cfef6b1236a90a13b1d99abb4aadcb0b93 30-Jan-2014 Snild Dolkow <snild.dolkow@sonymobile.com> Fix adb forward --list when forwarding a lot

The list action had some problems with large numbers of forwards:
* adb_query() limited replies to 1024 B (and the print was useless)
* the reply header's length could overflow (also in other commands)
* ...and the client had no way of detecting it
* writex() didn't retry on EAGAIN ("Resource temporarily unavailable")

This patch makes all "OKAY%04x" replies use a common function which
checks the length and limits it to 0xffff. This means that the client
can easily check for truncated replies.

Before: forward --list starts failing at 15-30 forwards (depending on
device serial and forward spec lengths).

After: no problems with forward --list.

Change-Id: Ie1e82c4d622f5c56e51abb26533ba17d40459914
db/adb.c
db/adb_client.c
db/transport.c
0ffbe4eed7f8bec6935ee2b7d40b28d79196045c 21-Feb-2014 Elliott Hughes <enh@google.com> am 24d06bc9: am bed58bf3: am 536dce31: Merge "Fix compiler warnings in libpixelflinger"

* commit '24d06bc9c64035b333b4f9e7d0949fb96e2c98a5':
Fix compiler warnings in libpixelflinger
5a78e23a0048a7e3b2111cc144a4ed4f9950aff2 21-Feb-2014 Nick Kralevich <nnk@google.com> am 490963a5: am c0f95624: am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."

* commit '490963a54e5ef0c421f0e1ac87eafc2b46c32b95':
Add -D option to restorecon for relabeling /data/data.
09c5db8451625fd408bc064cc08a5bbb0c9a95a0 21-Feb-2014 Elliott Hughes <enh@google.com> am 60d2f35c: am 8e66265a: am acc0a23a: Merge "Remove dead code."

* commit '60d2f35cbd11cdb43c24a1688c93677ab682e4eb':
Remove dead code.
24d06bc9c64035b333b4f9e7d0949fb96e2c98a5 20-Feb-2014 Elliott Hughes <enh@google.com> am bed58bf3: am 536dce31: Merge "Fix compiler warnings in libpixelflinger"

* commit 'bed58bf36fa9870fb0920c0c51e065e9a4eb3f5e':
Fix compiler warnings in libpixelflinger
bed58bf36fa9870fb0920c0c51e065e9a4eb3f5e 20-Feb-2014 Elliott Hughes <enh@google.com> am 536dce31: Merge "Fix compiler warnings in libpixelflinger"

* commit '536dce31d35e9411c03102d6abd837cd4d54ce55':
Fix compiler warnings in libpixelflinger
536dce31d35e9411c03102d6abd837cd4d54ce55 20-Feb-2014 Elliott Hughes <enh@google.com> Merge "Fix compiler warnings in libpixelflinger"
3078b13b98ad8d29dcb2b7e3665c0c92944404a9 17-Feb-2014 Ashok Bhat <ashok.bhat@arm.com> Fix compiler warnings in libpixelflinger

Change-Id: I6a5708ae6bc934b196d59d81a6cd550b05ed704f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ibpixelflinger/buffer.cpp
ibpixelflinger/codeflinger/Arm64Assembler.cpp
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/picker.cpp
ibpixelflinger/pixelflinger.cpp
ibpixelflinger/raster.cpp
ibpixelflinger/scanline.cpp
ibpixelflinger/tests/gglmul/gglmul_test.cpp
490963a54e5ef0c421f0e1ac87eafc2b46c32b95 20-Feb-2014 Nick Kralevich <nnk@google.com> am c0f95624: am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."

* commit 'c0f95624ad071d925de3463f7fa5aef0663076a0':
Add -D option to restorecon for relabeling /data/data.
c0f95624ad071d925de3463f7fa5aef0663076a0 20-Feb-2014 Nick Kralevich <nnk@google.com> am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."

* commit '783eb1689871850c082e0b6ccadeeccbaa81a5d2':
Add -D option to restorecon for relabeling /data/data.
783eb1689871850c082e0b6ccadeeccbaa81a5d2 20-Feb-2014 Nick Kralevich <nnk@google.com> Merge "Add -D option to restorecon for relabeling /data/data."
60d2f35cbd11cdb43c24a1688c93677ab682e4eb 20-Feb-2014 Elliott Hughes <enh@google.com> am 8e66265a: am acc0a23a: Merge "Remove dead code."

* commit '8e66265a17e5e13843bd59282b1feacdae4b4b41':
Remove dead code.
8e66265a17e5e13843bd59282b1feacdae4b4b41 20-Feb-2014 Elliott Hughes <enh@google.com> am acc0a23a: Merge "Remove dead code."

* commit 'acc0a23a20bf5e5db985661b2c8a8259d9e94498':
Remove dead code.
acc0a23a20bf5e5db985661b2c8a8259d9e94498 20-Feb-2014 Elliott Hughes <enh@google.com> Merge "Remove dead code."
b784f37341ba9a2a1dffedbf669052b476ce24e4 20-Feb-2014 Elliott Hughes <enh@google.com> Remove dead code.

We have benchmarking for memset in bionic itself, and a benchmarking
framework for other native benchmarking.

Change-Id: I241a288a96d3b2d37f3d51b04a519ac23f18a989
ibcutils/tests/Android.mk
ibcutils/tests/memset_mips/Android.mk
ibcutils/tests/memset_mips/android_memset_dumb.S
ibcutils/tests/memset_mips/android_memset_test.S
ibcutils/tests/memset_mips/memset_cmips.S
ibcutils/tests/memset_mips/memset_omips.S
ibcutils/tests/memset_mips/test_memset.c
1ee7570052487671b889d7b123ba049ee41bd9e8 17-Dec-2013 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use negative values in error enumeration

With AArch64 the enumerations with values in the range
0x80000000 to 0x80000007 are being assigned to ssize_t
typed variables which are 64-bit rather than 32-bit, and
are being used in conditions where they are being checked
for being negative. This is not the case when ssize_t is
64-bit, so redefine this to INT32_MIN value.

Change-Id: I7a031a940a28658b3bf34bebac93dfb3ba397b05
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
nclude/utils/Errors.h
a9fe590385cb8f094c6c233295f351aaf7463351 20-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
4046c132dc385fb9f2ae2e2198fd32269dd14a20 20-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge changes I929dddc7,Ice88b141,I243b1338

* changes:
logd: prune more aggressively when over the top
logd: initial checkin.
logcat: test: add clear and blocking check
d4446607b46d666665b57fc15b4341b139ed0ea7 19-Feb-2014 JP Abgrall <jpa@google.com> am c8178c85: am a0d4b9e8: am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"

* commit 'c8178c85650341790d33b39cc78c4501a723279e':
Handle FUSE_FSYNCDIR as FUSE_FSYNC
b3da098f5a97550627163e2cf6c278af8b8a4138 19-Feb-2014 JP Abgrall <jpa@google.com> am e752589d: am 406f1aff: am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"

* commit 'e752589dcb2f0caf86697cf7b787bf7d87255b3f':
sdcard: direct I/O file access write buffer alignment
c8178c85650341790d33b39cc78c4501a723279e 19-Feb-2014 JP Abgrall <jpa@google.com> am a0d4b9e8: am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"

* commit 'a0d4b9e8430c94a951fc8b53ca83fad20c5e11e7':
Handle FUSE_FSYNCDIR as FUSE_FSYNC
e752589dcb2f0caf86697cf7b787bf7d87255b3f 19-Feb-2014 JP Abgrall <jpa@google.com> am 406f1aff: am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"

* commit '406f1aff9acebfea81568e0a257e1300e22dcfa8':
sdcard: direct I/O file access write buffer alignment
a0d4b9e8430c94a951fc8b53ca83fad20c5e11e7 19-Feb-2014 JP Abgrall <jpa@google.com> am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"

* commit '912373005b53e70803cdae61dd63a18fa73a5e3e':
Handle FUSE_FSYNCDIR as FUSE_FSYNC
406f1aff9acebfea81568e0a257e1300e22dcfa8 19-Feb-2014 JP Abgrall <jpa@google.com> am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"

* commit '3b0c24e28d7538ff5b49a98eee99bac85c8e687b':
sdcard: direct I/O file access write buffer alignment
912373005b53e70803cdae61dd63a18fa73a5e3e 19-Feb-2014 JP Abgrall <jpa@google.com> Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"
b2831a2db9e0370c5f797c037c135108025f2522 17-Feb-2014 Daisuke Okitsu <daisuke.x.okitsu@sonymobile.com> Handle FUSE_FSYNCDIR as FUSE_FSYNC

There have been issues with sdcard data corruption even after
successfully calling fsync for /sdcard. This is caused by
the sdcard daemon doing nothing in this case.

Change-Id: I48149ceabdac79ac535b35c2598bb1fbb5410883
dcard/sdcard.c
3b0c24e28d7538ff5b49a98eee99bac85c8e687b 19-Feb-2014 JP Abgrall <jpa@google.com> Merge "sdcard: direct I/O file access write buffer alignment"
202be73b62e4adc65f7b192c6f374a073c500386 19-Feb-2014 Nick Kralevich <nnk@google.com> am f10492d8: am 066cde92: am 223e0798: Merge "Enable building init with -Wall -Werror."

* commit 'f10492d8c0c907fad6f87c871fec6b2fac41a02c':
Enable building init with -Wall -Werror.
f10492d8c0c907fad6f87c871fec6b2fac41a02c 19-Feb-2014 Nick Kralevich <nnk@google.com> am 066cde92: am 223e0798: Merge "Enable building init with -Wall -Werror."

* commit '066cde92d267986424ff79f35881116da3c672f8':
Enable building init with -Wall -Werror.
066cde92d267986424ff79f35881116da3c672f8 19-Feb-2014 Nick Kralevich <nnk@google.com> am 223e0798: Merge "Enable building init with -Wall -Werror."

* commit '223e07983718e1515f2a54542b9b0163a8f508ed':
Enable building init with -Wall -Werror.
223e07983718e1515f2a54542b9b0163a8f508ed 19-Feb-2014 Nick Kralevich <nnk@google.com> Merge "Enable building init with -Wall -Werror."
eb3f421e028608e37e4eb814351f03b99ae55900 12-Feb-2014 Stephen Smalley <sds@tycho.nsa.gov> Enable building init with -Wall -Werror.

Eliminates various warnings from SELinux-related code.

Bug: 12587913
Change-Id: I28921f0ebd934324436609540d95ccef58552b64
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nclude/cutils/klog.h
nit/init.c
ibcutils/klog.c
c9f3bcf87b701af671a16a7846db6e96df3fd4a3 27-Nov-2013 Alex Ray <aray@google.com> graphics: Add colorspace definitions

Change-Id: I54230dc2c0e481228457e8a01a50d300c917e657
nclude/system/graphics.h
500308a7e67bfd4b918604a81b8125b8e7c2f37c 18-Feb-2014 Stephen Smalley <sds@tycho.nsa.gov> Add -D option to restorecon for relabeling /data/data.

This depends on change I137588013ed1750315702c0dbe088ce3e4a29e83.

Change-Id: I5a4fef9affd6cddf98d72dc9d54899be25741779
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
oolbox/restorecon.c
49e9344bddca3699c04f3da8c689d0f2b1a338b6 18-Feb-2014 Arpad Horvath <secracon@gmail.com> sdcard: direct I/O file access write buffer alignment

It is not enough to align the read buffer only, because
consequent writes might still fail with EINVAL. The write
buffer should be also aligned according to the write(2)
manual page.

Change-Id: I7547dec5208732c56f4466c1b0c88f36dabacf5b
dcard/sdcard.c
b377d635066b3d02cb9bf3e73f3f5d2b5106e5b2 17-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
b6391ce26b6e5f7360efc7aba0fac8455cba53b4 16-Feb-2014 Colin Cross <ccross@android.com> am ee9de136: am bb2da79f: am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"

* commit 'ee9de136c52555e8775611ad32fc8ee47c75e3d1':
Start debuggerd64 for 64-bit processes
ee9de136c52555e8775611ad32fc8ee47c75e3d1 16-Feb-2014 Colin Cross <ccross@android.com> am bb2da79f: am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"

* commit 'bb2da79fdab68c9643a30f5156e7dcabb379b139':
Start debuggerd64 for 64-bit processes
bb2da79fdab68c9643a30f5156e7dcabb379b139 16-Feb-2014 Colin Cross <ccross@android.com> am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"

* commit '27fd413d6d02a53c453cf926717b67e9a8d1eb32':
Start debuggerd64 for 64-bit processes
27fd413d6d02a53c453cf926717b67e9a8d1eb32 16-Feb-2014 Colin Cross <ccross@android.com> Merge "Start debuggerd64 for 64-bit processes"
78ef91aa5ec29cc45bf3f0d4b32cd92db000a95a 16-Feb-2014 Dan Willemsen <dwillemsen@nvidia.com> Start debuggerd64 for 64-bit processes

Change-Id: I2fc33d9eb2726b043d2f13bfab0c605dbb6083c7
ootdir/init.rc
133993b486a796554b4fdaf2d748fa3be9d84617 15-Feb-2014 JP Abgrall <jpa@google.com> am a183eb3e: am 6e6140e0: am f7cf1a06: Merge "sdcard: direct I/O file access fix"

* commit 'a183eb3e737eda4de270b31b1a71462aed49eee9':
sdcard: direct I/O file access fix
a183eb3e737eda4de270b31b1a71462aed49eee9 15-Feb-2014 JP Abgrall <jpa@google.com> am 6e6140e0: am f7cf1a06: Merge "sdcard: direct I/O file access fix"

* commit '6e6140e0ad0575496cfbd6dd3c1eec5d53cb6e6a':
sdcard: direct I/O file access fix
6e6140e0ad0575496cfbd6dd3c1eec5d53cb6e6a 15-Feb-2014 JP Abgrall <jpa@google.com> am f7cf1a06: Merge "sdcard: direct I/O file access fix"

* commit 'f7cf1a062ef27b6579b9afb876d635a307b3d5d3':
sdcard: direct I/O file access fix
f7cf1a062ef27b6579b9afb876d635a307b3d5d3 15-Feb-2014 JP Abgrall <jpa@google.com> Merge "sdcard: direct I/O file access fix"
80b435a3f35795600654e9705f4b3fbbcc427a9d 15-Feb-2014 Arpad Horvath <secracon@gmail.com> sdcard: direct I/O file access fix

If a file is opened in direct I/O mode (with O_DIRECT flag),
the read buffer addess must be aligned to memory page size
boundary. The Direct I/O is not needed for normal files,
however, some special hardware access (e.g. smart SD cards)
will not work without it.

Change-Id: I42babeee86dba1880fd23e2592fddd7060da3e20
dcard/sdcard.c
63c15d50615a4c9e9ad25f601ef9dcb1161d8990 14-Jan-2014 Mark Salyzyn <salyzyn@google.com> logd: prune more aggressively when over the top

Change-Id: I929dddc7da048c032fb791c7af23f215f8856bf3
ogd/LogBuffer.cpp
3e76e0a49760c4970b7cda6153e51026af98e4f3 15-Dec-2011 Nick Kralevich <nnk@google.com> logd: initial checkin.

* Create a new userspace log daemon for handling logging messages.

Original-Change-Id: I75267df16359684490121e6c31cca48614d79856
Signed-off-by: Nick Kralevich <nnk@google.com>

* Merge conflicts
* rename new syslog daemon to logd to prevent confusion with bionic syslog
* replace racy getGroups call with KISS call to client->getGid()
* Timestamps are filed at logging source
* insert entries into list in timestamp order
* Added LogTimeEntry tail filtration handling
* Added region locking around LogWriter list
* separate threads for each writer
* /dev/socket/logd* permissions

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
nclude/log/log_read.h
nclude/log/logger.h
nclude/private/android_filesystem_config.h
ogd/Android.mk
ogd/CommandListener.cpp
ogd/CommandListener.h
ogd/FlushCommand.cpp
ogd/FlushCommand.h
ogd/LogBuffer.cpp
ogd/LogBuffer.h
ogd/LogBufferElement.cpp
ogd/LogBufferElement.h
ogd/LogCommand.cpp
ogd/LogCommand.h
ogd/LogListener.cpp
ogd/LogListener.h
ogd/LogReader.cpp
ogd/LogReader.h
ogd/LogTimes.cpp
ogd/LogTimes.h
ogd/main.cpp
ootdir/init.rc
b6e3b3cea2c2606fcff0364d680335fc3433247b 14-Feb-2014 Paul Lawrence <paullawrence@google.com> Merge "Mount default encrypted devices at boot"
1beb2ab6f6f7cec157b25a2e728c6de8c6be58c4 22-Jan-2014 Mark Salyzyn <salyzyn@google.com> logcat: test: add clear and blocking check

Change-Id: I243b1338c4a5935a297a0519c03697fd828e47e6
ogcat/tests/logcat_test.cpp
0f18bb1fe04a6d087644957cea9b6dbd2c621203 13-Feb-2014 Nick Kralevich <nnk@google.com> Merge "lowmemorykiller: make perms 0220"
b3739735b84a88cccfe08c0d69b1017a07004470 13-Feb-2014 Nick Kralevich <nnk@google.com> lowmemorykiller: make perms 0220

Set

* /sys/module/lowmemorykiller/parameters/adj
* /sys/module/lowmemorykiller/parameters/minfree

to 0220. This better indicates that these files are only intended
to be written to, never read.

Change-Id: I9ef054f032b3955e04128fc1a472a17c7b1fa792
ootdir/init.rc
1c38f5d9587396288997a568a01b2faa79ce1613 13-Feb-2014 Colin Cross <ccross@android.com> resolved conflicts for merge of 1fef485f to master

Change-Id: If402e68292a183064afe35cb77a4437682ee373a
1fef485fcc307f12b5f4eb1c300012d956ebbf6c 13-Feb-2014 Colin Cross <ccross@android.com> am 2bcf2437: am d0307bee: Merge "charger: add locale global variable"

* commit '2bcf2437c80dbb1d7520b2a5688d4ad7b38dad51':
charger: add locale global variable
2bcf2437c80dbb1d7520b2a5688d4ad7b38dad51 13-Feb-2014 Colin Cross <ccross@android.com> am d0307bee: Merge "charger: add locale global variable"

* commit 'd0307beeef57b9db06b82f1ffba746c5decb0b72':
charger: add locale global variable
d0307beeef57b9db06b82f1ffba746c5decb0b72 13-Feb-2014 Colin Cross <ccross@android.com> Merge "charger: add locale global variable"
fb31448b6fbf366149ddddefdc8e87c77452730c 13-Feb-2014 Colin Cross <ccross@android.com> am c5f3e0dc: am 594f0917: am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"

* commit 'c5f3e0dc092a3132b93d6784103c089ea9cf12ce':
build debuggerd and debuggerd64 on 64-bit architectures
c5f3e0dc092a3132b93d6784103c089ea9cf12ce 13-Feb-2014 Colin Cross <ccross@android.com> am 594f0917: am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"

* commit '594f0917000de7cc8bd8f184eede96a17cafd777':
build debuggerd and debuggerd64 on 64-bit architectures
594f0917000de7cc8bd8f184eede96a17cafd777 13-Feb-2014 Colin Cross <ccross@android.com> am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"

* commit 'a6b770566e62196f2fff8ab25952c33deed90ea8':
build debuggerd and debuggerd64 on 64-bit architectures
ca0e5044a390d2bffeef4dd652a4157b8998ef99 13-Feb-2014 Colin Cross <ccross@android.com> charger: add locale global variable

Some functions in minui reference a global extern char *locale. None
of them are used by charger, but the bfd linker cannot optimize them
out and fails to link charger. Define char *locale in charger.c
so it can resolve the symbol.

Change-Id: I738daf95d24356bf96bd226d91a5dc64b5d4dc9b
harger/charger.c
a6b770566e62196f2fff8ab25952c33deed90ea8 13-Feb-2014 Colin Cross <ccross@android.com> Merge "build debuggerd and debuggerd64 on 64-bit architectures"
06905ae9e16c807913b0a7b53916d426d3ba5cf9 13-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
579c9bc8a48a34b4fc5065a49febf7f80b2dd4c4 13-Feb-2014 Colin Cross <ccross@android.com> build debuggerd and debuggerd64 on 64-bit architectures

Change-Id: I1518d45ae0c5e0fed31d071fdaf19a67bad1bdfc
ebuggerd/Android.mk
ebuggerd/debuggerd.mk
3049f239156aebba51c7ac0e8112f96f4edf7b7a 13-Feb-2014 Nick Kralevich <nnk@google.com> am e41420bd: am 488b5eaf: am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit 'e41420bd8cbaa69f6eaca524b2412cb92a6d18a3':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
e41420bd8cbaa69f6eaca524b2412cb92a6d18a3 13-Feb-2014 Nick Kralevich <nnk@google.com> am 488b5eaf: am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '488b5eafe368781077b367a9afd68db303bc8891':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
488b5eafe368781077b367a9afd68db303bc8891 13-Feb-2014 Nick Kralevich <nnk@google.com> am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '2e7347d617b02b13d227bb4cecf6bd69b7b20fa9':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2e7347d617b02b13d227bb4cecf6bd69b7b20fa9 13-Feb-2014 Nick Kralevich <nnk@google.com> Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
b49443d1b67bff0d0426261f4f42c23264eff18b 13-Feb-2014 Colin Cross <ccross@android.com> am 28613a3c: am f094fd03: am dc97eec0: Merge "pixelflinger: support multilib builds"

* commit '28613a3c447d6ebdc30375ad5c6272c0c911e795':
pixelflinger: support multilib builds
a5d04cf62c342906021dd1dadcf06327e2f668ed 13-Feb-2014 Elliott Hughes <enh@google.com> am fcd4dad3: am 620a8800: am 1c1bd845: Merge "x86_64: Add atomic funtions"

* commit 'fcd4dad3967de79450549e78524ac73f775b51f2':
x86_64: Add atomic funtions
ef5000d10b31a9934a0ac0c25e7f433613242e24 13-Feb-2014 Colin Cross <ccross@android.com> am 6c0a1dd5: am d8b63266: am 7419498c: Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"

* commit '6c0a1dd58653b0253142625c5be2049617d13b6c':
pixelflinger: use __builtin___clear_cache instead of cacheflush
28613a3c447d6ebdc30375ad5c6272c0c911e795 12-Feb-2014 Colin Cross <ccross@android.com> am f094fd03: am dc97eec0: Merge "pixelflinger: support multilib builds"

* commit 'f094fd035f343b3704b3574ce0005fc0e4666db5':
pixelflinger: support multilib builds
fcd4dad3967de79450549e78524ac73f775b51f2 12-Feb-2014 Elliott Hughes <enh@google.com> am 620a8800: am 1c1bd845: Merge "x86_64: Add atomic funtions"

* commit '620a8800577743023490cd24b73a4d0a5b755d6e':
x86_64: Add atomic funtions
6c0a1dd58653b0253142625c5be2049617d13b6c 12-Feb-2014 Colin Cross <ccross@android.com> am d8b63266: am 7419498c: Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"

* commit 'd8b63266aa7e8f89ef0dea7799a390c49b113518':
pixelflinger: use __builtin___clear_cache instead of cacheflush
f094fd035f343b3704b3574ce0005fc0e4666db5 12-Feb-2014 Colin Cross <ccross@android.com> am dc97eec0: Merge "pixelflinger: support multilib builds"

* commit 'dc97eec05232a5d64b6425043b48eafaf63cef7f':
pixelflinger: support multilib builds
620a8800577743023490cd24b73a4d0a5b755d6e 12-Feb-2014 Elliott Hughes <enh@google.com> am 1c1bd845: Merge "x86_64: Add atomic funtions"

* commit '1c1bd8454915fde50b27db56739c34501f138937':
x86_64: Add atomic funtions
d8b63266aa7e8f89ef0dea7799a390c49b113518 12-Feb-2014 Colin Cross <ccross@android.com> am 7419498c: Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"

* commit '7419498cb5fa53427d8aec95c4ad27e82cfec156':
pixelflinger: use __builtin___clear_cache instead of cacheflush
14893ec27201b7a23864553b9d8b2c47b2128c48 12-Feb-2014 Kévin PETIT <kevin.petit@arm.com> Fix the definition of LOCAL_PATH in libusbhost/Android.mk

Change-Id: I870cac2f0e26644e4456743209aa45644d7e494b
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ibusbhost/Android.mk
dc97eec05232a5d64b6425043b48eafaf63cef7f 12-Feb-2014 Colin Cross <ccross@android.com> Merge "pixelflinger: support multilib builds"
1c1bd8454915fde50b27db56739c34501f138937 12-Feb-2014 Elliott Hughes <enh@google.com> Merge "x86_64: Add atomic funtions"
4bc2f8db0ad28604d6e2c394ca1b27736a0941ca 24-Jan-2014 Qiming Shi <qiming.shi@intel.com> x86_64: Add atomic funtions

This patch adds atomic functions for x86_64.

Change-Id: I298c760a1e6efa2ce2c61a143f833b6785805442
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
nclude/cutils/atomic-inline.h
nclude/cutils/atomic-x86_64.h
7419498cb5fa53427d8aec95c4ad27e82cfec156 11-Feb-2014 Colin Cross <ccross@android.com> Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"
f88fb1fade2f36dfc302e9bf11e8d9e37bdbcd76 11-Feb-2014 Colin Cross <ccross@android.com> pixelflinger: support multilib builds

Use the LOCAL_*_arch variables to support building for 32-bit and
64-bit at the same time.

Change-Id: Ibef8044e8b6500a6aa111320eb35bcdaf51ad064
ibpixelflinger/Android.mk
32ea4a895c4c914f0347dd1e943bca0f474a9050 11-Feb-2014 Colin Cross <ccross@android.com> pixelflinger: use __builtin___clear_cache instead of cacheflush

cacheflush doesn't exist on LP64 any more, and gcc's
__builtin___clear_cache is better in every way. Use it instead.

Change-Id: Ibbf6facbdefc15b6dda51d014e1c44fb7aa2b17d
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
7d05a4b7271a12412fd6dbf04273323a3e7f0c39 11-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
62ea114e5311872a133b73fe7898af91693430e8 10-Feb-2014 Colin Cross <ccross@android.com> am aeeacff9: am ec08c03c: am 85516e9d: Merge "log: add compile-time checking when ALOGV is disabled"

* commit 'aeeacff9ed2137bb06130555d8360b09bd75252c':
log: add compile-time checking when ALOGV is disabled
aeeacff9ed2137bb06130555d8360b09bd75252c 10-Feb-2014 Colin Cross <ccross@android.com> am ec08c03c: am 85516e9d: Merge "log: add compile-time checking when ALOGV is disabled"

* commit 'ec08c03cc7261e42346bf7dd15109c202162593b':
log: add compile-time checking when ALOGV is disabled
ec08c03cc7261e42346bf7dd15109c202162593b 10-Feb-2014 Colin Cross <ccross@android.com> am 85516e9d: Merge "log: add compile-time checking when ALOGV is disabled"

* commit '85516e9d019a7f5af0e394ea767185c12ffbcd42':
log: add compile-time checking when ALOGV is disabled
85516e9d019a7f5af0e394ea767185c12ffbcd42 10-Feb-2014 Colin Cross <ccross@android.com> Merge "log: add compile-time checking when ALOGV is disabled"
e50638e07e93e61e905d109c577bcc39be1bfee2 10-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
8a54dea42ade5f5c6d1bba6ec590368dab48f308 10-Feb-2014 Christopher Ferris <cferris@google.com> am 25a619fb: am 48e81834: am 4207df11: Merge "Use stat structure to keep oldest mtime."

* commit '25a619fb30ac04ee534a749ff238900845b64bb6':
Use stat structure to keep oldest mtime.
4160507b759bc119c5a7393b4c2c090654c04f47 10-Feb-2014 Elliott Hughes <enh@google.com> am a1ebd4d5: am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from nandread."

* commit 'a1ebd4d5c8b0a038c39b568b33e89f1b998f0a73':
Remove a pre-uapi hack from nandread.
c89210e3a846fad69699293b91840d5662017daf 10-Feb-2014 Colin Cross <ccross@android.com> am ec04a8d4: am d90b11b6: am 13274a26: Merge "Fix logging errors inside ALOGV"

* commit 'ec04a8d45bc6b01c3c2cd4a3064d194f7beeb386':
Fix logging errors inside ALOGV
54cf89a24b0e5cb5a3f0be4e5938e7ecd4ed44dd 10-Feb-2014 Elliott Hughes <enh@google.com> am 00010369: am 3bff7e3e: am 136a9619: Merge "Use socklen_t instead of int in debuggerd."

* commit '00010369a6a4d9b3db58a22dfeca258f328147da':
Use socklen_t instead of int in debuggerd.
810d19f99a724a929646502a1dd101acef00cd4f 07-Feb-2014 Colin Cross <ccross@android.com> log: add compile-time checking when ALOGV is disabled

Wrap the call in a if (0) when verbose logging is disabled
to provide compile time checking.

Also add a printf format attribute to the function to warn
if parameters are incorrect.

Change-Id: Ic77edeadcc4d886ca0f8b434f8550e18e22d5901
nclude/log/log.h
25a619fb30ac04ee534a749ff238900845b64bb6 08-Feb-2014 Christopher Ferris <cferris@google.com> am 48e81834: am 4207df11: Merge "Use stat structure to keep oldest mtime."

* commit '48e818344250324ad89cacd23105a8035287d33b':
Use stat structure to keep oldest mtime.
a1ebd4d5c8b0a038c39b568b33e89f1b998f0a73 08-Feb-2014 Elliott Hughes <enh@google.com> am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from nandread."

* commit '696c75c165bbefd588b411103036b1193958ef6b':
Remove a pre-uapi hack from nandread.
ec04a8d45bc6b01c3c2cd4a3064d194f7beeb386 08-Feb-2014 Colin Cross <ccross@android.com> am d90b11b6: am 13274a26: Merge "Fix logging errors inside ALOGV"

* commit 'd90b11b6c1905eb7c86dc2cf17314edb37ba4592':
Fix logging errors inside ALOGV
00010369a6a4d9b3db58a22dfeca258f328147da 08-Feb-2014 Elliott Hughes <enh@google.com> am 3bff7e3e: am 136a9619: Merge "Use socklen_t instead of int in debuggerd."

* commit '3bff7e3e65d382a8474e0b20dbcf616cfdd82a2d':
Use socklen_t instead of int in debuggerd.
48e818344250324ad89cacd23105a8035287d33b 08-Feb-2014 Christopher Ferris <cferris@google.com> am 4207df11: Merge "Use stat structure to keep oldest mtime."

* commit '4207df11c5c09969b576324b4eea93a4c4e1ee99':
Use stat structure to keep oldest mtime.
4207df11c5c09969b576324b4eea93a4c4e1ee99 08-Feb-2014 Christopher Ferris <cferris@google.com> Merge "Use stat structure to keep oldest mtime."
68bd59f6d2c63b752aa4f38bcd655c0d52d6597e 07-Feb-2014 Christopher Ferris <cferris@google.com> Use stat structure to keep oldest mtime.

Change-Id: If9496127db28d2dcd09bc5b3144632a43afb8d55
ebuggerd/tombstone.cpp
696c75c165bbefd588b411103036b1193958ef6b 08-Feb-2014 Elliott Hughes <enh@google.com> am 829ae5be: Merge "Remove a pre-uapi hack from nandread."

* commit '829ae5befa16efbd2ca4e974d702c2eaac3eab02':
Remove a pre-uapi hack from nandread.
829ae5befa16efbd2ca4e974d702c2eaac3eab02 08-Feb-2014 Elliott Hughes <enh@google.com> Merge "Remove a pre-uapi hack from nandread."
2c1d62d622a928d1b18ace84c543fc2ff6e4d960 08-Feb-2014 Elliott Hughes <enh@google.com> Remove a pre-uapi hack from nandread.

We only have uapi headers now.

Change-Id: I2c02e10bb3bba4006579772f3ab2a18c2df7535d
oolbox/nandread.c
d90b11b6c1905eb7c86dc2cf17314edb37ba4592 07-Feb-2014 Colin Cross <ccross@android.com> am 13274a26: Merge "Fix logging errors inside ALOGV"

* commit '13274a2661eeb9aa4b2f82db6fd11edc22af1d8a':
Fix logging errors inside ALOGV
3bff7e3e65d382a8474e0b20dbcf616cfdd82a2d 07-Feb-2014 Elliott Hughes <enh@google.com> am 136a9619: Merge "Use socklen_t instead of int in debuggerd."

* commit '136a961980f4c31da44fa496e0474754d42624e1':
Use socklen_t instead of int in debuggerd.
13274a2661eeb9aa4b2f82db6fd11edc22af1d8a 07-Feb-2014 Colin Cross <ccross@android.com> Merge "Fix logging errors inside ALOGV"
136a961980f4c31da44fa496e0474754d42624e1 07-Feb-2014 Elliott Hughes <enh@google.com> Merge "Use socklen_t instead of int in debuggerd."
f4b0b7971c0333b7331c2f54384af5de0260ae75 07-Feb-2014 Colin Cross <ccross@android.com> Fix logging errors inside ALOGV

Fix errors exposed by adding checking to disabled ALOGVs.

Change-Id: I36b77bb0ad8dc7661b0f834f20d1179b86134d57
ibbacktrace/BacktraceMap.cpp
ibziparchive/zip_archive.cc
0df8e4f86c93016daa2a6040c87247c4658cd33a 07-Feb-2014 Elliott Hughes <enh@google.com> Use socklen_t instead of int in debuggerd.

Also other trivial C++ cleanup.

Change-Id: I9b5278c5205e0ea4f9dcbbe3e7b99921dd2436dc
ebuggerd/debuggerd.cpp
13d5bb4badf59e22d9d983d104596da3ec4f2753 30-Jan-2014 Paul Lawrence <paullawrence@google.com> Mount default encrypted devices at boot

If userdata is default encrypted, we should mount it at boot
to avoid bringing the framework up and then down unnecessarily.

Needs matching vold changes from
https://googleplex-android-review.googlesource.com/#/c/412649/

Bug: 8769627
Change-Id: I4b8276befd832cd788e15c36edfbf8f0e18d7e6b
nit/builtins.c
ootdir/init.rc
27a93650c0df02e4cd3c48bbec8acee8b817a012 07-Feb-2014 Stephen Smalley <sds@tycho.nsa.gov> Convert all selinux_android_restorecon and _setfilecon calls to new API.

libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
db/file_sync_service.c
ebuggerd/tombstone.cpp
nit/util.c
oolbox/restorecon.c
84a95225d66c11ffabe7e55145d220e98a38774f 07-Feb-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera3: Add opaque raw format."
b3e2d02588a2dbed3ec50385625f4b4e4ad9b870 07-Feb-2014 Nick Kralevich <nnk@google.com> am 52ca10d1: am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."

* commit '52ca10d15aa803333467db456a40d2bbc89dc18e':
Unify toolbox restorecon and libselinux restorecon implementations.
52ca10d15aa803333467db456a40d2bbc89dc18e 07-Feb-2014 Nick Kralevich <nnk@google.com> am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."

* commit 'e3b1810e7e15a12512beb285a83a65a803d55366':
Unify toolbox restorecon and libselinux restorecon implementations.
e3b1810e7e15a12512beb285a83a65a803d55366 07-Feb-2014 Nick Kralevich <nnk@google.com> am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."

* commit '71de56a08cac3353334c2253748fdf8c37ec4aa1':
Unify toolbox restorecon and libselinux restorecon implementations.
71de56a08cac3353334c2253748fdf8c37ec4aa1 07-Feb-2014 Nick Kralevich <nnk@google.com> Merge "Unify toolbox restorecon and libselinux restorecon implementations."
f2b7ee765516c84a9995e3acdc8fbcd7dc1b33cc 06-Feb-2014 Stephen Smalley <sds@tycho.nsa.gov> Apply restorecon_recursive to all of /data.

With the following prior changes:
I77bf2a0c4c34b1feef6fdf4d6c3bd92dbf32f4a1
I698b1b2c3f00f31fbb2015edf23d33b51aa5bba1
I8dd915d9bb80067339621b905ea2b4ea0fa8d71e
it should now be safe (will correctly label all files)
and reasonably performant (will skip processing unless
file_contexts has changed since the last call) to call
restorecon_recursive /data from init.rc.

The call is placed after the setprop selinux.policy_reload 1 so that
we use any policy update under /data/security if present.

Change-Id: Ib8d9751a47c8e0238cf499fcec61898937945d9d
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
535253eabe96c9de993205c39ee32174fe05be7a 05-Feb-2014 Ruben Brunk <rubenbrunk@google.com> camera3: Add opaque raw format.

Change-Id: I7abf0e63a0f74ede46e0fe4dd1285283355624b1
nclude/system/graphics.h
2761b71d3fafbf8f104d591dd4013f2a729e2400 30-Jan-2014 Stephen Smalley <sds@tycho.nsa.gov> Unify toolbox restorecon and libselinux restorecon implementations.

Extend the libselinux restorecon implementation to allow reuse
by the toolbox restorecon command. This simply requires adding
support for the nochange (-n) and verbose (-v) options to the
libselinux functions and rewriting the toolbox restorecon command
to use the libselinux functions. Also add a force (-F) option to
support forcing a restorecon_recursive even if the restorecon_last
attribute matches the current file_contexts hash so that we can
continue to force a restorecon via the toolbox command for testing
or when we know something else has changed (e.g. for when we support
relabeling /data/data and package information has changed).

Change-Id: I92bb3259790a7195ba56a5e9555c3b6c76ceb862
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
oolbox/restorecon.c
0fc51fa4ff058c4b958add7b6173dee8ae27d650 06-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
260d400593154bea556eab8c72f4f35776040c5d 06-Feb-2014 Elliott Hughes <enh@google.com> am b30b159f: am 61e92a02: am 68835ee8: Merge "system/core LP64 cleanup."

* commit 'b30b159f709a94a0fb1d62aa1ed7b0da8a51120d':
system/core LP64 cleanup.
b30b159f709a94a0fb1d62aa1ed7b0da8a51120d 06-Feb-2014 Elliott Hughes <enh@google.com> am 61e92a02: am 68835ee8: Merge "system/core LP64 cleanup."

* commit '61e92a026472786ce81f4738e7d77bcad69697b8':
system/core LP64 cleanup.
61e92a026472786ce81f4738e7d77bcad69697b8 06-Feb-2014 Elliott Hughes <enh@google.com> am 68835ee8: Merge "system/core LP64 cleanup."

* commit '68835ee88b146f654fe3ce007f07ace71266e876':
system/core LP64 cleanup.
68835ee88b146f654fe3ce007f07ace71266e876 06-Feb-2014 Elliott Hughes <enh@google.com> Merge "system/core LP64 cleanup."
5d9fe779c8ec2705865a23061834ad8cdbee5b82 06-Feb-2014 Elliott Hughes <enh@google.com> system/core LP64 cleanup.

Fixes -Wint-to-pointer and -Wpointer-to-int warnings, plus various -Wformat
warnings.

Change-Id: I6c5eea6b4273d82d28b8e5d2925f3e5457511b17
ebuggerd/crasher.c
astbootd/commands.c
astbootd/commands/boot.c
astbootd/commands/boot.h
astbootd/protocol.c
iblog/tests/benchmark_main.cpp
iblog/tests/liblog_test.cpp
ibnl_2/Android.mk
dcard/sdcard.c
df4195067512eb06fe8b139522d0d066ca62b686 05-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
99be1a480e4f5a3e745545a97ebc44f09c982890 05-Feb-2014 Elliott Hughes <enh@google.com> am c7cb88f1: (-s ours) am afdd1915: am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""

* commit 'c7cb88f1677fcee87ebe09054cb7f217de33626e':
Revert "Move to the canonical UniquePtr.h."
c7cb88f1677fcee87ebe09054cb7f217de33626e 05-Feb-2014 Elliott Hughes <enh@google.com> am afdd1915: am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""

* commit 'afdd1915f6f7fd4ea941daac20ba234e981ef376':
Revert "Move to the canonical UniquePtr.h."
afdd1915f6f7fd4ea941daac20ba234e981ef376 05-Feb-2014 Elliott Hughes <enh@google.com> am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""

* commit 'eaba2bedf529eeb21351c8bf6365107cb6a4e8b6':
Revert "Move to the canonical UniquePtr.h."
d30eface6dbe9c5023aac4652825dd60db7bbc8c 05-Feb-2014 Elliott Hughes <enh@google.com> am 4e9d3ce2: (-s ours) am 0056a41d: am 345fc625: Merge "Move to the canonical UniquePtr.h."

* commit '4e9d3ce295ea57cf92d734617a6d0947d0fb7aa4':
Move to the canonical UniquePtr.h.
eaba2bedf529eeb21351c8bf6365107cb6a4e8b6 05-Feb-2014 Elliott Hughes <enh@google.com> Merge "Revert "Move to the canonical UniquePtr.h.""
5c4020005bda55aeeec6f347f5bcb4ad97792ddd 05-Feb-2014 Elliott Hughes <enh@google.com> Revert "Move to the canonical UniquePtr.h."

This reverts commit 2a72c575d260cd256f767b7ad511a6959444134b.

Change-Id: Idb485f1be2906e8c1c8f0da3df186a7aade027f6
nclude/utils/LruCache.h
nclude/utils/UniquePtr.h
4e9d3ce295ea57cf92d734617a6d0947d0fb7aa4 05-Feb-2014 Elliott Hughes <enh@google.com> am 0056a41d: am 345fc625: Merge "Move to the canonical UniquePtr.h."

* commit '0056a41d2a1ffd75644451b54e4ccacbbba75a5c':
Move to the canonical UniquePtr.h.
0056a41d2a1ffd75644451b54e4ccacbbba75a5c 05-Feb-2014 Elliott Hughes <enh@google.com> am 345fc625: Merge "Move to the canonical UniquePtr.h."

* commit '345fc6252a3e5c6113be893638f4746a54173489':
Move to the canonical UniquePtr.h.
345fc6252a3e5c6113be893638f4746a54173489 05-Feb-2014 Elliott Hughes <enh@google.com> Merge "Move to the canonical UniquePtr.h."
6edd1bdf53fe6fdeeca3b4031896df4f8007de3e 04-Feb-2014 Doug Zongker <dougz@android.com> Merge "set permissions of recovery install script"
9526202d84387df3950bf526bbbaeac1ede129d2 04-Feb-2014 Doug Zongker <dougz@android.com> set permissions of recovery install script

The script that writes the recovery partition after a successful
update of system needs to be made executable. This change also moves
it from /system/etc to /system/bin.

Bug: 12893978
Change-Id: I686e2392a2392515a6859a7381b735de1007b7ea
nclude/private/android_filesystem_config.h
ootdir/init.rc
2a72c575d260cd256f767b7ad511a6959444134b 04-Feb-2014 Elliott Hughes <enh@google.com> Move to the canonical UniquePtr.h.

Change-Id: I5330c36d2b571acb6d3debd30b8020e33aa8a4a7
nclude/utils/LruCache.h
nclude/utils/UniquePtr.h
6694b7508a6d3efd99a22c0f38b4e43b34e4df31 04-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 925a3cd9: am ddf872c0: am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"

* commit '925a3cd95a54c8955df0c8e6e2774819598e7917':
libsysutil: frequent native crash /system/bin/vold
925a3cd95a54c8955df0c8e6e2774819598e7917 04-Feb-2014 Mark Salyzyn <salyzyn@google.com> am ddf872c0: am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"

* commit 'ddf872c0fb3e2a9cf9bfb197842d9bb4ccc164cd':
libsysutil: frequent native crash /system/bin/vold
ddf872c0fb3e2a9cf9bfb197842d9bb4ccc164cd 04-Feb-2014 Mark Salyzyn <salyzyn@google.com> am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"

* commit '5931ea864599fc3ce29ed3b1ff8d4ff65413a168':
libsysutil: frequent native crash /system/bin/vold
5931ea864599fc3ce29ed3b1ff8d4ff65413a168 04-Feb-2014 Mark Salyzyn <salyzyn@google.com> Merge "libsysutil: frequent native crash /system/bin/vold"
d9d8a60e42b0acc8ad6285fb8d6244d508ad0250 04-Feb-2014 Nick Kralevich <nnk@google.com> am fbca9d94: am 7e3d72d9: am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."

* commit 'fbca9d9449231839b805ef4b11e4b2d968e601e3':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
fbca9d9449231839b805ef4b11e4b2d968e601e3 04-Feb-2014 Nick Kralevich <nnk@google.com> am 7e3d72d9: am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."

* commit '7e3d72d974d21932c2a6a0323c59fed2f689d323':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
7e3d72d974d21932c2a6a0323c59fed2f689d323 04-Feb-2014 Nick Kralevich <nnk@google.com> am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."

* commit 'ba023b063d25b73923f2df536b6258967f756ff6':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
ba023b063d25b73923f2df536b6258967f756ff6 04-Feb-2014 Nick Kralevich <nnk@google.com> Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
07ff3544fa02dcb34d12225b9829f59ae4b389c1 04-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
5a23144aa5c6f4a7b93bcc5a218ca9ce8f4d7f3b 04-Feb-2014 Glenn Kasten <gkasten@google.com> Merge "Add 24-bit packed to audio_format_t"
a3fe7a7927840ac16645ea16783602afda2b263e 03-Feb-2014 Christopher Ferris <cferris@google.com> am 10c2607c: am 77b23023: am 3faf86c0: Merge "Call a specialized local map set."

* commit '10c2607c3cc4903ca8dcbe2245f66d21af199865':
Call a specialized local map set.
1ffde8abbed48172014a733fe21c1be4137b3b67 03-Feb-2014 Christopher Ferris <cferris@google.com> am 2765ec14: am f355750d: am c47aa3bd: Merge "Fix mips build."

* commit '2765ec143440a0fffd3358d1dc6f7fcf893b2b01':
Fix mips build.
32b36979465c51329b60f8cbc4ad7944e96f70e8 03-Feb-2014 Elliott Hughes <enh@google.com> am f51bee45: am 784b6181: am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."

* commit 'f51bee45b015730b5f2759e89882c0cb457c22a3':
Fix debuggerd's symbol offset output.
242655c69376eaa8ff184c503f004870fe20be72 03-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
10c2607c3cc4903ca8dcbe2245f66d21af199865 03-Feb-2014 Christopher Ferris <cferris@google.com> am 77b23023: am 3faf86c0: Merge "Call a specialized local map set."

* commit '77b230233178e853dccfe9ca0ee52c78e2a2579b':
Call a specialized local map set.
2765ec143440a0fffd3358d1dc6f7fcf893b2b01 03-Feb-2014 Christopher Ferris <cferris@google.com> am f355750d: am c47aa3bd: Merge "Fix mips build."

* commit 'f355750defa34d2e28d51a220947fea59c4f4429':
Fix mips build.
f51bee45b015730b5f2759e89882c0cb457c22a3 03-Feb-2014 Elliott Hughes <enh@google.com> am 784b6181: am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."

* commit '784b6181cfd2a0362f35d32ee62a98ab60437397':
Fix debuggerd's symbol offset output.
77b230233178e853dccfe9ca0ee52c78e2a2579b 03-Feb-2014 Christopher Ferris <cferris@google.com> am 3faf86c0: Merge "Call a specialized local map set."

* commit '3faf86c0d4b98e7d26edbe8d1c8a8a231c86a234':
Call a specialized local map set.
f355750defa34d2e28d51a220947fea59c4f4429 03-Feb-2014 Christopher Ferris <cferris@google.com> am c47aa3bd: Merge "Fix mips build."

* commit 'c47aa3bd2acde49f858b21bcafd750b2981df7c0':
Fix mips build.
784b6181cfd2a0362f35d32ee62a98ab60437397 03-Feb-2014 Elliott Hughes <enh@google.com> am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."

* commit 'cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509':
Fix debuggerd's symbol offset output.
3faf86c0d4b98e7d26edbe8d1c8a8a231c86a234 01-Feb-2014 Christopher Ferris <cferris@google.com> Merge "Call a specialized local map set."
c47aa3bd2acde49f858b21bcafd750b2981df7c0 01-Feb-2014 Christopher Ferris <cferris@google.com> Merge "Fix mips build."
c53c47364f4996b10da3f38fa2894389c75030d6 01-Feb-2014 Christopher Ferris <cferris@google.com> Fix mips build.

Change-Id: I5401ae6ca6553ebbec231166820c1c904355ec63
ibcorkscrew/Android.mk
73dc1cc3fb799be309b8db57618be07de755eca4 01-Feb-2014 Christopher Ferris <cferris@google.com> Call a specialized local map set.

Bug: 12852152
Change-Id: I8a0c558bc218805b0e06371af0af055e4aa6e0bb
ibbacktrace/UnwindMap.cpp
cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509 01-Feb-2014 Elliott Hughes <enh@google.com> Merge "Fix debuggerd's symbol offset output."
f7b4b519e4c7df19faa04371d64b7560a08005e0 01-Feb-2014 Elliott Hughes <enh@google.com> Fix debuggerd's symbol offset output.

Before:
00007fff33e489d8 00007ff286e4ad94 /system/lib64/libc.so (__libc_init+54u)

After:
00007fff45c6c158 00007f61bc36fd94 /system/lib64/libc.so (__libc_init+84)

Change-Id: I36796c99843a41583824a96793a5a4c81ddb666e
ebuggerd/tombstone.cpp
6cfb31d65255eacd7965295a561cafa1218dc842 01-Feb-2014 Elliott Hughes <enh@google.com> am 5cbb68cf: am da9b5dab: am 434edbe6: Merge "LP64 should have debuggerd and debuggerd64."

* commit '5cbb68cf891fa040563c70784363496cf3e05174':
LP64 should have debuggerd and debuggerd64.
5cbb68cf891fa040563c70784363496cf3e05174 01-Feb-2014 Elliott Hughes <enh@google.com> am da9b5dab: am 434edbe6: Merge "LP64 should have debuggerd and debuggerd64."

* commit 'da9b5dab2d565f9682fe1fb3555702bf82334ab4':
LP64 should have debuggerd and debuggerd64.
da9b5dab2d565f9682fe1fb3555702bf82334ab4 01-Feb-2014 Elliott Hughes <enh@google.com> am 434edbe6: Merge "LP64 should have debuggerd and debuggerd64."

* commit '434edbe6fffb9445316567ac6de3f407c005b37b':
LP64 should have debuggerd and debuggerd64.
434edbe6fffb9445316567ac6de3f407c005b37b 01-Feb-2014 Elliott Hughes <enh@google.com> Merge "LP64 should have debuggerd and debuggerd64."
e9edf7a0efd8c62dacab7bf765c8037d8a94c3bb 01-Feb-2014 Elliott Hughes <enh@google.com> LP64 should have debuggerd and debuggerd64.

Change-Id: I4e39c200e6867bb9a5bbcfec1c449b8864028feb
ebuggerd/Android.mk
nclude/cutils/debugger.h
19750a2c3088e19e37a2f4ad64ec93d91b3d7196 01-Feb-2014 Elliott Hughes <enh@google.com> am f1935b6d: am 2e9dcd21: am 1bc6169f: Merge "Remove dead code that looked like part of debuggerd."

* commit 'f1935b6d933861d6194bf056a844ec0f11765c38':
Remove dead code that looked like part of debuggerd.
f1935b6d933861d6194bf056a844ec0f11765c38 01-Feb-2014 Elliott Hughes <enh@google.com> am 2e9dcd21: am 1bc6169f: Merge "Remove dead code that looked like part of debuggerd."

* commit '2e9dcd21d3be51297eff22a15c42f55904da0f4b':
Remove dead code that looked like part of debuggerd.
4389588e8ded66148d9e616aa20307cf25144460 29-Jan-2014 Mark Salyzyn <salyzyn@google.com> libsysutil: frequent native crash /system/bin/vold

regression from commit a6e965578e44f9ae5f98de822ba5decec381dffc

* wrap writev with sigaction SIG_IGN SIGPIPE to emulate the
send(,,,MSG_NOSIGNAL) call it had replaced.

(cherry pick from commit 83fc720785c4e40f3341daf7c0bf5ee99261fee9)

BUG: 12796279
Change-Id: I14363630ada79c0a5b85bb6b2afd0a1c4d5c3109
ibsysutils/src/SocketClient.cpp
2e9dcd21d3be51297eff22a15c42f55904da0f4b 01-Feb-2014 Elliott Hughes <enh@google.com> am 1bc6169f: Merge "Remove dead code that looked like part of debuggerd."

* commit '1bc6169f80fb02957695351ce8b4f49d0c019382':
Remove dead code that looked like part of debuggerd.
1bc6169f80fb02957695351ce8b4f49d0c019382 01-Feb-2014 Elliott Hughes <enh@google.com> Merge "Remove dead code that looked like part of debuggerd."
936fa72620b120fd982e3fb265cf171b09c447ad 01-Feb-2014 Christopher Ferris <cferris@google.com> am 5127626b: am 3133a4a2: am 0fdf0dc7: Merge "Refactor makefile."

* commit '5127626b4a7d998a75d366bf1128be91c6047dc0':
Refactor makefile.
033640c40440c1813b77f1f048dee4e720c49db4 01-Feb-2014 Elliott Hughes <enh@google.com> am 6beca66f: am 3f94aa5f: am 51c4d4c4: Merge "AArch64: Port debuggerd"

* commit '6beca66f9ceaf5733ff5a4a00f1d272e42e871a2':
AArch64: Port debuggerd
0a097c2a8030d4d4fcfbd25f80b8332b6c1da22c 01-Feb-2014 Elliott Hughes <enh@google.com> am 6bad401c: am 65bbc6c4: am e94985a2: Merge "Increase the scope of other reused definitions."

* commit '6bad401ce83028ea73d8356f82aa42520a3d8aad':
073e62e4ee546d0a44f2262fbf4ca459e3d4fc66 01-Feb-2014 JP Abgrall <jpa@google.com> am cdecfcbb: Merge "init: prevent waiting forever when a setprop is incomplete." into klp-volantis-dev

* commit 'cdecfcbb33fc3cc85ac7210ec53f6f1f90a6ffee':
init: prevent waiting forever when a setprop is incomplete.
5127626b4a7d998a75d366bf1128be91c6047dc0 01-Feb-2014 Christopher Ferris <cferris@google.com> am 3133a4a2: am 0fdf0dc7: Merge "Refactor makefile."

* commit '3133a4a20395032c7d5270516bbdacf58c6bbc78':
Refactor makefile.
6beca66f9ceaf5733ff5a4a00f1d272e42e871a2 01-Feb-2014 Elliott Hughes <enh@google.com> am 3f94aa5f: am 51c4d4c4: Merge "AArch64: Port debuggerd"

* commit '3f94aa5fbb627618c6b855f74e23465a4484546b':
AArch64: Port debuggerd
6bad401ce83028ea73d8356f82aa42520a3d8aad 01-Feb-2014 Elliott Hughes <enh@google.com> am 65bbc6c4: am e94985a2: Merge "Increase the scope of other reused definitions."

* commit '65bbc6c42d8e35b77f50d794e302da3d63a0b8ae':
cdecfcbb33fc3cc85ac7210ec53f6f1f90a6ffee 01-Feb-2014 JP Abgrall <jpa@google.com> Merge "init: prevent waiting forever when a setprop is incomplete." into klp-volantis-dev
3133a4a20395032c7d5270516bbdacf58c6bbc78 01-Feb-2014 Christopher Ferris <cferris@google.com> am 0fdf0dc7: Merge "Refactor makefile."

* commit '0fdf0dc725a130b39a4232262b77c17ff053ef23':
Refactor makefile.
3f94aa5fbb627618c6b855f74e23465a4484546b 01-Feb-2014 Elliott Hughes <enh@google.com> am 51c4d4c4: Merge "AArch64: Port debuggerd"

* commit '51c4d4c431dbbabe6db1cea5bb21822c69b7546c':
AArch64: Port debuggerd
65bbc6c42d8e35b77f50d794e302da3d63a0b8ae 01-Feb-2014 Elliott Hughes <enh@google.com> am e94985a2: Merge "Increase the scope of other reused definitions."

* commit 'e94985a2514312e7103fbb6a6a45e473031cb6c0':
0fdf0dc725a130b39a4232262b77c17ff053ef23 31-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Refactor makefile."
4515d81e7e9d4b11dfdb29493f55e3ef548fbbe8 31-Jan-2014 JP Abgrall <jpa@google.com> init: prevent waiting forever when a setprop is incomplete.

Any app can
socket_local_client_connect(s, "property_service", ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM)
and just keep it open without sending anything.
From then on, the property_service.c::handle_property_set_fd() will
just recv() forever.
This prevents any other properties (i.e. property_set("sys.powerctl", "reboot"))
from being processed.

Now, we just poll() for 2 sec before recv(...,MSG_DONTWAIT).

Bug: 12061560
Change-Id: Iffea4ebb444c7100b59c43ed87aecc5c99f9d3e8
nit/property_service.c
cbd0ae37758d6892866484a50e1a019b834da057 31-Jan-2014 Elliott Hughes <enh@google.com> am c337a961: am ba0cecf8: Increase the scope of other reused definitions.

* commit 'c337a961240baaa8529968d4e30e81621fba9ca5':
Increase the scope of other reused definitions.
9361b583309d4f382df7067fcc1ed9f8f54aa1e5 31-Jan-2014 Elliott Hughes <enh@google.com> am fe0d5d42: am 5434bf66: Merge "LP64: Enable debuggerd/libbacktrace/libunwind."

* commit 'fe0d5d42e4ca8b77d6a0657be1b8b6343c21d689':
LP64: Enable debuggerd/libbacktrace/libunwind.
28d1d3bad09e5a57c96cbd44648675f231b0a614 31-Jan-2014 Elliott Hughes <enh@google.com> am 287fed5d: am 469f1533: Merge "Fix build by defining LOCAL_PATH early enough."

* commit '287fed5d091bb772a1932ea369919811e6c371a6':
Fix build by defining LOCAL_PATH early enough.
c2e5886cf256b147326264be4849552af07064b2 31-Jan-2014 Elliott Hughes <enh@google.com> am 1ca51cba: am 525155ac: Merge "Allow the host libcorkscrew to build."

* commit '1ca51cba06b962e4ddfff9c731b693d103ba8a5e':
Allow the host libcorkscrew to build.
c337a961240baaa8529968d4e30e81621fba9ca5 31-Jan-2014 Elliott Hughes <enh@google.com> am ba0cecf8: Increase the scope of other reused definitions.

* commit 'ba0cecf8e3fd484494d3a586e1be97037c680bcf':
Increase the scope of other reused definitions.
fe0d5d42e4ca8b77d6a0657be1b8b6343c21d689 31-Jan-2014 Elliott Hughes <enh@google.com> am 5434bf66: Merge "LP64: Enable debuggerd/libbacktrace/libunwind."

* commit '5434bf6640af7145986d63968846ba7168dab406':
LP64: Enable debuggerd/libbacktrace/libunwind.
287fed5d091bb772a1932ea369919811e6c371a6 31-Jan-2014 Elliott Hughes <enh@google.com> am 469f1533: Merge "Fix build by defining LOCAL_PATH early enough."

* commit '469f15339dd2ea7458d12bcdff802d26dcffbcd7':
Fix build by defining LOCAL_PATH early enough.
1ca51cba06b962e4ddfff9c731b693d103ba8a5e 31-Jan-2014 Elliott Hughes <enh@google.com> am 525155ac: Merge "Allow the host libcorkscrew to build."

* commit '525155ac49bae98e9f50ce667609c32eeccc80be':
Allow the host libcorkscrew to build.
6694d3e3d5b7ca2418bbca3007ad4b980f3a3602 31-Jan-2014 Elliott Hughes <enh@google.com> Remove dead code that looked like part of debuggerd.

Note that these were two different functions. The definition was unused,
and the declaration was undefined.

Change-Id: I2edd10a0ab9422cd5252bdb9ccdd726dc5fad531
ebuggerd/crasher.c
nclude/cutils/misc.h
04b1e8c812fedd83f73bf2b22671bedbbc11b6e4 30-Jan-2014 Christopher Ferris <cferris@google.com> Refactor makefile.

With this change allow the creation of host backtrace libraries using
libunwind.

Change-Id: Ie48bb36cf0d2eccf94cb8ff516d829d8032f11f2
ibbacktrace/Android.build.mk
ibbacktrace/Android.mk
83fc720785c4e40f3341daf7c0bf5ee99261fee9 29-Jan-2014 Mark Salyzyn <salyzyn@google.com> libsysutil: frequent native crash /system/bin/vold

BUG: 12796279

regression from commit a6e965578e44f9ae5f98de822ba5decec381dffc

* wrap writev with sigaction SIG_IGN SIGPIPE to emulate the
send(,,,MSG_NOSIGNAL) call it had replaced.

Change-Id: I14363630ada79c0a5b85bb6b2afd0a1c4d5c3109
ibsysutils/src/SocketClient.cpp
df4b9e68906e30a5b58f93a64c61c16d36f33e56 31-Jan-2014 Elliott Hughes <enh@google.com> am 480fdd52: am e97dad0d: Merge "debuggerd: a few generic improvements"

* commit '480fdd524da3aa24429e46b81f52651f95c1c59a':
debuggerd: a few generic improvements
70b35fd6b8b234c1710713d76c2db7b1edc000f0 31-Jan-2014 Elliott Hughes <enh@google.com> am 7dc91f8c: am 8623972d: Merge "Don\'t try to build libcorkscrew for LP64."

* commit '7dc91f8cfae2cc71343fa0b914f339e55dd428a1':
Don't try to build libcorkscrew for LP64.
daea762e03f303263f320cc02c523c8c591c87c7 31-Jan-2014 Elliott Hughes <enh@google.com> am e5734557: am caefe564: Merge "x86: Enable libunwind"

* commit 'e5734557d962c801375eeee600e89c98d65dd976':
x86: Enable libunwind
6334485f164b3237805c4829c387c549c106779f 31-Jan-2014 Christopher Ferris <cferris@google.com> am cbe55724: am 7957529d: Merge "Clean up UnwindCurrent.cpp\'s use of ucontext.h."

* commit 'cbe55724c8211c9c06362cebff0a262197dbc351':
Clean up UnwindCurrent.cpp's use of ucontext.h.
bd74ac6d3839513cd0b9e8739313eaaa6f4eda5f 31-Jan-2014 Colin Cross <ccross@android.com> am 1c75422c: am 1686784a: Merge changes I6bffe1cd,I0984ba01

* commit '1c75422c2144b845412b20c100e3a13cf2704212':
fs_mgr: split fstab parsing into separate file
fs_mgr: update ext4_parse_sb to match change in ext4_utils
c97d38a5fd93a33d06caff98c315a4f9b278980b 31-Jan-2014 Elliott Hughes <enh@google.com> am c1c1c827: am 710f6634: Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."

* commit 'c1c1c8272860225a066d4365e9ebe87a753405b3':
Switch mips libcorkscrew over to <sys/ucontext.h>.
f31281406033128373c5c3fc88c8010c4fd9a01a 31-Jan-2014 Ian Rogers <irogers@google.com> am c9869057: am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."

* commit 'c98690576ab6d7d13e5c0d3387db8149de71d9de':
Avoid redefinition of __STDC_FORMAT_MACROS.
7d6aed2c77ccc1de6716da6fc8db7838f21e4022 31-Jan-2014 Elliott Hughes <enh@google.com> am 84ba6b52: am 59b5294f: Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."

* commit '84ba6b52b22e91cade601b28dd4c630a1f1d4b70':
Switch arm libcorkscrew over to <sys/ucontext.h>.
174d06f6e498b1c088285024c47900f161d69c2a 31-Jan-2014 Elliott Hughes <enh@google.com> am 4d0520fb: am b99d5294: Merge "Switch x86 libcorkscrew over to <ucontext.h>."

* commit '4d0520fbc92f4bfead3b87890ae9af6dcf3be0ab':
Switch x86 libcorkscrew over to <ucontext.h>.
c0a51093a2604b27f7d78f88eecaea15ac744f2e 31-Jan-2014 Glenn Kasten <gkasten@google.com> Add 24-bit packed to audio_format_t

Change-Id: I08c38ee3ade7b24dc9e2b3ed2b7037c42521a555
nclude/system/audio.h
480fdd524da3aa24429e46b81f52651f95c1c59a 31-Jan-2014 Elliott Hughes <enh@google.com> am e97dad0d: Merge "debuggerd: a few generic improvements"

* commit 'e97dad0d95ae1305686bf4294029da947fc2dcf2':
debuggerd: a few generic improvements
7dc91f8cfae2cc71343fa0b914f339e55dd428a1 31-Jan-2014 Elliott Hughes <enh@google.com> am 8623972d: Merge "Don\'t try to build libcorkscrew for LP64."

* commit '8623972dc0055ae878df24cf93a663e60a6787f1':
Don't try to build libcorkscrew for LP64.
e5734557d962c801375eeee600e89c98d65dd976 31-Jan-2014 Elliott Hughes <enh@google.com> am caefe564: Merge "x86: Enable libunwind"

* commit 'caefe564a4b05e717a3baec155b8968ad36e58b6':
x86: Enable libunwind
cbe55724c8211c9c06362cebff0a262197dbc351 31-Jan-2014 Christopher Ferris <cferris@google.com> am 7957529d: Merge "Clean up UnwindCurrent.cpp\'s use of ucontext.h."

* commit '7957529d4419fa92928daebfdc5f5bb1ee50120a':
Clean up UnwindCurrent.cpp's use of ucontext.h.
1c75422c2144b845412b20c100e3a13cf2704212 31-Jan-2014 Colin Cross <ccross@android.com> am 1686784a: Merge changes I6bffe1cd,I0984ba01

* commit '1686784a37848fa985258f3f87cf6835f1c8cf0e':
fs_mgr: split fstab parsing into separate file
fs_mgr: update ext4_parse_sb to match change in ext4_utils
c1c1c8272860225a066d4365e9ebe87a753405b3 31-Jan-2014 Elliott Hughes <enh@google.com> am 710f6634: Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."

* commit '710f66342591c889b0bf545ff3c578731f112a6b':
Switch mips libcorkscrew over to <sys/ucontext.h>.
c98690576ab6d7d13e5c0d3387db8149de71d9de 31-Jan-2014 Ian Rogers <irogers@google.com> am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."

* commit '1ca10eabd84e13e2c71d56ef48218bc981f79497':
Avoid redefinition of __STDC_FORMAT_MACROS.
84ba6b52b22e91cade601b28dd4c630a1f1d4b70 31-Jan-2014 Elliott Hughes <enh@google.com> am 59b5294f: Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."

* commit '59b5294f0ead4f50dbd3b45b6602d145cf9d3afd':
Switch arm libcorkscrew over to <sys/ucontext.h>.
4d0520fbc92f4bfead3b87890ae9af6dcf3be0ab 31-Jan-2014 Elliott Hughes <enh@google.com> am b99d5294: Merge "Switch x86 libcorkscrew over to <ucontext.h>."

* commit 'b99d52944f61aebdac427a490bfed2ae8cccbc10':
Switch x86 libcorkscrew over to <ucontext.h>.
51c4d4c431dbbabe6db1cea5bb21822c69b7546c 31-Jan-2014 Elliott Hughes <enh@google.com> Merge "AArch64: Port debuggerd"
abc60c26b7448e6b2842351688a7a823b8b787d6 19-Dec-2013 Kévin PETIT <kevin.petit@arm.com> AArch64: Port debuggerd

Change-Id: Ib18f76f375a1d70c84e0a09d221e17ac43144b96
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ebuggerd/Android.mk
ebuggerd/arm/vfp.S
ebuggerd/arm64/crashglue.S
ebuggerd/arm64/machine.cpp
ebuggerd/arm64/vfp.S
ebuggerd/debuggerd.cpp
ebuggerd/tombstone.cpp
ebuggerd/vfp.S
e94985a2514312e7103fbb6a6a45e473031cb6c0 31-Jan-2014 Elliott Hughes <enh@google.com> Merge "Increase the scope of other reused definitions."
ba0cecf8e3fd484494d3a586e1be97037c680bcf 31-Jan-2014 Elliott Hughes <enh@google.com> Increase the scope of other reused definitions.

(Testing this in a non-x86 tree, as I'd been doing, was no testing at all.)

Change-Id: I6c5d08e9d566554c212feb8499238aeadf877dad
ibcorkscrew/Android.mk
5434bf6640af7145986d63968846ba7168dab406 31-Jan-2014 Elliott Hughes <enh@google.com> Merge "LP64: Enable debuggerd/libbacktrace/libunwind."
469f15339dd2ea7458d12bcdff802d26dcffbcd7 31-Jan-2014 Elliott Hughes <enh@google.com> Merge "Fix build by defining LOCAL_PATH early enough."
bf857aeae39304bde323db06c1f59ff4579c37f6 31-Jan-2014 Elliott Hughes <enh@google.com> Fix build by defining LOCAL_PATH early enough.

Change-Id: I959b04e5539d6f24ce96cd6737434f932d717e1b
ibcorkscrew/Android.mk
c6c194ced095df5e777b8fa24527ebd29c8fef54 21-Nov-2013 Pavel Chupin <pavel.v.chupin@intel.com> LP64: Enable debuggerd/libbacktrace/libunwind.

Change-Id: I2e432839f86c33c2adbaac8cc12ca8961956044b
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
ebuggerd/Android.mk
ebuggerd/tombstone.cpp
ebuggerd/utility.cpp
ebuggerd/utility.h
ebuggerd/x86_64/crashglue.S
ebuggerd/x86_64/machine.cpp
nclude/backtrace/Backtrace.h
ibbacktrace/Android.mk
ibbacktrace/BacktraceImpl.cpp
ibbacktrace/BacktraceImpl.h
ibbacktrace/UnwindCurrent.cpp
525155ac49bae98e9f50ce667609c32eeccc80be 31-Jan-2014 Elliott Hughes <enh@google.com> Merge "Allow the host libcorkscrew to build."
fe4d68b6ed969f505e8a1c8d769912949973ba4b 31-Jan-2014 Elliott Hughes <enh@google.com> Allow the host libcorkscrew to build.

Change-Id: Iabe82720d3261a9bd35763c260d3c4b6d422e287
ibcorkscrew/Android.mk
e97dad0d95ae1305686bf4294029da947fc2dcf2 31-Jan-2014 Elliott Hughes <enh@google.com> Merge "debuggerd: a few generic improvements"
4bb477205a2446c3ba9db8df0b0446173065d9eb 18-Dec-2013 Kévin PETIT <kevin.petit@arm.com> debuggerd: a few generic improvements

This one makes dump_memory reasonably architecture-agnostic so it is
possible to share the code between architectures.

It also includes a few small improvements in tombstone.cpp.

Change-Id: Ib8a9599bfa420b41e80207988e87aee1b9d79541
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ebuggerd/arm/machine.cpp
ebuggerd/mips/machine.cpp
ebuggerd/tombstone.cpp
ebuggerd/utility.cpp
ebuggerd/utility.h
8623972dc0055ae878df24cf93a663e60a6787f1 31-Jan-2014 Elliott Hughes <enh@google.com> Merge "Don't try to build libcorkscrew for LP64."
d5aff0a6fa2b710145c39b01758f58e868e7aec0 30-Jan-2014 Elliott Hughes <enh@google.com> Don't try to build libcorkscrew for LP64.

Change-Id: I77e36b83048b40ba53b6790b7c31beac27feee56
ibcorkscrew/Android.mk
caefe564a4b05e717a3baec155b8968ad36e58b6 30-Jan-2014 Elliott Hughes <enh@google.com> Merge "x86: Enable libunwind"
c124402f39ec907ff18393885bd77ab72af2f80b 01-Dec-2013 Pavel Chupin <pavel.v.chupin@intel.com> x86: Enable libunwind

Change-Id: I098787f57801f68d0419732d5fd475c7e916c92c
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
ibbacktrace/Android.mk
7957529d4419fa92928daebfdc5f5bb1ee50120a 30-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Clean up UnwindCurrent.cpp's use of ucontext.h."
5c40019a92a1683fd790a80f53f8ca6c24289e46 30-Jan-2014 Christopher Ferris <cferris@google.com> Clean up UnwindCurrent.cpp's use of ucontext.h.

Change-Id: I9eff7486b9fe89eac57b5555649b871bc6f1cc77
ibbacktrace/UnwindCurrent.cpp
26f93ca6848e96e670ad9416176281d0637b94cc 30-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
1686784a37848fa985258f3f87cf6835f1c8cf0e 30-Jan-2014 Colin Cross <ccross@android.com> Merge changes I6bffe1cd,I0984ba01

* changes:
fs_mgr: split fstab parsing into separate file
fs_mgr: update ext4_parse_sb to match change in ext4_utils
710f66342591c889b0bf545ff3c578731f112a6b 30-Jan-2014 Elliott Hughes <enh@google.com> Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."
ade9afac207ecc030f376bf7f926f82d036bdf8f 30-Jan-2014 Elliott Hughes <enh@google.com> Switch mips libcorkscrew over to <sys/ucontext.h>.

Change-Id: I4db233fb85c8f0b0c210771a8c75ae8e67dff96f
ibcorkscrew/arch-mips/backtrace-mips.c
1ca10eabd84e13e2c71d56ef48218bc981f79497 30-Jan-2014 Ian Rogers <irogers@google.com> Merge "Avoid redefinition of __STDC_FORMAT_MACROS."
59b5294f0ead4f50dbd3b45b6602d145cf9d3afd 30-Jan-2014 Elliott Hughes <enh@google.com> Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."
ddeb7cc164ba87c73e5c943d1efc5b46b23d8205 30-Jan-2014 Ian Rogers <irogers@google.com> Avoid redefinition of __STDC_FORMAT_MACROS.

Change-Id: I5c65ea196bb9a197a74899ceb53543f289f6d494
ibbacktrace/BacktraceImpl.cpp
03a2597c31fd7466600bca0623d4bfabf99b5481 30-Jan-2014 Elliott Hughes <enh@google.com> Switch arm libcorkscrew over to <sys/ucontext.h>.

Change-Id: I90cf89453f2718fd4bec2bf17ea616ee8165d36a
ibcorkscrew/arch-arm/backtrace-arm.c
b99d52944f61aebdac427a490bfed2ae8cccbc10 30-Jan-2014 Elliott Hughes <enh@google.com> Merge "Switch x86 libcorkscrew over to <ucontext.h>."
3aa8675aa141688d3177b1cc55ecc5249ad84eec 30-Jan-2014 Elliott Hughes <enh@google.com> Switch x86 libcorkscrew over to <ucontext.h>.

Change-Id: I9fa536ea25f7e2d953488b0d317d8a5237b43d03
ibcorkscrew/arch-x86/backtrace-x86.c
82e87ed4799b12b7bd2e20a6fe5fdc19e0350fc3 29-Jan-2014 Stephen Smalley <sds@tycho.nsa.gov> Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.

mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed
in the various device-specific init*.rc files but seems generic.
Move it to the main init.rc file.

Drop the separate chown for /data/misc/dhcp as this is handled by mkdir
built-in if the directory already exists.

Add a restorecon_recursive /data/misc/wifi/sockets.

Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
76edb1c0e644fe9f0b9f93939647a34123a60063 29-Jan-2014 Vignesh Venkatasubramanian <vigneshv@google.com> Adding opus to list of audio formats

Adding opus to the list of audio formats enum.

This CL is part of adding Opus decoding support to android.

Change-Id: I41decf426ed3f76c10b27f247b1264010689c759
nclude/system/audio.h
5df1e320c75f207c651b1780155f99c75deb9cf4 29-Jan-2014 Mike Lockwood <lockwood@google.com> Merge "libusbhost: Add usb_device_set_configuration and usb_device_set_interface"
23bbf1a81b24f648bc4663fdce66c2274055687a 29-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
cc98fd7eb2ba2cb6a763c31ea919bf86804012a7 29-Jan-2014 Christopher Ferris <cferris@google.com> am ab2de415: am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."

* commit 'ab2de41574d15bac8c3ef8f49cfba493ea501a0a':
Fix global pointing to local variable.
f6b714ba6104315dd0c2a9bb17512e568c4e9527 29-Jan-2014 Kristian Monsen <kristianm@google.com> am da0d5bd1: am a40636f3: am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"

* commit 'da0d5bd147dfd87280b1924abfc3650d5306448d':
Fix code style, put unused in the end
96a0bf1e94cbb8bc625333537ace11944e20c396 29-Jan-2014 Christopher Ferris <cferris@google.com> am 36a4e408: am aaf89887: am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."

* commit '36a4e4085e55048ee2a78c7d5b50f7395e547fa2':
Re-enable libunwind for arm.
ab2de41574d15bac8c3ef8f49cfba493ea501a0a 29-Jan-2014 Christopher Ferris <cferris@google.com> am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."

* commit '773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5':
Fix global pointing to local variable.
773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5 29-Jan-2014 Christopher Ferris <cferris@google.com> am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."

* commit 'c96c29548fa0c933e5aa78116f90ff6be5c4fc39':
Fix global pointing to local variable.
c96c29548fa0c933e5aa78116f90ff6be5c4fc39 29-Jan-2014 Christopher Ferris <cferris@google.com> am a152ed73: Merge "Fix global pointing to local variable."

* commit 'a152ed734f179ee2748d306f2eb57acbb4df1ace':
Fix global pointing to local variable.
a152ed734f179ee2748d306f2eb57acbb4df1ace 29-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Fix global pointing to local variable."
2b4ae52a56e175cc64baaa6c70412d06411d7af0 29-Jan-2014 Christopher Ferris <cferris@google.com> Fix global pointing to local variable.

Change-Id: I933cbb680ca6310c13634f09a9827077c8dbd568
ibbacktrace/UnwindMap.cpp
da0d5bd147dfd87280b1924abfc3650d5306448d 28-Jan-2014 Kristian Monsen <kristianm@google.com> am a40636f3: am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"

* commit 'a40636f33fe4f2dbd99e58c98609445ecf5870b8':
Fix code style, put unused in the end
a40636f33fe4f2dbd99e58c98609445ecf5870b8 28-Jan-2014 Kristian Monsen <kristianm@google.com> am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"

* commit '5abe06bf8bfed0c15dc56b6d2cd30cc10c898153':
Fix code style, put unused in the end
5abe06bf8bfed0c15dc56b6d2cd30cc10c898153 28-Jan-2014 Kristian Monsen <kristianm@google.com> am 6e34793b: Merge "Fix code style, put unused in the end"

* commit '6e34793b9cf11237670a5daa320cd784f7442532':
Fix code style, put unused in the end
6e34793b9cf11237670a5daa320cd784f7442532 28-Jan-2014 Kristian Monsen <kristianm@google.com> Merge "Fix code style, put unused in the end"
8e4cdc1e8622f5c6ec1995f42b93489d58b982b9 28-Jan-2014 Mark Salyzyn <salyzyn@google.com> resolved conflicts for merge of 3a5f3050 to master

Change-Id: I87f51ba0dcc8187a3e620fab96c078e6614b28a2
36a4e4085e55048ee2a78c7d5b50f7395e547fa2 28-Jan-2014 Christopher Ferris <cferris@google.com> am aaf89887: am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."

* commit 'aaf898877c4225f939b27ca48bb5f474fc9b46ae':
Re-enable libunwind for arm.
aaf898877c4225f939b27ca48bb5f474fc9b46ae 28-Jan-2014 Christopher Ferris <cferris@google.com> am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."

* commit '6fe31b2f830309c2a8e0035c07b6b2bb44e081c9':
Re-enable libunwind for arm.
6fe31b2f830309c2a8e0035c07b6b2bb44e081c9 28-Jan-2014 Christopher Ferris <cferris@google.com> am d391c9b4: Merge "Re-enable libunwind for arm."

* commit 'd391c9b4acb2bcd6cec048075e728d3aee6a0d6f':
Re-enable libunwind for arm.
d391c9b4acb2bcd6cec048075e728d3aee6a0d6f 28-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Re-enable libunwind for arm."
3a5f3050626c01c45ff487274a2399876d63a4eb 28-Jan-2014 Mark Salyzyn <salyzyn@google.com> am 7b9bb36a: am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...

* commit '7b9bb36ade6c8fa2e77416143847b019ddda9e95': (29 commits)
libsysutils: SocketListener export release
libsysutils: Add iovec/runOnEachSocket
liblog: support struct logger_event_v2 format
liblog: update timestamp on NOTICE file
libcutils: resolve warning in iosched_policy.c
liblog: Add const pedantics
logcat: Add -T flag (-t w/o assumption of -d)
logcat: Add logcat test suite
liblog: Add cpu utilization test
liblog: Add liblog test suite
debuggerd: Support newline split in log messages
liblog: deprecate export LOGGER ioctl definitions
liblog: deprecate export of LOGGER_LOG_* defines
liblog: Add README
liblog: resolve build warning messages
liblog: high CPU usage from logcat
liblog: fix build again
liblog: drop use of sys/cdefs.h
liblog: git_master@964770 build problem
logcat: Incorporate liblog reading API
...
8ca9400c0a7a7ff30094a20d4dd72a17b1fbac3b 28-Jan-2014 Nick Kralevich <nnk@google.com> am f2869381: am 11322efd: am acd96b11: am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."

* commit 'f286938177390ec058ea39b308c9b9498b011c7c':
Move restorecon and restorecon_recursive code to libselinux.
7ddca5adb609c0234485c7eb6957d62dcb06e06a 28-Jan-2014 Kristian Monsen <kristianm@google.com> Fix code style, put unused in the end

Change-Id: I7315b35049924d5067203a432584b8f29e5a1391
iblog/logd_write.c
7b9bb36ade6c8fa2e77416143847b019ddda9e95 28-Jan-2014 Mark Salyzyn <salyzyn@google.com> am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...

* commit '0256e1f68bb8af10478b690c8fb772a0ec2027e3': (29 commits)
libsysutils: SocketListener export release
libsysutils: Add iovec/runOnEachSocket
liblog: support struct logger_event_v2 format
liblog: update timestamp on NOTICE file
libcutils: resolve warning in iosched_policy.c
liblog: Add const pedantics
logcat: Add -T flag (-t w/o assumption of -d)
logcat: Add logcat test suite
liblog: Add cpu utilization test
liblog: Add liblog test suite
debuggerd: Support newline split in log messages
liblog: deprecate export LOGGER ioctl definitions
liblog: deprecate export of LOGGER_LOG_* defines
liblog: Add README
liblog: resolve build warning messages
liblog: high CPU usage from logcat
liblog: fix build again
liblog: drop use of sys/cdefs.h
liblog: git_master@964770 build problem
logcat: Incorporate liblog reading API
...
0256e1f68bb8af10478b690c8fb772a0ec2027e3 28-Jan-2014 Mark Salyzyn <salyzyn@google.com> am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...

* commit 'd2acdd82e613b3e1d79a00943ac3bf5fbc14a766': (29 commits)
libsysutils: SocketListener export release
libsysutils: Add iovec/runOnEachSocket
liblog: support struct logger_event_v2 format
liblog: update timestamp on NOTICE file
libcutils: resolve warning in iosched_policy.c
liblog: Add const pedantics
logcat: Add -T flag (-t w/o assumption of -d)
logcat: Add logcat test suite
liblog: Add cpu utilization test
liblog: Add liblog test suite
debuggerd: Support newline split in log messages
liblog: deprecate export LOGGER ioctl definitions
liblog: deprecate export of LOGGER_LOG_* defines
liblog: Add README
liblog: resolve build warning messages
liblog: high CPU usage from logcat
liblog: fix build again
liblog: drop use of sys/cdefs.h
liblog: git_master@964770 build problem
logcat: Incorporate liblog reading API
...
d2acdd82e613b3e1d79a00943ac3bf5fbc14a766 28-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...

* changes:
libsysutils: SocketListener export release
libsysutils: Add iovec/runOnEachSocket
liblog: support struct logger_event_v2 format
liblog: update timestamp on NOTICE file
libcutils: resolve warning in iosched_policy.c
liblog: Add const pedantics
logcat: Add -T flag (-t w/o assumption of -d)
logcat: Add logcat test suite
liblog: Add cpu utilization test
liblog: Add liblog test suite
debuggerd: Support newline split in log messages
liblog: deprecate export LOGGER ioctl definitions
liblog: deprecate export of LOGGER_LOG_* defines
liblog: Add README
liblog: resolve build warning messages
liblog: high CPU usage from logcat
liblog: fix build again
liblog: drop use of sys/cdefs.h
liblog: git_master@964770 build problem
logcat: Incorporate liblog reading API
debuggerd: Incorporate liblog reading API
liblog: Interface to support abstracting log read
adb: deprecate legacy log service interface
adb: regression from Move list.c to inlines
liblog: whitespace cleanup
libcutils: bug str_parms.c:str_parms_get_float().
libcutils: UNUSED argument warnings
libsysutils: Get rid of warnings
libcutils: Move list.c to inlines on list.h
f286938177390ec058ea39b308c9b9498b011c7c 28-Jan-2014 Nick Kralevich <nnk@google.com> am 11322efd: am acd96b11: am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."

* commit '11322efdc63003ba7e2ba73dbbb2621e916a3773':
Move restorecon and restorecon_recursive code to libselinux.
11322efdc63003ba7e2ba73dbbb2621e916a3773 28-Jan-2014 Nick Kralevich <nnk@google.com> am acd96b11: am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."

* commit 'acd96b11189e0422fa4060bc29139fbfef5b14a8':
Move restorecon and restorecon_recursive code to libselinux.
acd96b11189e0422fa4060bc29139fbfef5b14a8 28-Jan-2014 Nick Kralevich <nnk@google.com> am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."

* commit '12db3eb6db3b80011043e404530012612a1d0fbf':
Move restorecon and restorecon_recursive code to libselinux.
12db3eb6db3b80011043e404530012612a1d0fbf 28-Jan-2014 Nick Kralevich <nnk@google.com> Merge "Move restorecon and restorecon_recursive code to libselinux."
35f6c3aed998ec5721c83a5c69a6e1d348ff98b3 28-Jan-2014 Kristian Monsen <kristianm@google.com> am 58a9cd16: am 97ea590b: am 9aaba5ca: am 8c6b9b0d: Merge "Fixes some warnings"

* commit '58a9cd1681688e031ef0642842d326da7d2a4934':
Fixes some warnings
58a9cd1681688e031ef0642842d326da7d2a4934 28-Jan-2014 Kristian Monsen <kristianm@google.com> am 97ea590b: am 9aaba5ca: am 8c6b9b0d: Merge "Fixes some warnings"

* commit '97ea590b4f55c1ee3998d1f17c06a7e7a27821e8':
Fixes some warnings
df2906186b6952c57b1f662bfef0b65c9f8c2e0d 23-Jan-2014 Christopher Ferris <cferris@google.com> Re-enable libunwind for arm.

Update to handle the new optimized way that libunwind works.

In addition, a small refactor of the BacktraceMap code.

A few new tests of for good measure.

Change-Id: I2f9b4f5ad5a0dfe907b31febee76e4b9b94fb76f
ebuggerd/tombstone.cpp
nclude/backtrace/Backtrace.h
nclude/backtrace/BacktraceMap.h
ibbacktrace/Android.mk
ibbacktrace/Backtrace.cpp
ibbacktrace/Backtrace.h
ibbacktrace/BacktraceImpl.cpp
ibbacktrace/BacktraceImpl.h
ibbacktrace/BacktraceMap.cpp
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
ibbacktrace/Corkscrew.cpp
ibbacktrace/Corkscrew.h
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindCurrent.h
ibbacktrace/UnwindMap.cpp
ibbacktrace/UnwindMap.h
ibbacktrace/UnwindPtrace.cpp
ibbacktrace/UnwindPtrace.h
ibbacktrace/backtrace_test.cpp
97ea590b4f55c1ee3998d1f17c06a7e7a27821e8 28-Jan-2014 Kristian Monsen <kristianm@google.com> am 9aaba5ca: am 8c6b9b0d: Merge "Fixes some warnings"

* commit '9aaba5cad1197a16c6af13bca76fbc95eeb25ca7':
Fixes some warnings
9aaba5cad1197a16c6af13bca76fbc95eeb25ca7 28-Jan-2014 Kristian Monsen <kristianm@google.com> am 8c6b9b0d: Merge "Fixes some warnings"

* commit '8c6b9b0d95974be3ba21c133661772206bc15e39':
Fixes some warnings
8c6b9b0d95974be3ba21c133661772206bc15e39 28-Jan-2014 Kristian Monsen <kristianm@google.com> Merge "Fixes some warnings"
b5a9890f900a5e2b53e91e6d63f3ade23240f90d 28-Jan-2014 Kristian Monsen <kristianm@google.com> Fixes some warnings

- Implicit decleared function
- Unused variable

Change-Id: Ia701e66682cb6788f0716a2ef7556ed07227f78f
iblog/fake_log_device.c
iblog/fake_log_device.h
iblog/logd_write.c
dbd37f2e1da5b27ef1ad6d0cc9580e6893560f5f 28-Jan-2014 Stephen Smalley <sds@tycho.nsa.gov> Move restorecon and restorecon_recursive code to libselinux.

This requires telling libselinux to use the sehandle already
obtained by init rather than re-acquiring it internally. init
retains ownership of the sehandle because it performs the
initial load, uses the sehandle for other purposes (e.g. labeling
of directories created via mkdir and labeling of socket files),
and handles the policy reload property trigger.

Change-Id: I4a380caab7f8481c33eb64fcdb16b6cabe918ebd
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/init.c
nit/util.c
bcdd2478d8b8ea8c5e8ced2acb1f84c35004cdcb 28-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
1dc8d76f7915bbe1d60d64404e4425750d5c72b8 28-Jan-2014 Benoit Goby <benoitgoby@google.com> am 119dbff9: am bbc92ee7: am 68a74ec4: am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"

* commit '119dbff9c18453c9d91189424e44b3dcdf9bb82b':
adbd: Don't close/reopen FFS ep0 on disconnect
119dbff9c18453c9d91189424e44b3dcdf9bb82b 28-Jan-2014 Benoit Goby <benoitgoby@google.com> am bbc92ee7: am 68a74ec4: am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"

* commit 'bbc92ee7e4d05571e734022894afa2236ccbf9a4':
adbd: Don't close/reopen FFS ep0 on disconnect
bbc92ee7e4d05571e734022894afa2236ccbf9a4 28-Jan-2014 Benoit Goby <benoitgoby@google.com> am 68a74ec4: am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"

* commit '68a74ec483db4317de0e309eb63d846009b018e9':
adbd: Don't close/reopen FFS ep0 on disconnect
68a74ec483db4317de0e309eb63d846009b018e9 28-Jan-2014 Benoit Goby <benoitgoby@google.com> am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"

* commit '6ddabb7a1cc3080ae773acb045f69b5e6afee87a':
adbd: Don't close/reopen FFS ep0 on disconnect
6ddabb7a1cc3080ae773acb045f69b5e6afee87a 28-Jan-2014 Benoit Goby <benoitgoby@google.com> Merge "adbd: Don't close/reopen FFS ep0 on disconnect"
44b99c22af84331068935a9bc3e807165a88237c 08-Jan-2014 Mark Salyzyn <salyzyn@google.com> libsysutils: SocketListener export release

* Foreground thread (legacy) closes connection by
reporting false return value for onDataAvailable.
* Background thread can choose instead to close the
connection asynchronously by calling release, must
return true for the onDataAvailable method.

(cherry picked from commit d7ad4e409eaac53db3a9789060097b712850b337)

Change-Id: I70ab37d5c22b02804aa3b4dfb26cc9b75291f8b6
nclude/sysutils/SocketListener.h
ibsysutils/src/SocketListener.cpp
23f04107dcedcef22556c1f57502cdddbfa2663f 25-Jan-2012 Mark Salyzyn <salyzyn@google.com> libsysutils: Add iovec/runOnEachSocket

SocketClient:
* Replace sendDataLocked with sendDataLockedv which takes an iovec.
* Add a version of sendData, sendDatav, which takes an iovec.
* do not preserve iovec content through sendDatav

SocketListener:
* Add runOnEachSocket, which allows to to specify a SocketClientCommand to
run individually on each socket. This allows you to do broadcast-like
actions customized for each individual socket.
* Client safe list reference counting for sendBroadcast & runOnEach Socket

(cherry picked from commit a6e965578e44f8ae5f98de822ba5decec381d5fc)

Signed-off-by: Nick Kralevich <nnk@google.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: I716f89c01b4cb7af900045c7e41fac1492defb06
nclude/sysutils/SocketClient.h
nclude/sysutils/SocketClientCommand.h
nclude/sysutils/SocketListener.h
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
40b21558e52e9245929495c5344443276e5d87c1 18-Dec-2013 Mark Salyzyn <salyzyn@google.com> liblog: support struct logger_event_v2 format

(cherry picked from commit c176e14ce3fd28432e2eaca7bc7a60046dd8be40)

Change-Id: I34c96adffab3478dae8f5a2597a840caad5092cc
iblog/logprint.c
e7ff525a7e8c2109439260c2ac898fc3cc17e011 14-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: update timestamp on NOTICE file

(cherry picked from commit b69e092dc75b643d95538929b38da6f647e79351)

Change-Id: I776509232aaa50e14fe79e45ab133c0ea3985933
iblog/NOTICE
3bca60611702f21738b1d45892bcf33847c4877e 11-Jan-2014 Mark Salyzyn <salyzyn@google.com> libcutils: resolve warning in iosched_policy.c

(cherry picked from commit 407038cd937391216d93f72d4d13db3803c5b452)

Change-Id: I35b0d1eeba21cc1ed9645a5acfa180ed20797c56
ibcutils/iosched_policy.c
318bb72601c0b6895a93d95ad0dedaebf2ae3d9f 10-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: Add const pedantics

(cherry picked from commit 9e03ce45f999b75000f1652747783d74e7063b9a)

Change-Id: I819695b778ac08fcfc9b1a87f3f86e5715f53084
nclude/log/logger.h
5d3d1f17dbcb01aedd510b5435ebdaf1d6afc138 09-Dec-2013 Mark Salyzyn <salyzyn@google.com> logcat: Add -T flag (-t w/o assumption of -d)

(cherry picked from commit de02546e3d7c9c307e3d87e0a7fe8bb39b363a72)

Change-Id: I49763e2db83755e0b7b12dfa3f83a3957c54d389
ogcat/logcat.cpp
ogcat/tests/logcat_test.cpp
65772ca7d7b61b111e75fb0f66f43966f0794bbd 13-Dec-2013 Mark Salyzyn <salyzyn@google.com> logcat: Add logcat test suite

(cherry picked from commit 2807db9a269baaa7b3f67c337d3312877ba90aa0)

Change-Id: Ic4c84b88b8d899965c9765bdc3ee223ef73ba7d1
ogcat/Android.mk
ogcat/logcat.cpp
ogcat/tests/Android.mk
ogcat/tests/logcat_test.cpp
cef098ef5df0d1e98bae269aaae2e3c3fbd1cb1f 09-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: Add cpu utilization test

- followup to measure CPU utilization in liblog to
ensure this issue gets caught before a regression
passes into the labs. Threshold for failure is 1%.

(cherry picked from commit edadb2e7196040dd476e86581dc1c8e26449c00d)

BUG: 12457855
Change-Id: I40568a72aeef2f554b19ad55f3dd3c02bc023f24
iblog/tests/liblog_test.cpp
819c58a8ca20f94700085b8967f371f5854a5216 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> liblog: Add liblog test suite

(cherry picked from commit 8d1fdb509305e93eb46d45a6dcd34bedd6dc0742)

Change-Id: Ia457d518b4e7ff37e840336ff0c48583709700d4
nclude/log/log.h
nclude/log/log_read.h
iblog/Android.mk
iblog/tests/Android.mk
iblog/tests/benchmark.h
iblog/tests/benchmark_main.cpp
iblog/tests/liblog_benchmark.cpp
iblog/tests/liblog_test.cpp
fca0bd1a38597b83f6511d0c7c971fce75dc8123 12-Dec-2013 Mark Salyzyn <salyzyn@google.com> debuggerd: Support newline split in log messages

(cherry picked from commit 706fad2b5fd96fb9b705795af1c11ef44d8a8fe9)

Change-Id: I2c19f12ef027ab1e1455ce78824537da1b03edcd
ebuggerd/tombstone.cpp
1345f38e4419607ea9c5b24109e5bd6df52dcffa 14-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: deprecate export LOGGER ioctl definitions

(cherry picked from commit 2e44a9ea2518024a07f38c2cc6066ec2074d5210)

Change-Id: I150cad9309255bec2b8bc7230c744e9bbb1b9578
nclude/log/logger.h
iblog/log_read.c
e9c4196980208124066fb45fa03bfb85fe1d8581 02-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: deprecate export of LOGGER_LOG_* defines

(cherry picked from commit 73459a5c87dc9e7c2aeee00597b9d3cc8d9a190e)

Change-Id: I263af8e889f8f2ad91b91757caf90a4d17823dab
nclude/log/logger.h
iblog/logd_write.c
24b5d3cec51e0d7fc0989913a901e6888d948375 17-Dec-2013 Mark Salyzyn <salyzyn@google.com> liblog: Add README

(cherry picked from commit 912c88cc5abde3fb7e09a810491c3285b3bd4a64)

Change-Id: I9d789e08e9301ec8afa7be8bede955379694b904
iblog/README
168021c2827312e17a13d77b54f7d030a08b257b 06-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: resolve build warning messages

(cherry picked from commit 153b370624c3da0660281f692fbe3f2da96cfd70)

Change-Id: Icc6f1f2c926a008efc4df71022cfde8d0e285880
nclude/log/uio.h
iblog/fake_log_device.c
iblog/uio.c
d0a83fddf18de1a567692a0eeb43228601c83fcf 09-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: high CPU usage from logcat

BUG: 12457855

- log_read.c poll timeout should be -1 instead of 0 when idling

(cherry picked from commit 080bbfab94ce91e4845860d5253eea6d869bbc18)

Change-Id: I9082a15fae0fbf999c0ed516950a49d65a279298
iblog/log_read.c
11aa6ee98c5cc67e149acb7c634f6c2546678c00 04-Jan-2014 Colin Cross <ccross@android.com> liblog: fix build again

log_read.c has to be in the target sources on all platforms, but
never needs to be in the host sources.

(cherry picked from commit 3c37fae4a472835c8e20060e1e6b7495b84f254a)

Change-Id: Ie0829f3f1daf16d151c401653dbef603b1c2f59d
iblog/Android.mk
f387fa5df0180831abfd2004e78859d66836bc05 04-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: drop use of sys/cdefs.h

(cherry picked from commit c96a44888a50fdc6155cb1a7fa8e37bee00fafc0)

Change-Id: I44ea5d6b572e3712c301e6ebf4b34e6225d7e18b
nclude/log/log.h
nclude/log/logger.h
015c8e76ca068bd4c68ad17a762698542d0c037c 04-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: git_master@964770 build problem

- darwin does not get log reader

(cherry picked from commit 5feea6890875c9046f40bdadc0dbd4a411e7f3f5)

Change-Id: I64eb69a6099a88d2acf501de725c35741fd7e551
iblog/Android.mk
95132e97e57b055c5103619ce2487d07f30e63db 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> logcat: Incorporate liblog reading API

(cherry picked from commit a1062c728a04e0de6e86a138d98eaff12f14fb41)

Change-Id: I1e1a55d13ac55350e8d54bfe92b392de07f26a5d
ogcat/logcat.cpp
22b5cef1277a5e1d5deef7420281eafade2e2614 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> debuggerd: Incorporate liblog reading API

(cherry picked from commit a63f927ce10817ce637dd52ba2f4ac763ce4fc61)

Change-Id: Ic26e9dba3b45c827d122b03e34cc4a5bd48f7deb
ebuggerd/tombstone.cpp
4295841ebe68a2ebf50ed7adf0a603c523d5af52 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> liblog: Interface to support abstracting log read

(cherry picked from commit 6c1b07fbbd0ccce0e4fdf79abd38494cc622d67e)

Change-Id: Iedc55c1316029b4bb72f51cc656b53b0e3f90aee
nclude/log/log.h
nclude/log/logger.h
iblog/Android.mk
iblog/log_read.c
7aa39a7b199bb9803d3fd47246ee9530b4a96177 10-Dec-2013 Mark Salyzyn <salyzyn@google.com> adb: deprecate legacy log service interface

(cherry picked form commit c66a7537df987715acc77eed952111cc56b7e72b)

Change-Id: If96019cc13b3d7a4dcd7785c7137e0cbcc622981
db/Android.mk
db/SERVICES.TXT
db/adb.h
db/log_service.c
db/services.c
c788278abce1830d4b5e9e78aaefd86d0eecafde 07-Dec-2013 Mark Salyzyn <salyzyn@google.com> adb: regression from Move list.c to inlines

(cherry picked from commit 5f64d528be2ca7229c0e9ce00837ac0fa4da2e54)

Change-Id: I057dbe3db80b1460f774e9f9ade11e0929529ec6
db/Android.mk
cf4aa030ce113ab4e18f41ac9e92002471a1a2be 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> liblog: whitespace cleanup

- change cutils to liblog directory path
- change tabs to spaces

(cherry picked from commit c1215c0b46576771370ceb4e1b1d8fc5a7034cfd)

Change-Id: I7d9db1e2b817ba0ec9a224340c5c7535a2387fd5
iblog/logd_write.c
iblog/logprint.c
b957baccd21ca43371dfbc02c10aae18497000b8 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> libcutils: bug str_parms.c:str_parms_get_float().

str_parms_get_float did not return the output into
*val. Only output if returning with no error. Audit
shows no internal users of this library function

(cherry picked from commit 8e71ddeac00d0733c7fcc2965d69f07aa5c5d0a3)

Change-Id: I14a3f08a098072a159dd93f85ead36b3f445816f
ibcutils/str_parms.c
2b94cc264f54fb588a8721caf92fff95b7576f4a 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> libcutils: UNUSED argument warnings

(cherry picked from commit ba02cd1e9bccee9b112ccbee06bc204381b5a215)

Change-Id: Ie427d481298af8d911bb2b157ebba30954335354
ibcutils/android_reboot.c
ibcutils/socket_local_client.c
ibcutils/str_parms.c
e16baef4d2f59c0b5f78e66c838d6c5e7d9b7363 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> libsysutils: Get rid of warnings

- UNUSED argument warnings
- Remove LOG_NDEBUG define

(cherry picked from commit 696f267ff5a1e6227c2f5784dae60c190e0228b8)

Change-Id: I48b0942adfdb7a46a7693e580bc6ed5a685b0d5b
ibsysutils/src/FrameworkCommand.cpp
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketListener.cpp
a6aad4cdb3ec75668838f3eced59bbb2c7b70c59 27-Nov-2013 Mark Salyzyn <salyzyn@google.com> libcutils: Move list.c to inlines on list.h

(cherry picked from commit 0ea3624b3ef2a6545df770d06338c4655386220d)

Change-Id: I0572555a194d2560e74dfbf07abcec05e9a276a2
nclude/cutils/list.h
ibcutils/Android.mk
ibcutils/list.c
6ee6db4c7ab7dc243dca4ca393ec107afe5d0f7a 27-Jan-2014 Nick Kralevich <nnk@google.com> am fef53b7e: am 2e3d1529: am 9b16f7db: am 6bfb7b64: Merge "Fix overflow in adb_client"

* commit 'fef53b7ecd114e5e6ccf7fe804ee323bd1a1abf2':
Fix overflow in adb_client
fef53b7ecd114e5e6ccf7fe804ee323bd1a1abf2 27-Jan-2014 Nick Kralevich <nnk@google.com> am 2e3d1529: am 9b16f7db: am 6bfb7b64: Merge "Fix overflow in adb_client"

* commit '2e3d1529348438f890a2bbbb7e7c33bf7937d394':
Fix overflow in adb_client
2e3d1529348438f890a2bbbb7e7c33bf7937d394 27-Jan-2014 Nick Kralevich <nnk@google.com> am 9b16f7db: am 6bfb7b64: Merge "Fix overflow in adb_client"

* commit '9b16f7db5c1bd9ed515b018072f67173e1d2072d':
Fix overflow in adb_client
9b16f7db5c1bd9ed515b018072f67173e1d2072d 27-Jan-2014 Nick Kralevich <nnk@google.com> am 6bfb7b64: Merge "Fix overflow in adb_client"

* commit '6bfb7b64ba857f78c0a0bcb08591003655df2b7e':
Fix overflow in adb_client
6bfb7b64ba857f78c0a0bcb08591003655df2b7e 27-Jan-2014 Nick Kralevich <nnk@google.com> Merge "Fix overflow in adb_client"
56e73359021697d898ba8d6243776bc94854f765 27-Jan-2014 Christopher Ferris <cferris@google.com> am 8d12b4a0: am 4fe48966: am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."

* commit '8d12b4a0901df4ab708243b4cd36c19ac2002a50':
Get arm64 to compile.
8d12b4a0901df4ab708243b4cd36c19ac2002a50 27-Jan-2014 Christopher Ferris <cferris@google.com> am 4fe48966: am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."

* commit '4fe489665fef420210cd2e9ac1a682f8bfb950e9':
Get arm64 to compile.
75e0645921cb6c3e9d33672733372f519bf57f38 10-Dec-2013 Nick Kralevich <nnk@google.com> Fix overflow in adb_client

Credit: Joshua Drake
Bug: 12060953

(cherry picked from commit e89e09dd2b9b42184973e3ade291186a2737bced)

Change-Id: I8a9b2592a5e4f7527c607abfe4ea6df6eb550aa8
db/adb_client.c
4fe489665fef420210cd2e9ac1a682f8bfb950e9 27-Jan-2014 Christopher Ferris <cferris@google.com> am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."

* commit '57c9b95b1f62ceec18c56ac10fb137a96e7a2287':
Get arm64 to compile.
57c9b95b1f62ceec18c56ac10fb137a96e7a2287 27-Jan-2014 Christopher Ferris <cferris@google.com> am 39baa829: Merge "Get arm64 to compile."

* commit '39baa8296d39edfb25f5f2a4673f6a303e1245c5':
Get arm64 to compile.
39baa8296d39edfb25f5f2a4673f6a303e1245c5 27-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Get arm64 to compile."
edbe3b4b56a02e1c56f95a8ab05afb4135339cc8 27-Jan-2014 Christopher Ferris <cferris@google.com> Get arm64 to compile.

Change-Id: Ica021aa134388fe7069a5de5df8036ecf0d570f8
ibbacktrace/Android.mk
ibbacktrace/UnwindCurrent.cpp
aba1ad9030d16095cd0c53c09e9bfa76f882d499 27-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
dd200e9d2f7d6e8cb4a414f76fcacd166f7b8059 25-Jan-2014 Elliott Hughes <enh@google.com> am 02d7fc05: am e75cc3d4: am 3d55662f: am fb6d601f: Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."

* commit '02d7fc05517997d49834ee48106c75ed4e661d57':
Use <stdint.h> for INT32_MIN and INT32_MAX.
02d7fc05517997d49834ee48106c75ed4e661d57 25-Jan-2014 Elliott Hughes <enh@google.com> am e75cc3d4: am 3d55662f: am fb6d601f: Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."

* commit 'e75cc3d4fde81fbb1d0f2617d86c330425f29022':
Use <stdint.h> for INT32_MIN and INT32_MAX.
e75cc3d4fde81fbb1d0f2617d86c330425f29022 25-Jan-2014 Elliott Hughes <enh@google.com> am 3d55662f: am fb6d601f: Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."

* commit '3d55662f177df98f887c1c53b694daa1c2e7e612':
Use <stdint.h> for INT32_MIN and INT32_MAX.
3d55662f177df98f887c1c53b694daa1c2e7e612 25-Jan-2014 Elliott Hughes <enh@google.com> am fb6d601f: Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."

* commit 'fb6d601f5ae99a59a16f87950a15b9ed3d175db7':
Use <stdint.h> for INT32_MIN and INT32_MAX.
fb6d601f5ae99a59a16f87950a15b9ed3d175db7 25-Jan-2014 Elliott Hughes <enh@google.com> Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."
81eb357b58ae9b54d8f294f816fadbc10f1c569d 25-Jan-2014 Elliott Hughes <enh@google.com> Use <stdint.h> for INT32_MIN and INT32_MAX.

Bug: 12708004
Change-Id: I99f222b2db1d128abf6ffbf7173a5aaff48f8e85
ibpixelflinger/tests/gglmul/gglmul_test.cpp
42e5fda53afee3b4f3b98b8201e118fe85e4a8b9 24-Jan-2014 Sujith Ramakrishnan <sujithrk@google.com> Merge "Add mknod utility to system/core/toolbox"
892af2303f4d7ca628bdd538fc372fc06b26228f 24-Jan-2014 Colin Cross <ccross@android.com> am 9222d911: am c8518616: am 02f68c4b: am 4800e20e: Merge "system/core: rename aarch64 target to arm64"

* commit '9222d911a89d30a9b0537e8cdb95401be3a4999e':
system/core: rename aarch64 target to arm64
46cdef53794ae9c6e96f7821caf7995a3c335008 24-Jan-2014 Brian Carlstrom <bdc@google.com> Merge "Fix entry handling for 0 length entries."
ibziparchive/zip_archive.cc
ibziparchive/zip_archive_test.cc
9222d911a89d30a9b0537e8cdb95401be3a4999e 24-Jan-2014 Colin Cross <ccross@android.com> am c8518616: am 02f68c4b: am 4800e20e: Merge "system/core: rename aarch64 target to arm64"

* commit 'c8518616ed1d98afc0a1b5a75a4b009a1931568d':
system/core: rename aarch64 target to arm64
c8518616ed1d98afc0a1b5a75a4b009a1931568d 24-Jan-2014 Colin Cross <ccross@android.com> am 02f68c4b: am 4800e20e: Merge "system/core: rename aarch64 target to arm64"

* commit '02f68c4b5f453c2192a1cd495439345bcdad879e':
system/core: rename aarch64 target to arm64
02f68c4b5f453c2192a1cd495439345bcdad879e 24-Jan-2014 Colin Cross <ccross@android.com> am 4800e20e: Merge "system/core: rename aarch64 target to arm64"

* commit '4800e20eafacabe76e56183aa82797ac5c4057c1':
system/core: rename aarch64 target to arm64
4800e20eafacabe76e56183aa82797ac5c4057c1 24-Jan-2014 Colin Cross <ccross@android.com> Merge "system/core: rename aarch64 target to arm64"
9c34e9646d081d4174a2df801ccf94b9678539b5 24-Jan-2014 Brian Carlstrom <bdc@google.com> am e490b615: am 72235773: am e18df357: am 794b587b: Merge "Fix entry handling for 0 length entries."

* commit 'e490b6155e4e669dc594c36903cbf91e79a43efe':
Fix entry handling for 0 length entries.
e490b6155e4e669dc594c36903cbf91e79a43efe 24-Jan-2014 Brian Carlstrom <bdc@google.com> am 72235773: am e18df357: am 794b587b: Merge "Fix entry handling for 0 length entries."

* commit '722357738fd8dea75d147dbc8d8d59c72c7ec7dd':
Fix entry handling for 0 length entries.
722357738fd8dea75d147dbc8d8d59c72c7ec7dd 24-Jan-2014 Brian Carlstrom <bdc@google.com> am e18df357: am 794b587b: Merge "Fix entry handling for 0 length entries."

* commit 'e18df357a4f8e3e960cca4ae281d3fe2f3e4b2c0':
Fix entry handling for 0 length entries.
e18df357a4f8e3e960cca4ae281d3fe2f3e4b2c0 24-Jan-2014 Brian Carlstrom <bdc@google.com> am 794b587b: Merge "Fix entry handling for 0 length entries."

* commit '794b587b37e3f32c081e5fdc084581be9d68292d':
Fix entry handling for 0 length entries.
794b587b37e3f32c081e5fdc084581be9d68292d 24-Jan-2014 Brian Carlstrom <bdc@google.com> Merge "Fix entry handling for 0 length entries."
35ef36456d89b4e823f32c328c4d0e6d15ae41e2 24-Jan-2014 Nick Kralevich <nnk@google.com> am c3af60af: am c7e28899: am 16384312: am 0620e3dd: Merge "adbd: switch to su domain when running as root"

* commit 'c3af60aff5d097c717b19721f143499891d5ca3d':
adbd: switch to su domain when running as root
c3af60aff5d097c717b19721f143499891d5ca3d 24-Jan-2014 Nick Kralevich <nnk@google.com> am c7e28899: am 16384312: am 0620e3dd: Merge "adbd: switch to su domain when running as root"

* commit 'c7e28899c3917ad6e72d5dc99401bcd133cbd475':
adbd: switch to su domain when running as root
c7e28899c3917ad6e72d5dc99401bcd133cbd475 24-Jan-2014 Nick Kralevich <nnk@google.com> am 16384312: am 0620e3dd: Merge "adbd: switch to su domain when running as root"

* commit '16384312244b8dccd53478a7bdeeb9a492821807':
adbd: switch to su domain when running as root
16384312244b8dccd53478a7bdeeb9a492821807 24-Jan-2014 Nick Kralevich <nnk@google.com> am 0620e3dd: Merge "adbd: switch to su domain when running as root"

* commit '0620e3ddb85582f66612d046d1295dc20bf1a4f5':
adbd: switch to su domain when running as root
0620e3ddb85582f66612d046d1295dc20bf1a4f5 24-Jan-2014 Nick Kralevich <nnk@google.com> Merge "adbd: switch to su domain when running as root"
48953a1b8fdcf1d6fa1aeeb40c57821d33fc87d2 24-Jan-2014 Narayan Kamath <narayan@google.com> Fix entry handling for 0 length entries.

Two minor issues were fixed:
- The offset to entry data can be the same as the
central directory offset when the last entry in the
file has length 0 and is stored (not deflated). Fix
a check that disallowed this. We already have a strict
check that entry data must end before the central directory,
so we're covered.
- We would attempt to map a segment of length 0 when writing
an entry whose length is 0. We should just return early in
this case.

bug: 12623277
Change-Id: I2a4ca0c4d170cc3cbf326e5ca13894acd9c434c9
ibziparchive/zip_archive.cc
ibziparchive/zip_archive_test.cc
d4146e6091d6ed947ce9edd0f8ef3e5fe066d716 22-Jan-2014 Colin Cross <ccross@android.com> system/core: rename aarch64 target to arm64

Rename aarch64 build targets to arm64. The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
nclude/cutils/atomic-aarch64.h
nclude/cutils/atomic-arm64.h
nclude/cutils/atomic-inline.h
ibbacktrace/Android.mk
ibpixelflinger/Android.mk
ibpixelflinger/arch-aarch64/col32cb16blend.S
ibpixelflinger/arch-aarch64/t32cb16blend.S
ibpixelflinger/arch-arm64/col32cb16blend.S
ibpixelflinger/arch-arm64/t32cb16blend.S
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/Aarch64Assembler.cpp
ibpixelflinger/codeflinger/Aarch64Assembler.h
ibpixelflinger/codeflinger/Aarch64Disassembler.cpp
ibpixelflinger/codeflinger/Aarch64Disassembler.h
ibpixelflinger/codeflinger/Arm64Assembler.cpp
ibpixelflinger/codeflinger/Arm64Assembler.h
ibpixelflinger/codeflinger/Arm64Disassembler.cpp
ibpixelflinger/codeflinger/Arm64Disassembler.h
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/scanline.cpp
ibpixelflinger/tests/arch-aarch64/Android.mk
ibpixelflinger/tests/arch-aarch64/assembler/Android.mk
ibpixelflinger/tests/arch-aarch64/assembler/aarch64_assembler_test.cpp
ibpixelflinger/tests/arch-aarch64/assembler/asm_test_jacket.S
ibpixelflinger/tests/arch-aarch64/col32cb16blend/Android.mk
ibpixelflinger/tests/arch-aarch64/col32cb16blend/col32cb16blend_test.c
ibpixelflinger/tests/arch-aarch64/disassembler/Android.mk
ibpixelflinger/tests/arch-aarch64/disassembler/aarch64_diassembler_test.cpp
ibpixelflinger/tests/arch-aarch64/t32cb16blend/Android.mk
ibpixelflinger/tests/arch-aarch64/t32cb16blend/t32cb16blend_test.c
ibpixelflinger/tests/arch-arm64/Android.mk
ibpixelflinger/tests/arch-arm64/assembler/Android.mk
ibpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
ibpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S
ibpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
ibpixelflinger/tests/arch-arm64/col32cb16blend/col32cb16blend_test.c
ibpixelflinger/tests/arch-arm64/disassembler/Android.mk
ibpixelflinger/tests/arch-arm64/disassembler/arm64_diassembler_test.cpp
ibpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
ibpixelflinger/tests/arch-arm64/t32cb16blend/t32cb16blend_test.c
ibpixelflinger/tests/codegen/codegen.cpp
adc09abb850081bcf198a33e29b7fe370c7bf00c 24-Jan-2014 Colin Cross <ccross@android.com> am 7d076b3b: am b36cfdb7: am 4b53b014: am 5bd11b48: Merge changes Ib13d9654,I98723ccd

* commit '7d076b3bf32e0d211d9d27964cc74dafd65afee3':
system/core: remove $(KERNEL_HEADERS) from includes
libcutils: fix atomic_memory_store_barrier
7d076b3bf32e0d211d9d27964cc74dafd65afee3 24-Jan-2014 Colin Cross <ccross@android.com> am b36cfdb7: am 4b53b014: am 5bd11b48: Merge changes Ib13d9654,I98723ccd

* commit 'b36cfdb718f30c667858f8bac04d012366dca94f':
system/core: remove $(KERNEL_HEADERS) from includes
libcutils: fix atomic_memory_store_barrier
b36cfdb718f30c667858f8bac04d012366dca94f 24-Jan-2014 Colin Cross <ccross@android.com> am 4b53b014: am 5bd11b48: Merge changes Ib13d9654,I98723ccd

* commit '4b53b0147a8f1de54a5e89f9763569016150de4f':
system/core: remove $(KERNEL_HEADERS) from includes
libcutils: fix atomic_memory_store_barrier
4b53b0147a8f1de54a5e89f9763569016150de4f 24-Jan-2014 Colin Cross <ccross@android.com> am 5bd11b48: Merge changes Ib13d9654,I98723ccd

* commit '5bd11b48875846b304e782afc537b4b4b8a6eb39':
system/core: remove $(KERNEL_HEADERS) from includes
libcutils: fix atomic_memory_store_barrier
5bd11b48875846b304e782afc537b4b4b8a6eb39 24-Jan-2014 Colin Cross <ccross@android.com> Merge changes Ib13d9654,I98723ccd

* changes:
system/core: remove $(KERNEL_HEADERS) from includes
libcutils: fix atomic_memory_store_barrier
026ec15670270dcf8839deacbdd950bfc655d5f4 24-Jan-2014 Nick Kralevich <nnk@google.com> am 0fef25b7: am 17ff7a8b: am ca53f0a0: don\'t load property_contexts from /data

* commit '0fef25b764e6bf62f65b9cf8f9796bc2c470ab7d':
don't load property_contexts from /data
0fef25b764e6bf62f65b9cf8f9796bc2c470ab7d 23-Jan-2014 Nick Kralevich <nnk@google.com> am 17ff7a8b: am ca53f0a0: don\'t load property_contexts from /data

* commit '17ff7a8b28ba736aa9435faba43fc605430d9a0f':
don't load property_contexts from /data
5edee2aca94cb0bfc45786260e23fbce1b239d87 23-Jan-2014 Colin Cross <ccross@android.com> fs_mgr: split fstab parsing into separate file

Move fstab parsing into fs_mgr_fstab.c so that it compiles into a
separate compilation unit. uncrypt links against it but doesn't
need to pull in the rest of the dependencies on fs_mgr.c.

Change-Id: I6bffe1cd42720151533e958028259d1931aaa4bf
s_mgr/Android.mk
s_mgr/fs_mgr.c
s_mgr/fs_mgr_fstab.c
a8be6279350211d610d2cf30173bd4bcb6405dfb 23-Jan-2014 Colin Cross <ccross@android.com> fs_mgr: update ext4_parse_sb to match change in ext4_utils

ext4_parse_sb now takes the struct fs_info to fill out to avoid
using the global info from external callers.

Change-Id: I0984ba01c0dbdd5b68b825817faf0c5cf5aa5510
s_mgr/fs_mgr_verity.c
17ff7a8b28ba736aa9435faba43fc605430d9a0f 23-Jan-2014 Nick Kralevich <nnk@google.com> am ca53f0a0: don\'t load property_contexts from /data

* commit 'ca53f0a0840ef859dbabfb089f2036656d1ca18c':
don't load property_contexts from /data
9dc69bd6c34c4874cf0ceac9b704f64feb667621 23-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
65dd88beccc571315ffc5d9cce90402d0426a28b 23-Jan-2014 Colin Cross <ccross@android.com> system/core: remove $(KERNEL_HEADERS) from includes

The kernel headers are already in the include path, and manually
adding them again will break on a multiarch build, where the
kernel headers may be different for each arch.

Change-Id: Ib13d96543f2c97b1b487a46e1748ceb2c5724169
ibcutils/Android.mk
ibsysutils/Android.mk
3510637c85a93b3e535482822e7b57693a22d6ac 23-Jan-2014 Colin Cross <ccross@android.com> libcutils: fix atomic_memory_store_barrier

dmb isht is not a valid instruction, fix it to be dmb ishst
(data memory barrier, inner shareable, on writes).

Change-Id: I98723ccd8618b7863cb55da53dc29b979c9905a5
nclude/cutils/atomic-aarch64.h
d49aa2537cf0b454dfaa4b0312a403ebff202d70 18-Jan-2014 Nick Kralevich <nnk@google.com> adbd: switch to su domain when running as root

When adbd runs as root, it should transition into the
su domain. This is needed to run the adbd and shell
domains in enforcing on userdebug / eng devices without
breaking developer workflows.

Introduce a new device_banner command line option.

Change-Id: Ib33c0dd2dd6172035230514ac84fcaed2ecf44d6
db/adb.c
ootdir/init.rc
ca53f0a0840ef859dbabfb089f2036656d1ca18c 19-Jan-2014 Nick Kralevich <nnk@google.com> don't load property_contexts from /data

Bug: 12613118

(cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf)

Change-Id: If630478b0e3fdda8c1c14b3f41b717085acf9914
nit/init.c
d7ad4e409eaac53db3a9789060097b712850b337 08-Jan-2014 Mark Salyzyn <salyzyn@google.com> libsysutils: SocketListener export release

* Foreground thread (legacy) closes connection by
reporting false return value for onDataAvailable.
* Background thread can choose instead to close the
connection asynchronously by calling release, must
return true for the onDataAvailable method.

Change-Id: I70ab37d5c22b02804aa3b4dfb26cc9b75291f8b6
nclude/sysutils/SocketListener.h
ibsysutils/src/SocketListener.cpp
a6e965578e44f8ae5f98de822ba5decec381d5fc 25-Jan-2012 Mark Salyzyn <salyzyn@google.com> libsysutils: Add iovec/runOnEachSocket

SocketClient:
* Replace sendDataLocked with sendDataLockedv which takes an iovec.
* Add a version of sendData, sendDatav, which takes an iovec.
* do not preserve iovec content through sendDatav

SocketListener:
* Add runOnEachSocket, which allows to to specify a SocketClientCommand to
run individually on each socket. This allows you to do broadcast-like
actions customized for each individual socket.
* Client safe list reference counting for sendBroadcast & runOnEach Socket

Signed-off-by: Nick Kralevich <nnk@google.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: I716f89c01b4cb7af900045c7e41fac1492defb06
nclude/sysutils/SocketClient.h
nclude/sysutils/SocketClientCommand.h
nclude/sysutils/SocketListener.h
ibsysutils/src/SocketClient.cpp
ibsysutils/src/SocketListener.cpp
a4c1ebd1a85795eb8ca5eebda0da361d9c06faa3 20-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
349f894e522830f462fdfff64d2ef8bec5dcf747 19-Jan-2014 Nick Kralevich <nnk@google.com> Merge "don't load property_contexts from /data"
10c51a38752d8f57f144f114331956c995180ad9 19-Jan-2014 Christopher Ferris <cferris@google.com> am f95d880f: am 884116c8: am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build"

* commit 'f95d880fe7e9a8860038a5c8391b89cfbeb0ce76':
Attempt to fix Mac build
f95d880fe7e9a8860038a5c8391b89cfbeb0ce76 19-Jan-2014 Christopher Ferris <cferris@google.com> am 884116c8: am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build"

* commit '884116c84aecd9d6685398e2735d6422909bb104':
Attempt to fix Mac build
884116c84aecd9d6685398e2735d6422909bb104 19-Jan-2014 Christopher Ferris <cferris@google.com> am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build"

* commit '719b0198a324582cbf2c01236bb03746475a52e0':
Attempt to fix Mac build
719b0198a324582cbf2c01236bb03746475a52e0 19-Jan-2014 Christopher Ferris <cferris@google.com> am 1db584b8: Merge "Attempt to fix Mac build"

* commit '1db584b899dffca884c3842c07da189f7c9af470':
Attempt to fix Mac build
1db584b899dffca884c3842c07da189f7c9af470 19-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Attempt to fix Mac build"
dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf 19-Jan-2014 Nick Kralevich <nnk@google.com> don't load property_contexts from /data

Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
nit/init.c
db5911a08ab99140c67eb304e5aecc6ddd55aa39 18-Jan-2014 Brian Carlstrom <bdc@google.com> Attempt to fix Mac build

Change-Id: I1364255bfed7788a35531962508bad804b8d5b7f
ibbacktrace/BacktraceMap.cpp
71bbbd15786b597b1d8a90c94cfe1d8c44b1869d 15-Jan-2014 Sujith Ramakrishnan <sujithrk@google.com> Add mknod utility to system/core/toolbox

Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
oolbox/Android.mk
oolbox/mknod.c
f7ce02d3e4948967c7b602048e9961f27ac00b28 18-Jan-2014 Nick Kralevich <nnk@google.com> am eb665350: am 55537633: am 78af6c4c: am 0a72d293: Merge "Fix "adb push /sdcard/filename""

* commit 'eb665350d13d36f8974da332674adf5df58859f3':
Fix "adb push /sdcard/filename"
eb665350d13d36f8974da332674adf5df58859f3 18-Jan-2014 Nick Kralevich <nnk@google.com> am 55537633: am 78af6c4c: am 0a72d293: Merge "Fix "adb push /sdcard/filename""

* commit '555376331f436fb519c182677c22d8299ead5523':
Fix "adb push /sdcard/filename"
555376331f436fb519c182677c22d8299ead5523 18-Jan-2014 Nick Kralevich <nnk@google.com> am 78af6c4c: am 0a72d293: Merge "Fix "adb push /sdcard/filename""

* commit '78af6c4c946fec01b232c92d40eb6fd202490e3e':
Fix "adb push /sdcard/filename"
78af6c4c946fec01b232c92d40eb6fd202490e3e 18-Jan-2014 Nick Kralevich <nnk@google.com> am 0a72d293: Merge "Fix "adb push /sdcard/filename""

* commit '0a72d2930adcd3b3504448f71b25ebb88c2cc3cf':
Fix "adb push /sdcard/filename"
0a72d2930adcd3b3504448f71b25ebb88c2cc3cf 18-Jan-2014 Nick Kralevich <nnk@google.com> Merge "Fix "adb push /sdcard/filename""
72917837e6a1163bd389cf535eb404501a118cf2 18-Jan-2014 Nick Kralevich <nnk@google.com> Fix "adb push /sdcard/filename"

Don't assume that calling chown(filename, getuid(), getgid())
will always succeed. In the case of /sdcard, a file you create
will be owned by root, so the chown call will fail.

Instead, use uid=gid=-1 so that the chown call is truly a no-op.

Ignore the results of calling chmod. Again, for /sdcard, the
chmod call will never succeed, because the file isn't owned by
the shell user.

Bug: 12441485
Change-Id: I11eaf1d6f6049c1158afc29754fbb7af2baf2c78
db/file_sync_service.c
5dbb002217a4f0b393fcb10f947321349df3b6b7 17-Jan-2014 Elliott Hughes <enh@google.com> am 1571dac4: am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."

* commit '1571dac49fee8d7304a082a787aed15520ed48b4':
Fix 'r' for LP64.
64ca5ade858a7bfddd4633aa7f6d50c26f350c14 17-Jan-2014 Christopher Ferris <cferris@google.com> am 758c8636: am 6ecdff5b: am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."

* commit '758c8636c6804f67db0b05617ff37f0a0d0ba859':
Add PROT_* constants not found on windows.
6c625f67174cf12ecec1c2c86e9541a7a08e0607 17-Jan-2014 Christopher Ferris <cferris@google.com> resolved conflicts for merge of 47fa9064 to master

Change-Id: I53fb8ff2dfbefe6246385e624c5c3525cc6f4253
1571dac49fee8d7304a082a787aed15520ed48b4 17-Jan-2014 Elliott Hughes <enh@google.com> am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."

* commit '1b37794b07212ef32c2930937445f9cad212ac63':
Fix 'r' for LP64.
758c8636c6804f67db0b05617ff37f0a0d0ba859 17-Jan-2014 Christopher Ferris <cferris@google.com> am 6ecdff5b: am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."

* commit '6ecdff5baeb8102438c7f91cd2297b8feaaa5081':
Add PROT_* constants not found on windows.
47fa90641e5321f853d50de1e129b6233fa183e1 17-Jan-2014 Christopher Ferris <cferris@google.com> am 0cf5d96c: am 237fdb4a: am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."

* commit '0cf5d96c43a11e150941202961bcedcbce9bb294':
Rewrite libbacktrace to be all C++.
1b37794b07212ef32c2930937445f9cad212ac63 17-Jan-2014 Elliott Hughes <enh@google.com> am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."

* commit 'f62b602f452ab9e1f97be2a61f3c26ece12506db':
Fix 'r' for LP64.
6ecdff5baeb8102438c7f91cd2297b8feaaa5081 17-Jan-2014 Christopher Ferris <cferris@google.com> am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."

* commit 'f7adcfc8bdd855e424b9970da444843920d8dde5':
Add PROT_* constants not found on windows.
0cf5d96c43a11e150941202961bcedcbce9bb294 17-Jan-2014 Christopher Ferris <cferris@google.com> am 237fdb4a: am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."

* commit '237fdb4a95aeb94ad040a737c6fa22d84d05d633':
Rewrite libbacktrace to be all C++.
f62b602f452ab9e1f97be2a61f3c26ece12506db 17-Jan-2014 Elliott Hughes <enh@google.com> am 6192eedb: Merge "Fix \'r\' for LP64."

* commit '6192eedb43bfa949569850b5cf4a6550b2c62f08':
Fix 'r' for LP64.
f7adcfc8bdd855e424b9970da444843920d8dde5 17-Jan-2014 Christopher Ferris <cferris@google.com> am 17b9c827: Merge "Add PROT_* constants not found on windows."

* commit '17b9c82765a325d88fc2e8920f9df3155c5773e2':
Add PROT_* constants not found on windows.
237fdb4a95aeb94ad040a737c6fa22d84d05d633 17-Jan-2014 Christopher Ferris <cferris@google.com> am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."

* commit 'eb8d73b675d8d9613310b5d5e5865571b98d6f78':
Rewrite libbacktrace to be all C++.
6192eedb43bfa949569850b5cf4a6550b2c62f08 17-Jan-2014 Elliott Hughes <enh@google.com> Merge "Fix 'r' for LP64."
2430a064bd956fb2eb4f40762966315a1b12e3a8 17-Jan-2014 Elliott Hughes <enh@google.com> Fix 'r' for LP64.

Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
oolbox/r.c
17b9c82765a325d88fc2e8920f9df3155c5773e2 17-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Add PROT_* constants not found on windows."
0dbce4564bd697bc2603f6c05ac47b81977cd41f 17-Jan-2014 Christopher Ferris <cferris@google.com> Add PROT_* constants not found on windows.

Change-Id: Ic515363ed66dfb2d8e1a6fdfa274508b3a91311d
nclude/backtrace/BacktraceMap.h
eb8d73b675d8d9613310b5d5e5865571b98d6f78 17-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Rewrite libbacktrace to be all C++."
c176e14ce3fd28432e2eaca7bc7a60046dd8be40 18-Dec-2013 Mark Salyzyn <salyzyn@google.com> liblog: support struct logger_event_v2 format

Change-Id: I34c96adffab3478dae8f5a2597a840caad5092cc
iblog/logprint.c
b69e092dc75b643d95538929b38da6f647e79351 14-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: update timestamp on NOTICE file

Change-Id: I776509232aaa50e14fe79e45ab133c0ea3985933
iblog/NOTICE
407038cd937391216d93f72d4d13db3803c5b452 11-Jan-2014 Mark Salyzyn <salyzyn@google.com> libcutils: resolve warning in iosched_policy.c

Change-Id: I35b0d1eeba21cc1ed9645a5acfa180ed20797c56
ibcutils/iosched_policy.c
9e03ce45f999b75000f1652747783d74e7063b9a 10-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: Add const pedantics

Change-Id: I819695b778ac08fcfc9b1a87f3f86e5715f53084
nclude/log/logger.h
de02546e3d7c9c307e3d87e0a7fe8bb39b363a72 09-Dec-2013 Mark Salyzyn <salyzyn@google.com> logcat: Add -T flag (-t w/o assumption of -d)

Change-Id: I49763e2db83755e0b7b12dfa3f83a3957c54d389
ogcat/logcat.cpp
ogcat/tests/logcat_test.cpp
97b0795104c0510fbe3f7f5f3fe9d3491f71e719 17-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "logcat: Add logcat test suite"
d3f99fbd06c5cfdad77e2db64da4094405a41624 17-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: Add cpu utilization test"
2b8579e769a9ce69360508a323f0f8acd1e21bbd 17-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: Add liblog test suite"
0f47b5ed821d13a98211c512539a597a9f019a38 17-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "debuggerd: Support newline split in log messages"
e44830e533066ac64f52c5578d178dd55221bd67 17-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: deprecate export LOGGER ioctl definitions"
3215ed422893d3c80d8e7f7bf4b7c676154e0f6d 17-Jan-2014 Elliott Hughes <enh@google.com> am b1091958: am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."

* commit 'b1091958bdb4bc42f66631fdf4105cbc2faec98a':
Remove obsolete 'setconsole' command.
46756821c4fe238f12a6e5ea18c356398f8d8795 15-Jan-2014 Christopher Ferris <cferris@google.com> Rewrite libbacktrace to be all C++.

This includes removing the map_info.c source and replacing it with the
BacktraceMap class to handle all map related code.

Change all callers of libbacktrace map functionality.

Also modify the corkscrew thread code so that it doesn't need to build
the map twice (once in the corkscrew format and once in the libbacktrace
format).

Change-Id: I32865a39f83a3dd6f958fc03c2759ba47d12382e
ebuggerd/tombstone.cpp
nclude/backtrace/Backtrace.h
nclude/backtrace/BacktraceMap.h
nclude/backtrace/backtrace.h
nclude/backtrace/backtrace_constants.h
nclude/utils/CallStack.h
ibbacktrace/Android.mk
ibbacktrace/Backtrace.cpp
ibbacktrace/Backtrace.h
ibbacktrace/BacktraceMap.cpp
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
ibbacktrace/Corkscrew.cpp
ibbacktrace/Corkscrew.h
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindCurrent.h
ibbacktrace/UnwindPtrace.cpp
ibbacktrace/UnwindPtrace.h
ibbacktrace/backtrace_test.cpp
ibbacktrace/map_info.c
2807db9a269baaa7b3f67c337d3312877ba90aa0 13-Dec-2013 Mark Salyzyn <salyzyn@google.com> logcat: Add logcat test suite

Change-Id: Ic4c84b88b8d899965c9765bdc3ee223ef73ba7d1
ogcat/Android.mk
ogcat/logcat.cpp
ogcat/tests/Android.mk
ogcat/tests/logcat_test.cpp
b1091958bdb4bc42f66631fdf4105cbc2faec98a 17-Jan-2014 Elliott Hughes <enh@google.com> am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."

* commit '320f2940239c405889baa3c5184beb1d8971837d':
Remove obsolete 'setconsole' command.
edadb2e7196040dd476e86581dc1c8e26449c00d 09-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: Add cpu utilization test

- followup to measure CPU utilization in liblog to
ensure this issue gets caught before a regression
passes into the labs. Threshold for failure is 1%.

BUG: 12457855
Change-Id: I40568a72aeef2f554b19ad55f3dd3c02bc023f24
iblog/tests/liblog_test.cpp
8d1fdb509305e93eb46d45a6dcd34bedd6dc0742 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> liblog: Add liblog test suite

Change-Id: Ia457d518b4e7ff37e840336ff0c48583709700d4
nclude/log/log.h
nclude/log/log_read.h
iblog/Android.mk
iblog/tests/Android.mk
iblog/tests/benchmark.h
iblog/tests/benchmark_main.cpp
iblog/tests/liblog_benchmark.cpp
iblog/tests/liblog_test.cpp
320f2940239c405889baa3c5184beb1d8971837d 17-Jan-2014 Elliott Hughes <enh@google.com> am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."

* commit 'e20b5f71c01d912a5ce6aa4140e6e35edae8f4df':
Remove obsolete 'setconsole' command.
e20b5f71c01d912a5ce6aa4140e6e35edae8f4df 17-Jan-2014 Elliott Hughes <enh@google.com> am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."

* commit '524b3a0c40fcca4b2259f317b2d098434998ce47':
Remove obsolete 'setconsole' command.
524b3a0c40fcca4b2259f317b2d098434998ce47 17-Jan-2014 Elliott Hughes <enh@google.com> Merge "Remove obsolete 'setconsole' command."
706fad2b5fd96fb9b705795af1c11ef44d8a8fe9 12-Dec-2013 Mark Salyzyn <salyzyn@google.com> debuggerd: Support newline split in log messages

Change-Id: I2c19f12ef027ab1e1455ce78824537da1b03edcd
ebuggerd/tombstone.cpp
2e44a9ea2518024a07f38c2cc6066ec2074d5210 14-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: deprecate export LOGGER ioctl definitions

Change-Id: I150cad9309255bec2b8bc7230c744e9bbb1b9578
nclude/log/logger.h
iblog/log_read.c
c1e91b0034b1e951cdd1927f03df63353db139a6 16-Jan-2014 Elliott Hughes <enh@google.com> Remove obsolete 'setconsole' command.

Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
oolbox/Android.mk
oolbox/setconsole.c
ab88481dc7f00643bf06f27fd1d0a2e007dc0ea6 16-Jan-2014 Elliott Hughes <enh@google.com> Merge "resolved conflicts for merge of ec9e5891 to master"
b70375abc2c4da6f868da4eef3d3f059acdf9774 16-Jan-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of ec9e5891 to master

Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
d0f2c265d8b7457bbb9b809e00b6e8b18bbef7c9 16-Jan-2014 Doug Zongker <dougz@android.com> Merge "add the pre-recovery service"
ec9e5891ac97c50cfb8d3d1c9c2d478637eff62b 16-Jan-2014 Elliott Hughes <enh@google.com> am 8940c0a0: am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup."

* commit '8940c0a07f8d6682712e2d2ee387e78096602f99':
system/core 64-bit cleanup.
8940c0a07f8d6682712e2d2ee387e78096602f99 16-Jan-2014 Elliott Hughes <enh@google.com> am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup."

* commit '97373bbc713c52c43e0fa48d0f16466e0a450178':
system/core 64-bit cleanup.
97373bbc713c52c43e0fa48d0f16466e0a450178 16-Jan-2014 Elliott Hughes <enh@google.com> am 7cd15614: Merge "system/core 64-bit cleanup."

* commit '7cd1561410473c71d40cec822fb53a282b5b3279':
system/core 64-bit cleanup.
7cd1561410473c71d40cec822fb53a282b5b3279 16-Jan-2014 Elliott Hughes <enh@google.com> Merge "system/core 64-bit cleanup."
24239a99ffde4a264be3121bff8b1ee70b78f63c 16-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: deprecate export of LOGGER_LOG_* defines"
ccecf1425412beb2bc3bb38d470293fdc244d6f1 16-Jan-2014 Elliott Hughes <enh@google.com> system/core 64-bit cleanup.

This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.

Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
db/services.c
db/sockets.c
db/transport.c
db/transport_local.c
db/usb_linux.c
db/usb_linux_client.c
astbootd/commands.c
astbootd/commands/flash.c
astbootd/secure.c
astbootd/transport.c
astbootd/transport_socket.c
astbootd/usb_linux_client.c
s_mgr/fs_mgr_verity.c
nit/init.c
nit/property_service.c
ibdiskconfig/diskconfig.c
ibion/ion_test.c
ibmemtrack/memtrack_test.c
ibsparse/output_file.c
ogcat/logcat.cpp
ogwrapper/logwrapper.c
oolbox/Android.mk
oolbox/dd.c
oolbox/getevent.c
oolbox/insmod.c
oolbox/ls.c
oolbox/nandread.c
oolbox/newfs_msdos.c
oolbox/schedtop.c
oolbox/setconsole.c
869d5933efc0f18c1f58257a986fbbf3b97f5904 16-Jan-2014 Nick Kralevich <nnk@google.com> am 325a99fb: am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"

* commit '325a99fb630306ff99cc24be720061ecec7dae17':
fs_mgr: increase verboseness on mount errors
325a99fb630306ff99cc24be720061ecec7dae17 16-Jan-2014 Nick Kralevich <nnk@google.com> am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"

* commit 'bdea585e68a054552a26272ec9321afaad9ac915':
fs_mgr: increase verboseness on mount errors
bdea585e68a054552a26272ec9321afaad9ac915 16-Jan-2014 Nick Kralevich <nnk@google.com> am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"

* commit 'a6b65eeef1280bbd38172d0b36b3493888e94b4b':
fs_mgr: increase verboseness on mount errors
a6b65eeef1280bbd38172d0b36b3493888e94b4b 16-Jan-2014 Nick Kralevich <nnk@google.com> am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"

* commit '7580661df179eb037c0dbe96e3bde1bc9e6bfbdc':
fs_mgr: increase verboseness on mount errors
7580661df179eb037c0dbe96e3bde1bc9e6bfbdc 16-Jan-2014 Nick Kralevich <nnk@google.com> Merge "fs_mgr: increase verboseness on mount errors"
7baebf1345ff9e861ea8ccf9712128a3b7cd9fcc 14-Jan-2014 Doug Zongker <dougz@android.com> add the pre-recovery service

Add a service called "pre-recovery" which is normally stopped but can
be started by the system server when we want to go into recovery. It
will do any preparation needed (currently needed to handle update
packages that reside on an encrypted /data partition) and then set
sys.powerctl when it's ready to actually reboot.

Bug: 12188746
Change-Id: I894a4cb200395a0f6d7fe643ed4c2ac0a45d2052
nclude/private/android_filesystem_config.h
nit/property_service.c
ootdir/init.rc
077047783bd1d787e17a7c1a9f2ab80d50f4a27a 16-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
d70009e7ec0a8b04a67d6bd579e36c279410eb21 16-Jan-2014 Mohamad Ayyash <mkayyash@google.com> Merge "fastboot: Make tags_offset a command line option."
112cf35d4d10c988bf4726efc52cd989427f113a 16-Jan-2014 Glenn Kasten <gkasten@google.com> Merge "Miscellaneous updates to <system/audio.h>"
1c3e16fb40780c010f35119cdf782e6fcb7ce017 19-Dec-2011 Glenn Kasten <gkasten@google.com> Miscellaneous updates to <system/audio.h>

Add single-precision floating-point PCM format:
- AUDIO_FORMAT_PCM_SUB_FLOAT
- AUDIO_FORMAT_PCM_FLOAT

Add symbols to replace hard-coded constants in code:
- AUDIO_IO_HANDLE_NONE
- AUDIO_IN_ACOUSTICS_NONE
- AUDIO_INTERLEAVE_*
- AUDIO_STREAM_MIN

Update comments.

Fix whitespace in switch statement.

Change-Id: I61862c188ebac06657b5d9887164edc24b8ab8f5
nclude/system/audio.h
32a32c9eb2b6975d76dae1dc5a2dbc73bb05f757 15-Jan-2014 Nick Kralevich <nnk@google.com> am 11190d0c: am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media."

* commit '11190d0ccb1216307043ceecf5360f1a1a946cd1':
restorecon /data/misc/media.
11190d0ccb1216307043ceecf5360f1a1a946cd1 15-Jan-2014 Nick Kralevich <nnk@google.com> am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media."

* commit '4552987e6a1338dac26f13f0851657335d998ffb':
restorecon /data/misc/media.
4552987e6a1338dac26f13f0851657335d998ffb 15-Jan-2014 Nick Kralevich <nnk@google.com> am c93904b4: am e847f429: Merge "restorecon /data/misc/media."

* commit 'c93904b445830cd17fd9dd6d4fe236987577a478':
restorecon /data/misc/media.
c93904b445830cd17fd9dd6d4fe236987577a478 15-Jan-2014 Nick Kralevich <nnk@google.com> am e847f429: Merge "restorecon /data/misc/media."

* commit 'e847f429f43ae56aaa406697ca603c8469e2100b':
restorecon /data/misc/media.
e847f429f43ae56aaa406697ca603c8469e2100b 15-Jan-2014 Nick Kralevich <nnk@google.com> Merge "restorecon /data/misc/media."
071f28ae0e6dc55e13303282b185c76b23ff1c3a 14-Jan-2014 William Roberts <wroberts@tresys.com> fs_mgr: increase verboseness on mount errors

While debugging a mount error, the dmesg output was less
than ideal. The error would be declared but why the mount
failed, and what options were passed was not present. This
patch ensures that the mount options and underlying
errno are printed.

Change-Id: I2b3a2c113149df878c0a8a10ef86fd9e4f909658
s_mgr/fs_mgr.c
bdf513c5f25b3c2051af737c37a7734c4559208e 15-Jan-2014 Mohamad Ayyash <mkayyash@google.com> fastboot: Make tags_offset a command line option.

This matches what mkbootimg supports in 5d4af6314fded027952941110a520dc9aa234a14

It will allow "fastboot flash:raw ..." to work for devices that need tags_offset.

Change-Id: I4ceca528f88cc8ede5742f8a67bec972e41eebe7
astboot/fastboot.c
9e9f05e5ebf72a60930a53e5cf45f575534fc29d 15-Jan-2014 Stephen Smalley <sds@tycho.nsa.gov> restorecon /data/misc/media.

Otherwise it will be mislabeled on upgrades with existing userdata.

Change-Id: Ibde88d5d692ead45b480bb34cfe0831baeffbf94
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
baa97ae43236f4c47756a22aab89501a04b5f679 15-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
c318fb405b73f4865c4b4156d181ff6edad490bd 15-Jan-2014 Nick Kralevich <nnk@google.com> am 7a2c2e80: am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""

* commit '7a2c2e8048cc6bba9b78be8a01c0b056b5548718':
Revert "fs_mgr: correct warning on unused function parameter"
11268294f319a39e1e05271ccd48d97f52dc3a00 15-Jan-2014 Nick Kralevich <nnk@google.com> am f6070528: am eca8ea82: am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter"

* commit 'f6070528844d41d70b22461df85e5a714e5f9924':
fs_mgr: correct warning on unused function parameter
7a2c2e8048cc6bba9b78be8a01c0b056b5548718 15-Jan-2014 Nick Kralevich <nnk@google.com> am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""

* commit 'aa25204f43421fe363238176d74e68eb8cdb5b01':
Revert "fs_mgr: correct warning on unused function parameter"
aa25204f43421fe363238176d74e68eb8cdb5b01 15-Jan-2014 Nick Kralevich <nnk@google.com> am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""

* commit '93557002e17dbda49650d198c11e78ff413c8ad4':
Revert "fs_mgr: correct warning on unused function parameter"
93557002e17dbda49650d198c11e78ff413c8ad4 15-Jan-2014 Nick Kralevich <nnk@google.com> am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""

* commit '37fd839fc26b9b3da451a3cb23da6e49c6b676d9':
Revert "fs_mgr: correct warning on unused function parameter"
37fd839fc26b9b3da451a3cb23da6e49c6b676d9 15-Jan-2014 Nick Kralevich <nnk@google.com> Merge "Revert "fs_mgr: correct warning on unused function parameter""
bc7776716a2b94edae66e0e7dea2900d569a75ef 15-Jan-2014 Nick Kralevich <nnk@google.com> Revert "fs_mgr: correct warning on unused function parameter"

The build is broken.

system/core/fs_mgr/fs_mgr.c:824:77: error: expected '(' before 'unused'
const char *blk_device, long long length __attribute__(unused))
^
system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry':
system/core/fs_mgr/fs_mgr.c:824:56: warning: unused parameter 'length' [-Wunused-parameter]
const char *blk_device, long long length __attribute__(unused))
^
make: *** [out/target/product/generic_x86/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr.o] Error 1
make: *** Waiting for unfinished jobs....
This reverts commit 21095d0cae64c70b4ac7e90af7a6787019cc317a.

Change-Id: I64f8c4d9c17c0e3bbf2eb427a2c0b81bbe66ec3a
s_mgr/fs_mgr.c
f6070528844d41d70b22461df85e5a714e5f9924 15-Jan-2014 Nick Kralevich <nnk@google.com> am eca8ea82: am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter"

* commit 'eca8ea823b38661dce0aa0bd88b94a32381d779b':
fs_mgr: correct warning on unused function parameter
eca8ea823b38661dce0aa0bd88b94a32381d779b 15-Jan-2014 Nick Kralevich <nnk@google.com> am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter"

* commit 'e220e9e06d8a09fc1e18d19b758636dd14c13821':
fs_mgr: correct warning on unused function parameter
e220e9e06d8a09fc1e18d19b758636dd14c13821 15-Jan-2014 Nick Kralevich <nnk@google.com> am 7169b230: Merge "fs_mgr: correct warning on unused function parameter"

* commit '7169b2303d9340b3537e5059f1790a246490b899':
fs_mgr: correct warning on unused function parameter
7169b2303d9340b3537e5059f1790a246490b899 15-Jan-2014 Nick Kralevich <nnk@google.com> Merge "fs_mgr: correct warning on unused function parameter"
39e63b53bc13de85afbf91bc1f50a724d4d43630 15-Jan-2014 Nick Kralevich <nnk@google.com> am 42acb531: Merge "Remove obsolete vdc call." into klp-modular-dev

* commit '42acb5314c8fb01f426e946392c248fde3371aff':
Remove obsolete vdc call.
42acb5314c8fb01f426e946392c248fde3371aff 15-Jan-2014 Nick Kralevich <nnk@google.com> Merge "Remove obsolete vdc call." into klp-modular-dev
ef53917406e90bc7620e036083e4d50b5cbb201e 15-Jan-2014 Elliott Hughes <enh@google.com> am 7dee721e: am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '7dee721eb3387fff695e5b5a3480428bccb3cf70':
Copy the bionic -fstack-protector hack into libbacktrace.
7dee721eb3387fff695e5b5a3480428bccb3cf70 15-Jan-2014 Elliott Hughes <enh@google.com> am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '42e82f80fef7b1f13c9c3ab184cea065f4f4edbc':
Copy the bionic -fstack-protector hack into libbacktrace.
42e82f80fef7b1f13c9c3ab184cea065f4f4edbc 15-Jan-2014 Elliott Hughes <enh@google.com> am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '4a8996fb42d2114fee344b75acb23d5b0e9c548d':
Copy the bionic -fstack-protector hack into libbacktrace.
4a8996fb42d2114fee344b75acb23d5b0e9c548d 15-Jan-2014 Elliott Hughes <enh@google.com> am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '3352c5037526e1f5cd3291a4853c497e488b824c':
Copy the bionic -fstack-protector hack into libbacktrace.
3352c5037526e1f5cd3291a4853c497e488b824c 15-Jan-2014 Elliott Hughes <enh@google.com> Merge "Copy the bionic -fstack-protector hack into libbacktrace."
1380ddcab2f67573cd5839b51499217d7e58acd7 15-Jan-2014 Elliott Hughes <enh@google.com> Copy the bionic -fstack-protector hack into libbacktrace.

aarch64 doesn't support -fstack-protector yet.

Change-Id: Id1e589742ba074f59d3390d059248c9b371aff58
ibbacktrace/Android.mk
57a6fbfb9a6b662a9ac9bfa8bf500512340b2541 15-Jan-2014 Elliott Hughes <enh@google.com> am b6e70fce: am 57f22625: am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit."

* commit 'b6e70fce5365c596a7b0b22cd3ba75c5d7ef6430':
Fix fastbootd build for 64-bit.
225459a5da21e9397ca49b0d9af7d5fe3462706b 15-Jan-2014 Nick Kralevich <nnk@google.com> Remove obsolete vdc call.

Since ca8e66a8b0f843812014a28d49208f9f6f64ecbc, init has
been handling reboots and filesystem unmounts. Remove obsolete
call to vdc.

Bug: 12504045
Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
db/adb.c
db/services.c
b6e70fce5365c596a7b0b22cd3ba75c5d7ef6430 15-Jan-2014 Elliott Hughes <enh@google.com> am 57f22625: am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit."

* commit '57f226256659eca3cf06233d74761ca9c37d51b2':
Fix fastbootd build for 64-bit.
57f226256659eca3cf06233d74761ca9c37d51b2 15-Jan-2014 Elliott Hughes <enh@google.com> am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit."

* commit 'ea8dcdcf64781ae83574bdad9e55cd78ea0e5d1d':
Fix fastbootd build for 64-bit.
ea8dcdcf64781ae83574bdad9e55cd78ea0e5d1d 15-Jan-2014 Elliott Hughes <enh@google.com> am 21ecc30c: Merge "Fix fastbootd build for 64-bit."

* commit '21ecc30cd0bb0eb5035d48e4eb0e78d6a509dd8d':
Fix fastbootd build for 64-bit.
21ecc30cd0bb0eb5035d48e4eb0e78d6a509dd8d 15-Jan-2014 Elliott Hughes <enh@google.com> Merge "Fix fastbootd build for 64-bit."
4f24125ccc7748bb971b686f4c1b18c6f4a5e4ac 15-Jan-2014 Elliott Hughes <enh@google.com> Fix fastbootd build for 64-bit.

Change-Id: I04bef46f0125fd6a8fc0cb966bd257ad594aff1e
astbootd/commands/partitions.c
astbootd/other/gptedit.c
astbootd/utils.c
765aef9c13cf85b2297fc7bc7bb1e7e8059b01bd 15-Jan-2014 Glenn Kasten <gkasten@google.com> Merge "Add AUDIO_SESSION_ALLOCATE"
c3149359a0d0f5dd9773a9a0340efc4bc0e88be7 15-Jan-2014 Elliott Hughes <enh@google.com> am af16bf4f: am 9c1cbe83: am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit 'af16bf4f5160c03c858b32c40900f07f1e9c0366':
Don't set LD_LIBRARY_PATH globally.
b4f2b4eac4b9ae3d8c7804c5902343c4235f81ad 25-Jun-2012 Glenn Kasten <gkasten@google.com> Add AUDIO_SESSION_ALLOCATE

Change-Id: I045f2f04520bc474666c43a0ff1568f0fab3567c
nclude/system/audio.h
af16bf4f5160c03c858b32c40900f07f1e9c0366 15-Jan-2014 Elliott Hughes <enh@google.com> am 9c1cbe83: am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit '9c1cbe8373f28c9a6d6ba489af3e9247647dc469':
Don't set LD_LIBRARY_PATH globally.
9c1cbe8373f28c9a6d6ba489af3e9247647dc469 15-Jan-2014 Elliott Hughes <enh@google.com> am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit '53cd1484aa13c43b4d6973c1c203dbff9c996d14':
Don't set LD_LIBRARY_PATH globally.
53cd1484aa13c43b4d6973c1c203dbff9c996d14 15-Jan-2014 Elliott Hughes <enh@google.com> am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit 'aead003c8bc677218329c535b063a5bb66695414':
Don't set LD_LIBRARY_PATH globally.
aead003c8bc677218329c535b063a5bb66695414 15-Jan-2014 Elliott Hughes <enh@google.com> Merge "Don't set LD_LIBRARY_PATH globally."
49cf122d25e62c9f3dacad65eb5a7df5ab1e27b8 15-Jan-2014 Elliott Hughes <enh@google.com> am 7b80c138: am 7c7d76f4: am ab3d5036: am d47ffb88: Merge "AArch64: Add atomic functions"

* commit '7b80c1381581bd3c0c28440236e043888c49087d':
AArch64: Add atomic functions
7b80c1381581bd3c0c28440236e043888c49087d 15-Jan-2014 Elliott Hughes <enh@google.com> am 7c7d76f4: am ab3d5036: am d47ffb88: Merge "AArch64: Add atomic functions"

* commit '7c7d76f47fc085219ad010c21b80e2ce521efb1b':
AArch64: Add atomic functions
7c7d76f47fc085219ad010c21b80e2ce521efb1b 15-Jan-2014 Elliott Hughes <enh@google.com> am ab3d5036: am d47ffb88: Merge "AArch64: Add atomic functions"

* commit 'ab3d5036271a214e88ceb7482564e69c0249339e':
AArch64: Add atomic functions
ab3d5036271a214e88ceb7482564e69c0249339e 15-Jan-2014 Elliott Hughes <enh@google.com> am d47ffb88: Merge "AArch64: Add atomic functions"

* commit 'd47ffb8890b937ee4f162032d9426f45b52b4346':
AArch64: Add atomic functions
d47ffb8890b937ee4f162032d9426f45b52b4346 15-Jan-2014 Elliott Hughes <enh@google.com> Merge "AArch64: Add atomic functions"
c15d2ce5fcb98bdf2261e365ce8f59122173172a 13-Nov-2013 Ashok Bhat <ashok.bhat@arm.com> AArch64: Add atomic functions

This patch adds atomic functions for AArch64. The functions
will be revisited later for potential optimizations using
assembly or otherwise.

This patch also introduces new 64-bit atomic functions for
LP64 platforms.

Change-Id: Id2127dd01cea65025f939e955d73d27e95d8687e
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
nclude/cutils/atomic-aarch64.h
nclude/cutils/atomic-inline.h
nclude/cutils/atomic.h
21095d0cae64c70b4ac7e90af7a6787019cc317a 14-Jan-2014 William Roberts <wroberts@tresys.com> fs_mgr: correct warning on unused function parameter

target thumb C: libfs_mgr <= system/core/fs_mgr/fs_mgr.c
system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry':
system/core/fs_mgr/fs_mgr.c:828:56: warning: unused parameter 'length' [-Wunused-parameter]
const char *blk_device, long long length)

Change-Id: Ide1bfa120c4f8d8e2f643929cb84c1be065e3310
s_mgr/fs_mgr.c
475377b68a49197b14d8ff6553842b7f417d8161 14-Jan-2014 Christopher Ferris <cferris@google.com> am 117e93a7: am 2c3b9a44: am d9cb2964: am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."

* commit '117e93a7208d028ccbc444aad8bd5ad250459c67':
Create a bare bones host libbacktrace on mac.
117e93a7208d028ccbc444aad8bd5ad250459c67 14-Jan-2014 Christopher Ferris <cferris@google.com> am 2c3b9a44: am d9cb2964: am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."

* commit '2c3b9a444f44402142f3ca37a91f529fc81fbfd3':
Create a bare bones host libbacktrace on mac.
2c3b9a444f44402142f3ca37a91f529fc81fbfd3 14-Jan-2014 Christopher Ferris <cferris@google.com> am d9cb2964: am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."

* commit 'd9cb2964e2d3428b24392a36ea7ad3b9014775f6':
Create a bare bones host libbacktrace on mac.
d9cb2964e2d3428b24392a36ea7ad3b9014775f6 14-Jan-2014 Christopher Ferris <cferris@google.com> am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."

* commit '91e2019f81a839b71cfcff75129d1c1fdd552dcb':
Create a bare bones host libbacktrace on mac.
91e2019f81a839b71cfcff75129d1c1fdd552dcb 14-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Create a bare bones host libbacktrace on mac."
73459a5c87dc9e7c2aeee00597b9d3cc8d9a190e 02-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: deprecate export of LOGGER_LOG_* defines

Change-Id: I263af8e889f8f2ad91b91757caf90a4d17823dab
nclude/log/logger.h
iblog/logd_write.c
3bb01e4b054ea146c1fc0c4d109681e806d1066e 14-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
f67c6410d12a1829b0c6d009c848d72cd0158ee4 10-Jan-2014 Christopher Ferris <cferris@google.com> Create a bare bones host libbacktrace on mac.

This allows the libbacktrace library to compile for host on mac.

Bug: 12474939
Change-Id: I32cbcf996e6fe9057e5065ba21f89086343704a0
ibbacktrace/Android.mk
ibbacktrace/Backtrace.cpp
ibbacktrace/BacktraceThread.h
4167d7e5c23b3b3056107b18bae7a871cf974414 14-Jan-2014 Christopher Ferris <cferris@google.com> resolved conflicts for merge of 8791ee5c to master

Change-Id: I107bb055941809331c451c1d903f231f07a86ece
8791ee5c1486c9d6f9bf275bb096179dce95f309 14-Jan-2014 Christopher Ferris <cferris@google.com> am 50fae736: am 1f71e465: am 68870199: Merge "Next phase of the move, reformat use C++ features."

* commit '50fae736dc0a5552e9e14d8e8358449aa0f7536a':
Next phase of the move, reformat use C++ features.
50fae736dc0a5552e9e14d8e8358449aa0f7536a 14-Jan-2014 Christopher Ferris <cferris@google.com> am 1f71e465: am 68870199: Merge "Next phase of the move, reformat use C++ features."

* commit '1f71e465ef1544a2962299445dee03e6856ea54a':
Next phase of the move, reformat use C++ features.
1f71e465ef1544a2962299445dee03e6856ea54a 14-Jan-2014 Christopher Ferris <cferris@google.com> am 68870199: Merge "Next phase of the move, reformat use C++ features."

* commit '688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8':
Next phase of the move, reformat use C++ features.
688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8 14-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Next phase of the move, reformat use C++ features."
bb07b536f528d5a55bde2571babe5d0f7878a86e 14-Jan-2014 Elliott Hughes <enh@google.com> Don't set LD_LIBRARY_PATH globally.

On a 64-bit system, 64-bit processes will want one path, 32-bit processes
another. The dynamic linker already provides the correct defaults for
native code, and we've coupled the VM and dynamic linker so that
LD_LIBRARY_PATH will be set correctly in any VM during startup if it's not
being manually overridden.

Change-Id: Icbffc0d451dbc242cdfb9267413d8bcac434e108
ootdir/init.environ.rc.in
da1f43f0753ef1d3f01e5eaf01280ef611f4abfb 14-Jan-2014 Nick Kralevich <nnk@google.com> am 5b5b1f9b: am d896c195: am 45f3ed05: am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"

* commit '5b5b1f9b48f966942be3cda8d4ecfb7d910f12a0':
restorecon_recursive("/sys") speed boot time
5b5b1f9b48f966942be3cda8d4ecfb7d910f12a0 14-Jan-2014 Nick Kralevich <nnk@google.com> am d896c195: am 45f3ed05: am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"

* commit 'd896c195123716fb04ab6718e77fe0e5d1ab2bb9':
restorecon_recursive("/sys") speed boot time
d896c195123716fb04ab6718e77fe0e5d1ab2bb9 14-Jan-2014 Nick Kralevich <nnk@google.com> am 45f3ed05: am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"

* commit '45f3ed05c98d4e9cfc7b70a8c5f3af510afea8ee':
restorecon_recursive("/sys") speed boot time
45f3ed05c98d4e9cfc7b70a8c5f3af510afea8ee 14-Jan-2014 Nick Kralevich <nnk@google.com> am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"

* commit '105f6b6686ae1b2f6ae8ae81548cceb313fb2cee':
restorecon_recursive("/sys") speed boot time
105f6b6686ae1b2f6ae8ae81548cceb313fb2cee 14-Jan-2014 Nick Kralevich <nnk@google.com> Merge "restorecon_recursive("/sys") speed boot time"
20303f856f1f1cdb5af58af0b116b8c598f0ea5c 11-Jan-2014 Christopher Ferris <cferris@google.com> Next phase of the move, reformat use C++ features.

Use the libbacktrace C++ interface instead of the C interface in debuggerd.

Reformat the debuggerd code to be closer to Google C++ style.

Fix all debuggerd casts to be C++ casts.

Add a frame number to the frame data structure for ease of formatting and
add another FormatFrameData function.

Change the format_test to use the new FormatFrameData function.

Modify all of the backtrace_test to use the C++ interface.

Change-Id: I10e1610861acf7f4a3ad53276b74971cfbfda464
ebuggerd/arm/machine.cpp
ebuggerd/backtrace.cpp
ebuggerd/backtrace.h
ebuggerd/debuggerd.cpp
ebuggerd/getevent.cpp
ebuggerd/mips/machine.cpp
ebuggerd/tombstone.cpp
ebuggerd/tombstone.h
ebuggerd/utility.cpp
ebuggerd/x86/machine.cpp
nclude/backtrace/Backtrace.h
nclude/backtrace/backtrace.h
ibbacktrace/Backtrace.cpp
ibbacktrace/Corkscrew.cpp
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindPtrace.cpp
ibbacktrace/backtrace_test.cpp
d2e798b53039f35967705acd5f6c399742f97e72 13-Jan-2014 Mike Lockwood <lockwood@google.com> libusbhost: Add usb_device_set_configuration and usb_device_set_interface

usb_device_set_configuration is to support devices with multiple configurations
usb_device_set_interface supports switching between interfaces with alternate settings

Also moved zero string index checking to usb_device_get_string

Change-Id: I34610b25f135894a0cf752a33e5738d4314d7122
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
ad094b707bf07fbac6e7b00849e5f040b501c41a 13-Jan-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
ccfa8988bbff5531c6d131ee25ae0881d6e05f2f 12-Jan-2014 Colin Cross <ccross@android.com> am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"

* commit '6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc':
Emerson USB ID
6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc 12-Jan-2014 Colin Cross <ccross@android.com> am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"

* commit '3e8bb3ff9ee1478c11408d7164ff7cb5d85f39d0':
Emerson USB ID
3e8bb3ff9ee1478c11408d7164ff7cb5d85f39d0 12-Jan-2014 Colin Cross <ccross@android.com> am e0e7595f: am e76343ef: Merge "Emerson USB ID"

* commit 'e0e7595f3c5e069e6b85973df6dbba39dcec0984':
Emerson USB ID
e0e7595f3c5e069e6b85973df6dbba39dcec0984 12-Jan-2014 Colin Cross <ccross@android.com> am e76343ef: Merge "Emerson USB ID"

* commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2':
Emerson USB ID
e76343ef72458aff8fdc25c57f4e84407c05a2f2 12-Jan-2014 Colin Cross <ccross@android.com> Merge "Emerson USB ID"
6e39bace17ef089beb143f6324807b9d33df366c 12-Jan-2014 Jon Sawyer <jon@cunninglogic.com> Emerson USB ID

Adds Emerson's USB id to the known USB Devices.

Change-Id: If6115c2551c1f30a5c190690f2aeaaf2adff7ee1
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
db/usb_vendors.c
a613819a96eeede9f9702d145e0575d459fdfd7a 11-Jan-2014 Nick Kralevich <nnk@google.com> restorecon_recursive("/sys") speed boot time

Currently, the restorecon_recursive("/sys") call in
init.c takes approx 2 seconds on hammerhead. This change
reduces the delay to 1.2 seconds.

1) Avoid double stat call when using nftw (time savings
of 0.3 seconds)
2) Avoid the repeated calls to is_selinux_enabled() (time
savings of 0.5 seconds)

Avoid calling lsetfilecon if the file is already properly
labeled. This doesn't speed up the restorecon on /sys,
but it should help when handling files on /data.

Bug: 11640230
Change-Id: Ie212ce4f4acade208c5676d60c1f03f50e2388a4
nit/util.c
6e9c19906a86ad500dbb46c9e5c93b14bba1ece9 11-Jan-2014 Christopher Ferris <cferris@google.com> am c37fec6d: am 715752cd: am a7083e0d: am 8387fc93: Merge "Move to C++ for debuggerd."

* commit 'c37fec6d61dc2650a0a92983dc8d577f9e19520d':
Move to C++ for debuggerd.
c37fec6d61dc2650a0a92983dc8d577f9e19520d 11-Jan-2014 Christopher Ferris <cferris@google.com> am 715752cd: am a7083e0d: am 8387fc93: Merge "Move to C++ for debuggerd."

* commit '715752cdbe5abb444f9c90769f7edb38ef52adb2':
Move to C++ for debuggerd.
715752cdbe5abb444f9c90769f7edb38ef52adb2 11-Jan-2014 Christopher Ferris <cferris@google.com> am a7083e0d: am 8387fc93: Merge "Move to C++ for debuggerd."

* commit 'a7083e0dd29aa5102e25c5a978c072b0a2bf94f4':
Move to C++ for debuggerd.
a7083e0dd29aa5102e25c5a978c072b0a2bf94f4 11-Jan-2014 Christopher Ferris <cferris@google.com> am 8387fc93: Merge "Move to C++ for debuggerd."

* commit '8387fc938e044a2bf2840139203af7f9b3884029':
Move to C++ for debuggerd.
8387fc938e044a2bf2840139203af7f9b3884029 11-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Move to C++ for debuggerd."
d607495b892fe6ffa1cd30eaad114eec97d77681 11-Jan-2014 Christopher Ferris <cferris@google.com> Move to C++ for debuggerd.

This is part 1, only including the bare minimum changes because
our diff tool doesn't easily show differences when a file moves. This
also breaks it into a small chunk in case some other changes break things,
as unlikely as I think that will be.

Change-Id: Ib7a3e7a2cc1ac574d15b65fda23813ebcf5d31af
ebuggerd/Android.mk
ebuggerd/arm/machine.c
ebuggerd/arm/machine.cpp
ebuggerd/backtrace.c
ebuggerd/backtrace.cpp
ebuggerd/debuggerd.c
ebuggerd/debuggerd.cpp
ebuggerd/getevent.c
ebuggerd/getevent.cpp
ebuggerd/mips/machine.c
ebuggerd/mips/machine.cpp
ebuggerd/tombstone.c
ebuggerd/tombstone.cpp
ebuggerd/utility.c
ebuggerd/utility.cpp
ebuggerd/x86/machine.c
ebuggerd/x86/machine.cpp
ec4ba22febd05690add5da9d8ec2b0e364468d8d 11-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: Add README"
ded7f8b58bb28d11e67652a07bdeab311e5d3580 11-Jan-2014 Christopher Ferris <cferris@google.com> am 596bfe67: am 5f662c33: am e8e5f8ed: am 261ff50e: Merge "Init the abort_msg_address value."

* commit '596bfe67eb5d223ef18edb9a5416d5c7353f9036':
Init the abort_msg_address value.
596bfe67eb5d223ef18edb9a5416d5c7353f9036 11-Jan-2014 Christopher Ferris <cferris@google.com> am 5f662c33: am e8e5f8ed: am 261ff50e: Merge "Init the abort_msg_address value."

* commit '5f662c3320d1c30495884ac66123666d8fd92933':
Init the abort_msg_address value.
7e6b5e956bd8a83ee69edf20da16193b31723bff 11-Jan-2014 Elliott Hughes <enh@google.com> am 7fd0ea9b: am c555476e: am 1972955e: am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."

* commit '7fd0ea9bb19dd0136706dab02454f9a642807a07':
Use the more portable <elf.h> instead of <sys/exec_elf.h>.
5f662c3320d1c30495884ac66123666d8fd92933 11-Jan-2014 Christopher Ferris <cferris@google.com> am e8e5f8ed: am 261ff50e: Merge "Init the abort_msg_address value."

* commit 'e8e5f8edc1176ededf0eddc8907cf898379a30b9':
Init the abort_msg_address value.
7fd0ea9bb19dd0136706dab02454f9a642807a07 11-Jan-2014 Elliott Hughes <enh@google.com> am c555476e: am 1972955e: am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."

* commit 'c555476e4a9947b1ce2e5c4668d68d422166bdfa':
Use the more portable <elf.h> instead of <sys/exec_elf.h>.
e8e5f8edc1176ededf0eddc8907cf898379a30b9 11-Jan-2014 Christopher Ferris <cferris@google.com> am 261ff50e: Merge "Init the abort_msg_address value."

* commit '261ff50e32b2b2a41bd3993c37abb5a9a94e431b':
Init the abort_msg_address value.
c555476e4a9947b1ce2e5c4668d68d422166bdfa 11-Jan-2014 Elliott Hughes <enh@google.com> am 1972955e: am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."

* commit '1972955eca052b07b454c4d26012f986c02bb06f':
Use the more portable <elf.h> instead of <sys/exec_elf.h>.
1972955eca052b07b454c4d26012f986c02bb06f 10-Jan-2014 Elliott Hughes <enh@google.com> am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."

* commit '99775d8751676e76e00ad72d7778ad9ba28cb454':
Use the more portable <elf.h> instead of <sys/exec_elf.h>.
261ff50e32b2b2a41bd3993c37abb5a9a94e431b 10-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Init the abort_msg_address value."
99775d8751676e76e00ad72d7778ad9ba28cb454 10-Jan-2014 Elliott Hughes <enh@google.com> Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."
1da83c3eccac942939748b66eb24f85b5f1983d4 10-Jan-2014 Christopher Ferris <cferris@google.com> Init the abort_msg_address value.

When initiating a manual dump, the abort_msg_address parameter is random
garbage. Initialize this value to 0.

Change-Id: I9ba817ee6104f47cfcb2b746bfa6f02a259c86d7
ibcutils/debugger.c
912c88cc5abde3fb7e09a810491c3285b3bd4a64 17-Dec-2013 Mark Salyzyn <salyzyn@google.com> liblog: Add README

Change-Id: I9d789e08e9301ec8afa7be8bede955379694b904
iblog/README
cac5d8c2235a6942fcf3c62ce7e775bbdfc620f0 10-Jan-2014 Elliott Hughes <enh@google.com> Use the more portable <elf.h> instead of <sys/exec_elf.h>.

Bug: 12476126
Change-Id: I08684987e867371d5537dadf1acb3408b420ad0c
ebuggerd/debuggerd.c
ibcorkscrew/arch-arm/backtrace-arm.c
ibcorkscrew/arch-arm/ptrace-arm.c
7899c65a309a066493c5ed3f9e01a6bdb02813a2 10-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: resolve build warning messages"
f922380f9ab3fcb0f1ac27c85bbb2dd394f8d2a5 10-Jan-2014 Benoit Goby <benoit@android.com> am 58c4a7dd: am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"

* commit '58c4a7ddf227bd6977677f4c8046eab6376477b3':
toolbox: Fix date tool with /dev/alarm
58c4a7ddf227bd6977677f4c8046eab6376477b3 10-Jan-2014 Benoit Goby <benoit@android.com> am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"

* commit 'e3cd2168886b581b091f0912795ee8077fc94e53':
toolbox: Fix date tool with /dev/alarm
e3cd2168886b581b091f0912795ee8077fc94e53 10-Jan-2014 Benoit Goby <benoit@android.com> am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"

* commit '709543a96836be5f1c10e4051ec6207dec72cd08':
toolbox: Fix date tool with /dev/alarm
709543a96836be5f1c10e4051ec6207dec72cd08 10-Jan-2014 Benoit Goby <benoit@android.com> am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"

* commit '08a140e6a3989ece3854014123dac243cc372886':
toolbox: Fix date tool with /dev/alarm
08a140e6a3989ece3854014123dac243cc372886 10-Jan-2014 Benoit Goby <benoit@android.com> Merge "toolbox: Fix date tool with /dev/alarm"
d340734cd76c4d270c24f640c6a65d3f6218e46f 10-Jan-2014 Benoit Goby <benoit@android.com> toolbox: Fix date tool with /dev/alarm

Change-Id: I6f8ad2149244c89690d5d5caae8ec55429462210
Signed-off-by: Benoit Goby <benoit@android.com>
oolbox/date.c
4a3a0edce1d548c03fb18a012d90ce929a41ceb9 10-Jan-2014 Christopher Ferris <cferris@google.com> am 7a6e8c9a: am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."

* commit '7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef':
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
5bbf7d3a5e95aee83d842316fc651e53e1cef3ac 10-Jan-2014 Christopher Ferris <cferris@google.com> resolved conflicts for merge of 72256db7 to master

Change-Id: I0b137b011d46d1689fa4e406a2ae0675147510a8
7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef 10-Jan-2014 Christopher Ferris <cferris@google.com> am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."

* commit 'ec7894cf5c08737f5dccacf462dd47c324309c64':
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
ec7894cf5c08737f5dccacf462dd47c324309c64 10-Jan-2014 Christopher Ferris <cferris@google.com> am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."

* commit 'c369f1993b41dac8ac1a005b3bc9312dfa5ebd63':
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
c369f1993b41dac8ac1a005b3bc9312dfa5ebd63 10-Jan-2014 Christopher Ferris <cferris@google.com> am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."

* commit '6e25786914d5f8c50040471c8b1a950d2efb32a1':
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
6e25786914d5f8c50040471c8b1a950d2efb32a1 10-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
72256db76e9810ea6b23caaabbb786f78672dc9d 10-Jan-2014 Christopher Ferris <cferris@google.com> am c49bd655: am 5d2ec87b: am b18f93ea: Merge "Move CallStack to libbacktrace."

* commit 'c49bd655e5233f367c535ed4324bbadc4aea5453':
Move CallStack to libbacktrace.
bc12d6329ef72147da93881a34aab763905b1039 12-Nov-2013 Christopher Ferris <cferris@google.com> Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.

Use a bit better name for this. The other name was a bit confusing.

Change-Id: I1261f2ee3854a9c8b82133ad0bfbbbe48b43c9ac

(cherry picked from commit 242b1a8c7a5ec73172bac811e51acbc27201f22c)

Conflicts:
libbacktrace/Backtrace.cpp
nclude/backtrace/backtrace.h
nclude/utils/CallStack.h
ibbacktrace/Backtrace.cpp
ibbacktrace/backtrace_test.cpp
c49bd655e5233f367c535ed4324bbadc4aea5453 10-Jan-2014 Christopher Ferris <cferris@google.com> am 5d2ec87b: am b18f93ea: Merge "Move CallStack to libbacktrace."

* commit '5d2ec87bf54dc8a02e6bcbe5848fd378056b8f78':
Move CallStack to libbacktrace.
5d2ec87bf54dc8a02e6bcbe5848fd378056b8f78 10-Jan-2014 Christopher Ferris <cferris@google.com> am b18f93ea: Merge "Move CallStack to libbacktrace."

* commit 'b18f93ea5d57b8dff31c6cc706c6b4f32180c0c8':
Move CallStack to libbacktrace.
b18f93ea5d57b8dff31c6cc706c6b4f32180c0c8 10-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Move CallStack to libbacktrace."
038ac694b36de2b081e62fcfb9b5f4a8c918c533 01-Nov-2013 Christopher Ferris <cferris@google.com> Move CallStack to libbacktrace.

Fix a small bug in the Printer for strings that didn't properly
prepend the prefix.

(cherry picked from commit 9b0e074c6d38143e01616404a08b0c7aa992f3c3)

Change-Id: I78bfa3f76864c34f33fb439bf20dfc85616f1077
nclude/utils/CallStack.h
nclude/utils/ProcessCallStack.h
ibutils/Android.mk
ibutils/CallStack.cpp
ibutils/Printer.cpp
ibutils/ProcessCallStack.cpp
a8eddbd5e82267bf92bf0dca3f364bb49816ff5d 09-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: high CPU usage from logcat

BUG: 12457855

- log_read.c poll timeout should be -1 instead of 0 when idling

Change-Id: I9082a15fae0fbf999c0ed516950a49d65a279298
iblog/log_read.c
153b370624c3da0660281f692fbe3f2da96cfd70 06-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: resolve build warning messages

Change-Id: Icc6f1f2c926a008efc4df71022cfde8d0e285880
nclude/log/uio.h
iblog/fake_log_device.c
iblog/uio.c
6aedf1d3d43e1df187991955c0136e2d6a536e4f 09-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "liblog: high CPU usage from logcat"
4f3c6aed7ba2227c49e28f89d600177cf1d61d83 09-Jan-2014 Colin Cross <ccross@android.com> am 3fb5ebc5: am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"

* commit '3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3':
HP USB ID
3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3 09-Jan-2014 Colin Cross <ccross@android.com> am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"

* commit '3794c96f3e7bb27e56336035bcd7ac643c6869fc':
HP USB ID
0a05f002fbc86e4fe410c4efbaf9d720739a21c3 09-Jan-2014 Colin Cross <ccross@android.com> am 4082bf8c: am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"

* commit '4082bf8c963dbd44fe2f6367fa687217cbac58d3':
Fix tracing on user builds
3794c96f3e7bb27e56336035bcd7ac643c6869fc 09-Jan-2014 Colin Cross <ccross@android.com> am c121c69b: am b0751101: Merge "HP USB ID"

* commit 'c121c69b856bfa9baea105439fbdac648d154097':
HP USB ID
4082bf8c963dbd44fe2f6367fa687217cbac58d3 09-Jan-2014 Colin Cross <ccross@android.com> am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"

* commit 'ce1340c665e8840c8856898bbfb7ee3b33765359':
Fix tracing on user builds
c121c69b856bfa9baea105439fbdac648d154097 09-Jan-2014 Colin Cross <ccross@android.com> am b0751101: Merge "HP USB ID"

* commit 'b0751101b090a8732c62ad261fa44e5d6a69a2cc':
HP USB ID
ce1340c665e8840c8856898bbfb7ee3b33765359 09-Jan-2014 Colin Cross <ccross@android.com> am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"

* commit '5a3696297b2f8d463ba601772df7af5966321d2e':
Fix tracing on user builds
5a3696297b2f8d463ba601772df7af5966321d2e 09-Jan-2014 Colin Cross <ccross@android.com> am cd0f824a: Merge "Fix tracing on user builds"

* commit 'cd0f824a7cfe91f4db24511830658228487ae919':
Fix tracing on user builds
b0751101b090a8732c62ad261fa44e5d6a69a2cc 09-Jan-2014 Colin Cross <ccross@android.com> Merge "HP USB ID"
cd0f824a7cfe91f4db24511830658228487ae919 09-Jan-2014 Colin Cross <ccross@android.com> Merge "Fix tracing on user builds"
080bbfab94ce91e4845860d5253eea6d869bbc18 09-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: high CPU usage from logcat

BUG: 12457855

- log_read.c poll timeout should be -1 instead of 0 when idling

Change-Id: I9082a15fae0fbf999c0ed516950a49d65a279298
iblog/log_read.c
a74ead0fd6f96e4c4c6d0b5f2b1d0d2448fc81fd 09-Jan-2014 Christopher Ferris <cferris@google.com> resolved conflicts for merge of 72f204de to master

Change-Id: I7345014d00c669aea5e27ea50b2ac658145b068b
0969ec3a558723ae55f033c163b052e1dbf97669 09-Jan-2014 Nick Kralevich <nnk@google.com> am 218878d4: am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."

* commit '218878d447b58b357f0dc97bfe6b77196d35a729':
Label existing /data/mediadrm files.
72f204de1f5399ec4db3fbbd441394a466bd1289 09-Jan-2014 Christopher Ferris <cferris@google.com> am 5ca7d87f: am f1f150d0: am 0c863cb5: Merge "Refactor to share map_info amongst threads."

* commit '5ca7d87fe47ad18594b5c5f79d00aa86ed1435cb':
Refactor to share map_info amongst threads.
218878d447b58b357f0dc97bfe6b77196d35a729 09-Jan-2014 Nick Kralevich <nnk@google.com> am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."

* commit 'df8d0ffd73f8359def90d2f79d25059023018213':
Label existing /data/mediadrm files.
5ca7d87fe47ad18594b5c5f79d00aa86ed1435cb 09-Jan-2014 Christopher Ferris <cferris@google.com> am f1f150d0: am 0c863cb5: Merge "Refactor to share map_info amongst threads."

* commit 'f1f150d0e6e27588d0b15a53e7fac4984bf6ccd8':
Refactor to share map_info amongst threads.
f1f150d0e6e27588d0b15a53e7fac4984bf6ccd8 09-Jan-2014 Christopher Ferris <cferris@google.com> am 0c863cb5: Merge "Refactor to share map_info amongst threads."

* commit '0c863cb5848795ac87e62dc34d2eab103c830dde':
Refactor to share map_info amongst threads.
0c863cb5848795ac87e62dc34d2eab103c830dde 09-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Refactor to share map_info amongst threads."
9846497f7926fc3240c2893d89e60880c22d1fd6 07-Jan-2014 Christopher Ferris <cferris@google.com> Refactor to share map_info amongst threads.

Allow the use of the same map info to be shared when getting information on
multiple threads from the same pid.

Change-Id: I2e460e20154a10f4894ae563331fb32179e4551f
ebuggerd/tombstone.c
nclude/backtrace/Backtrace.h
nclude/backtrace/backtrace.h
ibbacktrace/Backtrace.cpp
ibbacktrace/Backtrace.h
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
ibbacktrace/Corkscrew.cpp
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindPtrace.cpp
df8d0ffd73f8359def90d2f79d25059023018213 08-Jan-2014 Nick Kralevich <nnk@google.com> am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."

* commit '72f269f3050b3e5b2fd6be7d0a6a485114cc6ee7':
Label existing /data/mediadrm files.
72f269f3050b3e5b2fd6be7d0a6a485114cc6ee7 08-Jan-2014 Nick Kralevich <nnk@google.com> am 8830b53b: Merge "Label existing /data/mediadrm files."

* commit '8830b53b76c05416c021df3eb0cea1dd541bc3ac':
Label existing /data/mediadrm files.
8830b53b76c05416c021df3eb0cea1dd541bc3ac 08-Jan-2014 Nick Kralevich <nnk@google.com> Merge "Label existing /data/mediadrm files."
5ff167ca1121a2d598aa7564449950076f42a5ca 08-Jan-2014 Jon Sawyer <jon@cunninglogic.com> HP USB ID

Adds HP's USB id to the know USB Devices

Change-Id: I975126f3ae5e53f25e18dea7cc43c29076bfc965
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
db/usb_vendors.c
2dcbb81d89c86144b38c0f0b56ea7420c74a7f5a 08-Jan-2014 rpcraig <rpcraig rpcraig@tycho.ncsc.mil> Label existing /data/mediadrm files.

Use restorecon_recursive to label devices
where the directory and subfiles have
already been built and labeled.

Change-Id: I0dfe1e542fb153ad20adf7b2b1f1c087b4956a12
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
ootdir/init.rc
ebf1b66c81776948d6cfa88b7259ea00ccc2f1f9 08-Jan-2014 Elliott Hughes <enh@google.com> am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

* commit '16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd':
SWAP_FLAG_* constants are now in <sys/swap.h>.
16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd 08-Jan-2014 Elliott Hughes <enh@google.com> am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

* commit 'e61495c9b82e0bb4893095405518c23a55092f3a':
SWAP_FLAG_* constants are now in <sys/swap.h>.
e61495c9b82e0bb4893095405518c23a55092f3a 08-Jan-2014 Elliott Hughes <enh@google.com> am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

* commit '2ab2e110ce533c4f2095e954f645bdb52081e578':
SWAP_FLAG_* constants are now in <sys/swap.h>.
2ab2e110ce533c4f2095e954f645bdb52081e578 08-Jan-2014 Elliott Hughes <enh@google.com> am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

* commit 'bc836220f3ae6afd5d6409e0c9dfaaafc1ce4afa':
SWAP_FLAG_* constants are now in <sys/swap.h>.
bc836220f3ae6afd5d6409e0c9dfaaafc1ce4afa 08-Jan-2014 Elliott Hughes <enh@google.com> Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."
bfa7d0822b2811d667fba1b326fd54a083fd5a95 08-Jan-2014 Elliott Hughes <enh@google.com> SWAP_FLAG_* constants are now in <sys/swap.h>.

Bug: 9336527
Change-Id: I77e2b05cefbfb4eebda39b4079107833f4160563
s_mgr/fs_mgr.c
oolbox/swapon.c
ae998c7117b4944f57644bbbdcd2047ebaebc2ec 08-Jan-2014 Christopher Ferris <cferris@google.com> am 0298da56: am 492b0ca4: am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."

* commit '0298da56f410ba0f6a1f1f44deb8e2224f9fc49d':
Fix the ucontext for mips/x86.
4cbf1d882236462482b8e22893061604b224e308 24-Dec-2013 Jack Pham <jackp@codeaurora.org> adbd: Don't close/reopen FFS ep0 on disconnect

In case of bulk read/write failure or disconnect, transport_usb
calls usb_ffs_kick in order to force the daemon to re-open the
FunctionFS ep files as a way to soft restart the kernel driver.

However, there's no reason to always close the ep0 file, as it
would need to be reopened and the descriptors rewritten--this
is unnecessary, especially in the simple/frequent case of cable
disconnect, and causes the kernel driver to unbind and bind *all*
of the function drivers. This is causing USB Chapter 9 tests to fail.

Thus, try to reuse the same ep0 file handle across reconnects. In
case there is a failure, the ep1/ep2 opens would fail and all the
file handles get dropped. For the adb root case, the entire daemon
gets restarted anyway.

Change-Id: I0840085c52a0795dcb2d751c39aa4a436c039ee2
db/usb_linux_client.c
0298da56f410ba0f6a1f1f44deb8e2224f9fc49d 07-Jan-2014 Christopher Ferris <cferris@google.com> am 492b0ca4: am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."

* commit '492b0ca4b127a217305b4adf6f26a627a288f6bf':
Fix the ucontext for mips/x86.
492b0ca4b127a217305b4adf6f26a627a288f6bf 07-Jan-2014 Christopher Ferris <cferris@google.com> am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."

* commit '1e424d8ef54c4056416d19b54ef016304c957fe1':
Fix the ucontext for mips/x86.
1e424d8ef54c4056416d19b54ef016304c957fe1 07-Jan-2014 Christopher Ferris <cferris@google.com> am 0afaf7f4: Merge "Fix the ucontext for mips/x86."

* commit '0afaf7f4dde98ff554b69d05ed87ceab4ec611aa':
Fix the ucontext for mips/x86.
0afaf7f4dde98ff554b69d05ed87ceab4ec611aa 07-Jan-2014 Christopher Ferris <cferris@google.com> Merge "Fix the ucontext for mips/x86."
ddc4f093f7e2f6c6dd7d4b4fa356c1dcb753dbbe 07-Jan-2014 Christopher Ferris <cferris@google.com> Fix the ucontext for mips/x86.

Remove the mips ucontext definition, there is no need for it any more.

Fix the mips/x86 ucontext copy code to copy the entire uc_mcontext data
across.

Fix a potential memory leak too.

Change-Id: I4272022da5281ed881e2d59a3e19e7f33c01aceb
ibbacktrace/UnwindCurrent.cpp
b0e40722f4397fadf6f1b4014e45766f82cacd03 07-Jan-2014 Elliott Hughes <enh@google.com> am ea91fb97: am 1858c2a2: am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"

* commit 'ea91fb976ab842f3f41d9f3f25e988d70e51a77c':
Dwarf backtrace for MIPS
ea91fb976ab842f3f41d9f3f25e988d70e51a77c 07-Jan-2014 Elliott Hughes <enh@google.com> am 1858c2a2: am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"

* commit '1858c2a2ebb9284dfbc3f2bcc52d9179d1d44a26':
Dwarf backtrace for MIPS
1858c2a2ebb9284dfbc3f2bcc52d9179d1d44a26 07-Jan-2014 Elliott Hughes <enh@google.com> am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"

* commit 'ba5f5fdd774223b3a801626cde014637e0fb04ec':
Dwarf backtrace for MIPS
ba5f5fdd774223b3a801626cde014637e0fb04ec 07-Jan-2014 Elliott Hughes <enh@google.com> am e21d03ce: Merge "Dwarf backtrace for MIPS"

* commit 'e21d03ce3722582980be2c84ffbc6b6ccf55e258':
Dwarf backtrace for MIPS
e21d03ce3722582980be2c84ffbc6b6ccf55e258 07-Jan-2014 Elliott Hughes <enh@google.com> Merge "Dwarf backtrace for MIPS"
1241d5b9d2afbebd9097f12b558a12edaf0240c5 06-Jan-2014 Colin Cross <ccross@android.com> am b1b187f7: am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...

* commit 'b1b187f7c870a5267ef9d7a4476e281cd6ccffc7':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
d3ade367c1aed18cc002f1443ed902acb43e194f 06-Jan-2014 Todd Poynor <toddpoynor@google.com> am 7eea6200: am 950909c3: init.rc: start lmkd

* commit '7eea6200cbb7a90b056cd7c2d0d84815c2fe0458':
init.rc: start lmkd
01c6a06f096d9703bb7c1f2895a53de6ed183055 06-Jan-2014 Todd Poynor <toddpoynor@google.com> Merge commit '85679224' into manualmerge
b1b187f7c870a5267ef9d7a4476e281cd6ccffc7 06-Jan-2014 Colin Cross <ccross@android.com> am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...

* commit '748ab31ffbe3268249a8ef3dadbf6a79bd8df389':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
7eea6200cbb7a90b056cd7c2d0d84815c2fe0458 06-Jan-2014 Todd Poynor <toddpoynor@google.com> am 950909c3: init.rc: start lmkd

* commit '950909c301e316783e5b4687dbc422ed845cb69a':
init.rc: start lmkd
85679224ae1eaa959e34c8d84b12f7deb8da424e 06-Jan-2014 Todd Poynor <toddpoynor@google.com> am 58d58072: Add lmkd low memory killer daemon

* commit '58d58072894521874df8c90c0084fd50cf16b7fc':
Add lmkd low memory killer daemon
748ab31ffbe3268249a8ef3dadbf6a79bd8df389 06-Jan-2014 Colin Cross <ccross@android.com> am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...

* commit 'd8f74f1b3e40d64fafcd327066428235f0312c47':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
d8f74f1b3e40d64fafcd327066428235f0312c47 06-Jan-2014 Colin Cross <ccross@android.com> am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...

* commit '491ecd0b7275a98b7fda9b1e807724f7f06b1469':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
491ecd0b7275a98b7fda9b1e807724f7f06b1469 06-Jan-2014 Colin Cross <ccross@android.com> Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...

* changes:
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
c1b6b153dc7c535294a63a215a018d0824813757 04-Sep-2013 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for YotaDevices

Change-Id: Id8bec8a35edd0d21ae52e8469f7a65b5f4433bc2
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
db/usb_vendors.c
402c2b98889e02a9b558b02a0bc28bd85fb36b31 17-Dec-2013 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for TechFaith

Change-Id: Ied42e4d011b736ee990ed75e7d81bc6a16db47f9
db/usb_vendors.c
d0057c006b5bdfec6e6322d2b80a985a6359d8f3 27-Aug-2013 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for Rockchip

Change-Id: Iea3f7cc6ed463684fe30a73c39445b3ca36854d9
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
db/usb_vendors.c
fdd189c64ee5afe01f11072255a44fe57b965f57 08-Oct-2013 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.

Change-Id: Ic7f7c984db19050d2ce4da8ae87683ce42dc9094
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
db/usb_vendors.c
63f0f5117bb8ca781a8d9c9a66f5cba755e6005e 28-Aug-2013 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for Allwinner

Change-Id: Ic77d5f71c9e329e33cd31fa0854e692ad794a609
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
db/usb_vendors.c
d5dab6d5f85e7c03f08614918088a33ce73abcf5 26-Aug-2013 DanielMo <DanielMo@fih-foxconn.com> adb: Add USB vendor ID for Amlogic

Change-Id: I35fad82214f2b5a82b0150821326aaea15784de1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
db/usb_vendors.c
319d8c1d1f5e11e971125bb244e9afca25bce592 07-Oct-2013 Volker Moesker <volker.moesker@gigaset.com> added Gigaset's USB vendor ID

Change-Id: Iebb0f352eec4530ee1e972527fc76bbb9dad5cc3
Signed-off-by: Volker Moesker <volker.moesker@gigaset.com>
db/usb_vendors.c
293717c364f325c1b60a28fa5913cec0a99ba03d 06-Jan-2014 Colin Cross <ccross@android.com> adb: alphabetically sort usb vendors lists

Sort the lists of usb vendor ids alphabetically to reduce future
conflicts.

Change-Id: I682c18a1d97adf3a4aa9c00de9fed932c83e4646
db/usb_vendors.c
3c37fae4a472835c8e20060e1e6b7495b84f254a 04-Jan-2014 Colin Cross <ccross@android.com> liblog: fix build again

log_read.c has to be in the target sources on all platforms, but
never needs to be in the host sources.

Change-Id: Ie0829f3f1daf16d151c401653dbef603b1c2f59d
iblog/Android.mk
c96a44888a50fdc6155cb1a7fa8e37bee00fafc0 04-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: drop use of sys/cdefs.h

Change-Id: I44ea5d6b572e3712c301e6ebf4b34e6225d7e18b
nclude/log/log.h
nclude/log/logger.h
105a83e8549079b54be37bb3f20e400691df00aa 04-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge "Revert "liblog: Add liblog test suite""
20727babc7013b199a18abeb147e815fe10688fa 04-Jan-2014 Mark Salyzyn <salyzyn@google.com> Revert "liblog: Add liblog test suite"

This reverts commit 46abc522964f797fafb0a3af2cbbabee05597f47.

Change-Id: Iced83fdfa7de061c0495920ea28a9468023706d3
nclude/log/log.h
iblog/Android.mk
iblog/tests/Android.mk
iblog/tests/benchmark.h
iblog/tests/benchmark_main.cpp
iblog/tests/liblog_benchmark.cpp
iblog/tests/liblog_test.cpp
5feea6890875c9046f40bdadc0dbd4a411e7f3f5 04-Jan-2014 Mark Salyzyn <salyzyn@google.com> liblog: git_master@964770 build problem

- darwin does not get log reader

Change-Id: I64eb69a6099a88d2acf501de725c35741fd7e551
iblog/Android.mk
950909c301e316783e5b4687dbc422ed845cb69a 11-Jul-2013 Todd Poynor <toddpoynor@google.com> init.rc: start lmkd

Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
ootdir/init.rc
58d58072894521874df8c90c0084fd50cf16b7fc 10-Jul-2013 Todd Poynor <toddpoynor@google.com> Add lmkd low memory killer daemon

Move kernel low memory killer logic to new daemon lmkd. ActivityManager
communicates with this daemon over a named socket.

Change-Id: Ie957da7e9b1f7150e23c689fdadf23ff260b47be
(cherry picked from commit 3948f80f2af84016013cc674140ac5066a58fb4d)
mkd/Android.mk
mkd/lmkd.c
7cc233631694fa6629f083fe1fa68eafe0150d14 03-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge changes Ia6d6821e,I1e1a55d1,Ic26e9dba,Iedc55c13

* changes:
liblog: Add liblog test suite
logcat: Incorporate liblog reading API
debuggerd: Incorporate liblog reading API
liblog: Interface to support abstracting log read
e3f0c079b32eb1dd1a710f44f0e887047cd811c0 03-Jan-2014 Rom Lemarchand <romlem@google.com> am 79b6b7f0: am 1892fe66: am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"

* commit '79b6b7f0fdb14fcd8c336ed8f1c0a5b481bb8697':
move sync headers from include to libsync
79b6b7f0fdb14fcd8c336ed8f1c0a5b481bb8697 03-Jan-2014 Rom Lemarchand <romlem@google.com> am 1892fe66: am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"

* commit '1892fe66ea4df6d4b6ea7fe3849295f79adcfbf2':
move sync headers from include to libsync
1892fe66ea4df6d4b6ea7fe3849295f79adcfbf2 03-Jan-2014 Rom Lemarchand <romlem@google.com> am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"

* commit 'c8d7d2d6b99f405ea3fcada0d2407baee23873f6':
move sync headers from include to libsync
c8d7d2d6b99f405ea3fcada0d2407baee23873f6 03-Jan-2014 Rom Lemarchand <romlem@google.com> am 5234147c: Merge "move sync headers from include to libsync"

* commit '5234147c1e5cade7ecf98c12c8a7d7de6cd429ed':
move sync headers from include to libsync
5234147c1e5cade7ecf98c12c8a7d7de6cd429ed 03-Jan-2014 Rom Lemarchand <romlem@google.com> Merge "move sync headers from include to libsync"
ddc20de1483028ee0b4401266499a59631e9d659 03-Jan-2014 Rom Lemarchand <romlem@google.com> move sync headers from include to libsync

Make sw_sync.h private

Change-Id: I0b120ebe81fd4a191b7aa4b6a8de4f64d16e2b3e
nclude/sync/sw_sync.h
nclude/sync/sync.h
nclude/system/window.h
ibsync/Android.mk
ibsync/include/sync/sync.h
ibsync/sw_sync.h
ibsync/sync_test.c
398e6353cc22c821e5c8cbba013953517ac30c93 03-Jan-2014 Elliott Hughes <enh@google.com> am 60298601: am 687ec9b5: am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."

* commit '60298601c5cabb1a9985733dd0cc3845cc3da581':
Fix a sporadic build breakage.
60298601c5cabb1a9985733dd0cc3845cc3da581 03-Jan-2014 Elliott Hughes <enh@google.com> am 687ec9b5: am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."

* commit '687ec9b5e143aa92de008efcaa7b5750eeab87ef':
Fix a sporadic build breakage.
687ec9b5e143aa92de008efcaa7b5750eeab87ef 03-Jan-2014 Elliott Hughes <enh@google.com> am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."

* commit 'a166bea18ffd304163bddec4701904d91541f527':
Fix a sporadic build breakage.
a166bea18ffd304163bddec4701904d91541f527 03-Jan-2014 Elliott Hughes <enh@google.com> am f5447b0e: Merge "Fix a sporadic build breakage."

* commit 'f5447b0eb9cd2157f4935477f05d4c92dcda37c8':
Fix a sporadic build breakage.
f5447b0eb9cd2157f4935477f05d4c92dcda37c8 03-Jan-2014 Elliott Hughes <enh@google.com> Merge "Fix a sporadic build breakage."
0d123f21e1a92aefd2f0f3260d2d5f1b46f83bf8 03-Jan-2014 Colin Cross <ccross@android.com> am 2bd34772: am 42fb1783: am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"

* commit '2bd34772340174e844bd4ff1f3e2096d5a7e2cf8':
Modify BYD's USB Vendor ID
2bd34772340174e844bd4ff1f3e2096d5a7e2cf8 03-Jan-2014 Colin Cross <ccross@android.com> am 42fb1783: am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"

* commit '42fb1783a67a46bd00f946002b6bbc7116d9bc78':
Modify BYD's USB Vendor ID
42fb1783a67a46bd00f946002b6bbc7116d9bc78 03-Jan-2014 Colin Cross <ccross@android.com> am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"

* commit '4600d80cef73af052cbba25c7af0d7abfda6e08b':
Modify BYD's USB Vendor ID
4600d80cef73af052cbba25c7af0d7abfda6e08b 03-Jan-2014 Colin Cross <ccross@android.com> am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"

* commit 'e1095e1da12de9d6dc219f497f7c19d1c1f7a41b':
Modify BYD's USB Vendor ID
e1095e1da12de9d6dc219f497f7c19d1c1f7a41b 03-Jan-2014 Colin Cross <ccross@android.com> Merge "Modify BYD's USB Vendor ID"
dd82e96a33a9483a7865c5b495d02a93dad20404 03-Jan-2014 Nick Kralevich <nnk@google.com> am 4bacd1fb: am 4af0c74e: am 8be1ccff: am fcf3d207: Merge "adb: configure /system file permission with fs_config"

* commit '4bacd1fb6b278ce5efd1752d2c6fb363eef68add':
adb: configure /system file permission with fs_config
4bacd1fb6b278ce5efd1752d2c6fb363eef68add 03-Jan-2014 Nick Kralevich <nnk@google.com> am 4af0c74e: am 8be1ccff: am fcf3d207: Merge "adb: configure /system file permission with fs_config"

* commit '4af0c74e94fef611e8371bb0556de2a9023700ca':
adb: configure /system file permission with fs_config
4af0c74e94fef611e8371bb0556de2a9023700ca 03-Jan-2014 Nick Kralevich <nnk@google.com> am 8be1ccff: am fcf3d207: Merge "adb: configure /system file permission with fs_config"

* commit '8be1ccff87cad2a71a4db2f3f827b428e0d26d81':
adb: configure /system file permission with fs_config
8be1ccff87cad2a71a4db2f3f827b428e0d26d81 03-Jan-2014 Nick Kralevich <nnk@google.com> am fcf3d207: Merge "adb: configure /system file permission with fs_config"

* commit 'fcf3d207c51f1e734137a08ae2fdb1bb37a50b87':
adb: configure /system file permission with fs_config
fcf3d207c51f1e734137a08ae2fdb1bb37a50b87 03-Jan-2014 Nick Kralevich <nnk@google.com> Merge "adb: configure /system file permission with fs_config"
95986aae913d5bf0eb34b5de53a8022d97769dc6 03-Jan-2014 Narayan Kamath <narayan@google.com> Fix a sporadic build breakage.

The issue here is that the makefile sets LOCAL_LDFLAGS
and asks for -llog without declaring a dependency on it.
This will cause build breakages if liblog hasn't already
been built yet.

Change-Id: Ia38761cda44a38b6c2a88902d6108cbe64a328ce
ibziparchive/Android.mk
4884402449342f8d46e8dc7a45fd7ca30820430c 03-Jan-2014 Narayan Kamath <narayan@google.com> am f7a35ea4: am a0342af7: am 2264bd23: am 4958d85d: Merge "Change a debug log to a verbose log."

* commit 'f7a35ea46a8b574cf673faecfe176a9af86768e7':
Change a debug log to a verbose log.
f7a35ea46a8b574cf673faecfe176a9af86768e7 03-Jan-2014 Narayan Kamath <narayan@google.com> am a0342af7: am 2264bd23: am 4958d85d: Merge "Change a debug log to a verbose log."

* commit 'a0342af79d3fe6cf35e1e241e3aa2d8dc230f864':
Change a debug log to a verbose log.
a0342af79d3fe6cf35e1e241e3aa2d8dc230f864 03-Jan-2014 Narayan Kamath <narayan@google.com> am 2264bd23: am 4958d85d: Merge "Change a debug log to a verbose log."

* commit '2264bd23a69874ac4f2de125c25b46485c5a544e':
Change a debug log to a verbose log.
2264bd23a69874ac4f2de125c25b46485c5a544e 03-Jan-2014 Narayan Kamath <narayan@google.com> am 4958d85d: Merge "Change a debug log to a verbose log."

* commit '4958d85d23c03fdde6b3b44793aa2738caef9717':
Change a debug log to a verbose log.
4958d85d23c03fdde6b3b44793aa2738caef9717 03-Jan-2014 Narayan Kamath <narayan@google.com> Merge "Change a debug log to a verbose log."
d09eee892f22a22d1bd61e31c2d47388a1fd8ba4 03-Jan-2014 Nick Kralevich <nnk@google.com> am 05bfe7fb: am ceb1c5cd: am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"

* commit '05bfe7fb95540bae6a42a745fe3bcc1d39a67a7c':
toolbox-ls: re-introduce clobbered error message
05bfe7fb95540bae6a42a745fe3bcc1d39a67a7c 03-Jan-2014 Nick Kralevich <nnk@google.com> am ceb1c5cd: am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"

* commit 'ceb1c5cdf0e484f7c2763b3c4ac1fe8b39a55be6':
toolbox-ls: re-introduce clobbered error message
ceb1c5cdf0e484f7c2763b3c4ac1fe8b39a55be6 03-Jan-2014 Nick Kralevich <nnk@google.com> am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"

* commit '49264407de7b033fb30cdf3fac8919d75b5ea206':
toolbox-ls: re-introduce clobbered error message
49264407de7b033fb30cdf3fac8919d75b5ea206 03-Jan-2014 Nick Kralevich <nnk@google.com> am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"

* commit '7139b0c7f8b3c86c866096cb8621a0d866af1614':
toolbox-ls: re-introduce clobbered error message
7139b0c7f8b3c86c866096cb8621a0d866af1614 03-Jan-2014 Nick Kralevich <nnk@google.com> Merge "toolbox-ls: re-introduce clobbered error message"
20d33f4d99c26afdd0aebf23786958ef34e261e3 03-Jan-2014 Liang Cheng <licheng@nvidia.com> adb: configure /system file permission with fs_config

adbd changes the permissions of files uploaded by copying
owner's permission to group and other. This causes kernel
load failure if any changes are made to kernel modules
followed by ``adb push'' or ``adb sync'' because file mode
644 would become 666.

The change uses fs_config to get the target mode of files.

In addition, the SELinux file label is set incorrectly
on synced files. Set the label properly.

Change-Id: I354db848f39adfbf189d7e8d3b028e8d763c772f
Signed-off-by: Liang Cheng <licheng@nvidia.com>
Bug: 12264775
db/Android.mk
db/file_sync_service.c
ded3464a1099cdeba616dfa7a0df3bcf8671207d 02-Jan-2014 William Roberts <wroberts@tresys.com> toolbox-ls: re-introduce clobbered error message

commit 403b1955 clobbered the error message on lstat()
calls.

Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
oolbox/ls.c
d0dfd00270db0446b9f9d238b96d5c63342bfe2f 03-Jan-2014 Elliott Hughes <enh@google.com> am 3e30f6af: am 090928b1: am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit '3e30f6afa042f3bba4822dc5d1ef267ed4b9d722':
Switch ARM back to libcorkscrew temporarily.
3e30f6afa042f3bba4822dc5d1ef267ed4b9d722 03-Jan-2014 Elliott Hughes <enh@google.com> am 090928b1: am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit '090928b11b02d4a724f90eca65346918c44b144c':
Switch ARM back to libcorkscrew temporarily.
090928b11b02d4a724f90eca65346918c44b144c 03-Jan-2014 Elliott Hughes <enh@google.com> am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit 'a345b25371aa49ebaa4f3b36bb664ba4cf600e60':
Switch ARM back to libcorkscrew temporarily.
a345b25371aa49ebaa4f3b36bb664ba4cf600e60 03-Jan-2014 Elliott Hughes <enh@google.com> am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit 'dfc48139c9afc8366184a1a7bc2f3762c0c82ea2':
Switch ARM back to libcorkscrew temporarily.
dfc48139c9afc8366184a1a7bc2f3762c0c82ea2 03-Jan-2014 Elliott Hughes <enh@google.com> Merge "Switch ARM back to libcorkscrew temporarily."
3c67fe903913d354c9570fd1e662c9a3d8bedbd9 03-Jan-2014 Elliott Hughes <enh@google.com> Switch ARM back to libcorkscrew temporarily.

We're seeing major stack trace generation performance
regression and want to find out whether it's libunwind.

Bug: 12181612
Change-Id: I3866ea956859f5cbdfe4f1ee6f20a2b6d39962c4
ibbacktrace/Android.mk
cb1f0147d729d1a3e9b4898ea98de3e6761233e4 02-Jan-2014 Nick Kralevich <nnk@google.com> am 88d040a3: am 3df76c0c: am 6bec36ec: am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."

* commit '88d040a32feac727a7e11658198c32d9cc563d8e':
Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
88d040a32feac727a7e11658198c32d9cc563d8e 02-Jan-2014 Nick Kralevich <nnk@google.com> am 3df76c0c: am 6bec36ec: am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."

* commit '3df76c0c738e0205cf287dbdf6ebe3b75d765b87':
Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
3df76c0c738e0205cf287dbdf6ebe3b75d765b87 02-Jan-2014 Nick Kralevich <nnk@google.com> am 6bec36ec: am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."

* commit '6bec36ecc92af488f0193e03c386eaab409ca17c':
Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
6bec36ecc92af488f0193e03c386eaab409ca17c 02-Jan-2014 Nick Kralevich <nnk@google.com> am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."

* commit '5b8abdf6278a4142736d918d1371d10c54c91db3':
Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
5b8abdf6278a4142736d918d1371d10c54c91db3 02-Jan-2014 Nick Kralevich <nnk@google.com> Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."
46abc522964f797fafb0a3af2cbbabee05597f47 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> liblog: Add liblog test suite

Change-Id: Ia6d6821e8546e0eccacab812d39d529ea0372c6a
nclude/log/log.h
iblog/Android.mk
iblog/tests/Android.mk
iblog/tests/benchmark.h
iblog/tests/benchmark_main.cpp
iblog/tests/liblog_benchmark.cpp
iblog/tests/liblog_test.cpp
a1062c728a04e0de6e86a138d98eaff12f14fb41 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> logcat: Incorporate liblog reading API

Change-Id: I1e1a55d13ac55350e8d54bfe92b392de07f26a5d
ogcat/logcat.cpp
a63f927ce10817ce637dd52ba2f4ac763ce4fc61 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> debuggerd: Incorporate liblog reading API

Change-Id: Ic26e9dba3b45c827d122b03e34cc4a5bd48f7deb
ebuggerd/tombstone.c
6c1b07fbbd0ccce0e4fdf79abd38494cc622d67e 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> liblog: Interface to support abstracting log read

Change-Id: Iedc55c1316029b4bb72f51cc656b53b0e3f90aee
nclude/log/log.h
nclude/log/logger.h
iblog/Android.mk
iblog/log_read.c
a1ff801e5f8f896d7961f1b015c75b824e9c44a4 31-Dec-2013 Narayan Kamath <narayan@google.com> Change a debug log to a verbose log.

Unlike ALOGV, messages from ALOGD are logged on
all configurations. Not finding an entry in a zip
file is a "normal" occurrence so using an ALOGD
message for it amounts to spam.

Change-Id: I2c60d11e8a750be5106afd65c3c5e335f53f01b6
ibziparchive/zip_archive.cc
dab375bcba96315af1e388dcaa9c9b92c4a81248 30-Dec-2013 Colin Cross <ccross@android.com> am 764daa33: am 21ff8257: am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"

* commit '764daa33c06b5fd699bf0c8162b18dd39b00795a':
ueventd: fix a busy loop while reading uevents
764daa33c06b5fd699bf0c8162b18dd39b00795a 28-Dec-2013 Colin Cross <ccross@android.com> am 21ff8257: am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"

* commit '21ff8257c6ea4af11ab29553bad96ff3a87ba224':
ueventd: fix a busy loop while reading uevents
21ff8257c6ea4af11ab29553bad96ff3a87ba224 28-Dec-2013 Colin Cross <ccross@android.com> am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"

* commit 'bb96da432b129cfa2a680910cda00b6c469caeee':
ueventd: fix a busy loop while reading uevents
bb96da432b129cfa2a680910cda00b6c469caeee 28-Dec-2013 Colin Cross <ccross@android.com> am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"

* commit '268cc54089cbdeb0c2ea955448bb16a0858c4538':
ueventd: fix a busy loop while reading uevents
268cc54089cbdeb0c2ea955448bb16a0858c4538 28-Dec-2013 Colin Cross <ccross@android.com> Merge "ueventd: fix a busy loop while reading uevents"
3dd470552c6b1c88cd344c3a366666ba464bd994 27-Dec-2013 Colin Cross <ccross@android.com> am 469035b8: am fed48bb6: am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain."

* commit '469035b83546a847a1f12c1feca50a1c7e5e1062':
Run the console service shell in the shell domain.
469035b83546a847a1f12c1feca50a1c7e5e1062 27-Dec-2013 Colin Cross <ccross@android.com> am fed48bb6: am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain."

* commit 'fed48bb6de631402876f246d47d87ea1255e83d0':
Run the console service shell in the shell domain.
fed48bb6de631402876f246d47d87ea1255e83d0 27-Dec-2013 Colin Cross <ccross@android.com> am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain."

* commit '6604f2d1ef5e78e7f129f94abe7a763dd0e0dd1d':
Run the console service shell in the shell domain.
6604f2d1ef5e78e7f129f94abe7a763dd0e0dd1d 27-Dec-2013 Colin Cross <ccross@android.com> am 2dcc2759: Merge "Run the console service shell in the shell domain."

* commit '2dcc275936aefbb5badf3b4822d492260077144d':
Run the console service shell in the shell domain.
2dcc275936aefbb5badf3b4822d492260077144d 27-Dec-2013 Colin Cross <ccross@android.com> Merge "Run the console service shell in the shell domain."
2eab743f619110fb346cabda0bcc7df4f16dc1ec 27-Dec-2013 Colin Cross <ccross@android.com> am 0191c801: am 7fa9afed: am 3ccdf0bb: am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4

* commit '0191c801075c3a5218c69917e8488bcce38dce2b':
libion: add apache license header to ion_test.c
libion: initial unit tests
libion: update ion_test.h
0191c801075c3a5218c69917e8488bcce38dce2b 27-Dec-2013 Colin Cross <ccross@android.com> am 7fa9afed: am 3ccdf0bb: am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4

* commit '7fa9afedc1b8cd1d2c5f01693b8ae50c6c212e6d':
libion: add apache license header to ion_test.c
libion: initial unit tests
libion: update ion_test.h
7fa9afedc1b8cd1d2c5f01693b8ae50c6c212e6d 27-Dec-2013 Colin Cross <ccross@android.com> am 3ccdf0bb: am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4

* commit '3ccdf0bbb2bd51530fa674e454ad7a5b279e127c':
libion: add apache license header to ion_test.c
libion: initial unit tests
libion: update ion_test.h
3ccdf0bbb2bd51530fa674e454ad7a5b279e127c 27-Dec-2013 Colin Cross <ccross@android.com> am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4

* commit 'c3e314a93c4ee76f1fd46444e52aab3abe70565f':
libion: add apache license header to ion_test.c
libion: initial unit tests
libion: update ion_test.h
c3e314a93c4ee76f1fd46444e52aab3abe70565f 27-Dec-2013 Colin Cross <ccross@android.com> Merge changes Ie4b641cd,I5502b71d,I68086ce4

* changes:
libion: add apache license header to ion_test.c
libion: initial unit tests
libion: update ion_test.h
5e1461dc906f68f6590df1c79f2f4d69e0af18c5 23-Dec-2013 Stephen Smalley <sds@tycho.nsa.gov> Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.

If checkreqprot == 1, SELinux only checks the protection flags passed
by the application, even if the kernel internally adds PROT_EXEC for
READ_IMPLIES_EXEC personality flags. Switch to checkreqprot == 0
to check the final protection flags applied by the kernel.

Change-Id: Ic39242bbbd104fc9a1bcf2cd2ded7ce1aeadfac4
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
610653fe930d016e1d962661c4fcbe2a8747e5ac 23-Dec-2013 Stephen Smalley <sds@tycho.nsa.gov> Run the console service shell in the shell domain.

This allows it to be permissive in userdebug/eng builds
but confined/enforcing in user builds.

Change-Id: Ie322eaa0acdbefea2de4e71ae386778c929d042b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
735ead6e6896d6c5cf5006a7ca6d2b753e1e52bc 19-Dec-2013 Colin Cross <ccross@android.com> libion: add apache license header to ion_test.c

Change-Id: Ie4b641cd62b56f713178932cc5c08083c0d2452a
ibion/ion_test.c
363441b120aa7ff4ec7c639bac099e775c2ace69 08-Nov-2013 Colin Cross <ccross@android.com> libion: initial unit tests

Change-Id: I5502b71d0c7c24d7fd59e4880033657f840b341a
ibion/Android.mk
ibion/tests/Android.mk
ibion/tests/allocate_test.cpp
ibion/tests/device_test.cpp
ibion/tests/exit_test.cpp
ibion/tests/formerly_valid_handle_test.cpp
ibion/tests/invalid_values_test.cpp
ibion/tests/ion_test_fixture.cpp
ibion/tests/ion_test_fixture.h
ibion/tests/map_test.cpp
b04f75ab129e471eb0b45571f0c319c516de0c02 20-Dec-2013 Colin Cross <ccross@android.com> libion: update ion_test.h

Update ion_test.h to include a padding word to keep the same
struct size on 32-bit and 64-bit.

Change-Id: I68086ce49ca4cc4ed8e251752eaed331a35fbbd2
ibion/kernel-headers/linux/ion_test.h
ibion/original-kernel-headers/linux/ion_test.h
d809eace0cba3d6ba8495cc0a1d56feb817e4416 19-Dec-2013 Colin Cross <ccross@android.com> am 9f34b141: am 85d5d611: am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd

* commit '9f34b141b301f15111de2ff0efb3d76379b46f1c':
libion: update to latest uapi header
libion: return -errno from ion_close
libion: add include for size_t
libion: add NULL checks
libion: clean up whitespace
libion: move ion.h into local include directory
9f34b141b301f15111de2ff0efb3d76379b46f1c 19-Dec-2013 Colin Cross <ccross@android.com> am 85d5d611: am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd

* commit '85d5d611442f365c17e2109c3b9559a436484213':
libion: update to latest uapi header
libion: return -errno from ion_close
libion: add include for size_t
libion: add NULL checks
libion: clean up whitespace
libion: move ion.h into local include directory
85d5d611442f365c17e2109c3b9559a436484213 19-Dec-2013 Colin Cross <ccross@android.com> am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd

* commit 'c4f4e5e2550d730b56a9d27693d23f07a601d5c0':
libion: update to latest uapi header
libion: return -errno from ion_close
libion: add include for size_t
libion: add NULL checks
libion: clean up whitespace
libion: move ion.h into local include directory
c4f4e5e2550d730b56a9d27693d23f07a601d5c0 19-Dec-2013 Colin Cross <ccross@android.com> am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd

* commit 'cd8b953ede50f68dff5ea049e72aee130dc4a3cb':
libion: update to latest uapi header
libion: return -errno from ion_close
libion: add include for size_t
libion: add NULL checks
libion: clean up whitespace
libion: move ion.h into local include directory
cd8b953ede50f68dff5ea049e72aee130dc4a3cb 19-Dec-2013 Colin Cross <ccross@android.com> Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd

* changes:
libion: update to latest uapi header
libion: return -errno from ion_close
libion: add include for size_t
libion: add NULL checks
libion: clean up whitespace
libion: move ion.h into local include directory
141ce6063c2f7463d9302646cfaa635677e9e439 19-Dec-2013 Colin Cross <ccross@android.com> am b1e921ab: am 697c1c32: am 949e2a7c: am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"

* commit 'b1e921abf04629e8f6a9361e5f81a7d45a07a177':
ion: update struct and type definitions to match kernel header
b1e921abf04629e8f6a9361e5f81a7d45a07a177 19-Dec-2013 Colin Cross <ccross@android.com> am 697c1c32: am 949e2a7c: am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"

* commit '697c1c32cd405edcdbe3b8711c8cd02459e88353':
ion: update struct and type definitions to match kernel header
697c1c32cd405edcdbe3b8711c8cd02459e88353 19-Dec-2013 Colin Cross <ccross@android.com> am 949e2a7c: am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"

* commit '949e2a7c28e61aa1ef43ce7ae59a709fb25af1af':
ion: update struct and type definitions to match kernel header
949e2a7c28e61aa1ef43ce7ae59a709fb25af1af 19-Dec-2013 Colin Cross <ccross@android.com> am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"

* commit 'dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe':
ion: update struct and type definitions to match kernel header
dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe 19-Dec-2013 Colin Cross <ccross@android.com> Merge "ion: update struct and type definitions to match kernel header"
39ea00bf9dca98c655c27d8159278fb226351984 19-Dec-2013 Nick Kralevich <nnk@google.com> am 4639ae45: am a0ce4e28: am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."

* commit '4639ae452e7d22343053c5127ecb44ef19b7baf2':
adb: Check sender's socket id when receiving packets.
4639ae452e7d22343053c5127ecb44ef19b7baf2 19-Dec-2013 Nick Kralevich <nnk@google.com> am a0ce4e28: am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."

* commit 'a0ce4e288073b744a02e4301e7ec069346c416d7':
adb: Check sender's socket id when receiving packets.
a0ce4e288073b744a02e4301e7ec069346c416d7 19-Dec-2013 Nick Kralevich <nnk@google.com> am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."

* commit '98fdcfa9817bf54a8695c57366f4ff047ceddb85':
adb: Check sender's socket id when receiving packets.
98fdcfa9817bf54a8695c57366f4ff047ceddb85 19-Dec-2013 Nick Kralevich <nnk@google.com> am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."

* commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc':
adb: Check sender's socket id when receiving packets.
67cb61ee5a8b8f5c967361430fff250e76c3a1dc 19-Dec-2013 Nick Kralevich <nnk@google.com> Merge "adb: Check sender's socket id when receiving packets."
0e90bb97cb105a3c0c9e817f61f83f0982c6ce42 19-Dec-2013 Brian Carlstrom <bdc@google.com> am 137ab19a: am b37b53bf: am 87942c9a: am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"

* commit '137ab19a0a196a419636b078f94aef23b1172335':
Make libutils Looper independent of frameworks/native
137ab19a0a196a419636b078f94aef23b1172335 19-Dec-2013 Brian Carlstrom <bdc@google.com> am b37b53bf: am 87942c9a: am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"

* commit 'b37b53bf0775cabdfac05dd1d644f85b6f830005':
Make libutils Looper independent of frameworks/native
b37b53bf0775cabdfac05dd1d644f85b6f830005 19-Dec-2013 Brian Carlstrom <bdc@google.com> am 87942c9a: am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"

* commit '87942c9aace72daf1efb7f912c95c98efefb4edc':
Make libutils Looper independent of frameworks/native
87942c9aace72daf1efb7f912c95c98efefb4edc 19-Dec-2013 Brian Carlstrom <bdc@google.com> am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"

* commit 'b3bfe8818ae9cec129cf6d3ed30e5bb39e614fdb':
Make libutils Looper independent of frameworks/native
b3bfe8818ae9cec129cf6d3ed30e5bb39e614fdb 19-Dec-2013 Brian Carlstrom <bdc@google.com> Merge "Make libutils Looper independent of frameworks/native"
1693d7e48f976c2615100378c7e98d245e0213be 12-Dec-2013 Brian Carlstrom <bdc@google.com> Make libutils Looper independent of frameworks/native

Change-Id: I1dacca10a3cd7601abc3451b69ed761bf71c38fe
nclude/utils/Looper.h
ibutils/Looper.cpp
ibutils/tests/Looper_test.cpp
dd6770bd49bcb0ddb0f58191dfc1a0e341cc97ac 19-Dec-2013 Colin Cross <ccross@android.com> libion: update to latest uapi header

Pull the uapi headers from android-3.10 directly into libion.
No other modules should be directly calling ion kernel
interfaces, so there is no reason to have those interfaces
exposed.

Change-Id: I2d3fef08f6bb381522ecf7bcffea2b8280d5e737
ibion/Android.mk
ibion/kernel-headers/linux/ion.h
ibion/kernel-headers/linux/ion_test.h
ibion/original-kernel-headers/linux/ion.h
ibion/original-kernel-headers/linux/ion_test.h
aab47b293fa42cba6865a6991ca00c7eaafb9710 19-Dec-2013 Colin Cross <ccross@android.com> libion: return -errno from ion_close

Return -errno from ion_close instead of -1 on error.

Change-Id: Idb828aa4b4d1a660b79d2dba8be32f306eac959d
ibion/ion.c
51b6e42231b5d0c0a3bbf03cbd5880f04c277004 19-Dec-2013 Colin Cross <ccross@android.com> libion: add include for size_t

Add sys/types.h include for size_t

Change-Id: Ica764b1f5eca2df21d82c86493fc4e0d70b6628a
ibion/include/ion/ion.h
7496318486da5a501cd8ab854c2e47ca56ea1ee3 09-Nov-2013 Colin Cross <ccross@android.com> libion: add NULL checks

Check for NULL in any library function that takes a pointer.

Change-Id: I9ae8887b5ae0f231583173ee6a9dfd2f8c4611ec
ibion/ion.c
92d7ca6af3ee38027d7341f24c6b550eaa41417a 09-Nov-2013 Colin Cross <ccross@android.com> libion: clean up whitespace

Convert everything to 4 space indents, no tabs.

Change-Id: I376fad866864f0579b91ffad406e872fcce566ad
ibion/include/ion/ion.h
ibion/ion.c
ibion/ion_test.c
969eac8161ba3c08bac4278451c91f3307f3f565 22-Oct-2013 Rom Lemarchand <romlem@google.com> ion: update struct and type definitions to match kernel header

- Replacing struct ion_handle * with ion_user_handle_t
- Replacing heap_mask field name with heap_id_mask

Change-Id: Iaba1ccc62b9398a7b37c5a734bc21a9ecbbc8277
nclude/ion/ion.h
ibion/ion.c
ibion/ion_test.c
03c932dffa2f72ee63de24c221d07d249a6eafd3 08-Nov-2013 Colin Cross <ccross@android.com> libion: move ion.h into local include directory

Export it to users of libion with LOCAL_C_EXPORT_INCLUDE_DIRS

Change-Id: I4d00a9dd2e99953723994d0304ca77e0ad50a3a9
nclude/ion/ion.h
ibion/Android.mk
ibion/include/ion/ion.h
2f77ecb81366d9c269d608e33ec0a1ee9795dffe 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 796be8f1: am b1a82bcb: am f1da46d2: am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"

* commit '796be8f1432fd02d83f2dae9dbcf11a0976df3b5':
toolbox: date: use RTC subsystem on devices without /dev/alarm
796be8f1432fd02d83f2dae9dbcf11a0976df3b5 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am b1a82bcb: am f1da46d2: am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"

* commit 'b1a82bcb116d720ada2247a43d02729b32129f0a':
toolbox: date: use RTC subsystem on devices without /dev/alarm
ec5b104ca2ec459348f7b035fad878c65e4ec2f7 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 619376f4: am e34618a2: am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"

* commit '619376f41fb93ceb9fa634e9ddc561b90be01e23':
toolbox: date: fix parameter type warnings
821ac10bdc64d8f618e32e013794715fc17dd0d1 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 07dbb562: am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"

* commit '07dbb562a848af658f65cd41864f31aab5f4b955':
toolbox: uptime: use clock_gettime() on devices without /dev/alarm
3fd9ca979a56eb09d5ddf3a7e912694a38d1dbcc 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am e75af574: am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"

* commit 'e75af5745440eb70d1f5682168edb84eaa631982':
toolbox: uptime: fix unused parameter warnings
0c5f9c04b8b5349575288e201dee997c079b7851 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 0f7c043b: am 7510fa3e: am d38ca369: am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"

* commit '0f7c043ba89de91cb9531645893f3cb79e15ced5':
SystemClock: use clock_gettime() on devices without /dev/alarm
d9a5df44c5866a8cdd63d5ba39d70a0287a6df71 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 5ae67beb: am c042bb01: am e25864b7: am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"

* commit '5ae67bebc46a4974869458eb35270b23633aba0c':
rootdir: add permissions for /dev/rtc0
b1a82bcb116d720ada2247a43d02729b32129f0a 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am f1da46d2: am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"

* commit 'f1da46d293ce25311fe07e21b1e8859ac18653ef':
toolbox: date: use RTC subsystem on devices without /dev/alarm
619376f41fb93ceb9fa634e9ddc561b90be01e23 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am e34618a2: am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"

* commit 'e34618a24cf82374d3f096f5aa6d9e011b16a519':
toolbox: date: fix parameter type warnings
07dbb562a848af658f65cd41864f31aab5f4b955 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"

* commit '9d1de8a81240e6ede714e8ee67cb079132b3e6de':
toolbox: uptime: use clock_gettime() on devices without /dev/alarm
e75af5745440eb70d1f5682168edb84eaa631982 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"

* commit '70f22d6b7620b5a3a11ef1d8136a4d10efe14670':
toolbox: uptime: fix unused parameter warnings
0f7c043ba89de91cb9531645893f3cb79e15ced5 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 7510fa3e: am d38ca369: am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"

* commit '7510fa3e71e3d42065de44ccf3e0fa50606ecf05':
SystemClock: use clock_gettime() on devices without /dev/alarm
5ae67bebc46a4974869458eb35270b23633aba0c 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am c042bb01: am e25864b7: am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"

* commit 'c042bb01df9046a4aa7afeefe6d9b14a5bbc2ca2':
rootdir: add permissions for /dev/rtc0
f1da46d293ce25311fe07e21b1e8859ac18653ef 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"

* commit 'd27498cbef862fccb857d7d8970418b893f550ca':
toolbox: date: use RTC subsystem on devices without /dev/alarm
e34618a24cf82374d3f096f5aa6d9e011b16a519 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"

* commit 'd2ac1d8caa3eaf811df3a4f50c78a281c27f69a2':
toolbox: date: fix parameter type warnings
9d1de8a81240e6ede714e8ee67cb079132b3e6de 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"

* commit '0e23a3d4830e6a45bf9b4968da7553fab79205a8':
toolbox: uptime: use clock_gettime() on devices without /dev/alarm
70f22d6b7620b5a3a11ef1d8136a4d10efe14670 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"

* commit '066a3862a38957fdcd5f20caa63c7931e9a0f433':
toolbox: uptime: fix unused parameter warnings
7510fa3e71e3d42065de44ccf3e0fa50606ecf05 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am d38ca369: am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"

* commit 'd38ca369c07744abeb5477c6a524a683fb9a4927':
SystemClock: use clock_gettime() on devices without /dev/alarm
c042bb01df9046a4aa7afeefe6d9b14a5bbc2ca2 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am e25864b7: am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"

* commit 'e25864b752db0bc8ddc55f2c22cf1b8bcb2602bf':
rootdir: add permissions for /dev/rtc0
d2ac1d8caa3eaf811df3a4f50c78a281c27f69a2 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"

* commit 'eb3e9dafbd7f1c4f13bdcafe1a30f9da3bed9108':
toolbox: date: fix parameter type warnings
0e23a3d4830e6a45bf9b4968da7553fab79205a8 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"

* commit '215f78ae55b479ca6a78f9762ea9920fea16cf45':
toolbox: uptime: use clock_gettime() on devices without /dev/alarm
066a3862a38957fdcd5f20caa63c7931e9a0f433 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"

* commit '83a766373f4ee2036fe3824623b7881156fd2ee8':
toolbox: uptime: fix unused parameter warnings
d38ca369c07744abeb5477c6a524a683fb9a4927 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"

* commit '9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337':
SystemClock: use clock_gettime() on devices without /dev/alarm
e25864b752db0bc8ddc55f2c22cf1b8bcb2602bf 18-Dec-2013 Greg Hackmann <ghackmann@google.com> am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"

* commit '537f53b682eb0d99e90da2a3e7389ea474bc583d':
rootdir: add permissions for /dev/rtc0
d27498cbef862fccb857d7d8970418b893f550ca 18-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"
eb3e9dafbd7f1c4f13bdcafe1a30f9da3bed9108 18-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "toolbox: date: fix parameter type warnings"
215f78ae55b479ca6a78f9762ea9920fea16cf45 18-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"
83a766373f4ee2036fe3824623b7881156fd2ee8 18-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "toolbox: uptime: fix unused parameter warnings"
9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337 18-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"
537f53b682eb0d99e90da2a3e7389ea474bc583d 18-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "rootdir: add permissions for /dev/rtc0"
4a7bc60071901dce2af85ec56a088604b6c228ce 17-Dec-2013 Greg Hackmann <ghackmann@google.com> toolbox: date: use RTC subsystem on devices without /dev/alarm

Change-Id: I48c0fd1f4cffef936afb8d48d6d93babf006004d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
oolbox/date.c
c057503aaf53c25e67d5bf36c33cd15ec9188c5d 17-Dec-2013 Greg Hackmann <ghackmann@google.com> toolbox: date: fix parameter type warnings

Change-Id: I810a9abee8bc0061c5007fe08197384f2b85754b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
oolbox/date.c
fa66f1e49458e7745511416d72ac15c190a13e6f 17-Dec-2013 Greg Hackmann <ghackmann@google.com> toolbox: uptime: use clock_gettime() on devices without /dev/alarm

Change-Id: Id7287ca179cc0b8390c054803a25a961dd550a34
Signed-off-by: Greg Hackmann <ghackmann@google.com>
oolbox/uptime.c
7f625ed026006fafeaec49e21e34ee18ac28dbc3 17-Dec-2013 Greg Hackmann <ghackmann@google.com> toolbox: uptime: fix unused parameter warnings

Change-Id: Id240ce85bf09e1a81f4e2e2a7496ac7952edbf38
Signed-off-by: Greg Hackmann <ghackmann@google.com>
oolbox/uptime.c
64289760a2df9409d8f4fa5becb4a49f0acb20a5 17-Dec-2013 Greg Hackmann <ghackmann@google.com> SystemClock: use clock_gettime() on devices without /dev/alarm

On devices with an up-to-date kernel, the back-in-time bug affecting
clock_gettime() has been fixed and it can safely be used as an
alternative to the ANDROID_ALARM_GET_TIME ioctl. To ensure consistent
behavior on existing devices, make clock_gettime() a fallback for when
the alarm driver isn't available.

Change-Id: I384af5e7ec9e73e0bad4b6b0f987a8ea4583cba6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ibutils/SystemClock.cpp
a585e662e0141d8b3445749ef83b8d9b138d7905 13-Dec-2013 Greg Hackmann <ghackmann@google.com> rootdir: add permissions for /dev/rtc0

Change-Id: If9d853bdae2399b1e7434f45df375ba1fd6dbe9c
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ootdir/ueventd.rc
d9f2f8a1b24d16cb98a36dc77f092529e81b034c 17-Dec-2013 Elliott Hughes <enh@google.com> am 417e7467: am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"

* commit '417e7467703e637f384530f23850cb2bf852e61b':
libdiskconfig: Use uintptr_t instead of uint32_t
417e7467703e637f384530f23850cb2bf852e61b 17-Dec-2013 Elliott Hughes <enh@google.com> am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"

* commit '286ab6ce08acb5585ccc02ddf54d7654118fe11b':
libdiskconfig: Use uintptr_t instead of uint32_t
286ab6ce08acb5585ccc02ddf54d7654118fe11b 17-Dec-2013 Elliott Hughes <enh@google.com> am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"

* commit '3278af85f984a1b6df56b010a93589f6068514e0':
libdiskconfig: Use uintptr_t instead of uint32_t
3278af85f984a1b6df56b010a93589f6068514e0 17-Dec-2013 Elliott Hughes <enh@google.com> am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"

* commit '30f9b5092062a0c8b61356496128feaaf8cd4237':
libdiskconfig: Use uintptr_t instead of uint32_t
30f9b5092062a0c8b61356496128feaaf8cd4237 17-Dec-2013 Elliott Hughes <enh@google.com> Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
35539affd81eae1d8734a5c4f7a148108068d7fd 10-Dec-2013 Ashok Bhat <ashok.bhat@arm.com> libdiskconfig: Use uintptr_t instead of uint32_t

Use uintptr_t instead of uint32_t when pointer is cast
to an integer type.

Change-Id: I03dd4c7ff66611661af466dfb7b393d461bb2d7d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ibdiskconfig/config_mbr.c
fed76f85154950a4b2c63ac9e749ee23603e4d2b 16-Dec-2013 Elliott Hughes <enh@google.com> am 63824e92: am 980093ca: am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"

* commit '63824e923aca6fe15942beee00b258ea6119e459':
AArch64: Correction of struct surface_t
63824e923aca6fe15942beee00b258ea6119e459 16-Dec-2013 Elliott Hughes <enh@google.com> am 980093ca: am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"

* commit '980093ca5923d2a3a69075ca156c4b90e0ea6d39':
AArch64: Correction of struct surface_t
980093ca5923d2a3a69075ca156c4b90e0ea6d39 16-Dec-2013 Elliott Hughes <enh@google.com> am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"

* commit '348856fadb03cd0d93d0af3f78c11555a343e97f':
AArch64: Correction of struct surface_t
348856fadb03cd0d93d0af3f78c11555a343e97f 16-Dec-2013 Elliott Hughes <enh@google.com> am 532f4658: Merge "AArch64: Correction of struct surface_t"

* commit '532f46582362f6b14d5e2a19600c2930385cdc30':
AArch64: Correction of struct surface_t
c29664284b59cf8ebc9bb51d4713ff4280341b5a 16-Dec-2013 Elliott Hughes <enh@google.com> am 49a88c3c: am 410a1966: am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."

* commit '49a88c3cf38e9c17a756434880fb01971018a9c6':
Pixelflinger: Add AArch64 support to pixelflinger JIT.
49a88c3cf38e9c17a756434880fb01971018a9c6 16-Dec-2013 Elliott Hughes <enh@google.com> am 410a1966: am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."

* commit '410a1966df94cefbb2fb38448cbe95de6b335ceb':
Pixelflinger: Add AArch64 support to pixelflinger JIT.
532f46582362f6b14d5e2a19600c2930385cdc30 16-Dec-2013 Elliott Hughes <enh@google.com> Merge "AArch64: Correction of struct surface_t"
410a1966df94cefbb2fb38448cbe95de6b335ceb 16-Dec-2013 Elliott Hughes <enh@google.com> am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."

* commit 'fd382f2e2f27377e0a61f442bff196b66b188293':
Pixelflinger: Add AArch64 support to pixelflinger JIT.
fd382f2e2f27377e0a61f442bff196b66b188293 16-Dec-2013 Elliott Hughes <enh@google.com> am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."

* commit 'fd7eabe4429ee6bbc18796b0c76033902fa63497':
Pixelflinger: Add AArch64 support to pixelflinger JIT.
fd7eabe4429ee6bbc18796b0c76033902fa63497 16-Dec-2013 Elliott Hughes <enh@google.com> Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
dd2b85221b5ce9cd08ade794835b42be13b91e13 16-Dec-2013 Elliott Hughes <enh@google.com> am cec9ac9b: am f64b4a6a: am 7fe10ded: am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"

* commit 'cec9ac9b36c463f48f8447b8d4118845ea73a4d7':
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
cec9ac9b36c463f48f8447b8d4118845ea73a4d7 16-Dec-2013 Elliott Hughes <enh@google.com> am f64b4a6a: am 7fe10ded: am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"

* commit 'f64b4a6a84ee706f1bf3b089ced834c958dd9ec6':
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
f64b4a6a84ee706f1bf3b089ced834c958dd9ec6 16-Dec-2013 Elliott Hughes <enh@google.com> am 7fe10ded: am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"

* commit '7fe10dedfdefe952602d3507db3109eaa94d4068':
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
7fe10dedfdefe952602d3507db3109eaa94d4068 16-Dec-2013 Elliott Hughes <enh@google.com> am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"

* commit 'cadb10c9578c39e7f886a1fce11536258b2cac4e':
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
cadb10c9578c39e7f886a1fce11536258b2cac4e 16-Dec-2013 Elliott Hughes <enh@google.com> Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
f7f823e46b285169637c1f1a9c17e16ae1566b92 16-Dec-2013 Nick Kralevich <nnk@google.com> am 8b0d10c8: am a24e9a86: am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo"

* commit '8b0d10c870efbe8254f407e02c406c05bedfa0b5':
Relabel /data/misc/zoneinfo
8b0d10c870efbe8254f407e02c406c05bedfa0b5 16-Dec-2013 Nick Kralevich <nnk@google.com> am a24e9a86: am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo"

* commit 'a24e9a8655187b13eb15fdfde17f53677f203bb3':
Relabel /data/misc/zoneinfo
a24e9a8655187b13eb15fdfde17f53677f203bb3 16-Dec-2013 Nick Kralevich <nnk@google.com> am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo"

* commit '02ad8700dd22d5bf5d73c638e3a45c35d5ef3d1d':
Relabel /data/misc/zoneinfo
02ad8700dd22d5bf5d73c638e3a45c35d5ef3d1d 16-Dec-2013 Nick Kralevich <nnk@google.com> am e4335483: Merge "Relabel /data/misc/zoneinfo"

* commit 'e4335483e78292800e27c7bf0a67d23bee47dc84':
Relabel /data/misc/zoneinfo
e4335483e78292800e27c7bf0a67d23bee47dc84 16-Dec-2013 Nick Kralevich <nnk@google.com> Merge "Relabel /data/misc/zoneinfo"
818d641c420f5d4f35f4e8706937c17b974146d1 13-Dec-2013 David 'Digit' Turner <digit@android.com> adb: Check sender's socket id when receiving packets.

handle_packet() in adb.c didn't check that when an A_WRTE packet is
received, the sender's local-id matches the socket's peer id.

This meant that a compromised adbd server could sent packets to
the host adb server, spoofing the identity of another connected
device if it could "guess" the right host socket id.

This patch gets rid of the issue by enforcing even more checks
to ensure that all packets comply with the description in
protocol.txt.

+ Fix a bug where closing a local socket associated with a
remote one would always send an A_CLSE(0, remote-id, "")
message, though protocol.txt says that should only happen
for failed opens.

The issue was that local_socket_close() called
remote_socket_close() after clearing the remote socket's
'peer' field.

The fix introduces a new asocket optional callback,
named 'shutdown' that is called before that, and is
used to send the A_CLSE() message with the right ID
in remote_socket_shutdown().

Also add some code in handle_packet() to detect
invalid close commands.

Change-Id: I9098bc8c6e81f8809334b060e5dca4fc92e6fbc9
db/adb.c
db/adb.h
db/sockets.c
f73c009a3d5678fb68f7f99b566c6f7f0921e1c2 14-Dec-2013 Elliott Hughes <enh@google.com> am aa8dc146: am 41e9ee24: am feb539b6: am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"

* commit 'aa8dc14665003abbbeebed3b113c3083b3f342c7':
Force alignment of data buffer used to process netlink messages
aa8dc14665003abbbeebed3b113c3083b3f342c7 14-Dec-2013 Elliott Hughes <enh@google.com> am 41e9ee24: am feb539b6: am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"

* commit '41e9ee2477071265a0dfab87cece27a38c9c2f69':
Force alignment of data buffer used to process netlink messages
41e9ee2477071265a0dfab87cece27a38c9c2f69 14-Dec-2013 Elliott Hughes <enh@google.com> am feb539b6: am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"

* commit 'feb539b6e3d81a7f0ab86b6b48056a531c4cb4ed':
Force alignment of data buffer used to process netlink messages
feb539b6e3d81a7f0ab86b6b48056a531c4cb4ed 14-Dec-2013 Elliott Hughes <enh@google.com> am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"

* commit 'e1a475c0b4b73ec72fae12ea310b038d87a71b0e':
Force alignment of data buffer used to process netlink messages
e1a475c0b4b73ec72fae12ea310b038d87a71b0e 14-Dec-2013 Elliott Hughes <enh@google.com> Merge "Force alignment of data buffer used to process netlink messages"
354e9edbd73ad9453e6c284c0551105ccf6aac14 14-Dec-2013 Nick Kralevich <nnk@google.com> Relabel /data/misc/zoneinfo

The files in zoneinfo changed from system_data_file to
zoneinfo_data_file. Fixup pre-existing files.

Change-Id: Idddbd6c2ecf66cd16b057a9ff288cd586a109949
ootdir/init.rc
cec7e7e3ea1e6790ce5bd0a0cd71403d3070bbfe 13-Dec-2013 Narayan Kamath <narayan@google.com> am 153c03ac: am df39ce39: am d61266d0: am 4928d8d0: Merge "Fix ExtractEntryToFile."

* commit '153c03acc247ef283ed27d83e9286425b651a816':
Fix ExtractEntryToFile.
714521fc8640b238053faf2a3eb1b5778223d204 13-Dec-2013 Elliott Hughes <enh@google.com> am d27f65ba: am d2aea929: am f595365f: am d5f97db5: Merge "libion: Use %zu for size_t"

* commit 'd27f65badafaf48001fd532e188e20122330f44d':
libion: Use %zu for size_t
153c03acc247ef283ed27d83e9286425b651a816 13-Dec-2013 Narayan Kamath <narayan@google.com> am df39ce39: am d61266d0: am 4928d8d0: Merge "Fix ExtractEntryToFile."

* commit 'df39ce3929b2fe08ecc09740680af258a51aed63':
Fix ExtractEntryToFile.
df39ce3929b2fe08ecc09740680af258a51aed63 13-Dec-2013 Narayan Kamath <narayan@google.com> am d61266d0: am 4928d8d0: Merge "Fix ExtractEntryToFile."

* commit 'd61266d0167816e653141f7f3c6579f2a65944db':
Fix ExtractEntryToFile.
d61266d0167816e653141f7f3c6579f2a65944db 13-Dec-2013 Narayan Kamath <narayan@google.com> am 4928d8d0: Merge "Fix ExtractEntryToFile."

* commit '4928d8d072b5fab695f88437987c4be10781f40c':
Fix ExtractEntryToFile.
4928d8d072b5fab695f88437987c4be10781f40c 13-Dec-2013 Narayan Kamath <narayan@google.com> Merge "Fix ExtractEntryToFile."
00a258cec7bbecf10e04fef7ed4781cd750ba1d8 13-Dec-2013 Narayan Kamath <narayan@google.com> Fix ExtractEntryToFile.

We would always write uncompressed data at offset 0 instead
of the current filedescriptor offset.

Also adds a unit-test & a clarifying comment on the API.

Change-Id: If44757e96dde504ce63d81b4dec7115fc6f6d5fb
nclude/ziparchive/zip_archive.h
ibziparchive/zip_archive.cc
ibziparchive/zip_archive_test.cc
d27f65badafaf48001fd532e188e20122330f44d 13-Dec-2013 Elliott Hughes <enh@google.com> am d2aea929: am f595365f: am d5f97db5: Merge "libion: Use %zu for size_t"

* commit 'd2aea929bfccf00dc0242e24ca13b29f6eaeb892':
libion: Use %zu for size_t
d2aea929bfccf00dc0242e24ca13b29f6eaeb892 13-Dec-2013 Elliott Hughes <enh@google.com> am f595365f: am d5f97db5: Merge "libion: Use %zu for size_t"

* commit 'f595365fefab6abe2a0429eb9b0b519704c8b5fc':
libion: Use %zu for size_t
f595365fefab6abe2a0429eb9b0b519704c8b5fc 13-Dec-2013 Elliott Hughes <enh@google.com> am d5f97db5: Merge "libion: Use %zu for size_t"

* commit 'd5f97db507f47b0db0d15c8a809ce33c46391228':
libion: Use %zu for size_t
d5f97db507f47b0db0d15c8a809ce33c46391228 13-Dec-2013 Elliott Hughes <enh@google.com> Merge "libion: Use %zu for size_t"
32212f2688f3e303811002063a12338090202ebd 12-Dec-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "libnetutils: Expect 1's complement if computed UDP checksum is zero"
260854c0b0a19636988a7db5337ab978c2bbbf57 12-Dec-2013 Elliott Hughes <enh@google.com> am ed20fef0: am a99f0b6e: am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"

* commit 'ed20fef0630d02395abab6a073a5717ddfbfaa8d':
Pixelflinger: Fix issue of pointers being stored in ints
ed20fef0630d02395abab6a073a5717ddfbfaa8d 12-Dec-2013 Elliott Hughes <enh@google.com> am a99f0b6e: am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"

* commit 'a99f0b6e386f71ecfb8aca429693b4b44e346be4':
Pixelflinger: Fix issue of pointers being stored in ints
a99f0b6e386f71ecfb8aca429693b4b44e346be4 12-Dec-2013 Elliott Hughes <enh@google.com> am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"

* commit '5b8daae0440330097ed9d5f7bee24eea0ac0bb31':
Pixelflinger: Fix issue of pointers being stored in ints
5b8daae0440330097ed9d5f7bee24eea0ac0bb31 12-Dec-2013 Elliott Hughes <enh@google.com> am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"

* commit 'a67b39cb612744764ad9cd9a78aabd6b5742a384':
Pixelflinger: Fix issue of pointers being stored in ints
a67b39cb612744764ad9cd9a78aabd6b5742a384 12-Dec-2013 Elliott Hughes <enh@google.com> Merge "Pixelflinger: Fix issue of pointers being stored in ints"
1c87ae05b337f789b2e56bbb273758dfb12fb2ef 23-May-2013 Ajay Dudani <adudani@codeaurora.org> libnetutils: Expect 1's complement if computed UDP checksum is zero

Per http://tools.ietf.org/html/rfc768:
If the computed checksum is zero, it is transmitted as all ones (the
equivalent in one's complement arithmetic). An all zero transmitted
checksum value means that the transmitter generated no checksum (for
debugging or for higher level protocols that don't care).

Bug: 10642341
Change-Id: Ib6296dcf3f420f87227047a645c99d9f7ea0d437
ibnetutils/packet.c
79582f1a618f42c695caa3bf0d55d866e1ab4e4d 12-Dec-2013 Narayan Kamath <narayan@google.com> am b4d662dc: am de39957b: am 3a5ab80d: am 7d92b7cc: Merge "Get rid of some log spam."

* commit 'b4d662dc0acaa1c7b00fe278222d1acfb4e5695f':
Get rid of some log spam.
658f89dc5c418dbbc0c5d78f5861855b90ca8c9f 28-Feb-2013 Ashok Bhat <ashok.bhat@arm.com> Pixelflinger: Add AArch64 support to pixelflinger JIT.

See the comment-block at the top of Aarch64Assembler.cpp
for overview on how AArch64 support has been implemented

In addition, this commit contains
[x] AArch64 inline asm versions of gglmul series of
functions and a new unit test bench to test the
functions

[x] Assembly implementations of scanline_col32cb16blend
and scanline_t32cb16blend for AArch64, with unit
test bench

Change-Id: I915cded9e1d39d9a2a70bf8a0394b8a0064d1eb4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
nclude/private/pixelflinger/ggl_fixed.h
ibpixelflinger/Android.mk
ibpixelflinger/arch-aarch64/col32cb16blend.S
ibpixelflinger/arch-aarch64/t32cb16blend.S
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/Aarch64Assembler.cpp
ibpixelflinger/codeflinger/Aarch64Assembler.h
ibpixelflinger/codeflinger/Aarch64Disassembler.cpp
ibpixelflinger/codeflinger/Aarch64Disassembler.h
ibpixelflinger/codeflinger/CodeCache.cpp
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/scanline.cpp
ibpixelflinger/tests/arch-aarch64/Android.mk
ibpixelflinger/tests/arch-aarch64/assembler/Android.mk
ibpixelflinger/tests/arch-aarch64/assembler/aarch64_assembler_test.cpp
ibpixelflinger/tests/arch-aarch64/assembler/asm_test_jacket.S
ibpixelflinger/tests/arch-aarch64/col32cb16blend/Android.mk
ibpixelflinger/tests/arch-aarch64/col32cb16blend/col32cb16blend_test.c
ibpixelflinger/tests/arch-aarch64/disassembler/Android.mk
ibpixelflinger/tests/arch-aarch64/disassembler/aarch64_diassembler_test.cpp
ibpixelflinger/tests/arch-aarch64/t32cb16blend/Android.mk
ibpixelflinger/tests/arch-aarch64/t32cb16blend/t32cb16blend_test.c
ibpixelflinger/tests/codegen/codegen.cpp
ibpixelflinger/tests/gglmul/Android.mk
ibpixelflinger/tests/gglmul/gglmul_test.cpp
bfc6dc4ca8d5a1ee498e80a18350b91519a5412c 21-Feb-2013 Ashok Bhat <ashok.bhat@arm.com> Pixelflinger: Support for handling 64-bit addresses in GGL Assembler

GGLAssembler assumes addresses to be 32-bit and uses ARM 32-bit
instructions to load/store/manipulate addresses. To support, 64-bit
architectures, following changes has been done

1. ARMAssemblerInterface has been extended to support four new
operations ADDR_LDR, ADDR_STR, ADDR_SUB, ADDR_ADD. Base class
implements these virtual functions to use 32bit equivalent
function. This avoids existing 32-bit Assembler backend
implementations like ARMAssembler and MIPSAssembler from
mapping the new functions to existing equivalent routines.
This also allows 64-bit Architectures like AArch64 to override
the function in their assembler backend implementations.

2. GGLAssembler code (spread over GGLAssembler.cpp, GGLAssembler.h
and texturing.cpp) has been changed to use the new operations
for address operations.

Change-Id: I3d7eace4691e3e47cef737d97ac67ce6ef4fb18d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ibpixelflinger/codeflinger/ARMAssemblerInterface.cpp
ibpixelflinger/codeflinger/ARMAssemblerInterface.h
ibpixelflinger/codeflinger/ARMAssemblerProxy.cpp
ibpixelflinger/codeflinger/ARMAssemblerProxy.h
ibpixelflinger/codeflinger/GGLAssembler.cpp
ibpixelflinger/codeflinger/GGLAssembler.h
ibpixelflinger/codeflinger/texturing.cpp
d10afb17486f87a56baf97a893b4e4533eb5b851 14-Nov-2013 Ashok Bhat <ashok.bhat@arm.com> Pixelflinger: Fix issue of pointers being stored in ints

Pixelflinger's code makes assumptions, at certain places,
that pointers can be stored as ints. This patch makes use
of uintptr_t wherever pointers are stored as int or cast
to int.

Change-Id: Ie76f425cbc82ac038a747f77a95bd31774f4a8e8
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
nclude/private/pixelflinger/ggl_context.h
ibpixelflinger/buffer.cpp
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/scanline.cpp
b4d662dc0acaa1c7b00fe278222d1acfb4e5695f 12-Dec-2013 Narayan Kamath <narayan@google.com> am de39957b: am 3a5ab80d: am 7d92b7cc: Merge "Get rid of some log spam."

* commit 'de39957ba115b1e31b3b991fa09c958a0ba601c5':
Get rid of some log spam.
de39957ba115b1e31b3b991fa09c958a0ba601c5 12-Dec-2013 Narayan Kamath <narayan@google.com> am 3a5ab80d: am 7d92b7cc: Merge "Get rid of some log spam."

* commit '3a5ab80d0f2a70b2e39ffcc6eebf876b04ff5cdd':
Get rid of some log spam.
3a5ab80d0f2a70b2e39ffcc6eebf876b04ff5cdd 12-Dec-2013 Narayan Kamath <narayan@google.com> am 7d92b7cc: Merge "Get rid of some log spam."

* commit '7d92b7cc6580285ab7f8ef86be7512eafda89354':
Get rid of some log spam.
7d92b7cc6580285ab7f8ef86be7512eafda89354 12-Dec-2013 Narayan Kamath <narayan@google.com> Merge "Get rid of some log spam."
f6a196522ac823bef7eb06267e3c00ccdef1d298 12-Dec-2013 Narayan Kamath <narayan@google.com> Get rid of some log spam.

We don't need a warning if an entry isn't found in a zip
file. It can happen as part of normal operation.

Change-Id: I86c132a040371f36f0dd981b49c02b3173821439
ibziparchive/zip_archive.cc
2f06ba6122d41ce4b5a067a5bfd05ef115a41d5d 12-Dec-2013 Nick Kralevich <nnk@google.com> am bfb1d8a2: am af9e9d97: am f0a68b54: am 8779c4ea: Merge "Minor cleanups."

* commit 'bfb1d8a27532180dd08fc48190aed464abbdd8b8':
Minor cleanups.
bfb1d8a27532180dd08fc48190aed464abbdd8b8 11-Dec-2013 Nick Kralevich <nnk@google.com> am af9e9d97: am f0a68b54: am 8779c4ea: Merge "Minor cleanups."

* commit 'af9e9d97ee7a53fd5f315ac16b63cc41a3207c33':
Minor cleanups.
af9e9d97ee7a53fd5f315ac16b63cc41a3207c33 11-Dec-2013 Nick Kralevich <nnk@google.com> am f0a68b54: am 8779c4ea: Merge "Minor cleanups."

* commit 'f0a68b54be5ba78466a7075a6d9a72438c25e645':
Minor cleanups.
f0a68b54be5ba78466a7075a6d9a72438c25e645 11-Dec-2013 Nick Kralevich <nnk@google.com> am 8779c4ea: Merge "Minor cleanups."

* commit '8779c4eab43956ecf626bbece3f6f3bc54970d6a':
Minor cleanups.
8779c4eab43956ecf626bbece3f6f3bc54970d6a 11-Dec-2013 Nick Kralevich <nnk@google.com> Merge "Minor cleanups."
f5f50b727c1ef32de6cd1229924e4a202f8af3a5 11-Dec-2013 Narayan Kamath <narayan@google.com> am 5d7cd375: am bac8ae4d: am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."

* commit '5d7cd375e853aca670d01d92308f178145e0d0e8':
Use FileMap from libcutil instead of rolling our own.
5d7cd375e853aca670d01d92308f178145e0d0e8 11-Dec-2013 Narayan Kamath <narayan@google.com> am bac8ae4d: am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."

* commit 'bac8ae4d1de90e4d01f3782465a02e1ef989e030':
Use FileMap from libcutil instead of rolling our own.
bac8ae4d1de90e4d01f3782465a02e1ef989e030 11-Dec-2013 Narayan Kamath <narayan@google.com> am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."

* commit '841ef3bd2081a74bf95be83211e92a653df61541':
Use FileMap from libcutil instead of rolling our own.
5299857825f10bbc724e1598cc348a5ceafd444b 06-Dec-2013 Chris Dearman <chris.dearman@imgtec.com> Dwarf backtrace for MIPS

The Dwarf parsing code was copied from backtrace-x86.c
and modified for MIPS

Change-Id: I62c698fbbea28be39320a921dd778269dc478528
ibcorkscrew/arch-mips/backtrace-mips.c
ibcorkscrew/arch-mips/dwarf.h
ibcorkscrew/arch-mips/ptrace-mips.c
ibcorkscrew/ptrace-arch.h
841ef3bd2081a74bf95be83211e92a653df61541 11-Dec-2013 Narayan Kamath <narayan@google.com> am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."

* commit 'bcf1454cf6a2fadc30c5189c3756b3cb96149745':
Use FileMap from libcutil instead of rolling our own.
bcf1454cf6a2fadc30c5189c3756b3cb96149745 11-Dec-2013 Narayan Kamath <narayan@google.com> Merge "Use FileMap from libcutil instead of rolling our own."
eaf988532b9e603b1599b7750bfa923fbb39d297 11-Dec-2013 Narayan Kamath <narayan@google.com> Use FileMap from libcutil instead of rolling our own.

Adds windows support as a side effect.

Change-Id: I912c1f980f284d01d4f3936291999646ddf6250a
ibziparchive/Android.mk
ibziparchive/zip_archive.cc
1dd77487abf8b0de37f0554f0fe5d54553afd87b 11-Dec-2013 Sasha Levitskiy <sanek@google.com> Merge "Getevent: make sure the monotonic timestamp is displayed; warning cleanup."
cd7c10438a3ea744a937a2100440e20a3960d745 23-Nov-2013 Todd Poynor <toddpoynor@google.com> healthd: charger mode dump previous console from pstore

Change-Id: Id65ffe4f80aa870a1d1f3f3d67c3bb687490c27f
ealthd/healthd_mode_charger.cpp
4b2a57697df5f4e3f4075edc9ad736f79edf9a40 10-Dec-2013 Todd Poynor <toddpoynor@google.com> am fc092653: (-s ours) am 0af90f6f: (-s ours) charger: dump pstore ram console DO NOT MERGE

* commit 'fc092653856579437da9807aea2567e90a2ffb09':
charger: dump pstore ram console DO NOT MERGE
fc092653856579437da9807aea2567e90a2ffb09 10-Dec-2013 Todd Poynor <toddpoynor@google.com> am 0af90f6f: (-s ours) charger: dump pstore ram console DO NOT MERGE

* commit '0af90f6f750300e54409c251682e86d90401d0ab':
charger: dump pstore ram console DO NOT MERGE
0af90f6f750300e54409c251682e86d90401d0ab 23-Nov-2013 Todd Poynor <toddpoynor@google.com> charger: dump pstore ram console DO NOT MERGE

Change-Id: I7f612d49418272e2ac867f64c10149ad616391cd
harger/charger.c
aa25ede6074145495c72db2c83697ad9ffcf7f8b 10-Dec-2013 Mark Salyzyn <salyzyn@google.com> Merge "adb: deprecate legacy log service interface"
3909b78f2c3d3d1c2a90b87385c76f03338448c9 10-Dec-2013 Nick Kralevich <nnk@google.com> am 81b488e6: am a91a47c3: am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit '81b488e6876ca5af1258473c244b4b64036fb458':
Fix overflow in adb_client
81b488e6876ca5af1258473c244b4b64036fb458 10-Dec-2013 Nick Kralevich <nnk@google.com> am a91a47c3: am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit 'a91a47c30c7c6672137d5f43cffe87ed34dae04a':
Fix overflow in adb_client
a91a47c30c7c6672137d5f43cffe87ed34dae04a 10-Dec-2013 Nick Kralevich <nnk@google.com> am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit 'b2dfa7ece7fb69d2ce5ae517eb35492beb646385':
Fix overflow in adb_client
c66a7537df987715acc77eed952111cc56b7e72b 10-Dec-2013 Mark Salyzyn <salyzyn@google.com> adb: deprecate legacy log service interface

Change-Id: If96019cc13b3d7a4dcd7785c7137e0cbcc622981
db/Android.mk
db/SERVICES.TXT
db/adb.h
db/log_service.c
db/services.c
b2dfa7ece7fb69d2ce5ae517eb35492beb646385 10-Dec-2013 Nick Kralevich <nnk@google.com> am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit '02d90b92ce65ad4e7f49565f0e97373e1d8b0fbf':
Fix overflow in adb_client
02d90b92ce65ad4e7f49565f0e97373e1d8b0fbf 10-Dec-2013 Nick Kralevich <nnk@google.com> am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit '33e7f915d6a27880dd4c4c0709dcc921f549eea2':
Fix overflow in adb_client
33e7f915d6a27880dd4c4c0709dcc921f549eea2 10-Dec-2013 Nick Kralevich <nnk@google.com> am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit '54a80bcf88060b21f527c631c7ec911171bdb13f':
Fix overflow in adb_client
54a80bcf88060b21f527c631c7ec911171bdb13f 10-Dec-2013 Nick Kralevich <nnk@google.com> am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit 'cd072e94cf7e546cd6d333cd65641edcd69402b7':
Fix overflow in adb_client
cd072e94cf7e546cd6d333cd65641edcd69402b7 10-Dec-2013 Nick Kralevich <nnk@google.com> am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit 'ba104fb7f1f0acad99a0d3a1cf7153aab57ea450':
Fix overflow in adb_client
ba104fb7f1f0acad99a0d3a1cf7153aab57ea450 10-Dec-2013 Nick Kralevich <nnk@google.com> am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit 'e975716e36c9ad6aa80be2b54ee2cc63eadbdc44':
Fix overflow in adb_client
e975716e36c9ad6aa80be2b54ee2cc63eadbdc44 10-Dec-2013 Nick Kralevich <nnk@google.com> am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit '03d4eb29003a712c28733646588fafc8939fc1fe':
Fix overflow in adb_client
03d4eb29003a712c28733646588fafc8939fc1fe 10-Dec-2013 Nick Kralevich <nnk@google.com> am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc':
Fix overflow in adb_client
d63fb078aea697c536b19c03d29d4dde4ac087fc 10-Dec-2013 Nick Kralevich <nnk@google.com> am e89e09dd: Fix overflow in adb_client

* commit 'e89e09dd2b9b42184973e3ade291186a2737bced':
Fix overflow in adb_client
e89e09dd2b9b42184973e3ade291186a2737bced 10-Dec-2013 Nick Kralevich <nnk@google.com> Fix overflow in adb_client

Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037
Credit: Joshua Drake
Bug: 12060953
db/adb_client.c
605356416088e369f2c9279ed3b7dc989f9dea44 05-Jun-2013 Marcus Oakland <marcus.oakland@arm.com> AArch64: Correction of struct surface_t

The struct in the union with GGLSurface in struct surface_t assumed
that the reserved field, which corresponds to the GGLsizei version
field in the GGLSurface structure (where GGLsizei is define as being
ssize_t in the system/core/include/pixelflinger/pixelflinger.h header
file) is uint32_t. That is appropriate to the 32-bit system but is
not appropriate to the 64-bit system, where ssize_t is 64-bits rather
than 32-bits.

The 32-bit system has also been tested and has no regression
because of this change.

Change-Id: I5cd84fd4a18fa0e63e27975f7b3d3e95b99cea58
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
nclude/private/pixelflinger/ggl_context.h
aed6bec414b3533f79f2fc0c59b54b6cab62162f 10-Dec-2013 Ashok Bhat <ashok.bhat@arm.com> libion: Use %zu for size_t

Change-Id: If92fc31ab676a569530c21e655a1b5b451f5c5e5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ibion/ion_test.c
2810cb2b2793e6316b0198394f24264be21275a1 10-Dec-2013 Narayan Kamath <narayan@google.com> am 03560967: am 44eb1357: am a183f45f: Merge "Add unit tests for libziparchive."

* commit '03560967709ca25f8086c793b568f5c82651d0d6':
Add unit tests for libziparchive.
03560967709ca25f8086c793b568f5c82651d0d6 10-Dec-2013 Narayan Kamath <narayan@google.com> am 44eb1357: am a183f45f: Merge "Add unit tests for libziparchive."

* commit '44eb13570f7c60c5bd4d92f1c9c9c0ea567cf8e4':
Add unit tests for libziparchive.
44eb13570f7c60c5bd4d92f1c9c9c0ea567cf8e4 10-Dec-2013 Narayan Kamath <narayan@google.com> am a183f45f: Merge "Add unit tests for libziparchive."

* commit 'a183f45f7aaee721a9c1cde14cdd47e47a1592e4':
Add unit tests for libziparchive.
b0e08c0d810784fea62b71d0a85121da7e6d5a7d 10-Dec-2013 Narayan Kamath <narayan@google.com> am 9fde6246: am 0c2e454c: am 404c5408: Merge "Fix return code for ended iteration."

* commit '9fde6246f84967914e0820895863bd7011058d1c':
Fix return code for ended iteration.
81fcdd250e7c7ada6d1f5ef62f84e54d289f6fe8 10-Dec-2013 Nick Kralevich <nnk@google.com> am b470d404: am b988e95c: am 6fec3a23: Merge "Log a warning on services that lack SELinux domains."

* commit 'b470d404e58bbe89c5c2822120b220e45ff72b42':
Log a warning on services that lack SELinux domains.
11905774ecdf396dd654f985df383f0d404d5fb0 10-Dec-2013 Qiwen Zhao <zhao@google.com> am d5d68f12: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

* commit 'd5d68f12f524c710a42625ec17261c822bc96acd':
9fde6246f84967914e0820895863bd7011058d1c 10-Dec-2013 Narayan Kamath <narayan@google.com> am 0c2e454c: am 404c5408: Merge "Fix return code for ended iteration."

* commit '0c2e454cf4945233ec3ddb106a2e74bb23805f74':
Fix return code for ended iteration.
b470d404e58bbe89c5c2822120b220e45ff72b42 10-Dec-2013 Nick Kralevich <nnk@google.com> am b988e95c: am 6fec3a23: Merge "Log a warning on services that lack SELinux domains."

* commit 'b988e95c10724fbf611602130c7881554cb5255d':
Log a warning on services that lack SELinux domains.
a183f45f7aaee721a9c1cde14cdd47e47a1592e4 10-Dec-2013 Narayan Kamath <narayan@google.com> Merge "Add unit tests for libziparchive."
0c2e454cf4945233ec3ddb106a2e74bb23805f74 10-Dec-2013 Narayan Kamath <narayan@google.com> am 404c5408: Merge "Fix return code for ended iteration."

* commit '404c5408a0be7cc42d3c1c4af4e87b7daed39862':
Fix return code for ended iteration.
b988e95c10724fbf611602130c7881554cb5255d 10-Dec-2013 Nick Kralevich <nnk@google.com> am 6fec3a23: Merge "Log a warning on services that lack SELinux domains."

* commit '6fec3a23046a3100c2ce1863afdd0191da69cdcc':
Log a warning on services that lack SELinux domains.
404c5408a0be7cc42d3c1c4af4e87b7daed39862 10-Dec-2013 Narayan Kamath <narayan@google.com> Merge "Fix return code for ended iteration."
2037a307a414e28a1811ad98ee48493821454939 23-Oct-2013 Sasha Levitskiy <sanek@google.com> Getevent: make sure the monotonic timestamp is displayed; warning cleanup.

Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
oolbox/getevent.c
58aaf46e4d3c9f6ada086f88ecf137a9e04db2d9 10-Dec-2013 Narayan Kamath <narayan@google.com> Add unit tests for libziparchive.

- Add a build rule for host tests
- Add basic tests for Find / Iterate and Extract
for both deflated & stored entries.
- Fix an off by one error that the test uncovered.

Change-Id: If72009b1ea9791d5a265829f05c32ffe1c2752c4
ibziparchive/Android.mk
ibziparchive/testdata/valid.zip
ibziparchive/zip_archive.cc
ibziparchive/zip_archive_test.cc
6fec3a23046a3100c2ce1863afdd0191da69cdcc 10-Dec-2013 Nick Kralevich <nnk@google.com> Merge "Log a warning on services that lack SELinux domains."
d5d68f12f524c710a42625ec17261c822bc96acd 09-Dec-2013 Qiwen Zhao <zhao@google.com> DO NOT MERGE reset to goog/klp-volantis-dev
af06c6745bdf391c57ef29de4e6133f05c3b6187 09-Dec-2013 Stephen Smalley <sds@tycho.nsa.gov> Log a warning on services that lack SELinux domains.

Sample output on flo:
<3>[ 7.270568] init: Warning! Service irsc_util needs a SELinux domain defined; please fix!
<3>[ 8.290832] init: Warning! Service bootanim needs a SELinux domain defined; please fix!

Change-Id: If5514b188517917d58ee81c446af563b0443be45
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/init.c
6b3867fc6b3cb45e6163c15cc831fd150a8b104c 09-Dec-2013 Nick Kralevich <nnk@google.com> am 7d1f3a3d: am bdf53e2a: Merge "Do not change ownership on /sys/fs/selinux/enforce."

* commit '7d1f3a3daa721892b3247e847f72f1e948a0a68f':
Do not change ownership on /sys/fs/selinux/enforce.
7d1f3a3daa721892b3247e847f72f1e948a0a68f 09-Dec-2013 Nick Kralevich <nnk@google.com> am bdf53e2a: Merge "Do not change ownership on /sys/fs/selinux/enforce."

* commit 'bdf53e2a59654d2b1e8469616f1b0175b275219d':
Do not change ownership on /sys/fs/selinux/enforce.
bdf53e2a59654d2b1e8469616f1b0175b275219d 09-Dec-2013 Nick Kralevich <nnk@google.com> Merge "Do not change ownership on /sys/fs/selinux/enforce."
eb41ad212e125aa81f09df850e0c41e11ba96043 09-Dec-2013 Narayan Kamath <narayan@google.com> Fix return code for ended iteration.

The API promises a return code of -1 for an
ended iteration and lower negative values for
errors.

Change-Id: I688a1ee2efad1bdfc6959cf27e49c0426ebf27f8
ibziparchive/zip_archive.cc
17bec835d5cf1dfd3fa94df3b0da84a1e731e447 09-Dec-2013 Stephen Smalley <sds@tycho.nsa.gov> Do not change ownership on /sys/fs/selinux/enforce.

There is no longer any reason to permit system UID to set enforcing mode.

Change-Id: Ie28beed1ca2b215c71f2847e2390cee1af1713c3
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
5f64d528be2ca7229c0e9ce00837ac0fa4da2e54 07-Dec-2013 Mark Salyzyn <salyzyn@google.com> adb: regression from Move list.c to inlines

Change-Id: I057dbe3db80b1460f774e9f9ade11e0929529ec6
db/Android.mk
9880128af28cd757dd33819990ca349cbc2e8895 06-Dec-2013 Mark Salyzyn <salyzyn@google.com> Merge changes I7d9db1e2,I48b0942a,I0572555a

* changes:
liblog: whitespace cleanup
libsysutils: Get rid of warnings
libcutils: Move list.c to inlines on list.h
d33b5b7cdd7eb287bea41b2d813de1e15588fe42 06-Dec-2013 Mark Salyzyn <salyzyn@google.com> Merge "libcutils: bug str_parms.c:str_parms_get_float()."
ff4e3295ab2707fd3952e005ad470e59aee8344a 06-Dec-2013 Mark Salyzyn <salyzyn@google.com> Merge "libcutils: UNUSED argument warnings"
fe4d0a1065102fd0079ad72ecb2b36ad65590d06 06-Dec-2013 Narayan Kamath <narayan@google.com> am cb7092d9: am 48a6d3de: am ac3ab308: Merge "Fix Mac OS build for libziparchive."

* commit 'cb7092d9f602dcbe8c8c7b2eeec5858e1c35cc39':
Fix Mac OS build for libziparchive.
cb7092d9f602dcbe8c8c7b2eeec5858e1c35cc39 06-Dec-2013 Narayan Kamath <narayan@google.com> am 48a6d3de: am ac3ab308: Merge "Fix Mac OS build for libziparchive."

* commit '48a6d3de590714f4e913c6cc3135a455126df91d':
Fix Mac OS build for libziparchive.
48a6d3de590714f4e913c6cc3135a455126df91d 06-Dec-2013 Narayan Kamath <narayan@google.com> am ac3ab308: Merge "Fix Mac OS build for libziparchive."

* commit 'ac3ab308f657f70e2747734d5ff2158aa943b25e':
Fix Mac OS build for libziparchive.
ac3ab308f657f70e2747734d5ff2158aa943b25e 06-Dec-2013 Narayan Kamath <narayan@google.com> Merge "Fix Mac OS build for libziparchive."
574c3b35df54a288e70d1099ccb0ffe02d14c996 06-Dec-2013 Narayan Kamath <narayan@google.com> Fix Mac OS build for libziparchive.

BSD off_t are implicitly 64 bit so the platform
doesn't define off64_t.

Change-Id: I51cbe94ead01d2d6bc7c5010d9472487bee7c2d3
nclude/ziparchive/zip_archive.h
52d07d20566e0248ef115472422594ce74aef7df 06-Dec-2013 Narayan Kamath <narayan@google.com> am f591bbc2: am 51a1d4e3: am a2125077: Merge "Unify zipfile implementations : Step 1."

* commit 'f591bbc247cf3535c8b5e162058769db4aa3d4af':
Unify zipfile implementations : Step 1.
f591bbc247cf3535c8b5e162058769db4aa3d4af 06-Dec-2013 Narayan Kamath <narayan@google.com> am 51a1d4e3: am a2125077: Merge "Unify zipfile implementations : Step 1."

* commit '51a1d4e3f629f9a9a20a0c2a04c4f2a7507ee48c':
Unify zipfile implementations : Step 1.
51a1d4e3f629f9a9a20a0c2a04c4f2a7507ee48c 06-Dec-2013 Narayan Kamath <narayan@google.com> am a2125077: Merge "Unify zipfile implementations : Step 1."

* commit 'a2125077e104941f797f93fbe6bfad22ef60a1d8':
Unify zipfile implementations : Step 1.
a2125077e104941f797f93fbe6bfad22ef60a1d8 06-Dec-2013 Narayan Kamath <narayan@google.com> Merge "Unify zipfile implementations : Step 1."
1f9b04a304e79d755e9d6389e4bd51b535d945d7 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am f02af525: am 7fc7a07b: Merge commit \'252d9030cd4b2e3e6cf13fa33f328eccedb5e26c\' into HEAD

* commit 'f02af525738583ca42a3cbfea00b868de7281aeb':
f02af525738583ca42a3cbfea00b868de7281aeb 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am 7fc7a07b: Merge commit \'252d9030cd4b2e3e6cf13fa33f328eccedb5e26c\' into HEAD

* commit '7fc7a07b237e0887f3815822c4551b9968267b37':
67ee1205b1be15660adda7431d340ec5d2cda57a 05-Dec-2013 Todd Poynor <toddpoynor@google.com> am 9bc73047: (-s ours) am 3f17bda8: am a41611f6: healthd: fix botched logging call

* commit '9bc73047b59cdff412cfc647018a69a69d36ae3d':
30cd0fc4f66b2ea755d2db39f2a0c42892b3772c 05-Dec-2013 Elliott Hughes <enh@google.com> am f183a42f: (-s ours) am 49f2e1ce: am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"

* commit 'f183a42fb39f008c13e6ffdaa28766f8b78b43d3':
7fc7a07b237e0887f3815822c4551b9968267b37 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c' into HEAD
9bc73047b59cdff412cfc647018a69a69d36ae3d 05-Dec-2013 Todd Poynor <toddpoynor@google.com> am 3f17bda8: am a41611f6: healthd: fix botched logging call

* commit '3f17bda89498509fd56c3578ebff51ec0c2fb33f':
f183a42fb39f008c13e6ffdaa28766f8b78b43d3 05-Dec-2013 Elliott Hughes <enh@google.com> am 49f2e1ce: am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"

* commit '49f2e1cedfcf1dac72efe6e3634a3cd2db299e30':
Add USB Vendor ID for MSI
c1215c0b46576771370ceb4e1b1d8fc5a7034cfd 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> liblog: whitespace cleanup

- change cutils to liblog directory path
- change tabs to spaces

Change-Id: I7d9db1e2b817ba0ec9a224340c5c7535a2387fd5
iblog/logd_write.c
iblog/logprint.c
8e71ddeac00d0733c7fcc2965d69f07aa5c5d0a3 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> libcutils: bug str_parms.c:str_parms_get_float().

str_parms_get_float did not return the output into
*val. Only output if returning with no error. Audit
shows no internal users of this library function

Change-Id: I14a3f08a098072a159dd93f85ead36b3f445816f
ibcutils/str_parms.c
ba02cd1e9bccee9b112ccbee06bc204381b5a215 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> libcutils: UNUSED argument warnings

Change-Id: Ie427d481298af8d911bb2b157ebba30954335354
ibcutils/android_reboot.c
ibcutils/socket_local_client.c
ibcutils/str_parms.c
696f267ff5a1e6227c2f5784dae60c190e0228b8 22-Nov-2013 Mark Salyzyn <salyzyn@google.com> libsysutils: Get rid of warnings

- UNUSED argument warnings
- Remove LOG_NDEBUG define

Change-Id: I48b0942adfdb7a46a7693e580bc6ed5a685b0d5b
ibsysutils/src/FrameworkCommand.cpp
ibsysutils/src/FrameworkListener.cpp
ibsysutils/src/SocketListener.cpp
0ea3624b3ef2a6545df770d06338c4655386220d 27-Nov-2013 Mark Salyzyn <salyzyn@google.com> libcutils: Move list.c to inlines on list.h

Change-Id: I0572555a194d2560e74dfbf07abcec05e9a276a2
nclude/cutils/list.h
ibcutils/Android.mk
ibcutils/list.c
dd8fddd503ecffb607013109a42ee9614bd9c47c 05-Dec-2013 Carton He <carton.he@marvell.com> Fix tracing on user builds

Need the set correct permission for print-tgid option or tracing of
sched can't work on user build.

Change-Id: Ia88aabe58128b911afd78f01c27f7da884ed03f0
Signed-off-by: Carton He <carton.he@marvell.com>
ootdir/init.trace.rc
91a4160f5ceae04f7612421e87ad0bf266525fc7 05-Dec-2013 Colin Cross <ccross@android.com> am 26321284: am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2

* commit '263212845432865236b9b6ccdca807385603db68':
Fix fastbootd's <linux/kexec.h> reference.
Fastbootd: Comments and general cleaning
Fastbootd: General fixes and changes
Revert "Revert "Fastbootd: flashing certification""
Fastbootd: auto ssh server start
Fastbootd: network auto discovery
Fastbootd: socket and network transport
Fastbootd: build breakage fix
Revert "Fastbootd: flashing certification"
Fastbootd: flashing certification
Fastbootd: improved operations on gpt
Remove a homebrew mmap64.
Fastbootd: fixed missing file in Android.mk
fastbootd: erase, boot and partitioning commands
263212845432865236b9b6ccdca807385603db68 05-Dec-2013 Colin Cross <ccross@android.com> am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2

* commit '02ac0bfdc1c80a2f18487d28aa56dcd8499de246':
Fix fastbootd's <linux/kexec.h> reference.
Fastbootd: Comments and general cleaning
Fastbootd: General fixes and changes
Revert "Revert "Fastbootd: flashing certification""
Fastbootd: auto ssh server start
Fastbootd: network auto discovery
Fastbootd: socket and network transport
Fastbootd: build breakage fix
Revert "Fastbootd: flashing certification"
Fastbootd: flashing certification
Fastbootd: improved operations on gpt
Remove a homebrew mmap64.
Fastbootd: fixed missing file in Android.mk
fastbootd: erase, boot and partitioning commands
02ac0bfdc1c80a2f18487d28aa56dcd8499de246 05-Dec-2013 Colin Cross <ccross@android.com> Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2

* changes:
Fix fastbootd's <linux/kexec.h> reference.
Fastbootd: Comments and general cleaning
Fastbootd: General fixes and changes
Revert "Revert "Fastbootd: flashing certification""
Fastbootd: auto ssh server start
Fastbootd: network auto discovery
Fastbootd: socket and network transport
Fastbootd: build breakage fix
Revert "Fastbootd: flashing certification"
Fastbootd: flashing certification
Fastbootd: improved operations on gpt
Remove a homebrew mmap64.
Fastbootd: fixed missing file in Android.mk
fastbootd: erase, boot and partitioning commands
9536b8c997148d5ef2ae640a792a65ccbfb5a5f7 25-Nov-2013 Elliott Hughes <enh@google.com> Fix fastbootd's <linux/kexec.h> reference.

Change-Id: I28ce0288a6377153a96d3a98d6913d1271e3112f
astbootd/commands/boot.h
baf4c4bdeff4d21c564ae89698538efb8ef4d8b2 04-Oct-2013 Szymon Starzycki <sstar@google.com> Fastbootd: Comments and general cleaning

Alignment fix for fastbootd gpt_mmap

Change-Id: I86482e1645672daae1c8e4a4455c6291c0805fb0
astbootd/commands.c
astbootd/commands/partitions.c
55b61f4c9bac7f53289c79f22b4ad0ac80ecfb02 03-Oct-2013 Szymon Starzycki <sstar@google.com> Fastbootd: General fixes and changes

read data once bug fix
ability to run fastbootd without network and named socket configuration in init.rc
vendortrigger name changed to fastbootd
deleted unused function from default implementation of OEM library

Change-Id: Ib957fae8172530f20d51bb51b5e07bccab07e555
astbootd/commands.c
astbootd/commands/flash.h
astbootd/fastbootd.c
astbootd/include/vendor_trigger.h
astbootd/other/vendor_trigger.c
astbootd/secure.c
astbootd/transport_socket.c
4662a114a416e636de805fbd875f8b90fc5965b9 03-Oct-2013 Szymon Starzycki <sstar@google.com> Revert "Revert "Fastbootd: flashing certification""

CMS functionality is now available

This reverts commit 068b71dd9cd6cb03dfcdc0c9deced361780bc0d3.

Conflicts:
fastbootd/Android.mk
fastbootd/fastbootd.c
fastbootd/utils.c
fastbootd/utils.h

Change-Id: I1a27459b41d9297603deb124c65f237ff971e5b6
astbootd/Android.mk
astbootd/commands.c
astbootd/commands/flash.c
astbootd/commands/flash.h
astbootd/fastbootd.c
astbootd/other/sign/src/SignImg.java
astbootd/secure.c
astbootd/secure.h
27ea99fb99153e3b2d45efd6fce9785538469e49 19-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: auto ssh server start

Change-Id: I3e9c53c3d834726c3747e9ee0665ed027f55b08c
astbootd/fastbootd.c
astbootd/other/gptedit.c
astbootd/utils.c
astbootd/utils.h
bc849f14533a4a1fad676d31d0353909fa9d94be 14-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: network auto discovery

Change-Id: I91082f5832412e775244b3974c0ab00952905ad5
astbootd/Android.mk
astbootd/fastbootd.c
astbootd/network_discovery.c
astbootd/network_discovery.h
astbootd/utils.c
astbootd/utils.h
2a656c332b792c84fa6e96d8b40e2c8c0fe94ef9 05-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: socket and network transport

Change-Id: I395e5361d0484bd11421225c152f9aec00305f11
astbootd/Android.mk
astbootd/fastbootd.c
astbootd/socket_client.c
astbootd/socket_client.h
astbootd/transport.c
astbootd/transport_socket.c
astbootd/usb_linux_client.c
astbootd/utils.c
astbootd/utils.h
00f4e937300b09342983614e792668c269cd7fde 28-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: build breakage fix

Change-Id: I6a01ff6f785adc58581d0d9f44e71c94cbb4e3b5
astbootd/commands/partitions.c
b80e4c725d27fe316b0d6fde14d1f5eab34639ea 27-Sep-2013 Colin Cross <ccross@google.com> Revert "Fastbootd: flashing certification"

This reverts commit 5ccecfd26d2a7c3a79a139f0118b93ee64be4737.

Change-Id: I0ca31094c115e14982a27c258d9139a723da8428
astbootd/Android.mk
astbootd/commands.c
astbootd/commands/flash.c
astbootd/commands/flash.h
astbootd/fastbootd.c
astbootd/other/sign/src/SignImg.java
astbootd/secure.c
astbootd/secure.h
astbootd/utils.c
astbootd/utils.h
5621248d744a52a11ea927d7508d71cde44b63cd 20-Aug-2013 Szymon Starzycki <sstar@google.com> Fastbootd: flashing certification

Change-Id: I564086908942463eebee69449d484ba03effc50e
astbootd/Android.mk
astbootd/commands.c
astbootd/commands/flash.c
astbootd/commands/flash.h
astbootd/fastbootd.c
astbootd/other/sign/src/SignImg.java
astbootd/secure.c
astbootd/secure.h
astbootd/utils.c
astbootd/utils.h
b88fa3292d70f3a1e1512628f12cce87731ce160 17-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: improved operations on gpt

Change-Id: Ieabdcb1c52094d7408b169681e073ebf6613af20
astbootd/commands/partitions.c
astbootd/commands/partitions.h
astbootd/other/gptedit.c
ae2e69b9c0e57192401eb4f971be6b0d5a687c0d 20-Sep-2013 Elliott Hughes <enh@google.com> Remove a homebrew mmap64.

This should have been fixed in bionic, and now has been.

Change-Id: Ib9b21771ed7fbb6b4082b52d0b590f2867f344d4
astbootd/commands/partitions.c
c50dfd178ebd159d82f5577a96d743b0e831dba6 07-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: fixed missing file in Android.mk

Change-Id: I10927f488e35c688483f2d1d8c9f5b7ea1d7912d
astbootd/Android.mk
b6c5f2880e39526cddc9259b962911c0a3bb1f1d 25-Jul-2013 Szymon Starzycki <sstar@google.com> fastbootd: erase, boot and partitioning commands

Change-Id: I49ba2ba2e002fd5b6bbd37cc3fd0caa106f42010
astbootd/Android.mk
astbootd/commands.c
astbootd/commands/boot.c
astbootd/commands/boot.h
astbootd/commands/flash.c
astbootd/commands/flash.h
astbootd/commands/partitions.c
astbootd/commands/partitions.h
astbootd/commands/virtual_partitions.c
astbootd/commands/virtual_partitions.h
astbootd/config.c
astbootd/fastbootd.c
astbootd/include/vendor_trigger.h
astbootd/other/gptedit.c
astbootd/other/partitions.sample.cfg
astbootd/other/vendor_trigger.c
astbootd/trigger.c
astbootd/trigger.h
astbootd/utils.c
astbootd/utils.h
7462f02f82cce1dd196069e6d84c5c3ea7bf10ff 21-Nov-2013 Narayan Kamath <narayan@google.com> Unify zipfile implementations : Step 1.

Extract zip file processing logic from libdvm into a
standalone library.

This library is a stricter than the libdvm library in
several ways:
- Duplicate zip entry names are now disallowed. Files with
such entries will fail to parse.
- We now verify CD file size information with the individual
file header information. (This was pointed out as a deficiency
of this implementation in past discussions.)
- We also add support for crc checking, which means we might
need to parse the optional data descriptor footer (if one
exists).

We also provide an API for iterating over the entries of
a zip file. This library is optimized for two use cases :

- Lookup for a single entry in the file, with the intention
of processing or extracting the data associated with that
entry
- Iterating over all entries in a file *and* processing
/ extracting their data.

Change-Id: Ia87de6184ef753cc470b0af755c47a4f92ac8198
nclude/ziparchive/zip_archive.h
ibziparchive/Android.mk
ibziparchive/zip_archive.cc
ibziparchive/zip_archive_test.cc
58c530364923e05d5069218331eb6719c338b246 03-Dec-2013 JP Abgrall <jpa@google.com> adb: Don't clobber block devices during push

In the past, an adb push would ALWAYS unlink the target path.
Now, we only links and regular files (and links).
This allows the following to work:

adb shell ls -l /dev/block/mmcblk0p8
# brw------- root root 179, 8 2013-11-28 07:43 mmcblk0p8
adb push n7.jpa.mda.post_jb_encryption.raw /dev/block/mmcblk0p8

Bug: 11984121
Change-Id: I982c7a1cd87986621f2bebdcb41c4e281f67f772
db/file_sync_service.c
db7d933b9833f7a1d4d4ee6b6dc40cdc142c2761 03-Dec-2013 Greg Hackmann <ghackmann@google.com> am 0ddf436e: am b097ece8: Merge "libadf: add helper to set up a simple post"

* commit '0ddf436ef9450b7ecd4bce1206758f8d75267bfa':
libadf: add helper to set up a simple post
4e053f2df9787bed186cc6c096fb4e940bfc58aa 03-Dec-2013 Greg Hackmann <ghackmann@google.com> am b88d8e50: am 0e292002: Merge "libadf: filter overlay engines by a list of acceptable formats"

* commit 'b88d8e50645fc03f61e65cadac280c80fe14e50e':
libadf: filter overlay engines by a list of acceptable formats
b6a32b61889f4eecbf367ce11c834c763cf98cd7 03-Dec-2013 Greg Hackmann <ghackmann@google.com> am b11ab0f4: am 4635df34: Merge "add libadfhwc"

* commit 'b11ab0f497121c4f4ce9ea8648fe4f8e22faa124':
add libadfhwc
dfb61e9098cff279edb10eb03c8e284782d2de43 03-Dec-2013 Greg Hackmann <ghackmann@google.com> am 67afb1fa: am 4b95c2bb: Merge "add libadf"

* commit '67afb1fa399d3a64e639cb9051fa62caab56ffa8':
add libadf
0ddf436ef9450b7ecd4bce1206758f8d75267bfa 03-Dec-2013 Greg Hackmann <ghackmann@google.com> am b097ece8: Merge "libadf: add helper to set up a simple post"

* commit 'b097ece8271d13c7852d77c1784e237301e7e617':
libadf: add helper to set up a simple post
b88d8e50645fc03f61e65cadac280c80fe14e50e 03-Dec-2013 Greg Hackmann <ghackmann@google.com> am 0e292002: Merge "libadf: filter overlay engines by a list of acceptable formats"

* commit '0e292002c2da581bc0ff2bbc3d057bfe2f573d44':
libadf: filter overlay engines by a list of acceptable formats
b11ab0f497121c4f4ce9ea8648fe4f8e22faa124 03-Dec-2013 Greg Hackmann <ghackmann@google.com> am 4635df34: Merge "add libadfhwc"

* commit '4635df3433780371ff59e9c9c4577a7ca8d53f7f':
add libadfhwc
67afb1fa399d3a64e639cb9051fa62caab56ffa8 03-Dec-2013 Greg Hackmann <ghackmann@google.com> am 4b95c2bb: Merge "add libadf"

* commit '4b95c2bbf096b6438673659547914ae61ac4f127':
add libadf
b097ece8271d13c7852d77c1784e237301e7e617 03-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "libadf: add helper to set up a simple post"
0e292002c2da581bc0ff2bbc3d057bfe2f573d44 03-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "libadf: filter overlay engines by a list of acceptable formats"
4635df3433780371ff59e9c9c4577a7ca8d53f7f 03-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "add libadfhwc"
4b95c2bbf096b6438673659547914ae61ac4f127 03-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "add libadf"
f374fb84afd3000bf3abb6eeedbd3e474c298202 03-Dec-2013 Nick Kralevich <nnk@google.com> am 5e362c87: am 71e096c8: Merge "Increase buffer size, use bounds checking functions"

* commit '5e362c871a7b79b12e91a8737606988163f84dcf':
Increase buffer size, use bounds checking functions
8dfdf650abf4a9c05dbc7c60b7baee22e43c07b5 28-Nov-2013 Nick Kralevich <nnk@google.com> Minor cleanups.

Use ssize_t for handling the result of a readlink call.

Fix the following compiler warning:

system/core/toolbox/ls.c: In function 'listfile_maclabel':
system/core/toolbox/ls.c:238:68: warning: unused parameter 'flags' [-Wunused-parameter]
static int listfile_maclabel(const char *path, struct stat *s, int flags)

Change-Id: Idd65f3349fb9dfb6f7a374c81f72d3169af33505
oolbox/ls.c
5e362c871a7b79b12e91a8737606988163f84dcf 28-Nov-2013 Nick Kralevich <nnk@google.com> am 71e096c8: Merge "Increase buffer size, use bounds checking functions"

* commit '71e096c894b2b49b0ae63a852c0a8a5a6de0c8a7':
Increase buffer size, use bounds checking functions
71e096c894b2b49b0ae63a852c0a8a5a6de0c8a7 28-Nov-2013 Nick Kralevich <nnk@google.com> Merge "Increase buffer size, use bounds checking functions"
4ec2910fb670afabc1296bfc57bfd41ca50f00b1 28-Nov-2013 Nick Kralevich <nnk@google.com> Increase buffer size, use bounds checking functions

Increase the size of the user/group buffer from 16 bytes
to 32 bytes. Some OEMs are creating usernames longer than
15 bytes, causing problems.

Use bounds checking functions when handling user/group
data, to avoid overflowing buffers.

Change-Id: I4a5824b819b0c37662ba4f33573af0d0e071b444
oolbox/ls.c
45c0aa4700a6cc6bc4b8db297f9ca30939ef0576 27-Nov-2013 Elliott Hughes <enh@google.com> am 79fb7be4: am 1899628a: Merge "Switch ARM debuggerd over to <sys/user.h>."

* commit '79fb7be4f572297ea2c67d16f101e5e1d665f882':
Switch ARM debuggerd over to <sys/user.h>.
bf5e7ed84e51f40da30a1350cdc3124c19a3484c 27-Nov-2013 Greg Hackmann <ghackmann@google.com> am 5ebd8e43: am b2406973: Merge changes I727d9135,I3bd1b59d,I0d05aa28

* commit '5ebd8e43ba992d12fcdac4aedf7da51b50d6b949':
rootdir: add ueventd.rc rule for adf subsystem
init: add subsystem rules to ueventd.rc
init: handle ueventd path truncation better
dde75d940a0f8c177fea9299c26959eeb6707033 27-Nov-2013 Greg Hackmann <ghackmann@google.com> am 675c9966: am 0914e01e: Merge "init: limit visibility of init_parser.c helpers"

* commit '675c996651e0513e9c7b657d356c55f9b05c7c9f':
init: limit visibility of init_parser.c helpers
7b1791e153bb836f72ee122691f80f2012c9fe75 27-Nov-2013 Elliott Hughes <enh@google.com> am 8bda6ce5: am 121400a4: Merge "Make init distinguish between orderly exit and being killed by signals."

* commit '8bda6ce55700e46760f8d59820406b72964fa171':
Make init distinguish between orderly exit and being killed by signals.
79fb7be4f572297ea2c67d16f101e5e1d665f882 27-Nov-2013 Elliott Hughes <enh@google.com> am 1899628a: Merge "Switch ARM debuggerd over to <sys/user.h>."

* commit '1899628a2e1aad79eaf46b091ba60aa7d89add98':
Switch ARM debuggerd over to <sys/user.h>.
1899628a2e1aad79eaf46b091ba60aa7d89add98 27-Nov-2013 Elliott Hughes <enh@google.com> Merge "Switch ARM debuggerd over to <sys/user.h>."
9e7d2180c7ac60d4bec1c7a91f52dc765b39814c 27-Nov-2013 Elliott Hughes <enh@google.com> Switch ARM debuggerd over to <sys/user.h>.

Change-Id: I106d4e80a2e819f1d47ca81893340f567bb8b4d9
ebuggerd/arm/machine.c
18326353193f97d90b1a423b5efb9e3115befff8 12-Nov-2013 Greg Hackmann <ghackmann@google.com> libadf: add helper to set up a simple post

Change-Id: I381b47f924b02c208ea6f20cf887abdef1035830
Signed-off-by: Greg Hackmann <ghackmann@google.com>
df/libadf/adf.c
df/libadf/include/adf/adf.h
47e0c8d849277a4b96fc364e5703f301e2b94519 12-Nov-2013 Greg Hackmann <ghackmann@google.com> libadf: filter overlay engines by a list of acceptable formats

Change-Id: Ibb294f0520a7a7a6a2a89e1e3eb3c335906d3e66
Signed-off-by: Greg Hackmann <ghackmann@google.com>
df/libadf/adf.c
df/libadf/include/adf/adf.h
ebb26c71fe59c1904dc198b00948c581d31bd412 08-Nov-2013 Greg Hackmann <ghackmann@google.com> add libadfhwc

Helper library for implementing a hwcomposer HAL on top of libadf

Change-Id: I2af0617416fb4a6b3a1d182a22e809bfdc54a532
Signed-off-by: Greg Hackmann <ghackmann@google.com>
df/libadfhwc/Android.mk
df/libadfhwc/adfhwc.cpp
df/libadfhwc/include/adfhwc/adfhwc.h
b85d12a3074c13e37f59b47edb81e1d4ff34eeb0 08-Nov-2013 Greg Hackmann <ghackmann@google.com> add libadf

Helper library to enumerate ADF objects, wrap ADF ioctls, and read event
data

Change-Id: I7aa7f88935174e650a40b2f9db3212280121f760
Signed-off-by: Greg Hackmann <ghackmann@google.com>
df/Android.mk
df/libadf/Android.mk
df/libadf/adf.c
df/libadf/include/adf/adf.h
5ebd8e43ba992d12fcdac4aedf7da51b50d6b949 26-Nov-2013 Greg Hackmann <ghackmann@google.com> am b2406973: Merge changes I727d9135,I3bd1b59d,I0d05aa28

* commit 'b240697339b1ff1f45217a48dc9d3fa8a2f21a2b':
rootdir: add ueventd.rc rule for adf subsystem
init: add subsystem rules to ueventd.rc
init: handle ueventd path truncation better
b240697339b1ff1f45217a48dc9d3fa8a2f21a2b 26-Nov-2013 Greg Hackmann <ghackmann@google.com> Merge changes I727d9135,I3bd1b59d,I0d05aa28

* changes:
rootdir: add ueventd.rc rule for adf subsystem
init: add subsystem rules to ueventd.rc
init: handle ueventd path truncation better
95b348c5d7d1dbccee2c39f48010fd19e8396e44 19-Nov-2013 Greg Hackmann <ghackmann@google.com> rootdir: add ueventd.rc rule for adf subsystem

Change-Id: I727d91355229692c11e0e309c0fcac051269eba3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ootdir/ueventd.rc
3312aa8379d877044def52f3b3be5c912a5e61a2 19-Nov-2013 Greg Hackmann <ghackmann@google.com> init: add subsystem rules to ueventd.rc

By default ueventd creates device nodes under /dev based on the ueventd
DEVPATH. Several subsystems have special rules which are hardcoded in
devices.c. Moving forward these special rules should go in ueventd.rc.

Special rules have the syntax:

subsystem <s>
devname (uevent_devname|uevent_devpath)
[dirname <dir>]

Devices matching SUBSYSTEM=<s> will be populated under <dir>. dirname
is optional and defaults to /dev. If dirname is provided, <dir> must
start with "/".

If devname is uevent_devname, ueventd will create the device node as
<dir>/DEVNAME. DEVNAME may include intermediate subdirectories, which
ueventd will automatically create.

If devname is uevent_devpath, ueventd will use the legacy behavior of
computing DEVPATH_BASE=basepath(DEVPATH), and creating the device node
as <dir>/DEVPATH_BASE.

The new parsing code is based on init_parser.c, with small tweaks to
handle commands which don't fall under a section header.

Change-Id: I3bd1b59d7e62dfc9d289cf6ae889e237fb5bd7c5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
nit/devices.c
nit/ueventd.h
nit/ueventd_keywords.h
nit/ueventd_parser.c
nit/ueventd_parser.h
f6e009ee2650d8812942aa7f5761e86402346739 21-Nov-2013 Greg Hackmann <ghackmann@google.com> init: handle ueventd path truncation better

Log an error before discarding problematic events, and add a missing
truncation check to the usb subsystem's unique codepath

Change-Id: I0d05aa287ffc63b46d1752d2a7409d35dc8caca7
Signed-off-by: Greg Hackmann <ghackmann@google.com>
nit/devices.c
675c996651e0513e9c7b657d356c55f9b05c7c9f 26-Nov-2013 Greg Hackmann <ghackmann@google.com> am 0914e01e: Merge "init: limit visibility of init_parser.c helpers"

* commit '0914e01ed9936602006ed4a6891c5e55a42e881a':
init: limit visibility of init_parser.c helpers
0914e01ed9936602006ed4a6891c5e55a42e881a 26-Nov-2013 Greg Hackmann <ghackmann@google.com> Merge "init: limit visibility of init_parser.c helpers"
8bda6ce55700e46760f8d59820406b72964fa171 26-Nov-2013 Elliott Hughes <enh@google.com> am 121400a4: Merge "Make init distinguish between orderly exit and being killed by signals."

* commit '121400a40fce22b6e0b74f2492b8b9eff6133bd1':
Make init distinguish between orderly exit and being killed by signals.
121400a40fce22b6e0b74f2492b8b9eff6133bd1 26-Nov-2013 Elliott Hughes <enh@google.com> Merge "Make init distinguish between orderly exit and being killed by signals."
7d2db03ef7eb12fdf33562c37d47f803b32c12f1 26-Nov-2013 Stephen Hines <srhines@google.com> am f4083cae: am e456d420: Merge "libpixelflinger: do not use anonymous structs"

* commit 'f4083caec07ba6569865de40904e6776d2db3cfa':
libpixelflinger: do not use anonymous structs
f4083caec07ba6569865de40904e6776d2db3cfa 26-Nov-2013 Stephen Hines <srhines@google.com> am e456d420: Merge "libpixelflinger: do not use anonymous structs"

* commit 'e456d420a5bdd1085f587a7906b58aabcb43f220':
libpixelflinger: do not use anonymous structs
e456d420a5bdd1085f587a7906b58aabcb43f220 26-Nov-2013 Stephen Hines <srhines@google.com> Merge "libpixelflinger: do not use anonymous structs"
6c5ad5c2ced5e2f1dc31448ef3e0c0fb14f9ada8 26-Nov-2013 Elliott Hughes <enh@google.com> Make init distinguish between orderly exit and being killed by signals.

Bug: 11826724
Change-Id: I7c11f602447dbd6862decc51cdfe883003cf7d67
nit/signal_handler.c
a3afb4c6172b03243bcb140620b1e62786df132d 25-Nov-2013 Elliott Hughes <enh@google.com> Fix fastbootd's <linux/kexec.h> reference.

Change-Id: I28ce0288a6377153a96d3a98d6913d1271e3112f
astbootd/commands/boot.h
b451ea185beb4dee111c3cd8a2d818b9f3581dd0 25-Nov-2013 JP Abgrall <jpa@google.com> am ec51d818: am 71f2f251: Merge "logwrapper: fix missing include"

* commit 'ec51d818c5ce8fa6985ed9779a44647cfb040f8a':
logwrapper: fix missing include
ec51d818c5ce8fa6985ed9779a44647cfb040f8a 25-Nov-2013 JP Abgrall <jpa@google.com> am 71f2f251: Merge "logwrapper: fix missing include"

* commit '71f2f2514ee40a6d9b66545049855ab371955bed':
logwrapper: fix missing include
71f2f2514ee40a6d9b66545049855ab371955bed 25-Nov-2013 JP Abgrall <jpa@google.com> Merge "logwrapper: fix missing include"
d68db71e756c3fac2dd32fa78bdd2c0bc172663a 18-Nov-2013 Greg Hackmann <ghackmann@google.com> init: limit visibility of init_parser.c helpers

To prevent clashing with forthcoming changes to uevent_parser.c

Change-Id: I2ee183261c7f43e0e4104a16a280c7ee73d7df96
Signed-off-by: Greg Hackmann <ghackmann@google.com>
nit/init_parser.c
nit/parser.h
cd2fe3b49bb76c63f01895b079fb2434d77a61a1 07-Nov-2013 synergy dev <synergye@codefi.re> libpixelflinger: do not use anonymous structs

Avoiding the use of gnu extensions improves code portability

Change-Id: Ie9e94e3ce030f52a22997f8a48de1e6c1c549894
ibpixelflinger/scanline.cpp
5605cdade8dc8512c54f73863712b62582e6aaf4 21-Nov-2013 William Roberts <wroberts@tresys.com> logwrapper: fix missing include

Use of ECHILD with no definitive errno.h inclusion.

Explicitly listing the errno.h header file rather
then relying on the inclusion chain to do so.

Change-Id: I5552acd928d17fc62192217a30ff2e4fab0b1936
ogwrapper/logwrapper.c
4417dad18b7927fd42f88d144f39bbe244a76bb9 23-Nov-2013 The Android Open Source Project <initial-contribution@android.com> am d61ade1d: am 66ed50af: Merge commit \'536dea9d61a032e64bbe584a97463c6638ead009\' into HEAD

* commit 'd61ade1ddc064d8035e371e22d5fb2d1117a81e1':
d61ade1ddc064d8035e371e22d5fb2d1117a81e1 23-Nov-2013 The Android Open Source Project <initial-contribution@android.com> am 66ed50af: Merge commit \'536dea9d61a032e64bbe584a97463c6638ead009\' into HEAD

* commit '66ed50af6870210ce013a5588a688434a5d48ee9':
66ed50af6870210ce013a5588a688434a5d48ee9 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD

Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
fabe8716f81ec419ec854799d0a63c444e91edd3 22-Nov-2013 Todd Poynor <toddpoynor@google.com> am fd1dd864: am 479efb54: init.rc: mount pstore fs, set console-ramoops permissions

* commit 'fd1dd864a896bd6233ee8c75b84d9771148dd9b3':
init.rc: mount pstore fs, set console-ramoops permissions
fd1dd864a896bd6233ee8c75b84d9771148dd9b3 22-Nov-2013 Todd Poynor <toddpoynor@google.com> am 479efb54: init.rc: mount pstore fs, set console-ramoops permissions

* commit '479efb540a198a9b7cd278387b0d45009a05bb2b':
init.rc: mount pstore fs, set console-ramoops permissions
fd91129d5b3c70735a72b54abbeba9342dec49dc 22-Nov-2013 Elliott Hughes <enh@google.com> am bbdfc0c4: am dd2ac3de: am d966eebf: Merge "Fix build."

* commit 'bbdfc0c4124d838d16b65ef96cf4285dbe8ae038':
Fix build.
06d23c4b298390aea2aebb7426d6e3a2c1d781a7 22-Nov-2013 Elliott Hughes <enh@google.com> am 330b1afc: am 486ebac5: am a6fbc0f9: Merge "Replace __reboot call with syscall"

* commit '330b1afc13ae10f9defe34a39a966a9647945b92':
Replace __reboot call with syscall
9350d80e706f385c8a4dc6bc4fd9be15e6e0a850 22-Nov-2013 Elliott Hughes <enh@google.com> am b6ee39bc: am 4a4616f6: am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"

* commit 'b6ee39bca4b774cf2ffbad8eb12dcfc13b8814c9':
split setptop ethernet tcp buffer from wifi
bbdfc0c4124d838d16b65ef96cf4285dbe8ae038 22-Nov-2013 Elliott Hughes <enh@google.com> am dd2ac3de: am d966eebf: Merge "Fix build."

* commit 'dd2ac3de625e6c0328a0f70530d8ade0d2151bfc':
Fix build.
dd2ac3de625e6c0328a0f70530d8ade0d2151bfc 22-Nov-2013 Elliott Hughes <enh@google.com> am d966eebf: Merge "Fix build."

* commit 'd966eebfcba313477a598ad7b3e573a123a7a9af':
Fix build.
d966eebfcba313477a598ad7b3e573a123a7a9af 22-Nov-2013 Elliott Hughes <enh@google.com> Merge "Fix build."
f98e4bf7fb9496afbc31fd4812f5832e34aab7b8 22-Nov-2013 Elliott Hughes <enh@google.com> Fix build.

Change-Id: I6552bf9f83faa97bd5a844381aceb3ef85f86c76
nclude/ion/ion.h
ibion/ion_test.c
479efb540a198a9b7cd278387b0d45009a05bb2b 22-Nov-2013 Todd Poynor <toddpoynor@google.com> init.rc: mount pstore fs, set console-ramoops permissions

Change-Id: I44cb00f9123c6044a03de926b6a616da753bb549
ootdir/init.rc
93b923c34b7240586f3a36d77726f50877a31b26 22-Nov-2013 Elliott Hughes <enh@google.com> am 127eab25: am 8ab9ece2: am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."

* commit '127eab25293a59196de7a53602a7e27fd203ee65':
Switch MIPS over to <sys/user.h>.
330b1afc13ae10f9defe34a39a966a9647945b92 22-Nov-2013 Elliott Hughes <enh@google.com> am 486ebac5: am a6fbc0f9: Merge "Replace __reboot call with syscall"

* commit '486ebac551d64bb8698bbc805f71f5644d2c4917':
Replace __reboot call with syscall
b6ee39bca4b774cf2ffbad8eb12dcfc13b8814c9 22-Nov-2013 Elliott Hughes <enh@google.com> am 4a4616f6: am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"

* commit '4a4616f6450f191faf168a10b6e2ffaba14803bd':
split setptop ethernet tcp buffer from wifi
127eab25293a59196de7a53602a7e27fd203ee65 22-Nov-2013 Elliott Hughes <enh@google.com> am 8ab9ece2: am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."

* commit '8ab9ece2e9c6e246f66357c800d6d1ba61becc00':
Switch MIPS over to <sys/user.h>.
12c72d470babcdd75519037d06b479e582d304b8 22-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 4fe95eff: am 85fddd86: am cbc32e9f: Merge "Support parsing RDNSS ND options from netlink."

* commit '4fe95effe5e2413ab340e4ca6f37ca2498072696':
Support parsing RDNSS ND options from netlink.
6141fcbb9c5a719c89c60285571b87e55cee98f3 22-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 09e5ef65: am 6231f7f0: am 71dd5ba4: Merge "Switch back to subsystem "net" for netlink events."

* commit '09e5ef65cdb9b431a975a6afc8e0c21d623f7da9':
Switch back to subsystem "net" for netlink events.
3f0699d2d21d4bb4318cde7808791e7cc865d610 22-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 1df045d9: am ee676317: am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."

* commit '1df045d9525747f3bd7ba67f4aa6c43e299ebb1a':
Get rid of an infinite loop in NetlinkEvent.cpp.
d7ed0cae87e213102d4de48864408fac27e2776e 22-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 2cfa317c: am 740bf8da: (-s ours) am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."

* commit '2cfa317c015015495ae7e0679a9ac06409a09ab7':
Parse IP address changes in NetlinkEvent.
4fe95effe5e2413ab340e4ca6f37ca2498072696 22-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 85fddd86: am cbc32e9f: Merge "Support parsing RDNSS ND options from netlink."

* commit '85fddd867b06cf10ba8f79d0d37c4b65fa47cf8a':
Support parsing RDNSS ND options from netlink.
09e5ef65cdb9b431a975a6afc8e0c21d623f7da9 22-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 6231f7f0: am 71dd5ba4: Merge "Switch back to subsystem "net" for netlink events."

* commit '6231f7f07b1d2476e57410d5b8f7cbed72b893b7':
Switch back to subsystem "net" for netlink events.
1df045d9525747f3bd7ba67f4aa6c43e299ebb1a 22-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am ee676317: am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."

* commit 'ee676317b0d5b98968b8dc99d34b2ec0e60180ab':
Get rid of an infinite loop in NetlinkEvent.cpp.
2cfa317c015015495ae7e0679a9ac06409a09ab7 22-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 740bf8da: (-s ours) am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."

* commit '740bf8da310308bb5419468e2bf6d3920b8d6385':
Parse IP address changes in NetlinkEvent.
486ebac551d64bb8698bbc805f71f5644d2c4917 21-Nov-2013 Elliott Hughes <enh@google.com> am a6fbc0f9: Merge "Replace __reboot call with syscall"

* commit 'a6fbc0f9f49b797f4a67ea49f37681c08ab41111':
Replace __reboot call with syscall
a6fbc0f9f49b797f4a67ea49f37681c08ab41111 21-Nov-2013 Elliott Hughes <enh@google.com> Merge "Replace __reboot call with syscall"
dccdb942841aec3d243e8df8ccd20d6279737a2e 21-Nov-2013 Pavel Chupin <pavel.v.chupin@intel.com> Replace __reboot call with syscall

__reboot is hidden for 64-bits and should be hidden on others

Change-Id: Ib6435269aac7fa726e49cc02f8f76d2be2875bc6
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
ibcutils/android_reboot.c
1c3d3cdea1ec549872dca3eae5ebc1d53052045c 21-Nov-2013 Todd Poynor <toddpoynor@google.com> healthd: fix runstring option error reporting

Change-Id: I548d837afbde8a66826bb2cdb79ede7edda42b1f
ealthd/healthd.cpp
4a4616f6450f191faf168a10b6e2ffaba14803bd 21-Nov-2013 Elliott Hughes <enh@google.com> am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"

* commit '048bb92f3f33196d96a51b446c73805e208a5333':
split setptop ethernet tcp buffer from wifi
048bb92f3f33196d96a51b446c73805e208a5333 21-Nov-2013 Elliott Hughes <enh@google.com> Merge "split setptop ethernet tcp buffer from wifi"
8ab9ece2e9c6e246f66357c800d6d1ba61becc00 20-Nov-2013 Elliott Hughes <enh@google.com> am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."

* commit '162c9a247b2f62065c997c1085637f28e0fcde94':
Switch MIPS over to <sys/user.h>.
162c9a247b2f62065c997c1085637f28e0fcde94 20-Nov-2013 Elliott Hughes <enh@google.com> Merge "Switch MIPS over to <sys/user.h>."
76e7f5e508bad42f7924ed91d272bd341ec874f0 20-Nov-2013 Elliott Hughes <enh@google.com> Switch MIPS over to <sys/user.h>.

Bug: 11559337
Change-Id: I47ce51ec2d45d9cfdfbb6cccce93a66b0f02d967
ebuggerd/mips/machine.c
85fddd867b06cf10ba8f79d0d37c4b65fa47cf8a 20-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am cbc32e9f: Merge "Support parsing RDNSS ND options from netlink."

* commit 'cbc32e9f7e95d9c35ec5d855a13fd9346e9f55bf':
Support parsing RDNSS ND options from netlink.
6231f7f07b1d2476e57410d5b8f7cbed72b893b7 20-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 71dd5ba4: Merge "Switch back to subsystem "net" for netlink events."

* commit '71dd5ba4647fdecde0a44793f246fb0274159cbe':
Switch back to subsystem "net" for netlink events.
ee676317b0d5b98968b8dc99d34b2ec0e60180ab 20-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."

* commit 'a0b3fef0b78e8c6ef38eac6bcd6da7db6a841522':
Get rid of an infinite loop in NetlinkEvent.cpp.
740bf8da310308bb5419468e2bf6d3920b8d6385 20-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."

* commit '8c099bc206094dd229f4468b85c23b8639fb05ea':
Parse IP address changes in NetlinkEvent.
cbc32e9f7e95d9c35ec5d855a13fd9346e9f55bf 20-Nov-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Support parsing RDNSS ND options from netlink."
71dd5ba4647fdecde0a44793f246fb0274159cbe 20-Nov-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Switch back to subsystem "net" for netlink events."
a0b3fef0b78e8c6ef38eac6bcd6da7db6a841522 20-Nov-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Get rid of an infinite loop in NetlinkEvent.cpp."
8c099bc206094dd229f4468b85c23b8639fb05ea 20-Nov-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Parse IP address changes in NetlinkEvent."
c7eec83f08329a2a0008ba939c07dd1dc7d9b7ff 12-Aug-2013 Lorenzo Colitti <lorenzo@google.com> Support parsing RDNSS ND options from netlink.

The RDNSS options (RFC 6106) used to configure DNS servers via
router advertisements are passed from the kernel to userspace via
RTM_NEWNDUSEROPT netlink messages. Add code to NetlinkEvent to
parse them.

Also fix a compiler warning and a couple of style issues.

[Cherry-pick of b185e90dcc6ac111bff908edcc6d89fd6b37dc11]

Bug: 9180552
Change-Id: I6c532c8f0ceef3afdc977a431a036df398013e1a
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
526b838c9d647e8767fac957c53133153c3cf909 02-Sep-2013 Lorenzo Colitti <lorenzo@google.com> Switch back to subsystem "net" for netlink events.

The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".

Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.

[Cherry-pick of f34861346d5c207912075fba9874090e4c947869]

Bug: 10433320
Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
96834569343f38dc006492fccdf6dad68521b005 16-Aug-2013 Lorenzo Colitti <lorenzo@google.com> Get rid of an infinite loop in NetlinkEvent.cpp.

[Cherry-pick of 3984276ce47c965ad02a522280a139e0a0c7e5cf]

Bug: 10358527
Bug: 10263310
Bug: 10232006
Change-Id: I750e4bdf2000040adf214d6a772591d7bd25b350
ibsysutils/src/NetlinkEvent.cpp
381f70f52a282e6da780e4b686aaa9c230be2cdc 01-Aug-2013 Lorenzo Colitti <lorenzo@google.com> Parse IP address changes in NetlinkEvent.

This adds support for parsing RTM_NEWADDR and RTM_DELADDR
netlink messages received on netd's netlink socket and
formatting them them so NetlinkHandler can process them.

Address changes are notified in subsystem "address". Interface
changes, which used to be notified in subsystem "net", are now
notified in subsystem "interface" to avoid confusion.

[Cherry-pick of a4b4e9ad8e35ab424e61d76ebe6654445fc61e63]

Bug: 10232006
Change-Id: I93a50e8de17014e118a42f5cc0eb90a0cbfa73cc
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
1d4e86c44589b3a97ca0113493c2e569c3aabcc6 10-Nov-2013 Amir Goldstein <amir@cellrox.com> ueventd: fix a busy loop while reading uevents

Under certain conditions, poll() may raise the POLLERR
flag along with POLLIN, in which case the check for
(ufd.revents == POLLIN) results in an endless busy loop.

The following fix was applied to
hardware/libhardware_legacy/uevent/uevent.c
to fix a similar bug:

commit 3aabb260ceef10377c31c9e45fb239247f5cfeba
Author: Mathias Agopian <mathias@google.com>
Date: Mon Oct 1 14:53:18 2012 -0700

fix a typo in uevent_next_eventi

Bug: 7114973
Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2

Applying the same fix for two more poll loops in init
and ueventd.

Change-Id: I50693f6d3c904992ac4b8a9a14a83c7106e6b9e0
nit/init.c
nit/ueventd.c
c27843f2a9caa513b447faaf90bd27a7ced46703 15-Nov-2013 Elliott Hughes <enh@google.com> am 252d9030: am bf8e9342: am 3fa14a53: Merge "Remove x86 debuggerd dependencies on non-uapi headers and corkscrew."

* commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c':
Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.
252d9030cd4b2e3e6cf13fa33f328eccedb5e26c 15-Nov-2013 Elliott Hughes <enh@google.com> am bf8e9342: am 3fa14a53: Merge "Remove x86 debuggerd dependencies on non-uapi headers and corkscrew."

* commit 'bf8e9342daa8b148e6d94d98122c9bc2a429b04f':
Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.
bf8e9342daa8b148e6d94d98122c9bc2a429b04f 15-Nov-2013 Elliott Hughes <enh@google.com> am 3fa14a53: Merge "Remove x86 debuggerd dependencies on non-uapi headers and corkscrew."

* commit '3fa14a53e70cd55df031646fe3735a6fde37deb8':
Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.
3fa14a53e70cd55df031646fe3735a6fde37deb8 15-Nov-2013 Elliott Hughes <enh@google.com> Merge "Remove x86 debuggerd dependencies on non-uapi headers and corkscrew."
52ea510f8fa84b634ffff18b75b5a3f95e302ba6 15-Nov-2013 Jianzheng Zhou <jianzheng.zhou@freescale.com> split setptop ethernet tcp buffer from wifi

Change-Id: I0582ec75fddb904ca14b9cbddf593ddbd4195c41
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
ootdir/init.rc
18ddd420925fa7e61dd7775af6f024589556f779 15-Nov-2013 Elliott Hughes <enh@google.com> Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.

Also remove a hack that claims to be "just like ARM", but which was
different from the ARM and MIPS behavior.

Change-Id: I9b16da9a56430998ded27d304ce52c7cc8bfedfc
ebuggerd/x86/machine.c
b6ec7446b807aea9bc112aba203099562cf4477f 13-Nov-2013 Elliott Hughes <enh@google.com> am fc6a1da9: am d97a34af: am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."

* commit 'fc6a1da9a29f9322f3ca572f4067c854534dfe65':
Fix libnetutils to build with clean uapi headers.
fc6a1da9a29f9322f3ca572f4067c854534dfe65 12-Nov-2013 Elliott Hughes <enh@google.com> am d97a34af: am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."

* commit 'd97a34af49f6beafc21d5f459ea62b499544f9f3':
Fix libnetutils to build with clean uapi headers.
d97a34af49f6beafc21d5f459ea62b499544f9f3 12-Nov-2013 Elliott Hughes <enh@google.com> am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."

* commit '60e7d49557a4a330285f9bcd76f0dfae9c1855ae':
Fix libnetutils to build with clean uapi headers.
60e7d49557a4a330285f9bcd76f0dfae9c1855ae 12-Nov-2013 Elliott Hughes <enh@google.com> Merge "Fix libnetutils to build with clean uapi headers."
2d640c2640b957f704d86fcaea6e5a4af54dde2c 12-Nov-2013 Elliott Hughes <enh@google.com> Fix libnetutils to build with clean uapi headers.

(And old ones too.)

Bug: 11559337
Change-Id: Ie61218055bbe07655a9d53c539aa47b85098e42c
ibnetutils/ifc_utils.c
242b1a8c7a5ec73172bac811e51acbc27201f22c 12-Nov-2013 Christopher Ferris <cferris@google.com> Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.

Use a bit better name for this. The other name was a bit confusing.

Change-Id: I1261f2ee3854a9c8b82133ad0bfbbbe48b43c9ac
nclude/backtrace/backtrace.h
nclude/utils/CallStack.h
ibbacktrace/Backtrace.cpp
ibbacktrace/backtrace_test.cpp
230e98bfea49f542c145ad5eff57d29feef0cdf9 12-Nov-2013 Elliott Hughes <enh@google.com> am 36ff3bd2: am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi headers."

* commit '36ff3bd273d9f60822104eb53f3aa1886160b360':
Fix nandread to build with old or uapi headers.
36ff3bd273d9f60822104eb53f3aa1886160b360 12-Nov-2013 Elliott Hughes <enh@google.com> am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi headers."

* commit 'e8c6d15b1892ffd09dae8ac7922854140a11130d':
Fix nandread to build with old or uapi headers.
e8c6d15b1892ffd09dae8ac7922854140a11130d 12-Nov-2013 Elliott Hughes <enh@google.com> am 59644a6c: Merge "Fix nandread to build with old or uapi headers."

* commit '59644a6c7182db6caf53dc61f448f2c68ff569be':
Fix nandread to build with old or uapi headers.
59644a6c7182db6caf53dc61f448f2c68ff569be 12-Nov-2013 Elliott Hughes <enh@google.com> Merge "Fix nandread to build with old or uapi headers."
b05a2e513023133a780f51530246c492ddd95b46 12-Nov-2013 Elliott Hughes <enh@google.com> Fix nandread to build with old or uapi headers.

Bug: 11559337
Change-Id: I9795a16649dafdfe3df150170265157170cd5a79
oolbox/nandread.c
7f3c8f9c5bd057701e9914459cfd7960c4063d99 09-Nov-2013 Christopher Ferris <cferris@google.com> Remove hack for mingw compiler.

The __BEGIN_DECLS/__END_DECLS macro is now defined for mingw.

Change-Id: Icd09b92a83e982ac0ed3eb34df4c1d79de21941e
nclude/backtrace/backtrace.h
ab9189893d36e3174eba013f755473210c8cbc61 08-Nov-2013 Narayan Kamath <narayan@google.com> Fix mingw windows host build.

__BEGIN_DECLS isn't defined on this platform and
it appears to be missing sys/cdefs.h

Change-Id: I13cc557700198590cf717e3007dee738043ac3bf
nclude/backtrace/backtrace.h
e70f95f349c64489e736ad59aac811a5e56deb50 08-Nov-2013 Christopher Ferris <cferris@google.com> am 90e67bcd: am d36bfc30: am e6279294: Merge "Revert "Revert enabling libunwind.""

* commit '90e67bcdc383d552dc5325039c86b5bef5429b05':
Revert "Revert enabling libunwind."
90e67bcdc383d552dc5325039c86b5bef5429b05 08-Nov-2013 Christopher Ferris <cferris@google.com> am d36bfc30: am e6279294: Merge "Revert "Revert enabling libunwind.""

* commit 'd36bfc30ae5fa86b4c3fd8248e5ee16f479250b6':
Revert "Revert enabling libunwind."
d36bfc30ae5fa86b4c3fd8248e5ee16f479250b6 08-Nov-2013 Christopher Ferris <cferris@google.com> am e6279294: Merge "Revert "Revert enabling libunwind.""

* commit 'e627929490dfb92ab51ec6feb259d793a4a9f394':
Revert "Revert enabling libunwind."
e627929490dfb92ab51ec6feb259d793a4a9f394 08-Nov-2013 Christopher Ferris <cferris@google.com> Merge "Revert "Revert enabling libunwind.""
e6feaeeda108d45b804dfbc00d2dad01262ff825 08-Nov-2013 Christopher Ferris <cferris@google.com> Revert "Revert enabling libunwind."

This reverts commit db2309e3d104e47088135a7f1bb89ac853657838.

Change-Id: I1626442f029473066ce20921667a406f1a1ea865
ibbacktrace/Android.mk
d283d9348933dabec517db3dfb05596a166901a8 07-Nov-2013 Elliott Hughes <enh@google.com> am 8ddd08b1: am 4ae94541: am 62ea993a: Merge "Revert enabling libunwind."

* commit '8ddd08b1f24d361ace9cd78198664db4bf7e1325':
Revert enabling libunwind.
8ddd08b1f24d361ace9cd78198664db4bf7e1325 07-Nov-2013 Elliott Hughes <enh@google.com> am 4ae94541: am 62ea993a: Merge "Revert enabling libunwind."

* commit '4ae94541b82dde787b0e2c46f1a4f2524572c1c4':
Revert enabling libunwind.
1707bf0320d24ca49118068a9a99a20f5ae5dfad 07-Nov-2013 Elliott Hughes <enh@google.com> am 2ee98591: am fde641ee: am 30296f28: Merge "Let external/mksh install directly into /system/bin/sh."

* commit '2ee985913f4c7e082fc68e6896698d9fa117c474':
Let external/mksh install directly into /system/bin/sh.
3c8b229f60863c7a3637b4c6ccf930a04143f267 07-Nov-2013 Christopher Ferris <cferris@google.com> am c3920dee: am 11d04d04: am 351b0123: Merge "Enable libunwind on arm platforms."

* commit 'c3920dee104856025f9416670efd7f05d1acd3a0':
Enable libunwind on arm platforms.
4ae94541b82dde787b0e2c46f1a4f2524572c1c4 07-Nov-2013 Elliott Hughes <enh@google.com> am 62ea993a: Merge "Revert enabling libunwind."

* commit '62ea993a6997701dba7735ca4a4af6fc6cabac2c':
Revert enabling libunwind.
2ee985913f4c7e082fc68e6896698d9fa117c474 07-Nov-2013 Elliott Hughes <enh@google.com> am fde641ee: am 30296f28: Merge "Let external/mksh install directly into /system/bin/sh."

* commit 'fde641ee24b7a0a5d1fb6e2532153f1bb8504aea':
Let external/mksh install directly into /system/bin/sh.
c3920dee104856025f9416670efd7f05d1acd3a0 07-Nov-2013 Christopher Ferris <cferris@google.com> am 11d04d04: am 351b0123: Merge "Enable libunwind on arm platforms."

* commit '11d04d04418503e2381cf4479a105efaf7c13992':
Enable libunwind on arm platforms.
62ea993a6997701dba7735ca4a4af6fc6cabac2c 07-Nov-2013 Elliott Hughes <enh@google.com> Merge "Revert enabling libunwind."
fde641ee24b7a0a5d1fb6e2532153f1bb8504aea 07-Nov-2013 Elliott Hughes <enh@google.com> am 30296f28: Merge "Let external/mksh install directly into /system/bin/sh."

* commit '30296f2801ee692a01c3a4698f50ca01fa238fd1':
Let external/mksh install directly into /system/bin/sh.
11d04d04418503e2381cf4479a105efaf7c13992 07-Nov-2013 Christopher Ferris <cferris@google.com> am 351b0123: Merge "Enable libunwind on arm platforms."

* commit '351b0123084570f8274ad3de44d515754c4b3add':
Enable libunwind on arm platforms.
db2309e3d104e47088135a7f1bb89ac853657838 07-Nov-2013 Christopher Ferris <cferris@google.com> Revert enabling libunwind.

It appears that some branches might not have libunwind set up properly.

Change-Id: Ia72889e115bc2791c7a9e67563c5f4a62197cafd
ibbacktrace/Android.mk
30296f2801ee692a01c3a4698f50ca01fa238fd1 07-Nov-2013 Elliott Hughes <enh@google.com> Merge "Let external/mksh install directly into /system/bin/sh."
351b0123084570f8274ad3de44d515754c4b3add 07-Nov-2013 Christopher Ferris <cferris@google.com> Merge "Enable libunwind on arm platforms."
efaf9296918fa74c731be5d22ce8c36e485db755 07-Nov-2013 Rom Lemarchand <romlem@google.com> Merge "ion: update struct and type definitions to match kernel header"
d44712a838b8d0a3dcf0eebb8c22c2646999fa85 07-Nov-2013 Christopher Ferris <cferris@google.com> am aca6a4c8: am 5e860ce2: am d6f9be1b: Merge "Fix include files in backtrace.h."

* commit 'aca6a4c8afe609439d8f5204cb273b36ac71cc85':
Fix include files in backtrace.h.
aca6a4c8afe609439d8f5204cb273b36ac71cc85 07-Nov-2013 Christopher Ferris <cferris@google.com> am 5e860ce2: am d6f9be1b: Merge "Fix include files in backtrace.h."

* commit '5e860ce246b9235debc6a04325c7c1983c2b277e':
Fix include files in backtrace.h.
5e860ce246b9235debc6a04325c7c1983c2b277e 07-Nov-2013 Christopher Ferris <cferris@google.com> am d6f9be1b: Merge "Fix include files in backtrace.h."

* commit 'd6f9be1b9a2fc5880b0bcbb0fa47267a14fdc734':
Fix include files in backtrace.h.
d6f9be1b9a2fc5880b0bcbb0fa47267a14fdc734 07-Nov-2013 Christopher Ferris <cferris@google.com> Merge "Fix include files in backtrace.h."
e57912da92494e51c16dccce3ac3ac29f7d31591 07-Nov-2013 Christopher Ferris <cferris@google.com> Fix include files in backtrace.h.

(cherry picked from commit 08932582226456b8789b52c28462e2224dfcc2e4)

Change-Id: I37a78a9472b94ae84a84d871bfa9a070ff882699
nclude/backtrace/backtrace.h
08932582226456b8789b52c28462e2224dfcc2e4 07-Nov-2013 Christopher Ferris <cferris@google.com> Fix include files in backtrace.h.

Change-Id: Iaaa98b12bbf231ea43ee12f5a3f5ba0a3e4a15d6
nclude/backtrace/backtrace.h
22f91cb3a1e3f4618952a5544d81e21d6b84c043 07-Nov-2013 Christopher Ferris <cferris@google.com> Enable libunwind on arm platforms.

Bug: 8410085
Change-Id: I8a645ec0e04b38fc186bbc0f0cc597e31b05cc55
ibbacktrace/Android.mk
9b0e074c6d38143e01616404a08b0c7aa992f3c3 01-Nov-2013 Christopher Ferris <cferris@google.com> Move CallStack to libbacktrace.

Fix a small bug in the Printer for strings that didn't properly
prepend the prefix.

Change-Id: I33c63841ef6e07728ab3195886539d82b38ee19a
nclude/utils/CallStack.h
nclude/utils/ProcessCallStack.h
ibutils/Android.mk
ibutils/CallStack.cpp
ibutils/Printer.cpp
ibutils/ProcessCallStack.cpp
a97f22aaf1a5a057b086c6987b0eff06b50b1e06 22-Oct-2013 Rom Lemarchand <romlem@google.com> ion: update struct and type definitions to match kernel header

- Replacing struct ion_handle * with ion_user_handle_t
- Replacing heap_mask field name with heap_id_mask

Change-Id: Iaba1ccc62b9398a7b37c5a734bc21a9ecbbc8277
nclude/ion/ion.h
ibion/ion.c
ibion/ion_test.c
62a70df0643e7d5d40613904bf6c9747494366ef 05-Nov-2013 Christopher Ferris <cferris@google.com> am dee1842d: am adbb3352: am a2d1469c: Merge "Use new defines in test code."

* commit 'dee1842d2f6861dd4cb2d622992ec2c75f19ab3e':
Use new defines in test code.
0186edee583119deaf4b369fa26a34e447e4f6f9 05-Nov-2013 Christopher Ferris <cferris@google.com> am 2e47c8ac: am 1e1bae1b: am c2945850: Merge "Add some clarifying defines."

* commit '2e47c8ac74e070d62cfb46355c7c04797657c594':
Add some clarifying defines.
9ef363ea7b29dd8c36f7a3d9b15fba47e1eadce7 05-Nov-2013 Elliott Hughes <enh@google.com> am f6e11efd: am f4b3b73e: am c8626ba4: Merge "Dispose of ash."

* commit 'f6e11efd073741044fbcfe84347f1b21a551d3bf':
Dispose of ash.
d709ad3da07e7e113ac62b368cbcb30e5a2cc5d9 05-Nov-2013 Christopher Ferris <cferris@google.com> am 4ddea7f4: am d5a7c371: am 408b3acf: Merge "Add corkscrew support for finding static symbols."

* commit '4ddea7f44c6362e7c34939302729e4508aa665c5':
Add corkscrew support for finding static symbols.
dee1842d2f6861dd4cb2d622992ec2c75f19ab3e 05-Nov-2013 Christopher Ferris <cferris@google.com> am adbb3352: am a2d1469c: Merge "Use new defines in test code."

* commit 'adbb3352e9ce98e2012fa136198daa8342bdac00':
Use new defines in test code.
adbb3352e9ce98e2012fa136198daa8342bdac00 05-Nov-2013 Christopher Ferris <cferris@google.com> am a2d1469c: Merge "Use new defines in test code."

* commit 'a2d1469c773d809261d830d2f3cb3f6a7b6cdade':
Use new defines in test code.
a2d1469c773d809261d830d2f3cb3f6a7b6cdade 05-Nov-2013 Christopher Ferris <cferris@google.com> Merge "Use new defines in test code."
7f081ec079923a089c9928bc982154b873addf68 05-Nov-2013 Christopher Ferris <cferris@google.com> Use new defines in test code.

In addition, fix up the warnings and remove the -fpermissive when
compiling.

Change-Id: Ia27b902499b34ff3d881acb9057120af390baf2c
ibbacktrace/Android.mk
ibbacktrace/backtrace_test.cpp
2e47c8ac74e070d62cfb46355c7c04797657c594 05-Nov-2013 Christopher Ferris <cferris@google.com> am 1e1bae1b: am c2945850: Merge "Add some clarifying defines."

* commit '1e1bae1b0fc750f60ef9a2531850bbcf27ba6610':
Add some clarifying defines.
1e1bae1b0fc750f60ef9a2531850bbcf27ba6610 05-Nov-2013 Christopher Ferris <cferris@google.com> am c2945850: Merge "Add some clarifying defines."

* commit 'c2945850e58f4ef50f3e3534ce50306262375d37':
Add some clarifying defines.
c2945850e58f4ef50f3e3534ce50306262375d37 05-Nov-2013 Christopher Ferris <cferris@google.com> Merge "Add some clarifying defines."
09b3598761b9851b2abb98dd347f5a8af793f3eb 05-Nov-2013 Elliott Hughes <enh@google.com> Let external/mksh install directly into /system/bin/sh.

Change-Id: I3ac60af2b5c6bba98c33cb63952eb4d35676d73f
h/Android.mk
cbfc7302fb3b5d5c77d2aa7974b26983ce479aa0 05-Nov-2013 Christopher Ferris <cferris@google.com> Add some clarifying defines.

In order to be explicit in the Backtrace::Create() calls, adding a couple
of defines and some comments to describe what they mean.

Change-Id: I6ad08c529791821496a95fa33cea1c95b0a7eada
nclude/backtrace/backtrace.h
ibbacktrace/Backtrace.cpp
f6e11efd073741044fbcfe84347f1b21a551d3bf 05-Nov-2013 Elliott Hughes <enh@google.com> am f4b3b73e: am c8626ba4: Merge "Dispose of ash."

* commit 'f4b3b73e95422afe79d5c5e7d28b0fcdfeaa7e88':
Dispose of ash.
4ddea7f44c6362e7c34939302729e4508aa665c5 05-Nov-2013 Christopher Ferris <cferris@google.com> am d5a7c371: am 408b3acf: Merge "Add corkscrew support for finding static symbols."

* commit 'd5a7c371d22ea327be03bfa10944e5f0f2d51a24':
Add corkscrew support for finding static symbols.
f4b3b73e95422afe79d5c5e7d28b0fcdfeaa7e88 05-Nov-2013 Elliott Hughes <enh@google.com> am c8626ba4: Merge "Dispose of ash."

* commit 'c8626ba480c0e2cab4f4d2fe43bd8f741320b404':
Dispose of ash.
d5a7c371d22ea327be03bfa10944e5f0f2d51a24 05-Nov-2013 Christopher Ferris <cferris@google.com> am 408b3acf: Merge "Add corkscrew support for finding static symbols."

* commit '408b3acf5e0b0d353cf8b64598f285141d1a0116':
Add corkscrew support for finding static symbols.
c8626ba480c0e2cab4f4d2fe43bd8f741320b404 05-Nov-2013 Elliott Hughes <enh@google.com> Merge "Dispose of ash."
f6e21e06e38404c1dfd8d787dd7e38331dde3be3 05-Nov-2013 Elliott Hughes <enh@google.com> Dispose of ash.

We haven't used ash for several releases. Remove ash and its
companion liblinenoise.

I've left the support for an alternative shell here for now,
but we can move that out to external/mksh later if we want.
(For now this seemed like a somewhat useful signpost to the real shell.)

Change-Id: I634c7969f6cbe375a2bc56fc1077e64888380f3d
iblinenoise/Android.mk
iblinenoise/MODULE_LICENSE_BSD_LIKE
iblinenoise/NOTICE
iblinenoise/linenoise.c
iblinenoise/linenoise.h
h/Android.mk
h/MODULE_LICENSE_BSD
h/NOTICE
h/TOUR
h/ThirdPartyProject.prop
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
408b3acf5e0b0d353cf8b64598f285141d1a0116 05-Nov-2013 Christopher Ferris <cferris@google.com> Merge "Add corkscrew support for finding static symbols."
923b5369202b0fbcd5d482fefe8de1c9fe2148a1 04-Nov-2013 Christopher Ferris <cferris@google.com> Add corkscrew support for finding static symbols.

Change-Id: Ie557a9b0efadece75e1accaa7e214fb559eb19e1
ibbacktrace/Corkscrew.cpp
d969d8e019767917145c93c7c8a233dda3919ec2 02-Nov-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Support parsing RDNSS ND options from netlink."
52aa2466ca5832d75ea8fddafa1a4eef360d54ee 01-Nov-2013 Kristian Monsen <kristianm@google.com> Fixes some warnings

- Implicit decleared function
- Unused variable

Change-Id: If60ad6f25aabf3b8fb68a2c9d8d75c7bda95c74a
iblog/fake_log_device.c
iblog/fake_log_device.h
iblog/logd_write.c
b185e90dcc6ac111bff908edcc6d89fd6b37dc11 12-Aug-2013 Lorenzo Colitti <lorenzo@google.com> Support parsing RDNSS ND options from netlink.

The RDNSS options (RFC 6106) used to configure DNS servers via
router advertisements are passed from the kernel to userspace via
RTM_NEWNDUSEROPT netlink messages. Add code to NetlinkEvent to
parse them.

Also fix a compiler warning and a couple of style issues.

Bug: 9180552
Change-Id: I6c532c8f0ceef3afdc977a431a036df398013e1a
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
f1e072780eee546a18c5dda9f328c5f1dfcc0127 31-Oct-2013 Shuo Gao <shuo.gao@intel.com> am eb0eb4f7: fix corruption in Vector<> when malloc falied

* commit 'eb0eb4f79fca083009aa7a6b6e28ddcdbcbd1214':
fix corruption in Vector<> when malloc falied
eb0eb4f79fca083009aa7a6b6e28ddcdbcbd1214 17-Oct-2013 Shuo Gao <shuo.gao@intel.com> fix corruption in Vector<> when malloc falied

1. When alloc or realloc failed in the function SharedBuffer::editResize,
it would return a NULL pointer, then mStorage would update to be 1 by
SharedBuffer::data() if no pointer check here, which is an obviously
wrong address, and would cause corruption when used it e.g. in capacity().

So add the pointer check here for the return value of SharedBuffer::editResize,
if it's NULL do not use it to update mStorage, to avoid the value of mStorage
polluted.

2. when alloc or realloc falied in _grow & _shrink function, mStorage keep
the original value, so mCount should not be updated here.

Otherwise, mStorage might be 0 but mCount>0, so a corruption would happend
when it try to delete items from the Vector since mCount>0.

Change-Id: I7c3814e843c459834ca5eed392e8d63d1cb7d2d8
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 139626
ibutils/VectorImpl.cpp
c20d479f0f068e3571ef61749e93037e99fb9cae 31-Oct-2013 Igor Murashkin <iam@google.com> am d3beee64: am e65b7ea8: utils: Fix broken sdk build on windows

* commit 'd3beee649ffe7c2879b7b3616d33d6e813e28dbd':
utils: Fix broken sdk build on windows
d3beee649ffe7c2879b7b3616d33d6e813e28dbd 31-Oct-2013 Igor Murashkin <iam@google.com> am e65b7ea8: utils: Fix broken sdk build on windows

* commit 'e65b7ea8801145626504c724c28aedd0e5038a28':
utils: Fix broken sdk build on windows
e65b7ea8801145626504c724c28aedd0e5038a28 31-Oct-2013 Igor Murashkin <iam@google.com> utils: Fix broken sdk build on windows

Bug: 11324229
Change-Id: Ia50e79b5e2430faea77b0c98902e8e018fb9ceff
ibutils/Printer.cpp
ibutils/ProcessCallStack.cpp
1051c27dcfa012ece8fdc24d0591b6e6a275ac2d 31-Oct-2013 Igor Murashkin <iam@google.com> am ce510d40: am 81f2c3d2: utils: Fix broken build

* commit 'ce510d40c209a627d06573a9b32f3e0eb941d3a4':
utils: Fix broken build
ce510d40c209a627d06573a9b32f3e0eb941d3a4 31-Oct-2013 Igor Murashkin <iam@google.com> am 81f2c3d2: utils: Fix broken build

* commit '81f2c3d2117cfe7307ee6efbd82567bd02950965':
utils: Fix broken build
81f2c3d2117cfe7307ee6efbd82567bd02950965 31-Oct-2013 Igor Murashkin <iam@google.com> utils: Fix broken build

Bug: 11324229
Change-Id: I7e4f514c5531e4c0c11bb0ba5d67e4dabbcd5792
ibutils/ProcessCallStack.cpp
b518aeb5e3432046e492c631a7a8f1200153c58f 30-Oct-2013 Chris Dearman <chris.dearman@imgtec.com> Force alignment of data buffer used to process netlink messages

This avoids any overhead associated with accessing unaligned data
while processing netlink messages.

Change-Id: I1ea13051816ef46b6627594121d98cda130ac609
nclude/sysutils/NetlinkListener.h
74160cb77506252d54fb6c390c8ef014fee0d889 30-Oct-2013 Christopher Ferris <cferris@google.com> am 6b7b6541: am b5c24e09: am 8c58086c: Merge "More libbacktrace fixes."

* commit '6b7b65417aead0189681c12d9162f31e8bc9b3e5':
More libbacktrace fixes.
6b7b65417aead0189681c12d9162f31e8bc9b3e5 30-Oct-2013 Christopher Ferris <cferris@google.com> am b5c24e09: am 8c58086c: Merge "More libbacktrace fixes."

* commit 'b5c24e096d34e0f096d574f2aa799cd2dc6fc7db':
More libbacktrace fixes.
b5c24e096d34e0f096d574f2aa799cd2dc6fc7db 30-Oct-2013 Christopher Ferris <cferris@google.com> am 8c58086c: Merge "More libbacktrace fixes."

* commit '8c58086c54a23d33e915852a1355a171b09679cc':
More libbacktrace fixes.
8c58086c54a23d33e915852a1355a171b09679cc 30-Oct-2013 Christopher Ferris <cferris@google.com> Merge "More libbacktrace fixes."
de2eae31b370d7e03e9f620958133e20ad264d92 30-Oct-2013 Igor Murashkin <iam@google.com> am 39f18c9e: am 1b84e0a3: Merge "utils: Add ProcessCallStack to collect stack traces for all threads in a process" into klp-dev

* commit '39f18c9ece973a0eaff7e982a120de63f31ee5c0':
utils: Add ProcessCallStack to collect stack traces for all threads in a process
39f18c9ece973a0eaff7e982a120de63f31ee5c0 30-Oct-2013 Igor Murashkin <iam@google.com> am 1b84e0a3: Merge "utils: Add ProcessCallStack to collect stack traces for all threads in a process" into klp-dev

* commit '1b84e0a3145f1497fc2259608d8830f371526ece':
utils: Add ProcessCallStack to collect stack traces for all threads in a process
8ed46278bee3cfc4c216f3a1524744019b693200 29-Oct-2013 Christopher Ferris <cferris@google.com> More libbacktrace fixes.

Included in minor fix ups is the addition of a warning macro to replace
all of the ALOGW calls.

Fix a race where multiple threads could be attempting to unwind the threads
of the current process at the same time.

Bug: 8410085

Change-Id: I02a65dc778dde690e5f95fc8ff069a32d0832fd1
nclude/backtrace/Backtrace.h
ibbacktrace/Backtrace.cpp
ibbacktrace/Backtrace.h
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
ibbacktrace/Corkscrew.cpp
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindPtrace.cpp
1b84e0a3145f1497fc2259608d8830f371526ece 30-Oct-2013 Igor Murashkin <iam@google.com> Merge "utils: Add ProcessCallStack to collect stack traces for all threads in a process" into klp-dev
288ebfda3b7de6d27a9e2ecce315e98f2e408e8b 30-Oct-2013 Elliott Hughes <enh@google.com> am 9259663c: am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."

* commit '9259663cdb8f15226844e3ecfc6e3aa53614ad03':
Fix a bunch of small system/core bugs.
9259663cdb8f15226844e3ecfc6e3aa53614ad03 30-Oct-2013 Elliott Hughes <enh@google.com> am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."

* commit 'f17f55914e18eb176ccc5bb8266b248ece8cb56b':
Fix a bunch of small system/core bugs.
f17f55914e18eb176ccc5bb8266b248ece8cb56b 29-Oct-2013 Elliott Hughes <enh@google.com> am 36d44740: Merge "Fix a bunch of small system/core bugs."

* commit '36d44740dd045403ae615b8dd6dac8b9a4e9f5bf':
Fix a bunch of small system/core bugs.
36d44740dd045403ae615b8dd6dac8b9a4e9f5bf 29-Oct-2013 Elliott Hughes <enh@google.com> Merge "Fix a bunch of small system/core bugs."
14e28d39f7f094225c1ddae8fa43bd792c621a8f 29-Oct-2013 Elliott Hughes <enh@google.com> Fix a bunch of small system/core bugs.

Missing frees in:
adb/file_sync_client.c
fastboot/fastboot.c
libsparse/output_file.c

Missing closedirs in:
adb/file_sync_service.c
cpio/mkbootfs.c
libcutils/dir_hash.c

Potential buffer overrun in:
gpttool/gpttool.c

Incorrect NULL check in:
libsparse/backed_block.c

Bug: https://code.google.com/p/android/issues/detail?id=61564
Change-Id: If97838a9e73a77aef7f416c31c237ce1fca4ce21
db/file_sync_client.c
db/file_sync_service.c
pio/mkbootfs.c
astboot/Android.mk
astboot/fastboot.c
pttool/gpttool.c
ibcutils/dir_hash.c
ibsparse/backed_block.c
ibsparse/output_file.c
6996f91809c3b56a7a7e5ba5b170a9905192b62a 29-Oct-2013 Christopher Ferris <cferris@google.com> resolved conflicts for merge of 0433d622 to master

Change-Id: I6799c3fe8900ddcb2e9fe3032793dbb0996cf177
0433d62291c4e847ae90a6f0a8f264329e1e5617 29-Oct-2013 Christopher Ferris <cferris@google.com> am 0f26808e: am 98f87d92: Merge "Rewrite libbacktrace using C++."

* commit '0f26808e2c696f8bdcca644e0ddae2af9f753ada':
Rewrite libbacktrace using C++.
0f26808e2c696f8bdcca644e0ddae2af9f753ada 29-Oct-2013 Christopher Ferris <cferris@google.com> am 98f87d92: Merge "Rewrite libbacktrace using C++."

* commit '98f87d92d89079f274374409efcf57ca52b13c1f':
Rewrite libbacktrace using C++.
98f87d92d89079f274374409efcf57ca52b13c1f 29-Oct-2013 Christopher Ferris <cferris@google.com> Merge "Rewrite libbacktrace using C++."
4067077a44e6088c488d6260911818f90a0915df 29-Oct-2013 Marco Nelissen <marcone@google.com> Merge "Add -n option to ps to print numeric uid"
e2f32d05e601e396ae936f4effe965ea17e73fb8 29-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> libnl: Add nl_socket_set_nonblocking() function

Change-Id: I80fad954f588baf1af216ca6fe659d295233bbe5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ibnl_2/socket.c
17e91d44edf5e6476a477a200bcd89d4327358a3 21-Oct-2013 Christopher Ferris <cferris@google.com> Rewrite libbacktrace using C++.

The old code was essentially trying to be C++ in C and was awkward. This
change makes it all objects with a thin layer that C code can use.

There is a C++ backtrace object that is not very useful, this code will
replace it.

This change also includes moving the backtrace test to a gtest, and adding
coverage of all major functionality.

Bug: 8410085
Change-Id: Iae0f1b09b3dd60395f71ed66010c1ea5cdd37841
ebuggerd/backtrace.c
ebuggerd/backtrace.h
ebuggerd/tombstone.c
nclude/backtrace/Backtrace.h
nclude/backtrace/backtrace.h
ibbacktrace/Android.mk
ibbacktrace/Backtrace.cpp
ibbacktrace/Backtrace.h
ibbacktrace/BacktraceThread.cpp
ibbacktrace/BacktraceThread.h
ibbacktrace/Corkscrew.cpp
ibbacktrace/Corkscrew.h
ibbacktrace/UnwindCurrent.cpp
ibbacktrace/UnwindCurrent.h
ibbacktrace/UnwindPtrace.cpp
ibbacktrace/UnwindPtrace.h
ibbacktrace/backtrace_test.c
ibbacktrace/backtrace_test.cpp
ibbacktrace/backtrace_testlib.c
ibbacktrace/common.c
ibbacktrace/common.h
ibbacktrace/corkscrew.c
ibbacktrace/demangle.c
ibbacktrace/demangle.h
ibbacktrace/stubs.c
ibbacktrace/thread_utils.c
ibbacktrace/thread_utils.h
ibbacktrace/unwind.c
ibbacktrace/unwind.h
ibbacktrace/unwind_local.c
ibbacktrace/unwind_remote.c
fd4d0de5753a069740f9f8c84ef3da0f6696fe0f 28-Oct-2013 Brian Carlstrom <bdc@google.com> am 406abdc8: am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"

* commit '406abdc8a2b68df77ab30836826f642c2ef37bda':
Improve some adb error logging
406abdc8a2b68df77ab30836826f642c2ef37bda 28-Oct-2013 Brian Carlstrom <bdc@google.com> am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"

* commit '5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7':
Improve some adb error logging
5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7 28-Oct-2013 Brian Carlstrom <bdc@google.com> am 87af04a4: Merge "Improve some adb error logging"

* commit '87af04a42ec2d959cced0f1c01888f9cf3b2b9c5':
Improve some adb error logging
87af04a42ec2d959cced0f1c01888f9cf3b2b9c5 28-Oct-2013 Brian Carlstrom <bdc@google.com> Merge "Improve some adb error logging"
93c91fad77dc9516954a606e6199e8a940d99388 18-Oct-2013 Brian Carlstrom <bdc@google.com> Improve some adb error logging

Bug: 11290643
Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848
db/adb_client.c
db/commandline.c
ec79ef2e7b6b1d81266637ca0e002b5c0c5a789b 25-Oct-2013 Igor Murashkin <iam@google.com> utils: Add ProcessCallStack to collect stack traces for all threads in a process

- Also add a Printer class (print lines to logcat, fd, or strings)

Bug: 11324229
Change-Id: I78435ed49aa196a0efb45bf9b2d58b62c41737d3
nclude/utils/CallStack.h
nclude/utils/Printer.h
nclude/utils/ProcessCallStack.h
ibutils/Android.mk
ibutils/CallStack.cpp
ibutils/Printer.cpp
ibutils/ProcessCallStack.cpp
377cb2ab3aff08119c5934ff0e582cb604884f8e 25-Oct-2013 Marco Nelissen <marcone@google.com> Add -n option to ps to print numeric uid

and fix some whitespace issues

Change-Id: Iefb6f51f5f4522ce4ab0f1ea3c996fe892715e90
oolbox/ps.c
866977526cccc21c889236085b405e1b1ff41b9f 24-Oct-2013 Nick Kralevich <nnk@google.com> am 0bf7924d: am 91704522: Don\'t return immediately from reboot commands.

* commit '0bf7924df19f72258df7b553515bfbc9574d0114':
Don't return immediately from reboot commands.
2092680f86f2c70eff939acd2784b6c88107d836 24-Oct-2013 Elliott Hughes <enh@google.com> am 396f6b77: am c3d04aab: am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"

* commit '396f6b7771688c5aeb72138fff4d9415e31ae1da':
Eliminate text relocations in x86 optimized memset versions
0bf7924df19f72258df7b553515bfbc9574d0114 24-Oct-2013 Nick Kralevich <nnk@google.com> am 91704522: Don\'t return immediately from reboot commands.

* commit '917045222a69021eb36aea96708649c709685509':
Don't return immediately from reboot commands.
396f6b7771688c5aeb72138fff4d9415e31ae1da 24-Oct-2013 Elliott Hughes <enh@google.com> am c3d04aab: am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"

* commit 'c3d04aab960c81a746579d67a17049d8f4efba9a':
Eliminate text relocations in x86 optimized memset versions
c3d04aab960c81a746579d67a17049d8f4efba9a 24-Oct-2013 Elliott Hughes <enh@google.com> am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"

* commit '4d87e743083c201edd0b565dd7d42e70945a6265':
Eliminate text relocations in x86 optimized memset versions
4d87e743083c201edd0b565dd7d42e70945a6265 24-Oct-2013 Elliott Hughes <enh@google.com> Merge "Eliminate text relocations in x86 optimized memset versions"
917045222a69021eb36aea96708649c709685509 24-Oct-2013 Nick Kralevich <nnk@google.com> Don't return immediately from reboot commands.

The reboot commands return too fast, interfering with testing.
Add a pause(), which will allow the device time to complete the
reboot.

Change-Id: Ie9cc6eea67b7ff662ec71ea2329cbb94f8d55404
Bug: 11369303
db/services.c
eboot/reboot.c
9ff8767bc6c1a0eae1fe9db1a2d6bd75c32988a3 24-Oct-2013 Pavel Chupin <pavel.v.chupin@intel.com> Eliminate text relocations in x86 optimized memset versions

Change-Id: Ieb72af8cf7f93210a68a87b1e2538deb5642f4d5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
ibcutils/arch-x86/sse2-memset16-atom.S
ibcutils/arch-x86/sse2-memset32-atom.S
c15e9934675d2f6b8dc19f042e6d045415e79359 23-Oct-2013 Todd Poynor <toddpoynor@google.com> healthd: remove/rearrange extra battery property handling

Change-Id: I6cc1570e23c1c1468f08579f633997e95327347a
ealthd/BatteryMonitor.cpp
9b53cf79afb843758546752327de96a8d8fde951 23-Oct-2013 Todd Poynor <toddpoynor@google.com> healthd: remove service batterypropreg

Change-Id: Iac24af6a59453686fca145d0814dc5ff045efcec
ealthd/BatteryPropertiesRegistrar.cpp
f0e2ac26424da01f1a48eed1c343dfdafd338553 23-Oct-2013 Todd Poynor <toddpoynor@google.com> healthd: rename service batterypropreg => batteryproperties

Part 1 of 2 (to avoid transitory runtime crashes).

Change-Id: I40d990ef7ee18cea99e5add39738bbe9fd5701ca
ealthd/BatteryPropertiesRegistrar.cpp
020369d8724eff2b87350e54e157a609846166e4 19-Sep-2013 Todd Poynor <toddpoynor@google.com> healthd: BatteryService dumpstate support

Change-Id: Ia6938b7126751801310632c995af0f96e41f5f64
ealthd/BatteryMonitor.cpp
ealthd/BatteryMonitor.h
ealthd/BatteryPropertiesRegistrar.cpp
ealthd/BatteryPropertiesRegistrar.h
ealthd/healthd.cpp
ealthd/healthd.h
6dcc45ed6dd455d82ecfb3addf247125846f3019 22-Oct-2013 Todd Poynor <toddpoynor@google.com> healthd: Fixups for systems without batteries or removable batteries

* Replace unnecessary warnings about missing attributes with a more
informative message when no battery devices provided by the system.

* Turn off periodic battery checks when no battery devices (thereby
reducing unnecessary kernel log spam).

* Replace battery properties in log messages with a more informative
message when no battery is provided or the battery is removed.

Change-Id: I68a514aa7315ae2b5d22cb8861d3c9b1b38035a1
ealthd/BatteryMonitor.cpp
ealthd/BatteryMonitor.h
83dfaa8853fd485bc5d4307c282b093f6e140f1e 19-Oct-2013 Elliott Hughes <enh@google.com> am 37cc29e9: resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aosp

* commit '37cc29e95684de126693f59e91703b2af57e7659':
Use %zd for size_t.
37cc29e95684de126693f59e91703b2af57e7659 19-Oct-2013 Elliott Hughes <enh@google.com> resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aosp

Change-Id: I0250174055a16bc2d35ede1f6a0a7f033bb3c844
9ff588f84b855b7d00d259a07e13d6707a95647b 19-Oct-2013 Elliott Hughes <enh@google.com> am f1296b9e: Merge "Use %zd for size_t."

* commit 'f1296b9e92cb04f9bba8c622560d37dfc53c7aa4':
Use %zd for size_t.
f1296b9e92cb04f9bba8c622560d37dfc53c7aa4 19-Oct-2013 Elliott Hughes <enh@google.com> Merge "Use %zd for size_t."
9640b30dd78d71ca56ac6d701f8c7874cbd51038 19-Oct-2013 Elliott Hughes <enh@google.com> Use %zd for size_t.

Change-Id: I0139243c309e85236eb00bb471736bdd99eeec84
ibcutils/mq.c
7d0c73cb8dda620a17503911726a3a01356eb39d 18-Oct-2013 Scott Anderson <saa@android.com> Merge "Enhance the ioctl toolbox command"
fb7e395455c9a2acee13aaa527768558d0a58b7c 18-Oct-2013 Jeff Sharkey <jsharkey@android.com> am 9b41f452: am a9e453f1: Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev

* commit '9b41f452013123d0a394e696f597467da73108ed':
vold no longer does MS_MOVE; remove tmpfs.
9b41f452013123d0a394e696f597467da73108ed 18-Oct-2013 Jeff Sharkey <jsharkey@android.com> am a9e453f1: Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev

* commit 'a9e453f1b552699f69dca19599c7624a581089bd':
vold no longer does MS_MOVE; remove tmpfs.
a9e453f1b552699f69dca19599c7624a581089bd 18-Oct-2013 Jeff Sharkey <jsharkey@android.com> Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev
9e97fee0190307dd38eb2e3cd76b4ec60ab057b7 18-Oct-2013 Scott Anderson <saa@android.com> Enhance the ioctl toolbox command

1) Implement documented but unimplemented read-only option.
2) Allow standard input to be used as the <device> by passing
"-". On some devices, opening the device has side effects.
Allowing standard input can prevent this by using a sequence
of something like:

# Open the device on file descriptor 3
exec 3<> /dev/something
ioctl -d - 0 0 <&3
ioctl -d - 1 0 <&3
dd if=myfile >&3
# Close file descriptor 3
exec 3>&-

Change-Id: If17ac3cffa7ccb159051550724b4ce7d8efa5feb
Signed-off-by: Scott Anderson <saa@android.com>
oolbox/ioctl.c
00c8e1a2199b2f9c50935bb4ea8bb3b86ba1bbef 18-Oct-2013 Jeff Sharkey <jsharkey@android.com> vold no longer does MS_MOVE; remove tmpfs.

MS_MOVE was used when staging external storage devices, which no
longer occurs. In fact, having a writable tmpfs was masking a vold
bug around moving apps to SD cards.

Bug: 11175082
Change-Id: Ib2d7561c3a0b6fde94f651a496cb0c1f12f88d96
ootdir/init.rc
031120e807d2685765256fbed82e6ac59be5b858 17-Oct-2013 JP Abgrall <jpa@google.com> am e6cc5659: am 9c39c96a: am b387a7f2: Merge "Wait for device to disappear after reboot-bootloader."

* commit 'e6cc565990f5281d2b2bdd02518ef7482473b9c4':
Wait for device to disappear after reboot-bootloader.
e6cc565990f5281d2b2bdd02518ef7482473b9c4 17-Oct-2013 JP Abgrall <jpa@google.com> am 9c39c96a: am b387a7f2: Merge "Wait for device to disappear after reboot-bootloader."

* commit '9c39c96a524def86d4aeba9cbfe7c7fe717e20e3':
Wait for device to disappear after reboot-bootloader.
9c39c96a524def86d4aeba9cbfe7c7fe717e20e3 17-Oct-2013 JP Abgrall <jpa@google.com> am b387a7f2: Merge "Wait for device to disappear after reboot-bootloader."

* commit 'b387a7f2168a720fa486f31e8f3189114f69c0db':
Wait for device to disappear after reboot-bootloader.
b387a7f2168a720fa486f31e8f3189114f69c0db 17-Oct-2013 JP Abgrall <jpa@google.com> Merge "Wait for device to disappear after reboot-bootloader."
157b00171a06f9ac2fd25ee3a86e801e896713d6 02-Oct-2013 Mark Wachsler <wachsler@google.com> Wait for device to disappear after reboot-bootloader.

(Linux only for now) With fastboot reading serial numbers from sysfs, it had
become possible for a fastboot command issued immediately after rebooting
the bootloader to fail, because sysfs still thought the device was online.
To prevent this, after reboot-bootloader we wait for the device to disconnect.

Also made usb_read and usb_write fail immediately if the descriptor has been
closed; this prevents an incorrect error message ("Bad file descriptor")
when errors from fb_getvar are ignored (e.g., by fb_format_supported).

Also removed unused fd param from filter_usb_device, and simplified logic
in usb_write by using do/while instead of a special case for len == 0.

Change-Id: I799b857eab411fd8ad25f5777fc61c685152ea86
astboot/Android.mk
astboot/engine.c
astboot/fastboot.c
astboot/fastboot.h
astboot/usb.h
astboot/usb_linux.c
astboot/usb_osx.c
astboot/usb_windows.c
astboot/util.c
8ac7c9f6593f1fcdca5d79297e4d8ba550df19c9 17-Oct-2013 JP Abgrall <jpa@google.com> am 308f0f9b: am 95e69261: am ac568b8f: Merge "init: remove obsolete rle logo"

* commit '308f0f9bf2a82d9c1e02982f0e177f6b04545210':
init: remove obsolete rle logo
308f0f9bf2a82d9c1e02982f0e177f6b04545210 17-Oct-2013 JP Abgrall <jpa@google.com> am 95e69261: am ac568b8f: Merge "init: remove obsolete rle logo"

* commit '95e69261b22cd57c795e96e5ac122f120113f819':
init: remove obsolete rle logo
95e69261b22cd57c795e96e5ac122f120113f819 17-Oct-2013 JP Abgrall <jpa@google.com> am ac568b8f: Merge "init: remove obsolete rle logo"

* commit 'ac568b8f783ee60a7a2cb0ab5b6db786bdb39b35':
init: remove obsolete rle logo
ac568b8f783ee60a7a2cb0ab5b6db786bdb39b35 17-Oct-2013 JP Abgrall <jpa@google.com> Merge "init: remove obsolete rle logo"
8d16ac26f3453ce3c5a9b6fe6c26750123b6ae5d 17-Oct-2013 Ed Heyl <edheyl@google.com> am 536dea9d: am 169c12b5: merge in klp-release (no-op)

* commit '536dea9d61a032e64bbe584a97463c6638ead009':
536dea9d61a032e64bbe584a97463c6638ead009 17-Oct-2013 Ed Heyl <edheyl@google.com> am 169c12b5: merge in klp-release (no-op)

* commit '169c12b5cf55d9574f98935d5517d20f55f62be8':
169c12b5cf55d9574f98935d5517d20f55f62be8 17-Oct-2013 Ed Heyl <edheyl@google.com> merge in klp-release (no-op)
50dc936964e057ad779ce271c6d1c12e4d81f0aa 16-Oct-2013 Marcin Chojnacki <marcinch7@gmail.com> init: remove obsolete rle logo

Obsolete RLE 565 logo is used nowhere,
because 565 framebuffer isn't used for years.

It's not necessary to keep this thing alive anymore.

Change-Id: Ie61e168790f791230530cd3eb1c68b1f7344c9a7
nit/Android.mk
nit/init.c
nit/init.h
nit/logo.c
3a5a7c0e26cf34e7228a1e6a3181ad0d46d60d6d 10-Oct-2013 Nick Kralevich <nnk@google.com> am aa4051dc: am 2f924ebe: am a94d2b39: Merge "Add a restorecon_recursive built-in command to init."

* commit 'aa4051dc4f90f987ba05269ce396d676571156e0':
Add a restorecon_recursive built-in command to init.
aa4051dc4f90f987ba05269ce396d676571156e0 10-Oct-2013 Nick Kralevich <nnk@google.com> am 2f924ebe: am a94d2b39: Merge "Add a restorecon_recursive built-in command to init."

* commit '2f924ebe0b0891dba1996c246839427b23705018':
Add a restorecon_recursive built-in command to init.
2f924ebe0b0891dba1996c246839427b23705018 10-Oct-2013 Nick Kralevich <nnk@google.com> am a94d2b39: Merge "Add a restorecon_recursive built-in command to init."

* commit 'a94d2b392f830e3c0a1e4bd0d2d262314eada8d9':
Add a restorecon_recursive built-in command to init.
a94d2b392f830e3c0a1e4bd0d2d262314eada8d9 10-Oct-2013 Nick Kralevich <nnk@google.com> Merge "Add a restorecon_recursive built-in command to init."
df206c8e46699bda2b496ad3f9b24a6eb07f6047 10-Oct-2013 Kenny Root <kroot@google.com> am 33d1e629: am 4ff9c3f7: am aab1670b: Merge "Add support for ECDSA P-256 with SHA256"

* commit '33d1e6294f609c4f417905239bd5a086f3ef880f':
Add support for ECDSA P-256 with SHA256
33d1e6294f609c4f417905239bd5a086f3ef880f 10-Oct-2013 Kenny Root <kroot@google.com> am 4ff9c3f7: am aab1670b: Merge "Add support for ECDSA P-256 with SHA256"

* commit '4ff9c3f7d89fe418290288d0925f257f0fe15f20':
Add support for ECDSA P-256 with SHA256
4ff9c3f7d89fe418290288d0925f257f0fe15f20 10-Oct-2013 Kenny Root <kroot@google.com> am aab1670b: Merge "Add support for ECDSA P-256 with SHA256"

* commit 'aab1670b7071e90786c6a23d404cb03f3e316568':
Add support for ECDSA P-256 with SHA256
726e8f7a8f3603f952055e440e21cc69c7340b36 09-Oct-2013 Stephen Smalley <sds@tycho.nsa.gov> Add a restorecon_recursive built-in command to init.

Functionally equivalent to the restorecon -R toolbox command.
A use case is given by:
I48eaa2b9901ac8c978192c14493ba1058a089423

Also, fix error handling and documentation for restorecon command.

Change-Id: Ia7fbcc82645baf52c6bff0490d3492f458881cbb
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/builtins.c
nit/init_parser.c
nit/keywords.h
nit/readme.txt
aab1670b7071e90786c6a23d404cb03f3e316568 10-Oct-2013 Kenny Root <kroot@google.com> Merge "Add support for ECDSA P-256 with SHA256"
cd8ab5e458e89785c185fd009a6593393abe0dc3 10-Oct-2013 Elliott Hughes <enh@google.com> am 6891df7a: am 45ddf184: am 9b8a929d: Merge "libcutils doesn\'t need to be looking at bionic\'s privates."

* commit '6891df7a651a6f311121e119be7c69b1920ced14':
libcutils doesn't need to be looking at bionic's privates.
17e8e6c69f34d2e958732122797fad723479d496 10-Oct-2013 Elliott Hughes <enh@google.com> am 7f7b12b8: am 5baecee3: am be18538d: Merge "Cleanup x86 flags and memset versions"

* commit '7f7b12b8ebba299868505984d6cf15b11f75aadf':
Cleanup x86 flags and memset versions
6891df7a651a6f311121e119be7c69b1920ced14 10-Oct-2013 Elliott Hughes <enh@google.com> am 45ddf184: am 9b8a929d: Merge "libcutils doesn\'t need to be looking at bionic\'s privates."

* commit '45ddf184960225862c6e178588034cce676683e3':
libcutils doesn't need to be looking at bionic's privates.
7f7b12b8ebba299868505984d6cf15b11f75aadf 10-Oct-2013 Elliott Hughes <enh@google.com> am 5baecee3: am be18538d: Merge "Cleanup x86 flags and memset versions"

* commit '5baecee3c6bf348b77b8785bcd8e35362a3507fb':
Cleanup x86 flags and memset versions
45ddf184960225862c6e178588034cce676683e3 10-Oct-2013 Elliott Hughes <enh@google.com> am 9b8a929d: Merge "libcutils doesn\'t need to be looking at bionic\'s privates."

* commit '9b8a929dc4375b91dde2e8d34df1b0b485ae3b23':
libcutils doesn't need to be looking at bionic's privates.
5baecee3c6bf348b77b8785bcd8e35362a3507fb 10-Oct-2013 Elliott Hughes <enh@google.com> am be18538d: Merge "Cleanup x86 flags and memset versions"

* commit 'be18538d4373364b6c9b1149a24974976169f52f':
Cleanup x86 flags and memset versions
9b8a929dc4375b91dde2e8d34df1b0b485ae3b23 10-Oct-2013 Elliott Hughes <enh@google.com> Merge "libcutils doesn't need to be looking at bionic's privates."
478c566a90233efd868172ad0300c60e45fdb374 10-Oct-2013 Elliott Hughes <enh@google.com> libcutils doesn't need to be looking at bionic's privates.

Change-Id: Ib11a0c1bdc4b85c58274b21a07aa92f958d23713
ibcutils/Android.mk
be18538d4373364b6c9b1149a24974976169f52f 10-Oct-2013 Elliott Hughes <enh@google.com> Merge "Cleanup x86 flags and memset versions"
4aa51cd46842d4e821bd5536fd80ee0a796f3a83 10-Oct-2013 Pavel Chupin <pavel.v.chupin@intel.com> Cleanup x86 flags and memset versions

ARCH_X86_HAVE_SSE2 is always true

Change-Id: I680493d14280aafad5448aec727e8d9a84a6db00
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
ibcutils/Android.mk
ibcutils/arch-x86/android_memset16.S
ibcutils/arch-x86/android_memset32.S
90a5df40bd0f230c74ea9043b68fd31f05300644 10-Oct-2013 Christopher Ferris <cferris@google.com> am f84f7fa4: am 9492b6e7: am 2de8102d: Merge "Fix bug in abort message processing."

* commit 'f84f7fa4d280e02c5cfc5730c64693f3e20eb5c5':
Fix bug in abort message processing.
f84f7fa4d280e02c5cfc5730c64693f3e20eb5c5 10-Oct-2013 Christopher Ferris <cferris@google.com> am 9492b6e7: am 2de8102d: Merge "Fix bug in abort message processing."

* commit '9492b6e72cef71422ba624e3cd11f07156cfb34a':
Fix bug in abort message processing.
9492b6e72cef71422ba624e3cd11f07156cfb34a 10-Oct-2013 Christopher Ferris <cferris@google.com> am 2de8102d: Merge "Fix bug in abort message processing."

* commit '2de8102d422f48eec44fe8782cd2411f04f1dcb2':
Fix bug in abort message processing.
2de8102d422f48eec44fe8782cd2411f04f1dcb2 10-Oct-2013 Christopher Ferris <cferris@google.com> Merge "Fix bug in abort message processing."
dbd2ab4dca9f96cb7214c6a9b30f73959ace3bba 10-Oct-2013 Christopher Ferris <cferris@google.com> Fix bug in abort message processing.

Bug: 11156592
Change-Id: I4b82e7be5d7fccd167f6c52f78a5af3d3a553779
ebuggerd/tombstone.c
db0850c3b637faaa7cbe1bab2e6c91ad2af35426 08-Oct-2013 Kenny Root <kroot@google.com> Add support for ECDSA P-256 with SHA256

This adds a small EC library that is capable of verifying a signature of
SHA256 with ECDSA on the NIST P-256 curve.

Change-Id: I2a16639c92a77e8e4783c47ffbc56676de56eb59
nclude/mincrypt/dsa_sig.h
nclude/mincrypt/hash-internal.h
nclude/mincrypt/p256.h
nclude/mincrypt/p256_ecdsa.h
nclude/mincrypt/rsa.h
nclude/mincrypt/sha.h
nclude/mincrypt/sha256.h
ibmincrypt/Android.mk
ibmincrypt/dsa_sig.c
ibmincrypt/p256.c
ibmincrypt/p256_ec.c
ibmincrypt/p256_ecdsa.c
ibmincrypt/test/Android.mk
ibmincrypt/test/ecdsa_test.c
ibmincrypt/tools/Android.mk
ibmincrypt/tools/DumpPublicKey.java
885cb6877c303a91538351c17fcc45222784495b 09-Oct-2013 Ed Heyl <edheyl@google.com> am 1101c1eb: am 1c39fdcd: merge in KQS81M

* commit '1101c1eb1a2c670bee7689587504de34d0306882':
Only check caller when deriving permissions.
Fix recursive locking bug.
19ebdadee468bfbf28b4118aa1990e5eeb46e94a 09-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
eef6fca832c7270dfe48a9bb2aad632bba3d0ea8 09-Oct-2013 Jeff Sharkey <jsharkey@android.com> am a5fdea71: am e93a0517: Set GID required to write, media_rw mount point.

* commit 'a5fdea7189239d7edeafa528c299306cba55e6c6':
Set GID required to write, media_rw mount point.
1101c1eb1a2c670bee7689587504de34d0306882 09-Oct-2013 Ed Heyl <edheyl@google.com> am 1c39fdcd: merge in KQS81M

* commit '1c39fdcd9eb628338d7f273e43723585ca35721a':
Only check caller when deriving permissions.
Fix recursive locking bug.
1c39fdcd9eb628338d7f273e43723585ca35721a 09-Oct-2013 Ed Heyl <edheyl@google.com> merge in KQS81M
a5fdea7189239d7edeafa528c299306cba55e6c6 08-Oct-2013 Jeff Sharkey <jsharkey@android.com> am e93a0517: Set GID required to write, media_rw mount point.

* commit 'e93a0517f4c88310066ac39c6b268ebfcceef44e':
Set GID required to write, media_rw mount point.
e93a0517f4c88310066ac39c6b268ebfcceef44e 08-Oct-2013 Jeff Sharkey <jsharkey@android.com> Set GID required to write, media_rw mount point.

Add sdcard FUSE daemon flag to specify the GID required for a package
to have write access. Normally sdcard_rw, but it will be media_rw
for secondary external storage devices, so DefaultContainerService
can still clean up package directories after uninstall.

Create /mnt/media_rw which is where vold will mount raw secondary
external storage devices before wrapping them in a FUSE instance.

Bug: 10330128, 10330229
Change-Id: I4385c36fd9035cdf56892aaf7b36ef4b81f4418a
ootdir/init.rc
dcard/sdcard.c
8511a3da020a2d192383829555c3dc59966bc031 05-Oct-2013 Christopher Ferris <cferris@google.com> am 816c9a64: am fa135f5c: am 7dbe9660: Merge "Update debuggerd to use libbacktrace."

* commit '816c9a64f968b62eb60fa4060bcab614821b8f54':
Update debuggerd to use libbacktrace.
816c9a64f968b62eb60fa4060bcab614821b8f54 05-Oct-2013 Christopher Ferris <cferris@google.com> am fa135f5c: am 7dbe9660: Merge "Update debuggerd to use libbacktrace."

* commit 'fa135f5ce95a8eff2ff51c03ad2e9d9b2a8b2274':
Update debuggerd to use libbacktrace.
fa135f5ce95a8eff2ff51c03ad2e9d9b2a8b2274 05-Oct-2013 Christopher Ferris <cferris@google.com> am 7dbe9660: Merge "Update debuggerd to use libbacktrace."

* commit '7dbe96602cde4822d22f17b85e33027563e8c521':
Update debuggerd to use libbacktrace.
7dbe96602cde4822d22f17b85e33027563e8c521 05-Oct-2013 Christopher Ferris <cferris@google.com> Merge "Update debuggerd to use libbacktrace."
544020895c5b57d5015fb45af580d0e14e27420c 04-Oct-2013 Colin Cross <ccross@google.com> Merge "Fastbootd: Comments and general cleaning"
6b817760e94e591df926586d452cc5fc6d5bd693 04-Oct-2013 Colin Cross <ccross@google.com> Merge "Fastbootd: General fixes and changes"
9e786b4557fd57e14f6f49b2731f1d58033090f8 04-Oct-2013 Szymon Starzycki <sstar@google.com> Fastbootd: Comments and general cleaning

Alignment fix for fastbootd gpt_mmap

Change-Id: I86482e1645672daae1c8e4a4455c6291c0805fb0
astbootd/commands.c
astbootd/commands/partitions.c
8fa2f34fd51f7296999389a4c79c025d781c7b92 03-Oct-2013 Szymon Starzycki <sstar@google.com> Fastbootd: General fixes and changes

read data once bug fix
ability to run fastbootd without network and named socket configuration in init.rc
vendortrigger name changed to fastbootd
deleted unused function from default implementation of OEM library

Change-Id: Ib957fae8172530f20d51bb51b5e07bccab07e555
astbootd/commands.c
astbootd/commands/flash.h
astbootd/fastbootd.c
astbootd/include/vendor_trigger.h
astbootd/other/vendor_trigger.c
astbootd/secure.c
astbootd/transport_socket.c
dc722ee329e4e7d396ecaff2467827e6ddf98712 04-Oct-2013 Colin Cross <ccross@google.com> Merge changes I1a27459b,I3e9c53c3,I91082f58,I395e5361

* changes:
Revert "Revert "Fastbootd: flashing certification""
Fastbootd: auto ssh server start
Fastbootd: network auto discovery
Fastbootd: socket and network transport
ecb2e3903bf24a511032654532f44486362de765 04-Oct-2013 Colin Cross <ccross@android.com> am ad296139: am 410f8c30: am 79b277ab: Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."

* commit 'ad2961397f1c7b79b114672108a3bc9b87dc8174':
Set security context of /adb_keys and /data/misc/adb/adb_keys.
dcf2771bb77e0c3c4047893272a6488ad137be74 04-Oct-2013 Alex Klyubin <klyubin@google.com> am ea1f56e7: am b1dd1765: am b42fc74f: Merge "Expose /dev/hw_random to group "system"."

* commit 'ea1f56e7ffec235cc5d48e7cd9cb7d39f4ba1598':
Expose /dev/hw_random to group "system".
ad2961397f1c7b79b114672108a3bc9b87dc8174 04-Oct-2013 Colin Cross <ccross@android.com> am 410f8c30: am 79b277ab: Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."

* commit '410f8c305b416484f17f068c37b785605a2f69eb':
Set security context of /adb_keys and /data/misc/adb/adb_keys.
ea1f56e7ffec235cc5d48e7cd9cb7d39f4ba1598 04-Oct-2013 Alex Klyubin <klyubin@google.com> am b1dd1765: am b42fc74f: Merge "Expose /dev/hw_random to group "system"."

* commit 'b1dd176520896efacbabd1df65d8bb56e1bfeb71':
Expose /dev/hw_random to group "system".
410f8c305b416484f17f068c37b785605a2f69eb 04-Oct-2013 Colin Cross <ccross@android.com> am 79b277ab: Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."

* commit '79b277ab73711313690d03a9fb2e9cb3f9242b39':
Set security context of /adb_keys and /data/misc/adb/adb_keys.
b1dd176520896efacbabd1df65d8bb56e1bfeb71 04-Oct-2013 Alex Klyubin <klyubin@google.com> am b42fc74f: Merge "Expose /dev/hw_random to group "system"."

* commit 'b42fc74f0db60e1e86deaf527b3b7e7ec53dcc54':
Expose /dev/hw_random to group "system".
79b277ab73711313690d03a9fb2e9cb3f9242b39 04-Oct-2013 Colin Cross <ccross@android.com> Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."
b42fc74f0db60e1e86deaf527b3b7e7ec53dcc54 04-Oct-2013 Alex Klyubin <klyubin@google.com> Merge "Expose /dev/hw_random to group "system"."
b2478a713a39ab745017308e8859467017fb6fa5 03-Oct-2013 Alex Klyubin <klyubin@google.com> Expose /dev/hw_random to group "system".

This is needed to let EntropyMixer (runs inside system_server) read
from /dev/hw_random.

Change-Id: Ifde851004301ffd41b2189151a64a0c5989c630f
ootdir/ueventd.rc
365e4ae74568274ffd692c12fd7285a230d49a67 02-Oct-2013 Christopher Ferris <cferris@google.com> Update debuggerd to use libbacktrace.

Remove all of the code in debuggerd that uses libcorkscrew directly
and replace with libbacktrace.

Also do a bit of refactoring to clean up some functions that were
passing around variables that weren't used.

Bug: 8410085

Change-Id: I27da4fbe3f12ce38a85b4432fc1119984c9c391b
ebuggerd/Android.mk
ebuggerd/arm/machine.c
ebuggerd/backtrace.c
ebuggerd/backtrace.h
ebuggerd/machine.h
ebuggerd/mips/machine.c
ebuggerd/tombstone.c
ebuggerd/x86/machine.c
781f9fc4af6002f5eb47b2bad852e1090d525298 03-Oct-2013 Szymon Starzycki <sstar@google.com> Revert "Revert "Fastbootd: flashing certification""

CMS functionality is now available

This reverts commit 068b71dd9cd6cb03dfcdc0c9deced361780bc0d3.

Conflicts:
fastbootd/Android.mk
fastbootd/fastbootd.c
fastbootd/utils.c
fastbootd/utils.h

Change-Id: I1a27459b41d9297603deb124c65f237ff971e5b6
astbootd/Android.mk
astbootd/commands.c
astbootd/commands/flash.c
astbootd/commands/flash.h
astbootd/fastbootd.c
astbootd/other/sign/src/SignImg.java
astbootd/secure.c
astbootd/secure.h
4aef2e911eb6f3d9f09523a1c99e4c0281e5d11d 02-Oct-2013 Christopher Ferris <cferris@google.com> am 7bdb7b42: am 81890fd8: am 5daba1e0: Merge "Only build host library on linux-x86."

* commit '7bdb7b42224c6139c400eb47a5e9b660184aad54':
Only build host library on linux-x86.
f7bc1702a64a15dc51f3185a52d856b947160bfe 02-Oct-2013 Colin Cross <ccross@android.com> am 903e6865: am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"

* commit '903e6865cae15d5967c4c810ece17c021945c2e4':
Handle screendumps for all framebuffer sizes
7bdb7b42224c6139c400eb47a5e9b660184aad54 02-Oct-2013 Christopher Ferris <cferris@google.com> am 81890fd8: am 5daba1e0: Merge "Only build host library on linux-x86."

* commit '81890fd80ffda1cbb259912b0e5ee29a5fa8c617':
Only build host library on linux-x86.
903e6865cae15d5967c4c810ece17c021945c2e4 02-Oct-2013 Colin Cross <ccross@android.com> am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"

* commit 'b024bbf6a1daf752a8d756bfda472fe6fb48dd9e':
Handle screendumps for all framebuffer sizes
81890fd80ffda1cbb259912b0e5ee29a5fa8c617 02-Oct-2013 Christopher Ferris <cferris@google.com> am 5daba1e0: Merge "Only build host library on linux-x86."

* commit '5daba1e0ee1c7cb21b3f8001ab6806834884f0d0':
Only build host library on linux-x86.
b024bbf6a1daf752a8d756bfda472fe6fb48dd9e 02-Oct-2013 Colin Cross <ccross@android.com> am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"

* commit '6da66ef49b7c35cc5050a4a6b9771801640fb99b':
Handle screendumps for all framebuffer sizes
5daba1e0ee1c7cb21b3f8001ab6806834884f0d0 02-Oct-2013 Christopher Ferris <cferris@google.com> Merge "Only build host library on linux-x86."
9e1ee2b3c6195cf34ea3568398f073272fab270a 02-Oct-2013 Christopher Ferris <cferris@google.com> Only build host library on linux-x86.

Change-Id: I26d5bd4b34c3669897fea1488fa58972f4299757
ibbacktrace/Android.mk
6da66ef49b7c35cc5050a4a6b9771801640fb99b 02-Oct-2013 Colin Cross <ccross@android.com> Merge "Handle screendumps for all framebuffer sizes"
6d22960759aa444592d684540359157a3b65a917 02-Oct-2013 Christopher Ferris <cferris@google.com> Move cutils/log.h to log/log.h.

The log.h file moved, so clean up these references to the old
location.

Change-Id: I25494ea069bfb20fa07a02e67868c8be82e60161
ibbacktrace/common.c
ibbacktrace/corkscrew.c
ibbacktrace/map_info.c
ibbacktrace/stubs.c
ibbacktrace/unwind_local.c
ibbacktrace/unwind_remote.c
9043fc66961d7932a7903d41ac3a77f08f3ff907 02-Oct-2013 Christopher Ferris <cferris@google.com> am e6cfee1b: am 0e9abad8: am f3217de3: Merge "Fix problems in libbacktrace."

* commit 'e6cfee1b91081ca12f1d8d66a639fce61d8dd18a':
Fix problems in libbacktrace.
41c9fd6480771ec7ab4c160aef046e0d27a085a0 02-Oct-2013 Colin Cross <ccross@android.com> am 0d3ac55d: am 230252d5: am 61afb07b: Merge "Trigger a policy reload from post-fs-data."

* commit '0d3ac55d0654fe4f6d37923782dcd41f0590c741':
Trigger a policy reload from post-fs-data.
c123f3ac6aedf3b86197053cfb619dc210f410d7 02-Oct-2013 William Luh <williamluh@google.com> am 9293ea4c: am e3e22062: Merge "Add new cert_pin_failure tag that can be used in user-consent filtering." into klp-dev

* commit '9293ea4c8650a2907772f684a7c9415f82414539':
Add new cert_pin_failure tag that can be used in user-consent filtering.
e6cfee1b91081ca12f1d8d66a639fce61d8dd18a 02-Oct-2013 Christopher Ferris <cferris@google.com> am 0e9abad8: am f3217de3: Merge "Fix problems in libbacktrace."

* commit '0e9abad8d22868bc2039380df2f4b29edd248402':
Fix problems in libbacktrace.
0d3ac55d0654fe4f6d37923782dcd41f0590c741 02-Oct-2013 Colin Cross <ccross@android.com> am 230252d5: am 61afb07b: Merge "Trigger a policy reload from post-fs-data."

* commit '230252d5cd70f5be4c24046c7a409e9498ac97f5':
Trigger a policy reload from post-fs-data.
0e9abad8d22868bc2039380df2f4b29edd248402 02-Oct-2013 Christopher Ferris <cferris@google.com> am f3217de3: Merge "Fix problems in libbacktrace."

* commit 'f3217de32cff8f82a22de84f35d782307a4ed4da':
Fix problems in libbacktrace.
230252d5cd70f5be4c24046c7a409e9498ac97f5 02-Oct-2013 Colin Cross <ccross@android.com> am 61afb07b: Merge "Trigger a policy reload from post-fs-data."

* commit '61afb07b9b14233f76a969840f74ce1ced22bf58':
Trigger a policy reload from post-fs-data.
f3217de32cff8f82a22de84f35d782307a4ed4da 02-Oct-2013 Christopher Ferris <cferris@google.com> Merge "Fix problems in libbacktrace."
5eaafe230675ae5ac12ac060d2a040b45abe685a 02-Oct-2013 Christopher Ferris <cferris@google.com> am 44b23fd6: am 3f0a5e9c: am 71a8aa34: Merge "Update comment from review."

* commit '44b23fd6aac2303adc446b1b3ed5b7c05d6d7865':
Update comment from review.
06865353606c712cee09e8b9abe26e7cdf64ba15 02-Oct-2013 Christopher Ferris <cferris@google.com> am 7eb36bf4: am 7f21826c: am f41cf208: Merge "Create a single backtrace library."

* commit '7eb36bf4b6e8de5fb28e6e5172f93e6973cd6bd2':
Create a single backtrace library.
a16a4e10e140094ca7b83dc5a65c1ddc68470a5e 02-Oct-2013 Christopher Ferris <cferris@google.com> Fix problems in libbacktrace.

- Add a wait for stop to backtrace_test. There is a possible race
condition that is exposed when using libunwind.
- Fix a few calls to unwind function calls.

Bug: 8410085
Change-Id: I7487d687f6d4b7b05b8a96ad1c5f7183681e5c95
ibbacktrace/backtrace_test.c
ibbacktrace/unwind_local.c
ibbacktrace/unwind_remote.c
deb41e512760f9d18cb718b007ced367018b3667 01-Oct-2013 Stephen Smalley <sds@tycho.nsa.gov> Set security context of /adb_keys and /data/misc/adb/adb_keys.

I97b3d86a69681330bba549491a2fb39df6cf20ef introduced a separate type
for the adb_keys file. Set the security context of the adb_keys file
accordingly by adding restorecon commands to init.rc.

Change-Id: I30e4d2a1ae223a03eadee58a883c79932fff59fe
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
f981b1ed0f5f5428aa686a2de306002463ce16e2 01-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
9293ea4c8650a2907772f684a7c9415f82414539 01-Oct-2013 William Luh <williamluh@google.com> am e3e22062: Merge "Add new cert_pin_failure tag that can be used in user-consent filtering." into klp-dev

* commit 'e3e22062f0a00bc23dade9c6f06d41e76dd7b351':
Add new cert_pin_failure tag that can be used in user-consent filtering.
2e227fbc5ad735856ce016714440e377e85fb839 01-Oct-2013 Todd Poynor <toddpoynor@google.com> healthd: start switchover to BatteryExtraProperties

Change-Id: I47a24d4284f502858ee929b2cda8881165ef4ef3
ealthd/BatteryMonitor.cpp
e3e22062f0a00bc23dade9c6f06d41e76dd7b351 30-Sep-2013 William Luh <williamluh@google.com> Merge "Add new cert_pin_failure tag that can be used in user-consent filtering." into klp-dev
61afb07b9b14233f76a969840f74ce1ced22bf58 30-Sep-2013 Colin Cross <ccross@android.com> Merge "Trigger a policy reload from post-fs-data."
44b23fd6aac2303adc446b1b3ed5b7c05d6d7865 30-Sep-2013 Christopher Ferris <cferris@google.com> am 3f0a5e9c: am 71a8aa34: Merge "Update comment from review."

* commit '3f0a5e9c9f279546fc5c89c61053554ef6eb43d3':
Update comment from review.
3f0a5e9c9f279546fc5c89c61053554ef6eb43d3 30-Sep-2013 Christopher Ferris <cferris@google.com> am 71a8aa34: Merge "Update comment from review."

* commit '71a8aa347383fa5891a43aaa587fe67be166d5c4':
Update comment from review.
71a8aa347383fa5891a43aaa587fe67be166d5c4 30-Sep-2013 Christopher Ferris <cferris@google.com> Merge "Update comment from review."
7eb36bf4b6e8de5fb28e6e5172f93e6973cd6bd2 30-Sep-2013 Christopher Ferris <cferris@google.com> am 7f21826c: am f41cf208: Merge "Create a single backtrace library."

* commit '7f21826c478088b4717cc6c7d1ff6ef3d7da464a':
Create a single backtrace library.
474afff2295b66440386bb40228ea51850e3d3be 30-Sep-2013 Christopher Ferris <cferris@google.com> Update comment from review.

Missed this typo that enh pointed out.

Bug: 8410085
Change-Id: Ic636ae218fc153bc5e3b1a0fdc2f7161980e5eec
nclude/backtrace/backtrace.h
7f21826c478088b4717cc6c7d1ff6ef3d7da464a 30-Sep-2013 Christopher Ferris <cferris@google.com> am f41cf208: Merge "Create a single backtrace library."

* commit 'f41cf2086d759987708321772f0c67f7d7034509':
Create a single backtrace library.
f41cf2086d759987708321772f0c67f7d7034509 30-Sep-2013 Christopher Ferris <cferris@google.com> Merge "Create a single backtrace library."
6298d6601eff1c782458956e4e39445e06b4eccb 30-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "Remove non-existing klog_close()"
48dbe8d4ab0517d10a7d4570fcfeff382fce2ac1 29-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
7fb22878d43bddd48b854f8e201afb800393482a 27-Sep-2013 Christopher Ferris <cferris@google.com> Create a single backtrace library.

This library will be used to abstract away getting backtrace
data from how it is implemented. This is the first step to
replacing libcorkscrew with libunwind.

Bug: 8410085
Change-Id: Ie8f159e96a055d378e1ddc72d40239fba4cf52b7
nclude/backtrace/backtrace.h
ibbacktrace/Android.mk
ibbacktrace/backtrace_test.c
ibbacktrace/backtrace_testlib.c
ibbacktrace/common.c
ibbacktrace/common.h
ibbacktrace/corkscrew.c
ibbacktrace/demangle.c
ibbacktrace/demangle.h
ibbacktrace/map_info.c
ibbacktrace/stubs.c
ibbacktrace/unwind.c
ibbacktrace/unwind.h
ibbacktrace/unwind_local.c
ibbacktrace/unwind_remote.c
8c3263ea94ab7292ce8ba88d60c4672ec75b5e1a 19-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: auto ssh server start

Change-Id: I3e9c53c3d834726c3747e9ee0665ed027f55b08c
astbootd/fastbootd.c
astbootd/other/gptedit.c
astbootd/utils.c
astbootd/utils.h
658122881774460d43952673a1f4553e2952bd54 14-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: network auto discovery

Change-Id: I91082f5832412e775244b3974c0ab00952905ad5
astbootd/Android.mk
astbootd/fastbootd.c
astbootd/network_discovery.c
astbootd/network_discovery.h
astbootd/utils.c
astbootd/utils.h
b015b16c977d2cdf3fe1028c08270833ff428d07 05-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: socket and network transport

Change-Id: I395e5361d0484bd11421225c152f9aec00305f11
astbootd/Android.mk
astbootd/fastbootd.c
astbootd/socket_client.c
astbootd/socket_client.h
astbootd/transport.c
astbootd/transport_socket.c
astbootd/usb_linux_client.c
astbootd/utils.c
astbootd/utils.h
4f115c7127037e3729bb64c149df298e269a17a7 28-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: build breakage fix

Change-Id: I6a01ff6f785adc58581d0d9f44e71c94cbb4e3b5
astbootd/commands/partitions.c
32b7108b64c209d4397575498b63dd42aae13926 26-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Remove non-existing klog_close()

Change-Id: I49f6047b3f6d90ffa1601bd9348ae69d87b63aed
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
nclude/cutils/klog.h
c2d41bfe0d284df61210caf176e3954df38173df 27-Sep-2013 Colin Cross <ccross@google.com> Merge "Revert "Fastbootd: flashing certification""
068b71dd9cd6cb03dfcdc0c9deced361780bc0d3 27-Sep-2013 Colin Cross <ccross@google.com> Revert "Fastbootd: flashing certification"

This reverts commit 5ccecfd26d2a7c3a79a139f0118b93ee64be4737.

Change-Id: I0ca31094c115e14982a27c258d9139a723da8428
astbootd/Android.mk
astbootd/commands.c
astbootd/commands/flash.c
astbootd/commands/flash.h
astbootd/fastbootd.c
astbootd/other/sign/src/SignImg.java
astbootd/secure.c
astbootd/secure.h
astbootd/utils.c
astbootd/utils.h
6257e89da867b77efef9094ff5c926b626dda4a2 27-Sep-2013 Colin Cross <ccross@google.com> Merge "Fastbootd: flashing certification"
2a8e7a6a097f3541fd3be02c003bddff19869c7d 27-Sep-2013 Colin Cross <ccross@google.com> Merge "Fastbootd: improved operations on gpt"
5ccecfd26d2a7c3a79a139f0118b93ee64be4737 20-Aug-2013 Szymon Starzycki <sstar@google.com> Fastbootd: flashing certification

Change-Id: I564086908942463eebee69449d484ba03effc50e
astbootd/Android.mk
astbootd/commands.c
astbootd/commands/flash.c
astbootd/commands/flash.h
astbootd/fastbootd.c
astbootd/other/sign/src/SignImg.java
astbootd/secure.c
astbootd/secure.h
astbootd/utils.c
astbootd/utils.h
bc7cbfd4e35a143540d9971c788d62ceda934efd 17-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: improved operations on gpt

Change-Id: Ieabdcb1c52094d7408b169681e073ebf6613af20
astbootd/commands/partitions.c
astbootd/commands/partitions.h
astbootd/other/gptedit.c
fded185fc0636593585a9e7e549704f07ea63a56 26-Sep-2013 Ying Wang <wangying@android.com> am f47c01da: am 1690a5a6: am aa62be65: Merge "Use SSE2 enhanced memset for capable x86 processors"

* commit 'f47c01da1834e7046bc7120642f672ccaabd5d1a':
Use SSE2 enhanced memset for capable x86 processors
f47c01da1834e7046bc7120642f672ccaabd5d1a 26-Sep-2013 Ying Wang <wangying@android.com> am 1690a5a6: am aa62be65: Merge "Use SSE2 enhanced memset for capable x86 processors"

* commit '1690a5a6943d4e4b65d5e4dcd077702c2c8f40a0':
Use SSE2 enhanced memset for capable x86 processors
1690a5a6943d4e4b65d5e4dcd077702c2c8f40a0 26-Sep-2013 Ying Wang <wangying@android.com> am aa62be65: Merge "Use SSE2 enhanced memset for capable x86 processors"

* commit 'aa62be65eddc68b29ab9d7993f0311738d24bfcf':
Use SSE2 enhanced memset for capable x86 processors
849b7aa5bebc1f1f79358a2d43683b4eb974b6ed 26-Sep-2013 Adam Lesinski <adamlesinski@google.com> am 71ddce59: am bbe4c49b: Merge "Moves libmemtrack header to standard location" into klp-dev

* commit '71ddce59275e70c34015b0fa87c10384ab1876cd':
Moves libmemtrack header to standard location
71ddce59275e70c34015b0fa87c10384ab1876cd 26-Sep-2013 Adam Lesinski <adamlesinski@google.com> am bbe4c49b: Merge "Moves libmemtrack header to standard location" into klp-dev

* commit 'bbe4c49b4eb664ca018ff670a4dcbf5b9de9a810':
Moves libmemtrack header to standard location
bbe4c49b4eb664ca018ff670a4dcbf5b9de9a810 26-Sep-2013 Adam Lesinski <adamlesinski@google.com> Merge "Moves libmemtrack header to standard location" into klp-dev
aa62be65eddc68b29ab9d7993f0311738d24bfcf 26-Sep-2013 Ying Wang <wangying@android.com> Merge "Use SSE2 enhanced memset for capable x86 processors"
53367585956dd5a4da37e388e5a32ce577d8174a 05-Sep-2013 William Luh <williamluh@google.com> Add new cert_pin_failure tag that can be used in user-consent filtering.

Bug: 10912373
Change-Id: If8a2f9829b3aac4abc33a4623c5f5b4966fd6870
ogcat/event.logtags
01b5618347bbdea8aef2449c5987ece0c2dffdcd 25-Sep-2013 jp abgrall <jpa@google.com> am 8f4c14f1: am 08170103: am 91962669: Merge "cutils: list: add list_for_each_safe"

* commit '8f4c14f1e7fd0a2f9b46151ccc83c49b41e830ef':
cutils: list: add list_for_each_safe
8f4c14f1e7fd0a2f9b46151ccc83c49b41e830ef 25-Sep-2013 jp abgrall <jpa@google.com> am 08170103: am 91962669: Merge "cutils: list: add list_for_each_safe"

* commit '0817010366feecb53fc70719b3784dd7c6d66b55':
cutils: list: add list_for_each_safe
0817010366feecb53fc70719b3784dd7c6d66b55 25-Sep-2013 jp abgrall <jpa@google.com> am 91962669: Merge "cutils: list: add list_for_each_safe"

* commit '919626693999d8d3f22e12477d35c067594a6387':
cutils: list: add list_for_each_safe
919626693999d8d3f22e12477d35c067594a6387 25-Sep-2013 jp abgrall <jpa@google.com> Merge "cutils: list: add list_for_each_safe"
25deadbe02544c5cd60cea3f2b0701edd2bca5c3 25-Sep-2013 Kenny Root <kroot@android.com> am 7d343236: am 6d06b01c: am e245b8fb: Merge changes I9f858204,Ib35643b3

* commit '7d343236f34dbc2ee2771d3e42f881019ec1aa6a':
mincrypt: merge the two RSA verifiers
mincrypt: support SHA-256 hash algorithm
7d343236f34dbc2ee2771d3e42f881019ec1aa6a 25-Sep-2013 Kenny Root <kroot@android.com> am 6d06b01c: am e245b8fb: Merge changes I9f858204,Ib35643b3

* commit '6d06b01cf4237bd43b6e13f1683fcfc4dae83e78':
mincrypt: merge the two RSA verifiers
mincrypt: support SHA-256 hash algorithm
6d06b01cf4237bd43b6e13f1683fcfc4dae83e78 25-Sep-2013 Kenny Root <kroot@android.com> am e245b8fb: Merge changes I9f858204,Ib35643b3

* commit 'e245b8fb5d3d5b3fe23cbc82ba79c6caaee901f2':
mincrypt: merge the two RSA verifiers
mincrypt: support SHA-256 hash algorithm
e245b8fb5d3d5b3fe23cbc82ba79c6caaee901f2 25-Sep-2013 Kenny Root <kroot@android.com> Merge changes I9f858204,Ib35643b3

* changes:
mincrypt: merge the two RSA verifiers
mincrypt: support SHA-256 hash algorithm
0a862dcd637d3ed82861d39bb48a55ed10a796a6 11-Apr-2013 Doug Zongker <dougz@android.com> mincrypt: merge the two RSA verifiers

The e=3 and e=65537 implementations are nearly identical, refactor
them down into one.

(cherry picked from commit 8fdbf97652b76b19b4faff522ddcf4a9da543a86)

Change-Id: I9f858204d52a0ae880170d955bf8f29fed57ee94
ibmincrypt/Android.mk
ibmincrypt/rsa.c
ibmincrypt/rsa_e_3.c
ibmincrypt/rsa_e_f4.c
ibmincrypt/test/Android.mk
ibmincrypt/test/rsa_test.c
8e5b63d045e988f13d1ee9b7797db28fde15bbfc 10-Apr-2013 Doug Zongker <dougz@android.com> mincrypt: support SHA-256 hash algorithm

- adds a library to compute the SHA-256 hash

- updates the RSA verifier to take an argument specifying either SHA-1
or SHA-256

- updates DumpPublicKey to with new "key" version numbers for
specifying SHA-256

- adds new argument to adb auth code to maintain existing behavior

(cherry picked from commit 515e1639ef0ab5e3149fafeffce826cf654d616f)

Change-Id: Ib35643b3d864742e817ac6e725499b451e45afcf
db/adb_auth_client.c
nclude/mincrypt/hash-internal.h
nclude/mincrypt/rsa.h
nclude/mincrypt/sha.h
nclude/mincrypt/sha256.h
ibmincrypt/Android.mk
ibmincrypt/rsa.c
ibmincrypt/rsa_e_3.c
ibmincrypt/rsa_e_f4.c
ibmincrypt/sha.c
ibmincrypt/sha256.c
ibmincrypt/tools/DumpPublicKey.java
7f1aa4cbd831481beb1b8f2f045d80d04b9c40e7 25-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
85373f42803f86e3295afd5031a0e42e0b3bef33 25-Sep-2013 Chris Dearman <chris.dearman@imgtec.com> Handle screendumps for all framebuffer sizes

readx() treats a partial read as an error but also consumes the data,
Now exactly the amount of data needed for the screendump is requested.

This bug showed up for framebuffers that were not a multiple of 640
bytes.

Also fix a compiler warning related to handing pipe() failure.

Change-Id: I8b1713923e156d4e3424784152e5dc5cbc7d478d
db/framebuffer_service.c
adb88e20e4b71cfd1b73bd9efbf7693a28025af3 25-Sep-2013 Benoit Goby <benoit@android.com> am 4820022b: am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"

* commit '4820022b5edb0d19e268d836c25aa628b4378aba':
init: Fix queue_all_property_triggers with nonexistent properties
4820022b5edb0d19e268d836c25aa628b4378aba 25-Sep-2013 Benoit Goby <benoit@android.com> am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"

* commit '0b7d588d531691904530ba57d772b31fb24ed343':
init: Fix queue_all_property_triggers with nonexistent properties
0b7d588d531691904530ba57d772b31fb24ed343 25-Sep-2013 Benoit Goby <benoit@android.com> am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"

* commit 'f2c4c4ada725b86e6581a89cc06e2836d4bdc6e3':
init: Fix queue_all_property_triggers with nonexistent properties
f2c4c4ada725b86e6581a89cc06e2836d4bdc6e3 25-Sep-2013 Benoit Goby <benoit@android.com> Merge "init: Fix queue_all_property_triggers with nonexistent properties"
90f143328f8f050b6648c7342dc7a6721725e32f 25-Sep-2013 Ben Cheng <bccheng@google.com> am bcea352d: am d38cc182: Merge "Disable timestamp logging." into klp-dev

* commit 'bcea352d2ce59c98414d15cb38f16d4c1abe2b72':
Disable timestamp logging.
bcea352d2ce59c98414d15cb38f16d4c1abe2b72 25-Sep-2013 Ben Cheng <bccheng@google.com> am d38cc182: Merge "Disable timestamp logging." into klp-dev

* commit 'd38cc182dbfce4a1d7e8e9c16bff10b71128cc01':
Disable timestamp logging.
d38cc182dbfce4a1d7e8e9c16bff10b71128cc01 25-Sep-2013 Ben Cheng <bccheng@google.com> Merge "Disable timestamp logging." into klp-dev
d679e1b572c8fc2a115b7d126593f92abd746aab 24-Sep-2013 Benoit Goby <benoit@android.com> init: Fix queue_all_property_triggers with nonexistent properties

Don't queue actions for "on property=*" if the property does not exist.
This fixes these errors on boot:

init: property 'sys.powerctl' doesn't exist while
expanding '${sys.powerctl}'
init: powerctl: cannot expand '${sys.powerctl}

Change-Id: I3bd354d73a860f856be5df2c654f940445f9efd9
nit/init_parser.c
51546ee32c22426aa85f2ee7cc2e8df7d774e385 25-May-2012 Daniel Leung <daniel.leung@intel.com> Use SSE2 enhanced memset for capable x86 processors

Originally, if TARGET_ARCH_VARIANT is x86-atom, the SSE2 enhanced
memset is used. This patch extends this to all x86 processors which
support SSE2 (i.e. ARCH_X86_HAVE_SSE2 is true).

Indentation added to the ifeq cases to make this easier to read.

Change-Id: I05f49e237a95359d3f2e3216b037e3fc1a0fbcb0
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
ibcutils/Android.mk
87b3c6af08ab724ec48301aa3b77851d05843480 24-Sep-2013 Rom Lemarchand <romlem@google.com> am b5ffaded: am 397a3642: fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab

* commit 'b5ffadedd48a3e9a5e302925a87eeec47ac00dbe':
fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
b5ffadedd48a3e9a5e302925a87eeec47ac00dbe 24-Sep-2013 Rom Lemarchand <romlem@google.com> am 397a3642: fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab

* commit '397a3642145dbd0919f8148ff24f0cafe1714b55':
fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
397a3642145dbd0919f8148ff24f0cafe1714b55 24-Sep-2013 Rom Lemarchand <romlem@google.com> fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab

Make sure fstab is not NULL before freeing it

Bug: 10911605
Change-Id: I549c0a470dd183fb15a2f3c5cf4f3dd393b6e307
s_mgr/fs_mgr.c
63144019468b2043393aabd7cba6f03b2e9a4234 24-Sep-2013 Ken Sumrall <ksumrall@android.com> am dfcbf02b: am 6b1a0272: Merge "Create a separate copy of the fsck logs" into klp-dev

* commit 'dfcbf02bb0a6705e3714a59e42e052fbb0ce8799':
Create a separate copy of the fsck logs
dbbafa5307e0c3395cba6e8b7fb643f2cb2499ca 24-Sep-2013 Ken Sumrall <ksumrall@android.com> am 12d71925: am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev

* commit '12d71925862c9268a06c4a9bbf0904f22e1c5323':
New fstab flags to support more expressive SD card permissions
61c24928c8047e3f487762e12c0af74b7be9186e 24-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
5cd118178e87c4a6590dc8d8446effa5d5193a9f 24-Sep-2013 Ben Cheng <bccheng@google.com> Disable timestamp logging.

The kernel problem has been fixed long time ago and the ad-hoc logging
mechanism is not thread safe and can flood the log with spurious
messages.

BUG: 10899829
Change-Id: I63278db51295e744eed3e47dc8d4cfe621c0d8f7
ibutils/SystemClock.cpp
dfcbf02bb0a6705e3714a59e42e052fbb0ce8799 24-Sep-2013 Ken Sumrall <ksumrall@android.com> am 6b1a0272: Merge "Create a separate copy of the fsck logs" into klp-dev

* commit '6b1a027239689a817aa5ca44a2bcbfe48ed21408':
Create a separate copy of the fsck logs
12d71925862c9268a06c4a9bbf0904f22e1c5323 24-Sep-2013 Ken Sumrall <ksumrall@android.com> am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev

* commit '777a00e3d193e45d928b1a26de85ae5a238271c4':
New fstab flags to support more expressive SD card permissions
481b947d687a752174f2030511f5338e0ea674b0 24-Sep-2013 Adam Lesinski <adamlesinski@google.com> Moves libmemtrack header to standard location

Change-Id: If8c80003bc2f042c67ffdf38469407de3c2fda2c
nclude/memtrack/memtrack.h
ibmemtrack/Android.mk
ibmemtrack/include/memtrack.h
ibmemtrack/memtrack.c
ibmemtrack/memtrack_test.c
3707e7ff03a4240c8603f2d2e1d0b69fe7994cb9 24-Sep-2013 Glenn Kasten <gkasten@google.com> toolbox: Add nohup command

Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
oolbox/Android.mk
oolbox/nohup.c
6b1a027239689a817aa5ca44a2bcbfe48ed21408 23-Sep-2013 Ken Sumrall <ksumrall@android.com> Merge "Create a separate copy of the fsck logs" into klp-dev
777a00e3d193e45d928b1a26de85ae5a238271c4 23-Sep-2013 Ken Sumrall <ksumrall@android.com> Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
4676550b5684da8355f9ee0b2db964005ce9ea4f 17-Sep-2013 Todd Poynor <toddpoynor@google.com> init.rc: use oom_score_adj instead of oom_adj

Use kernel oom_score_adj interface to make init and children unkillable.

Stop using older, deprecated oom_adj interface.

Use OOM_SCORE_ADJ_MIN to make the processes unkillable (previously the processes
were set to a very low score, but not unkillable).

Change-Id: I680965009585c2a5a580859fb946f2d0caa95d9c
ootdir/init.rc
16b6099476078feb6da54ef4789f2a0ff569b6db 17-Sep-2013 Todd Poynor <toddpoynor@google.com> low memory killer: switch to kernel oom_score_adj interface

Use oom_score_adj for setting OOM score adjustment values instead
of the older, deprecated oom_adj interface.

Change-Id: I5ba7801d4b8971be092b31ae0fd8af8c3001d613
mkd/lmkd.c
06465f50cb5b7ecbaec562f252ba60195ad69da1 22-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
cae02657be05e7f016cb261fc9fffdc96dd1b9cd 21-Sep-2013 Jeff Sharkey <jsharkey@android.com> am 500f3ffa: am 0ee7d8c6: Fix Mac builds, for realz.

* commit '500f3ffad43d115faad38f4ed2c32a08b694f183':
Fix Mac builds, for realz.
500f3ffad43d115faad38f4ed2c32a08b694f183 21-Sep-2013 Jeff Sharkey <jsharkey@android.com> am 0ee7d8c6: Fix Mac builds, for realz.

* commit '0ee7d8c68b57c02d02f707d6f71c731234d56eec':
Fix Mac builds, for realz.
0ee7d8c68b57c02d02f707d6f71c731234d56eec 21-Sep-2013 Jeff Sharkey <jsharkey@android.com> Fix Mac builds, for realz.

Change-Id: I63e21b90e5b8a8f016dd04ceca4354793faa5e37
ibcutils/Android.mk
ibcutils/fs.c
4eaf905858c6a1d7cf0639bed3e8de3bd7987646 19-Sep-2013 Ken Sumrall <ksumrall@android.com> Create a separate copy of the fsck logs

The log_target parameter of android_fork_execvp_ext() is now a
bit field, and multiple targets can be set to log to multiple
places at the same time.

The new target LOG_FILE will log to a file specified by the new
parameter file_path.

Set LOG_FILE and log to a file in /dev (the only writable filesystem
avilable when e2fsck runs) when invoking e2fsck in fs_mgr.

Bug: 10021342

Change-Id: I63baf644cc8c3afccc8345df27a74203b44d0400
s_mgr/fs_mgr.c
ogwrapper/include/logwrap/logwrap.h
ogwrapper/logwrap.c
ogwrapper/logwrapper.c
ootdir/init.rc
887f2892062c64fa688fc9525ebd09cc98ca70d8 12-Sep-2013 Ken Sumrall <ksumrall@android.com> New fstab flags to support more expressive SD card permissions

Bug: 10330128

Change-Id: I41fb178b839487b604762fbc1ccba097d25c7aa0
s_mgr/fs_mgr.c
s_mgr/fs_mgr_priv.h
s_mgr/include/fs_mgr.h
7e82a37327c7abe1927c25f030a3eb7233895f1e 21-Sep-2013 Jeff Sharkey <jsharkey@android.com> am 68955fc8: am 4481c325: Fix Mac builds.

* commit '68955fc82edc2b4a3b61712a9fb9c80a705ba4c0':
Fix Mac builds.
68955fc82edc2b4a3b61712a9fb9c80a705ba4c0 21-Sep-2013 Jeff Sharkey <jsharkey@android.com> am 4481c325: Fix Mac builds.

* commit '4481c325b16d4a42fd0ebf4c8a2bb5bcc09daf5e':
Fix Mac builds.
4481c325b16d4a42fd0ebf4c8a2bb5bcc09daf5e 21-Sep-2013 Jeff Sharkey <jsharkey@android.com> Fix Mac builds.

Change-Id: I0eb029395a3afd2f93a7632d7d3d20d28c2ab189
ibcutils/Android.mk
aa4a3228f00fedd870c25dc37a112e439682dbde 21-Sep-2013 Jeff Sharkey <jsharkey@android.com> am 9729b415: am 44d6342c: Remove mkdir() side effect, add .nomedia, utils.

* commit '9729b41574ca5e5e87c86b203a2096cbdc72cfea':
Remove mkdir() side effect, add .nomedia, utils.
9729b41574ca5e5e87c86b203a2096cbdc72cfea 21-Sep-2013 Jeff Sharkey <jsharkey@android.com> am 44d6342c: Remove mkdir() side effect, add .nomedia, utils.

* commit '44d6342caa0db1f613809e9ba1ea8d9af0183b74':
Remove mkdir() side effect, add .nomedia, utils.
44d6342caa0db1f613809e9ba1ea8d9af0183b74 12-Sep-2013 Jeff Sharkey <jsharkey@android.com> Remove mkdir() side effect, add .nomedia, utils.

Before this change, FUSE lookup() would have the side effect of
creating the directory on behalf of apps. This resulted in most
directories being created just by Settings trying to measure disk
space. Instead, we're switching to have vold do directory creation
when an app doesn't have enough permissions.

Create fs_mkdirs() utility to create all parent directories in a
path as needed. Allow traversal (+x) into /storage directories.

Fix FUSE derived permissions to be case insensitive. Mark well-known
directories as .nomedia when created.

Bug: 10577808, 10330221
Change-Id: I53114f2e63ffbe6de4ba6a72d94a232523231cad
nclude/cutils/fs.h
ibcutils/fs.c
ootdir/init.rc
dcard/sdcard.c
780e011f09b9e0e36d0ea877b23a970f01dd5dde 20-Sep-2013 Kenny Root <kroot@google.com> Merge "Remove UniquePtr.h copy"
cf14eb59a5848767febd0ab53d9623c4bd321d94 20-Sep-2013 Ying Wang <wangying@google.com> Merge "Install the nonexistent-source symlink as a post-install step"
d975f37294076907d908826c503ebebd962e6f92 12-Sep-2013 Kenny Root <kroot@google.com> Remove UniquePtr.h copy

This was copied from libcore/include quite a while ago, but the
canonical version has since moved out to a generic library called
libnativehelper. All users of this header should already have
libnativehelper on their include path, so switching to the canonical
version is as easy as removing the "utils/" part.

Change-Id: Iae8e59bf3eee573bfa78381866989934e5bbf19d
nclude/utils/UniquePtr.h
c4d6ade8394c84bf8f15147f4b31f5fcb7f60120 20-Sep-2013 Ying Wang <wangying@google.com> Install the nonexistent-source symlink as a post-install step

Previously because /sbin/healthd does not exist on the build host, make
always tries to rebuild the symlink even in an already-up-to-date tree.

Change-Id: I41201282281476b14eaf4c7d9b2e09fe367c1422
ealthd/Android.mk
3aed2cf04fbb0207b002dd548aff88afc26bdb10 20-Sep-2013 Elliott Hughes <enh@google.com> Merge "Remove a homebrew mmap64."
82021570629e1f3b189f24badfea38b64ef3ff37 20-Sep-2013 Elliott Hughes <enh@google.com> Remove a homebrew mmap64.

This should have been fixed in bionic, and now has been.

Change-Id: Ib9b21771ed7fbb6b4082b52d0b590f2867f344d4
astbootd/commands/partitions.c
60549075e83e615179720f930c618a530462bc3c 20-Sep-2013 Elliott Hughes <enh@google.com> am 4d5d633b: am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"

* commit '4d5d633bf862dbb0a960019e80fadc40c93177f0':
libsparse: Use BIONIC implementation of mmap64()
4d5d633bf862dbb0a960019e80fadc40c93177f0 19-Sep-2013 Elliott Hughes <enh@google.com> am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"

* commit '20eb7ac26435abb1b2514951eee07fee44773877':
libsparse: Use BIONIC implementation of mmap64()
20eb7ac26435abb1b2514951eee07fee44773877 19-Sep-2013 Elliott Hughes <enh@google.com> am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"

* commit '3c8bdef029cbaa8d8fa18e4e55e51b60e938dd6e':
libsparse: Use BIONIC implementation of mmap64()
3c8bdef029cbaa8d8fa18e4e55e51b60e938dd6e 19-Sep-2013 Elliott Hughes <enh@google.com> Merge "libsparse: Use BIONIC implementation of mmap64()"
b5e14ead1ea7554914e9f332f51240520fb22eba 19-Sep-2013 Geremy Condra <gcondra@google.com> Merge "Add append2simg."
5660da25b9cd0b2e8d4e5d89de5b1cc281bce9bd 19-Sep-2013 Nick Kralevich <nnk@google.com> am 1998e505: am 2e940286: am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to system UID."

* commit '1998e505a98ad445bead87c2bb047053f1aea648':
Do not change ownership of /sys/fs/selinux/load to system UID.
1998e505a98ad445bead87c2bb047053f1aea648 19-Sep-2013 Nick Kralevich <nnk@google.com> am 2e940286: am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to system UID."

* commit '2e9402863b40fe8bf2ddd8169c62f2419d968ff9':
Do not change ownership of /sys/fs/selinux/load to system UID.
2e9402863b40fe8bf2ddd8169c62f2419d968ff9 19-Sep-2013 Nick Kralevich <nnk@google.com> am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to system UID."

* commit '0f507339ec474a2f67227466efc9045630f1f1a4':
Do not change ownership of /sys/fs/selinux/load to system UID.
0f507339ec474a2f67227466efc9045630f1f1a4 19-Sep-2013 Nick Kralevich <nnk@google.com> Merge "Do not change ownership of /sys/fs/selinux/load to system UID."
cc13e8ab87f74143293722e5301480fbe31b788d 26-Aug-2013 Stephen Smalley <sds@tycho.nsa.gov> Do not change ownership of /sys/fs/selinux/load to system UID.

Policy reload is handled by setting the selinux.reload_policy property
and letting the init process perform the actual loading of policy into
the kernel. Thus, there should be no need for the system UID to directly
write to /sys/fs/selinux/load.

Change-Id: I240c5bb2deaee757a2e1e396e14dea9e5d9286f5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
8978540d92badfc64e59af95770bcf6d2e65eb4b 19-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
af781c2692c20c954f650505faa1d2ba36b643f6 19-Sep-2013 Elliott Hughes <enh@google.com> am a2a93250: am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak"

* commit 'a2a93250f625b776886d3c5d41599abdaddb2e50':
Fix fstab memory leak
7fdd7913bd54adcc7ef911d3ed9697bf142c1af9 19-Sep-2013 Elliott Hughes <enh@google.com> am 9f25b565: am c4295d9b: am 810ff696: Merge "Cleanup fs_getline from fs_mgr"

* commit '9f25b565f716d865597dd24761137a93f08d4bb1':
Cleanup fs_getline from fs_mgr
a2a93250f625b776886d3c5d41599abdaddb2e50 19-Sep-2013 Elliott Hughes <enh@google.com> am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak"

* commit 'c67bd8d7cd9b43a5a5ef249ea787ac9786359d22':
Fix fstab memory leak
c67bd8d7cd9b43a5a5ef249ea787ac9786359d22 19-Sep-2013 Elliott Hughes <enh@google.com> am a208ea63: Merge "Fix fstab memory leak"

* commit 'a208ea6301b3a7141f800d21407b0befa8ad0a56':
Fix fstab memory leak
a208ea6301b3a7141f800d21407b0befa8ad0a56 19-Sep-2013 Elliott Hughes <enh@google.com> Merge "Fix fstab memory leak"
d431b8d7f1396fe984b946f55e480ead99219484 18-Sep-2013 Irina Tirdea <irina.tirdea@intel.com> Fix fstab memory leak

When reading the fstab config file fails, fstab memory is not freed.
When fstab structure is no longer needed, only half of it is freed.

Free fstab memory in all cases (error or when it is no longer needed).

Change-Id: Ib0758a5aaa69505285bf64143632986a2dbbdccb
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
s_mgr/fs_mgr.c
9f25b565f716d865597dd24761137a93f08d4bb1 19-Sep-2013 Elliott Hughes <enh@google.com> am c4295d9b: am 810ff696: Merge "Cleanup fs_getline from fs_mgr"

* commit 'c4295d9b72812afbaebd7f2512c7a5bba9e7d5fa':
Cleanup fs_getline from fs_mgr
c4295d9b72812afbaebd7f2512c7a5bba9e7d5fa 19-Sep-2013 Elliott Hughes <enh@google.com> am 810ff696: Merge "Cleanup fs_getline from fs_mgr"

* commit '810ff69609c6f6e0a562c8f05912d4d785fd8bd2':
Cleanup fs_getline from fs_mgr
810ff69609c6f6e0a562c8f05912d4d785fd8bd2 19-Sep-2013 Elliott Hughes <enh@google.com> Merge "Cleanup fs_getline from fs_mgr"
7a060eddce1fe51553371b1c499f1dbf54388d0c 19-Sep-2013 Colin Cross <ccross@android.com> am 54aad026: am 8dc82eea: am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"

* commit '54aad026616148164ff6ceda7508a4e5a04ec569':
init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
54aad026616148164ff6ceda7508a4e5a04ec569 19-Sep-2013 Colin Cross <ccross@android.com> am 8dc82eea: am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"

* commit '8dc82eea7ebda374830ee7fa1802222a94eefd88':
init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
126cdc2c4b135156ffb2a4414ff67af2b22b2283 19-Sep-2013 Mathias Agopian <mathias@google.com> am a512c1ca: am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-dev

* commit 'a512c1ca6322b54b6a74be01be53d537f5a81da4':
Fix rotation in camera2 API
a512c1ca6322b54b6a74be01be53d537f5a81da4 19-Sep-2013 Mathias Agopian <mathias@google.com> am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-dev

* commit '7b445a8e3a21055a5735585ca0890d14977032f0':
Fix rotation in camera2 API
7b445a8e3a21055a5735585ca0890d14977032f0 19-Sep-2013 Mathias Agopian <mathias@google.com> Merge "Fix rotation in camera2 API" into klp-dev
fccfa414c96061689676a8803e3492f992618486 11-Dec-2012 Daniel Leung <daniel.leung@intel.com> libsparse: Use BIONIC implementation of mmap64()

Change-Id: I63692629d3a62b7aee21202b67241904b1cc9789
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
ibsparse/output_file.c
8dc82eea7ebda374830ee7fa1802222a94eefd88 18-Sep-2013 Colin Cross <ccross@android.com> am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"

* commit '36b39a97f3fc5790538e2e69429043b78ba486e4':
init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
36b39a97f3fc5790538e2e69429043b78ba486e4 18-Sep-2013 Colin Cross <ccross@android.com> Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"
e16d747b5105f52895c5e1a687568ea4cab804d5 06-Sep-2013 Irina Tirdea <irina.tirdea@intel.com> Cleanup fs_getline from fs_mgr

Since getline is included in bionic, fs_mgr can use this version instead of
the one defined internally by fs_getline.

Replace fs_getline with getline.

Change-Id: I49b53d639bd995f051256fb7573ff6ab45d9c36d
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
s_mgr/fs_mgr.c
5d4be690935ea7970a53837914f31de0a4f0690d 18-Sep-2013 Nick Kralevich <nnk@google.com> am 0e7bd81c: am 4f18183b: Merge "Initialize /dev/urandom earlier in boot." into klp-dev

* commit '0e7bd81c938611cfa4ebf44870668300a5bba875':
Initialize /dev/urandom earlier in boot.
0e7bd81c938611cfa4ebf44870668300a5bba875 18-Sep-2013 Nick Kralevich <nnk@google.com> am 4f18183b: Merge "Initialize /dev/urandom earlier in boot." into klp-dev

* commit '4f18183bd6d3d2ed5d698c176ecc239211bdb82e':
Initialize /dev/urandom earlier in boot.
4f18183bd6d3d2ed5d698c176ecc239211bdb82e 18-Sep-2013 Nick Kralevich <nnk@google.com> Merge "Initialize /dev/urandom earlier in boot." into klp-dev
02e20daebe72e7bdcd86b04fc061317ae1a2f39d 18-Sep-2013 Jamie Gennis <jgennis@google.com> am 3929efb9: am 9d773b97: Merge "trace: Add support for tracing 64-bit ints." into klp-dev

* commit '3929efb9d480b8893eb3e95cd282dd161ab8fb12':
trace: Add support for tracing 64-bit ints.
3929efb9d480b8893eb3e95cd282dd161ab8fb12 18-Sep-2013 Jamie Gennis <jgennis@google.com> am 9d773b97: Merge "trace: Add support for tracing 64-bit ints." into klp-dev

* commit '9d773b978b9fc26fb08a973e0290aba5432b720a':
trace: Add support for tracing 64-bit ints.
9d773b978b9fc26fb08a973e0290aba5432b720a 18-Sep-2013 Jamie Gennis <jgennis@google.com> Merge "trace: Add support for tracing 64-bit ints." into klp-dev
f1921c79498cb2c048caf4f1725e74c22cae3e8f 18-Sep-2013 Jamie Gennis <jgennis@google.com> trace: Add support for tracing 64-bit ints.

Bug: 10624956
Change-Id: Ie1d7c8ac16b5a5ec1e63e4fb1863f5b1ab2b59e8
nclude/cutils/trace.h
b410eb19130cf1eca158a672bba8f515e7627f11 18-Sep-2013 Nick Kralevich <nnk@google.com> Initialize /dev/urandom earlier in boot.

It's a security best practice to carry entropy across reboots.
(see "man 4 random"). Currently, entropy saving and mixing occur
in the system_server, via the EntropyMixer code. Unfortunately, the
EntropyMixer code runs fairly late in the boot process, which means
early boot doesn't have high quality entropy. This has caused security
problems in the past.

Load entropy data as soon as we can in the early boot process, so that
we can get /dev/random / /dev/urandom into a "random" state earlier.

Bug: 9983133
Change-Id: Id4a6f39e9060f30fe7497bd8f8085a9bec851e80
ootdir/init.rc
96675ed91ffe1ff95e7b10edf2b285f46b6f5213 18-Sep-2013 Mathias Agopian <mathias@google.com> Fix rotation in camera2 API

Bug: 10804238
Change-Id: I093945789d9c6d373392fc9dfd18ec2c6058d3b9
nclude/system/graphics.h
nclude/system/window.h
b2539070cfa9d09cae74365a9de58a792f0b12d7 18-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
fe86c8fad2bf867b5525e7105d548b91a7c36f2c 18-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
3dcfb7f107916445cd378d530a6a69175128d0c7 18-Sep-2013 Nick Kralevich <nnk@google.com> am 18c34183: am 5535b051: write_file: introduce O_NOFOLLOW, use sane mask

* commit '18c34183d76be2efbf2f498ec0185c1ceffa49f0':
write_file: introduce O_NOFOLLOW, use sane mask
18c34183d76be2efbf2f498ec0185c1ceffa49f0 18-Sep-2013 Nick Kralevich <nnk@google.com> am 5535b051: write_file: introduce O_NOFOLLOW, use sane mask

* commit '5535b05120fa3fd3d68a09e01284aba35cc6e058':
write_file: introduce O_NOFOLLOW, use sane mask
5535b05120fa3fd3d68a09e01284aba35cc6e058 17-Sep-2013 Nick Kralevich <nnk@google.com> write_file: introduce O_NOFOLLOW, use sane mask

Don't follow symlinks when writing to a file.
Don't create world-writable files.

Bug: 10802869
Change-Id: Ifb55600d574307a535df878acb3347e02028cd30
nit/builtins.c
59e51e792a13e017d0f1b85a02fcc56815ea83d6 11-Sep-2013 Todd Poynor <toddpoynor@google.com> init.rc: no longer start healthd in charger mode

Being moved to healthd/charger mode in board-specific init.rc.

Change-Id: Ie9fc2e5abc1737fbffec8fb071c73f5fd96e4d17
ootdir/init.rc
fea5b4d44b2f646a4befb6be92ddc3987b38bb36 09-Sep-2013 Todd Poynor <toddpoynor@google.com> healthd: move charger executable to healthd charger mode

* Add healthd charger mode ops
* Check for executable invocation as "charger", set charger mode if so
* Incorporate charger executable as healthd charger mode

Change-Id: I4a44e7a4c3a65ae9be94491f7f498aa48d4f8a84
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_5.png
harger/images/battery_charge.png
harger/images/battery_fail.png
ealthd/Android.mk
ealthd/healthd.cpp
ealthd/healthd.h
ealthd/healthd_mode_charger.cpp
ealthd/images/battery_0.png
ealthd/images/battery_1.png
ealthd/images/battery_2.png
ealthd/images/battery_3.png
ealthd/images/battery_4.png
ealthd/images/battery_5.png
ealthd/images/battery_charge.png
ealthd/images/battery_fail.png
nclude/private/android_filesystem_config.h
c7464c9150eb63ad277cc5b5f704f4fd5e6678c5 10-Sep-2013 Todd Poynor <toddpoynor@google.com> healthd: move Android communication code to separate source

* add ops for different "modes" of healthd operation: android vs. recovery
* recovery mode selected by runstring options -r
* binder/Android communication moved to android mode
* recovery mode ops avoiding binder service registration
* "no service manager" flag removed; now handled by android vs. other modes

Change-Id: I3d8c89bf96a18a6a00cc85306f9a07d3f408f2a0
ealthd/Android.mk
ealthd/BatteryMonitor.cpp
ealthd/BatteryMonitor.h
ealthd/healthd.cpp
ealthd/healthd.h
ealthd/healthd_mode_android.cpp
98c23d82f03fede6f434ad8800a7b3bb9175e348 10-Sep-2013 Todd Poynor <toddpoynor@google.com> healthd: add register event interface

Facilitates registering events from external source files.

Add epoll events param to callbacks.

Change-Id: Icf8fb0c62af11453cbcc92877ff2c3bc03b9bb1b
ealthd/healthd.cpp
ealthd/healthd.h
9256bd4670f886f1d27806ad378f822b015c3af9 17-Sep-2013 jp abgrall <jpa@google.com> am e6e5daac: am edeed28b: am 4a280e3d: Merge "Don\'t use control requests to read device serial numbers."

* commit 'e6e5daace55672b1ec8fb6c5c17a85ee1531f7ad':
Don't use control requests to read device serial numbers.
e6e5daace55672b1ec8fb6c5c17a85ee1531f7ad 17-Sep-2013 jp abgrall <jpa@google.com> am edeed28b: am 4a280e3d: Merge "Don\'t use control requests to read device serial numbers."

* commit 'edeed28bd397f863686ba3e5bb7479f881efc657':
Don't use control requests to read device serial numbers.
edeed28bd397f863686ba3e5bb7479f881efc657 17-Sep-2013 jp abgrall <jpa@google.com> am 4a280e3d: Merge "Don\'t use control requests to read device serial numbers."

* commit '4a280e3dbe002bb5419ec010f89cdc158244e435':
Don't use control requests to read device serial numbers.
4a280e3dbe002bb5419ec010f89cdc158244e435 17-Sep-2013 jp abgrall <jpa@google.com> Merge "Don't use control requests to read device serial numbers."
7b27f27d3de9e39d0de86c6e592d49bd4cc89158 07-Sep-2013 Todd Poynor <toddpoynor@google.com> healthd: break link between BatteryMonitor and BatteryPropertiesRegistrar

Make it easier to later separate out binder-related code.

Add helper functions healthd_battery_update(), healthd_get_property() to
allow these operations without needing references to the BatteryMonitor
object.

Change-Id: Ie584bf53e5178ce0a098d0d940d6c311fdff62d4
ealthd/BatteryMonitor.cpp
ealthd/BatteryPropertiesRegistrar.cpp
ealthd/BatteryPropertiesRegistrar.h
ealthd/healthd.cpp
ealthd/healthd.h
2880aaee77fe1101197da0df08963e421b34c1b0 17-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
bd446c76f3676b1a8d752fbd83846b54a81ac602 12-Sep-2013 Mark Wachsler <wachsler@google.com> Don't use control requests to read device serial numbers.

Instead of sending control requests to all devices to read their serial
numbers, read the cached strings from sysfs. This fixes two problems:
1) The control requests sometimes timed out, causing devices to show up
as "????????????????", and 2) a control request could mess up devices
which were in the middle of being flashed.

Also enumerate by walking sysfs rather than devs so that we can avoid
opening host controller devices, which can be slow. On a system with 10
EHCI controllers, fastboot devices now takes 7 msec instead of 700 msec.

Change-Id: I2ad2d58b48268d7950bd279fd6a6753dc2f79514
astboot/usb_linux.c
c2c5a2410a2d7861d3c4f07f039eb8c471741cfa 16-Sep-2013 Nick Kralevich <nnk@google.com> property_service: address comments from previous review.

Address post-submit comments from
694636142113d91c2b9585ad28e143d4ff001584

Bug: 10733330
Change-Id: I7c652f7ef0379536df48b9478a2362f1bfd252fe
nit/property_service.c
db3f6ef829e6c463c6c15746e64525c76b4c10e1 16-Sep-2013 Nick Kralevich <nnk@google.com> am b453a9aa: am 3a0d4b34: Merge "property_service: better validate property names" into klp-dev

* commit 'b453a9aa1d6f0b2ac624583938202983ad25673b':
property_service: better validate property names
b453a9aa1d6f0b2ac624583938202983ad25673b 16-Sep-2013 Nick Kralevich <nnk@google.com> am 3a0d4b34: Merge "property_service: better validate property names" into klp-dev

* commit '3a0d4b34816d65e21951f44e4d98a954c5c855ae':
property_service: better validate property names
3a0d4b34816d65e21951f44e4d98a954c5c855ae 16-Sep-2013 Nick Kralevich <nnk@google.com> Merge "property_service: better validate property names" into klp-dev
694636142113d91c2b9585ad28e143d4ff001584 14-Sep-2013 Nick Kralevich <nnk@google.com> property_service: better validate property names

Don't allow unexpected characters in property names.
Don't allow double dots in property names.

Bug: 10733330
Change-Id: I8d69740d697efb791f2f201f90989576e13bac81
nit/property_service.c
6adbcbff33abc3bb4499dda0e76f86cb86d4a181 16-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
f94c6be7211dff1af794d75623227d3f21e05c43 14-Sep-2013 Rom Lemarchand <romlem@google.com> am 5c0e6410: am c0ce002a: Merge "Initial libmemtrack" into klp-dev

* commit '5c0e6410d04c60fba043a68ffc9ae58c302a32bd':
Initial libmemtrack
5c0e6410d04c60fba043a68ffc9ae58c302a32bd 13-Sep-2013 Rom Lemarchand <romlem@google.com> am c0ce002a: Merge "Initial libmemtrack" into klp-dev

* commit 'c0ce002ae53613f622c3bb2cae258a779e22770c':
Initial libmemtrack
c0ce002ae53613f622c3bb2cae258a779e22770c 13-Sep-2013 Rom Lemarchand <romlem@google.com> Merge "Initial libmemtrack" into klp-dev
3e9d7c726fc8d9912340ae741001968e33a4799a 13-Sep-2013 Dima Zavin <dima@android.com> am 96957080: am 56b93693: am 6ed51b8a: Merge "mkbootimg: support longer kernel command lines"

* commit '969570804cdf7636bd405de9142c2d487e71384c':
mkbootimg: support longer kernel command lines
969570804cdf7636bd405de9142c2d487e71384c 13-Sep-2013 Dima Zavin <dima@android.com> am 56b93693: am 6ed51b8a: Merge "mkbootimg: support longer kernel command lines"

* commit '56b93693fa6e3c470ba48047839555ba23d6a947':
mkbootimg: support longer kernel command lines
cfea27aeb167dc61d485fa0545ddde63bd5a4193 13-Sep-2013 Dima Zavin <dima@android.com> am e4e7fef1: am 5951a369: am b4819e4a: Merge "init: support longer command lines"

* commit 'e4e7fef1bc19ce83a6076eca65fa1a2f6eac862e':
init: support longer command lines
e4e7fef1bc19ce83a6076eca65fa1a2f6eac862e 13-Sep-2013 Dima Zavin <dima@android.com> am 5951a369: am b4819e4a: Merge "init: support longer command lines"

* commit '5951a3691eb0378ec65ea2e6a2e2fe77d24c5e55':
init: support longer command lines
56b93693fa6e3c470ba48047839555ba23d6a947 13-Sep-2013 Dima Zavin <dima@android.com> am 6ed51b8a: Merge "mkbootimg: support longer kernel command lines"

* commit '6ed51b8a2d6c64a44b58230a0b53a109169edd1a':
mkbootimg: support longer kernel command lines
5951a3691eb0378ec65ea2e6a2e2fe77d24c5e55 13-Sep-2013 Dima Zavin <dima@android.com> am b4819e4a: Merge "init: support longer command lines"

* commit 'b4819e4adaee86884725754d4966c7b78a61fb11':
init: support longer command lines
6ed51b8a2d6c64a44b58230a0b53a109169edd1a 13-Sep-2013 Dima Zavin <dima@android.com> Merge "mkbootimg: support longer kernel command lines"
b4819e4adaee86884725754d4966c7b78a61fb11 13-Sep-2013 Dima Zavin <dima@android.com> Merge "init: support longer command lines"
30fb83b6e520e0167934b6defe105f2bdd408fd5 13-Sep-2013 Andrew Boie <andrew.p.boie@intel.com> cutils: list: add list_for_each_safe

For when you want to modify the list whilst iterating over it.

Change-Id: I84432892890987c218e56883c35e52c9ff0240a3
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
nclude/cutils/list.h
0103326dff80e2d4b91668335aae562009259a1b 12-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
0ddfe115b5b19036bedfc9e82dfe9a836d200558 12-Sep-2013 Kenny Root <kroot@google.com> Use canonical UniquePtr.h file

Change-Id: I88b51b76120a83d2165d44421f29bcb5fd6d62a2
nclude/utils/LruCache.h
d28cd133714f9be3a1195bc4a77bf58f79d82f65 12-Sep-2013 Eric Laurent <elaurent@google.com> am d9c0642c: am 53dc297d: Merge "Add HOTWORD audio source to audio.h" into klp-dev

* commit 'd9c0642c6e3430c90492a1b0c9be435e9cc7b5a9':
Add HOTWORD audio source to audio.h
d9c0642c6e3430c90492a1b0c9be435e9cc7b5a9 12-Sep-2013 Eric Laurent <elaurent@google.com> am 53dc297d: Merge "Add HOTWORD audio source to audio.h" into klp-dev

* commit '53dc297dd685aa7498203fddb3f85e60f2cbc7df':
Add HOTWORD audio source to audio.h
53dc297dd685aa7498203fddb3f85e60f2cbc7df 12-Sep-2013 Eric Laurent <elaurent@google.com> Merge "Add HOTWORD audio source to audio.h" into klp-dev
dbe7f2f66cd1c92ccbd27ad0a61b32e88854ae17 11-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
8d0a92ddc568c4fb065d8e9ec098f1ef4ff9e6ac 11-Sep-2013 Rom Lemarchand <romlem@google.com> am 342077e7: am 67b00d8b: init.rc: change mem cgroups permissions

* commit '342077e78da9411c252232313bc40fb4ce5f6137':
init.rc: change mem cgroups permissions
342077e78da9411c252232313bc40fb4ce5f6137 11-Sep-2013 Rom Lemarchand <romlem@google.com> am 67b00d8b: init.rc: change mem cgroups permissions

* commit '67b00d8b2d96e8133c249bcbc0fb63c49e10e022':
init.rc: change mem cgroups permissions
67b00d8b2d96e8133c249bcbc0fb63c49e10e022 11-Sep-2013 Rom Lemarchand <romlem@google.com> init.rc: change mem cgroups permissions

Changing mem cgroups permissions to only be accessible by root and system.

Bug: 10210529
Bug: 10210900
Change-Id: Ib4fff6f49b33013b3629d40ae98a5e2464571b2d
ootdir/init.rc
85a8cfc8a663277a6d2ae72f7ae4739aa4c90205 10-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
47f284af49d2aef7c3bc0c2c9d1295c190e8be1a 10-Sep-2013 Todd Poynor <toddpoynor@google.com> am ee549d25: am ff9ec2d9: healthd: perform periodic chores when awake and on battery power

* commit 'ee549d256f50ca3078a8537fa5b32a3f86295ea5':
healthd: perform periodic chores when awake and on battery power
ee549d256f50ca3078a8537fa5b32a3f86295ea5 10-Sep-2013 Todd Poynor <toddpoynor@google.com> am ff9ec2d9: healthd: perform periodic chores when awake and on battery power

* commit 'ff9ec2d9990fbf9a707df063f3d43e9169bdde16':
healthd: perform periodic chores when awake and on battery power
04c12ca061cd4ffe79a8eb5d570c4830a0950c85 09-Sep-2013 Eric Laurent <elaurent@google.com> Add HOTWORD audio source to audio.h

- This is a complimentary change to the one adding this new source to
MediaRecorder.java

Bug: 10640877.

Change-Id: Ie213e82b5a60dad2a277cef367c2f5e4df70df06
nclude/system/audio.h
ff9ec2d9990fbf9a707df063f3d43e9169bdde16 09-Sep-2013 Todd Poynor <toddpoynor@google.com> healthd: perform periodic chores when awake and on battery power

Monitor battery/charging status at normal awake rate when on battery
power.

Bug: 10650797
Change-Id: I914d24af4963ab9d52b03c0a2615ad653ced9b12
ealthd/healthd.cpp
5868e06192bd14c3037c8b83155b35fe9ec41f93 09-Sep-2013 Elliott Hughes <enh@google.com> Merge "Add new cert_pin_failure tag that can be used in user-consent filtering."
d35ce3563b4d86702cec4c8f7031fb8a1c55cac2 22-Aug-2013 Andrew Boie <andrew.p.boie@intel.com> mkbootimg: support longer kernel command lines

We can't simply increase the value of BOOT_ARGS_SIZE since that
would break past binary compatibility; the offset of 'id' would
change. This can cause serious problems with incremental OTA updates.

Instead, define a supplemental field which stores command line
information beyond the first 512 bytes. A value of 1024 was chosen
to keep the total size of struct boot_img_hdr under the smallest
page size of 2048 bytes.

Even if the extra_cmdline field is used, the original cmdline
field is still always NULL-terminated to avoid issues with older
bootloaders that haven't been updated.

Change-Id: I887e6f1db351a5b71a61e3a03363cf8856123d74
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
kbootimg/bootimg.h
kbootimg/mkbootimg.c
2e63e71f3116f0330b3bf61dde7deca235dd40ac 09-Sep-2013 Andrew Boie <andrew.p.boie@intel.com> init: support longer command lines

The Linux kernel supports command lines up to 2048 bytes on x86,
see COMMAND_LINE_SIZE in asm/setup.h.

If any androidboot.xxxx arguments were past the 1024 byte limit
here, they were lost.

Change-Id: I6247c511a7de04109490fffa0125801d274a5501
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
nit/util.c
5249306ad0398f24e8654089b6175d04d532d9f8 05-Sep-2013 William Luh <williamluh@google.com> Add new cert_pin_failure tag that can be used in user-consent filtering.

Change-Id: If8a2f9829b3aac4abc33a4623c5f5b4966fd6870
ogcat/event.logtags
fc600e49bf9e0977b8e91642480e065bd95f2670 07-Sep-2013 Colin Cross <ccross@android.com> Initial libmemtrack

libmemtrack is an interface to a device-specific Memory Tracker HAL
to account for memory that may not show up in the normal memory
usage tools that walk /proc/pid/maps.

Bug: 10294768
Change-Id: I436f6799898df0bf8bf29747be3bc9dea5721185
ibmemtrack/Android.mk
ibmemtrack/include/memtrack.h
ibmemtrack/memtrack.c
ibmemtrack/memtrack_test.c
585af584f75946070740f7b2a537643ad9d6d3a0 07-Sep-2013 Szymon Starzycki <sstar@google.com> Fastbootd: fixed missing file in Android.mk

Change-Id: I10927f488e35c688483f2d1d8c9f5b7ea1d7912d
astbootd/Android.mk
e160f81713034e1b5cfa6f8d8b47870b47ae84c8 25-Jul-2013 Szymon Starzycki <sstar@google.com> fastbootd: erase, boot and partitioning commands

Change-Id: I49ba2ba2e002fd5b6bbd37cc3fd0caa106f42010
astbootd/Android.mk
astbootd/commands.c
astbootd/commands/boot.c
astbootd/commands/boot.h
astbootd/commands/flash.c
astbootd/commands/flash.h
astbootd/commands/partitions.c
astbootd/commands/partitions.h
astbootd/commands/virtual_partitions.c
astbootd/commands/virtual_partitions.h
astbootd/config.c
astbootd/fastbootd.c
astbootd/include/vendor_trigger.h
astbootd/other/gptedit.c
astbootd/other/partitions.sample.cfg
astbootd/other/vendor_trigger.c
astbootd/trigger.c
astbootd/trigger.h
astbootd/utils.c
astbootd/utils.h
783e6c471abfbfb732a3d8846dff99509740299a 05-Sep-2013 Colin Cross <ccross@android.com> am 8da6e9c7: am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."

* commit '8da6e9c717ec5c1076dfedc7a37e9cfbe100977e':
fix valgrind ioctl warning.
8da6e9c717ec5c1076dfedc7a37e9cfbe100977e 05-Sep-2013 Colin Cross <ccross@android.com> am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."

* commit 'c9ff37144a7943ee1bc247cef3620c8cce22049d':
fix valgrind ioctl warning.
c9ff37144a7943ee1bc247cef3620c8cce22049d 05-Sep-2013 Colin Cross <ccross@android.com> am 596e9c63: Merge "fix valgrind ioctl warning."

* commit '596e9c6314e4f2869499bcdbb816680ddb10c88f':
fix valgrind ioctl warning.
596e9c6314e4f2869499bcdbb816680ddb10c88f 05-Sep-2013 Colin Cross <ccross@android.com> Merge "fix valgrind ioctl warning."
bc102111845a48f79a4cf6ea058a0ca334cd613c 28-Aug-2013 Todd Poynor <toddpoynor@google.com> healthd: Add average current property

Change-Id: Ibc901fe1b550c0d72095ef5590e2db8962d1a7b2
ealthd/BatteryMonitor.cpp
ealthd/healthd.cpp
ealthd/healthd.h
2d0c5d168fe0ecae2063f901610db597e6c53a88 04-Sep-2013 Ben Cheng <bccheng@google.com> am 61e4b4d5: am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."

* commit '61e4b4d5a8a948c4241c26627cf8d6cb9d0544ca':
Add -Wno-unused-parameter to suppress the warning.
61e4b4d5a8a948c4241c26627cf8d6cb9d0544ca 04-Sep-2013 Ben Cheng <bccheng@google.com> am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."

* commit '8fb85b37af1753ce6bc5d88a04485a6c805bb3a3':
Add -Wno-unused-parameter to suppress the warning.
8fb85b37af1753ce6bc5d88a04485a6c805bb3a3 04-Sep-2013 Ben Cheng <bccheng@google.com> am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."

* commit '2b2f1ae86fb791e9f2fff25f93e7f2c4db010bf6':
Add -Wno-unused-parameter to suppress the warning.
2b2f1ae86fb791e9f2fff25f93e7f2c4db010bf6 04-Sep-2013 Ben Cheng <bccheng@google.com> Merge "Add -Wno-unused-parameter to suppress the warning."
c665df33e054f8ac48c98892e4c91754d86ebf6d 03-Sep-2013 Ben Cheng <bccheng@google.com> Add -Wno-unused-parameter to suppress the warning.

For example in system/core/libcorkscrew/arch-arm/backtrace-arm.c:

system/core/libcorkscrew/arch-arm/backtrace-arm.c:555:49: error: unused
parameter 'siginfo' [-Werror=unused-parameter]

Change-Id: Ibe13e8761a2f57324c0f0d87d9add549a20aa37a
ibcorkscrew/Android.mk
bf0a6e8309839960d3840406b007720146fb954b 04-Sep-2013 Colin Cross <ccross@android.com> am d64df296: am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"

* commit 'd64df296998bcb1528067d7e9adc40cf5e47abd1':
[GNSS] Add AID_GPS to property user white list
d64df296998bcb1528067d7e9adc40cf5e47abd1 04-Sep-2013 Colin Cross <ccross@android.com> am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"

* commit '9dd40e9756de23a25aaa9909c8d4055105621a76':
[GNSS] Add AID_GPS to property user white list
9dd40e9756de23a25aaa9909c8d4055105621a76 04-Sep-2013 Colin Cross <ccross@android.com> am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"

* commit 'd171b6567023f7f840b3a145ec27b5723750dc18':
[GNSS] Add AID_GPS to property user white list
d171b6567023f7f840b3a145ec27b5723750dc18 04-Sep-2013 Colin Cross <ccross@android.com> Merge "[GNSS] Add AID_GPS to property user white list"
b6dddf24b8c82ef20aec607ec193d505aa4ea43f 04-Sep-2013 Nick Kralevich <nnk@google.com> am a9f6cc54: am f487e07b: am 53132840: Merge "init: call restorecon on /sys"

* commit 'a9f6cc54e7330a03e55291bda1d75bc78f3f8f2a':
init: call restorecon on /sys
22041903a1e9be09939765863dd30c1dbdb98d4f 04-Sep-2013 Nick Kralevich <nnk@google.com> am 164a517b: am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"

* commit '164a517bc89dac39dad069c0e8e7693a677ce573':
init: allow disabling selinux via a kernel command line
025ebae382921cf4ffa7540bd6d8d540bca06357 04-Sep-2013 Nick Kralevich <nnk@google.com> am a46286db: am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing mode."

* commit 'a46286db3429d50296f6fb070f948261b21c5c5d':
init: move SELinux into enforcing mode.
a9f6cc54e7330a03e55291bda1d75bc78f3f8f2a 04-Sep-2013 Nick Kralevich <nnk@google.com> am f487e07b: am 53132840: Merge "init: call restorecon on /sys"

* commit 'f487e07bce49735235b91bf5ee79b6987ff80188':
init: call restorecon on /sys
164a517bc89dac39dad069c0e8e7693a677ce573 04-Sep-2013 Nick Kralevich <nnk@google.com> am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"

* commit '49382f12f2e8278a02019d78482df00bb7f7fad7':
init: allow disabling selinux via a kernel command line
a46286db3429d50296f6fb070f948261b21c5c5d 04-Sep-2013 Nick Kralevich <nnk@google.com> am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing mode."

* commit '5fc1acfaabd5de3a8043d0950e4946dda7b6d5c3':
init: move SELinux into enforcing mode.
f487e07bce49735235b91bf5ee79b6987ff80188 04-Sep-2013 Nick Kralevich <nnk@google.com> am 53132840: Merge "init: call restorecon on /sys"

* commit '531328400ed6ce513f9bb4d9d772f02affeeaa26':
init: call restorecon on /sys
49382f12f2e8278a02019d78482df00bb7f7fad7 04-Sep-2013 Nick Kralevich <nnk@google.com> am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"

* commit '8328edb0a7d9f6eb3af82ea8bcda8bf15ffd75ab':
init: allow disabling selinux via a kernel command line
5fc1acfaabd5de3a8043d0950e4946dda7b6d5c3 04-Sep-2013 Nick Kralevich <nnk@google.com> am b2423399: Merge "init: move SELinux into enforcing mode."

* commit 'b2423399883094ad1a1ddf7e02d798fd72a283a9':
init: move SELinux into enforcing mode.
531328400ed6ce513f9bb4d9d772f02affeeaa26 04-Sep-2013 Nick Kralevich <nnk@google.com> Merge "init: call restorecon on /sys"
8328edb0a7d9f6eb3af82ea8bcda8bf15ffd75ab 04-Sep-2013 Nick Kralevich <nnk@google.com> Merge "init: allow disabling selinux via a kernel command line"
b2423399883094ad1a1ddf7e02d798fd72a283a9 04-Sep-2013 Nick Kralevich <nnk@google.com> Merge "init: move SELinux into enforcing mode."
ae76f6dbcf3dfd6eda223911f91f4a1316433771 12-Jul-2013 Nick Kralevich <nnk@google.com> init: call restorecon on /sys

Not all files on /sys are not getting labeled properly. Fix them.

Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
nit/init.c
nit/util.c
nit/util.h
935bd3e31574ea83db84797b0dee2a6581a19cdf 27-Jun-2013 Nick Kralevich <nnk@google.com> init: allow disabling selinux via a kernel command line

Create a new "androidboot.selinux" option, to control how userspace
handles SELinux. This kernel command line can have three options:

* disabled
* permissive
* enforcing

"disabled" completely disables userspace support for SELinux. No
policy is ever loaded, nor is the SELinux filesystem /sys/fs/selinux
ever mounted.

"permissive" loads the SELinux policy, but puts SELinux into
permissive mode. SELinux policy violations are logged, but not rejected.

"enforcing", the default, loads the SELinux policy, and places
SELinux into enforcing mode. Policy violations are rejected.

This change addresses post review comments for change
b710ed21dec88c0dde8209264df054c842561589 .

Change-Id: I912583db8e6a0e9c63380de32ad8ffc47a8a440f
nit/init.c
56fa0ac6b6e4ca790c0169c21a3106e09cab672c 25-Jun-2013 Nick Kralevich <nnk@google.com> init: move SELinux into enforcing mode.

When init starts up, immediately put SELinux into enforcing mode.

This is currently a no-op. We currently have everything in the
unconfined domain, so this should not break anything.
(if it does, I'll roll it back immediately)

If the kernel doesn't have SELinux support compiled in, then
don't try loading a policy and continue without SELinux protections.

Change-Id: Id0279cf82c545ea0f7090137b7566a5bc3ddd641
nit/init.c
d3a0681309c2e23211bc78f21e046d24024c0d48 03-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
b329d19cdd84ffa957bc563f6476d695e5032929 03-Sep-2013 Lorenzo Colitti <lorenzo@google.com> am 6324776b: am f3486134: Switch back to subsystem "net" for netlink events.

* commit '6324776b3efe46903f9a1291d90b52fcf51e7880':
Switch back to subsystem "net" for netlink events.
6324776b3efe46903f9a1291d90b52fcf51e7880 03-Sep-2013 Lorenzo Colitti <lorenzo@google.com> am f3486134: Switch back to subsystem "net" for netlink events.

* commit 'f34861346d5c207912075fba9874090e4c947869':
Switch back to subsystem "net" for netlink events.
f34861346d5c207912075fba9874090e4c947869 02-Sep-2013 Lorenzo Colitti <lorenzo@google.com> Switch back to subsystem "net" for netlink events.

The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".

Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.

Bug: 10433320
Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
b81570124713939e33ff15ada36704c3409e7fe3 18-Oct-2012 Jin Wei <wei.a.jin@intel.com> fix valgrind ioctl warning.

Initialize local variable to avoid syscall ioctl warning.

Change-Id: Ibad5b86cd799f147c71f182d654e61318e2ac15e
Origin-Change-Id: Iedf5b128ae1743f633d2821ac3e402942ad6642b
Signed-off-by: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 62797
ibcutils/ashmem-dev.c
aacded70196acf958ddd26149dec9709571f1f56 11-Jul-2013 Todd Poynor <toddpoynor@google.com> init.rc: start lmkd

Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
ootdir/init.rc
3948f80f2af84016013cc674140ac5066a58fb4d 10-Jul-2013 Todd Poynor <toddpoynor@google.com> Add lmkd low memory killer daemon

Move kernel low memory killer logic to new daemon lmkd. ActivityManager
communicates with this daemon over a named socket.

Change-Id: Ie957da7e9b1f7150e23c689fdadf23ff260b47be
mkd/Android.mk
mkd/lmkd.c
3912701e5ea188972d5f53a42c5e2edda2c4d447 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> am 78c984ae: am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev

* commit '78c984aef222654bd337ae7f466a526e23db8f07':
Only check caller when deriving permissions.
c6480909e5819e7e9eae4b3c9864cc5bef704d21 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> Only check caller when deriving permissions.

Bug: 10547597
Change-Id: Ied909f9047c2567e93dde0f4658d6e4b9ff161ab
dcard/sdcard.c
ec0639a58a8c018dd8742762f1c4899e013ffc65 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> Fix recursive locking bug.

handle_rename() would end up acquiring the lock twice. Change to
always derive has_rw inside earlier locks (instead of acquiring a
second time), and pass the value into check_caller_access_to_name().

Bug: 10547597
Change-Id: If5744d6d226a4785676c19d0f7fdf1c05060ed76
dcard/sdcard.c
78c984aef222654bd337ae7f466a526e23db8f07 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev

* commit '5835ac9e31aea910adb6b9d2de1d63df771df45b':
Only check caller when deriving permissions.
5835ac9e31aea910adb6b9d2de1d63df771df45b 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> Merge "Only check caller when deriving permissions." into klp-dev
39ff0ae0f66d7bc1499b30c9f75e187d329382ec 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> Only check caller when deriving permissions.

Bug: 10547597
Change-Id: Ied909f9047c2567e93dde0f4658d6e4b9ff161ab
dcard/sdcard.c
5c0ae417780eea9e2c235a1800d0823cb4a967e5 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> am ab977264: am 5856fd89: Merge "Fix recursive locking bug." into klp-dev

* commit 'ab9772641cad9342e615b21e5a4afb665e40cacf':
Fix recursive locking bug.
ab9772641cad9342e615b21e5a4afb665e40cacf 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> am 5856fd89: Merge "Fix recursive locking bug." into klp-dev

* commit '5856fd8935b8aa499930daed29105f6419a96a5e':
Fix recursive locking bug.
5856fd8935b8aa499930daed29105f6419a96a5e 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> Merge "Fix recursive locking bug." into klp-dev
aa04e818a4904b193e00d603785c93e888eab174 30-Aug-2013 Jeff Sharkey <jsharkey@android.com> Fix recursive locking bug.

handle_rename() would end up acquiring the lock twice. Change to
always derive has_rw inside earlier locks (instead of acquiring a
second time), and pass the value into check_caller_access_to_name().

Bug: 10547597
Change-Id: If5744d6d226a4785676c19d0f7fdf1c05060ed76
dcard/sdcard.c
f8f64988dd9d2ca2ef8aa5fe0eb11d9116e547fe 28-Aug-2013 Dima Zavin <dima@android.com> am c3c03f12: am 28e52c81: am b35f68a6: Merge "init: load factory properties"

* commit 'c3c03f12ad5397588af639178ad200b56787790a':
init: load factory properties
c3c03f12ad5397588af639178ad200b56787790a 28-Aug-2013 Dima Zavin <dima@android.com> am 28e52c81: am b35f68a6: Merge "init: load factory properties"

* commit '28e52c816d06d78fa823be2d310d9f4c25012c8f':
init: load factory properties
28e52c816d06d78fa823be2d310d9f4c25012c8f 28-Aug-2013 Dima Zavin <dima@android.com> am b35f68a6: Merge "init: load factory properties"

* commit 'b35f68a6974589fc3c762d6d2c7bac363794e355':
init: load factory properties
b35f68a6974589fc3c762d6d2c7bac363794e355 28-Aug-2013 Dima Zavin <dima@android.com> Merge "init: load factory properties"
61d1b4420cc7e7715d02fb7e565d1f08e83f0724 28-Aug-2013 Alex Klyubin <klyubin@google.com> am f7f3955d: am 5f395624: am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3

* commit 'f7f3955d4d7cf78914395ddb47400d1237bf4bc2':
Fix run-as which was broken in Android 4.3
f7f3955d4d7cf78914395ddb47400d1237bf4bc2 28-Aug-2013 Alex Klyubin <klyubin@google.com> am 5f395624: am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3

* commit '5f39562466688da2f6a0d6fc1588e8a3f5c54971':
Fix run-as which was broken in Android 4.3
5f39562466688da2f6a0d6fc1588e8a3f5c54971 28-Aug-2013 Alex Klyubin <klyubin@google.com> am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3

* commit 'aed27f8018e4365aa52a5dd8e89c4db2df0273c5':
Fix run-as which was broken in Android 4.3
aed27f8018e4365aa52a5dd8e89c4db2df0273c5 28-Aug-2013 Alex Klyubin <klyubin@google.com> am b0739c66: Fix run-as which was broken in Android 4.3

* commit 'b0739c662db6a19b49c0912b865edb2853156bda':
Fix run-as which was broken in Android 4.3
e7aa5baef02ac3d30b013a6614231150771747b4 28-Aug-2013 Elliott Hughes <enh@google.com> am b9264934: am 876f4366: am a7f6e015: Merge "correct msi usb vendor id."

* commit 'b92649341718984bf91a09a3e9dddf04b844c567':
correct msi usb vendor id.
b92649341718984bf91a09a3e9dddf04b844c567 28-Aug-2013 Elliott Hughes <enh@google.com> am 876f4366: am a7f6e015: Merge "correct msi usb vendor id."

* commit '876f436668036e8e9d3f86434eee1a44ff5364b8':
correct msi usb vendor id.
876f436668036e8e9d3f86434eee1a44ff5364b8 28-Aug-2013 Elliott Hughes <enh@google.com> am a7f6e015: Merge "correct msi usb vendor id."

* commit 'a7f6e015a5cf2ac85549fe676d6641caf6af1291':
correct msi usb vendor id.
a7f6e015a5cf2ac85549fe676d6641caf6af1291 28-Aug-2013 Elliott Hughes <enh@google.com> Merge "correct msi usb vendor id."
48c5d7b6cd805ea859960f9859b424b5a9a52666 28-Aug-2013 astonehuang <astonehuang@msi.com> correct msi usb vendor id.

Change-Id: I13128531b8dd7758abddce47ce1c119381773c26
db/usb_vendors.c
9950f549d6de8cd312d1c9ee4ecc40388f77f857 27-Aug-2013 Elliott Hughes <enh@google.com> am 9fe7014d: am bfe8e68a: am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

* commit '9fe7014d056ac6478069d6f2e946ddbe2863d576':
Fix build with gcc-4.8 and array boundaries issue
9fe7014d056ac6478069d6f2e946ddbe2863d576 27-Aug-2013 Elliott Hughes <enh@google.com> am bfe8e68a: am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

* commit 'bfe8e68a251046fe9a0d9838f4cecaeea19eaa6c':
Fix build with gcc-4.8 and array boundaries issue
bfe8e68a251046fe9a0d9838f4cecaeea19eaa6c 27-Aug-2013 Elliott Hughes <enh@google.com> am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

* commit '2e5157fa05dca31b2d409c185a6ca5230182503d':
Fix build with gcc-4.8 and array boundaries issue
2e5157fa05dca31b2d409c185a6ca5230182503d 27-Aug-2013 Elliott Hughes <enh@google.com> Merge "Fix build with gcc-4.8 and array boundaries issue"
13eca3ba1b60ea6e7c7b3edbdec3d4807117cec5 27-Aug-2013 Benoit Goby <benoitgoby@google.com> am 3bb2be74: am f0eec130: am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created"

* commit '3bb2be7499bbefbb5b702eff974619067e1afd27':
libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
3bb2be7499bbefbb5b702eff974619067e1afd27 27-Aug-2013 Benoit Goby <benoitgoby@google.com> am f0eec130: am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created"

* commit 'f0eec1301dc629bfbaf71f1d2db8be0449d7ec97':
libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
b9b231081cb7640b9b3cde8a587da927a2f3f61b 27-Aug-2013 Benoit Goby <benoitgoby@google.com> am 7109fddc: am 7e18e456: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev

* commit '7109fddc43b2b9aa77f8c6849ebf4d09cb313706':
libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
73d7b0422062d48e7e629edd68883a2da7640785 27-Aug-2013 Michael Wright <michaelwr@google.com> am 2c8fa5ee: am 2f9c5fd4: Merge "Add standard options to readlink" into klp-dev

* commit '2c8fa5eecf407107f951ba6aa9f618a794ef0a33':
Add standard options to readlink
f0eec1301dc629bfbaf71f1d2db8be0449d7ec97 27-Aug-2013 Benoit Goby <benoitgoby@google.com> am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created"

* commit 'db71324a4f3538fa8716ec4d77b3a512598c0527':
libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
db71324a4f3538fa8716ec4d77b3a512598c0527 27-Aug-2013 Benoit Goby <benoitgoby@google.com> Merge "libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created"
7109fddc43b2b9aa77f8c6849ebf4d09cb313706 27-Aug-2013 Benoit Goby <benoitgoby@google.com> am 7e18e456: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev

* commit '7e18e45617b73c7a4081202115bb8e5a06ebb1c7':
libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
2c8fa5eecf407107f951ba6aa9f618a794ef0a33 27-Aug-2013 Michael Wright <michaelwr@google.com> am 2f9c5fd4: Merge "Add standard options to readlink" into klp-dev

* commit '2f9c5fd4b9676c59839c45bf4877551188dbc22a':
Add standard options to readlink
7e18e45617b73c7a4081202115bb8e5a06ebb1c7 26-Aug-2013 Benoit Goby <benoitgoby@google.com> Merge "libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev
8cc80fc8944142c610c5816ced4f0d0518b3922f 07-Aug-2013 Ziv Hendel <ziv@primesense.com> libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created

On some devices there is a slight delay between the creation of "/dev/bus"
and "/dev/bus/usb". Previously, the code assumed that both are created in the
same time which caused "watch_existing_subdirs" to fail and libusbhost to stop
working until the device is rebooted. The fix will setup an inotify event on the
creation of the "bus/usb" so it will not be missed once it's created.

Change-Id: I17f06dd167e61573307425e48898e12ebc954093
ibusbhost/usbhost.c
841859f79f23467938f3358c6ade9ebe9912a4e1 21-Jun-2013 Nicolas SUET <nicolas.suet@intel.com> [GNSS] Add AID_GPS to property user white list

Add "gps." and "persist.gps." to property_perms white list.

Change-Id: I7177170676d774c87e08d1548f5264ac27cba3ff
Orig-Change-Id: I7a94caa26be4aefd2fe4f155908e2f8f09858bee
Signed-off-by: Nicolas SUET <nicolas.suet@intel.com>
Signed-off-by: jerome Pantaloni <jeromex.pantaloni@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 118091
nit/property_service.c
6552f6885fc2a94501ca064bffc4c18ad40caad8 26-Aug-2013 Stephen Smalley <sds@tycho.nsa.gov> Trigger a policy reload from post-fs-data.

Once userdata is available and decrypted, trigger a policy reload to pick
up any policy update files stored under /data/security.

Change-Id: Ic2b3121c3395429b108c40d1d7f5a3124a5896c5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
565eed9f7b34c8f843962a03ce183dd121104cc4 24-Aug-2013 Colin Cross <ccross@android.com> am b69f8634: am 0cbaed42: am a8ba1f2f: Merge "Add support for socket security context specification."

* commit 'b69f863455261a656da02343e8b9d55110ecd45f':
Add support for socket security context specification.
b69f863455261a656da02343e8b9d55110ecd45f 24-Aug-2013 Colin Cross <ccross@android.com> am 0cbaed42: am a8ba1f2f: Merge "Add support for socket security context specification."

* commit '0cbaed4211b514dd2aaa4d28f8936ba58e83c6a5':
Add support for socket security context specification.
0cbaed4211b514dd2aaa4d28f8936ba58e83c6a5 24-Aug-2013 Colin Cross <ccross@android.com> am a8ba1f2f: Merge "Add support for socket security context specification."

* commit 'a8ba1f2f0b67063978819cc7d04276060450f364':
Add support for socket security context specification.
a8ba1f2f0b67063978819cc7d04276060450f364 24-Aug-2013 Colin Cross <ccross@android.com> Merge "Add support for socket security context specification."
2f9c5fd4b9676c59839c45bf4877551188dbc22a 24-Aug-2013 Michael Wright <michaelwr@google.com> Merge "Add standard options to readlink" into klp-dev
a34f1391bd9c368aceecb3f8dec158b2cb8b2dd4 23-Aug-2013 Colin Cross <ccross@android.com> am 30caffc0: resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp

* commit '30caffc025aff450ebb354ee693174cc1732732b':
Handle policy reloads within ueventd rather than restarting it.
30caffc025aff450ebb354ee693174cc1732732b 23-Aug-2013 Colin Cross <ccross@android.com> resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp

Change-Id: I08e9898940f7cdd466469b76760807cc5d5c67e4
a1af5cf6d1c008dbde2e40121940d65faa0816bf 23-Aug-2013 Colin Cross <ccross@android.com> am d8d99c45: Merge "Handle policy reloads within ueventd rather than restarting it."

* commit 'd8d99c45b704399d50ae0a5e4df938d825c70cfa':
Handle policy reloads within ueventd rather than restarting it.
d8d99c45b704399d50ae0a5e4df938d825c70cfa 23-Aug-2013 Colin Cross <ccross@android.com> Merge "Handle policy reloads within ueventd rather than restarting it."
8348d279c7ce1a2453965ba7f05a7b818d58886c 13-May-2013 Stephen Smalley <sds@tycho.nsa.gov> Add support for socket security context specification.

Add an optional argument to the socket option for specifying
a SELinux security context for the socket. Normally the socket
security context is automatically computed from the service security
context or set using the seclabel option, but this facility allows
dealing with two scenarios that cannot be addressed using the existing
mechanisms:
1) Use of logwrapper to wrap a service.
In this case, init cannot determine the service security context
as it does not directly execute it and we do not want logwrapper
to run in the same domain as the service.

2) Situations where a service has multiple sockets and we want to
label them distinctly.

Change-Id: I7ae9088c326a2140e56a8044bfb21a91505aea11
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/init.c
nit/init.h
nit/init_parser.c
nit/property_service.c
nit/readme.txt
nit/util.c
nit/util.h
51cf3502f645e96a40ce8f2f65cc21279609b8af 23-Aug-2013 Jeff Brown <jeffbrown@google.com> am 8ca2bf08: (-s ours) am 46a24db5: Remove input flinger stubs. (DO NOT MERGE)

* commit '8ca2bf084209cf121f1d4b011ad4db3e35f35c82':
Remove input flinger stubs. (DO NOT MERGE)
8ca2bf084209cf121f1d4b011ad4db3e35f35c82 23-Aug-2013 Jeff Brown <jeffbrown@google.com> am 46a24db5: Remove input flinger stubs. (DO NOT MERGE)

* commit '46a24db563f46736f6e02c4d80656ab51d94ff77':
Remove input flinger stubs. (DO NOT MERGE)
46a24db563f46736f6e02c4d80656ab51d94ff77 23-Aug-2013 Jeff Brown <jeffbrown@google.com> Remove input flinger stubs. (DO NOT MERGE)

Bug: 10446930
Change-Id: I88b926380dbe1e866c0b87ec95b3489d87c5907b
ootdir/init.rc
1e1d29133f12031bd432b6818143c309f18de417 20-Aug-2013 Michael Wright <michaelwr@google.com> Add standard options to readlink

Change-Id: I4c2624d22ce879a3578d5b17440a9895b19e2f1f
oolbox/readlink.c
c133b7198a02c8738aeef86d6cfd921a626adce7 15-Aug-2013 Todd Poynor <toddpoynor@google.com> healthd: read individual battery property value on demand

Adding support for batteryChargeCounter and batteryCurrentNow as parameters
likely to be useful for power consumption analysis.

Change-Id: Ib23b05d3c31c22ece0d21e55cc481c1b5dabe59e
ealthd/BatteryMonitor.cpp
ealthd/BatteryMonitor.h
ealthd/BatteryPropertiesRegistrar.cpp
ealthd/BatteryPropertiesRegistrar.h
b0739c662db6a19b49c0912b865edb2853156bda 05-Aug-2013 Alex Klyubin <klyubin@google.com> Fix run-as which was broken in Android 4.3

In Android 4.3 the run-as binary no longer has the SUID/SGID bits
set. Instead, it requires to be installed with setuid and setgid
file-based capabilities. As a result of the above two changes, the
binary no longer executes as root when invoked by the "shell" user
but can still change its UID/GID to that of the target package.

Unfortunately, run-as attempts to chdir into the target package's
data directory before changing its effective UID/GID. As a result,
when run-as is invoked by the "shell" user, the chdir operation
fails.

The fix is for run-as to chdir after changing the effective UID/GID
to those of the target package.

Bug: 10154652

(cherry picked from commit f2904a7b63c2005ab588a9ba2fb309e73200ec81)

Change-Id: I0f6cb9efd49f5c2c491f7aa1d614d700a5ec2304
un-as/run-as.c
0ea259ae5f640848d24179ae6e4ad53a14783d9f 21-Aug-2013 Alex Klyubin <klyubin@google.com> Merge "Fix run-as which was broken in Android 4.3"
a306ced1ac383557dabfb38c70e5f5e2a2ec0510 07-Aug-2013 Ziv Hendel <ziv@primesense.com> libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created

On some devices there is a slight delay between the creation of "/dev/bus"
and "/dev/bus/usb". Previously, the code assumed that both are created in the
same time which caused "watch_existing_subdirs" to fail and libusbhost to stop
working until the device is rebooted. The fix will setup an inotify event on the
creation of the "bus/usb" so it will not be missed once it's created.

Change-Id: I17f06dd167e61573307425e48898e12ebc954093
ibusbhost/usbhost.c
3b46298c98afe239d069b3bee8acfac28f0088fc 21-Aug-2013 Alex Klyubin <klyubin@google.com> am 18860c52: Enable run-as to read packages.list now owned by package_info.

* commit '18860c524915bc991a9015bdbab32e918f5298d7':
Enable run-as to read packages.list now owned by package_info.
18860c524915bc991a9015bdbab32e918f5298d7 21-Aug-2013 Alex Klyubin <klyubin@google.com> Enable run-as to read packages.list now owned by package_info.

The group ownership of the package database
/data/system/packages.list read by run-as was changed in
977a9f3b1a05e6168e8245a1e2061225b68b2b41 from "system" to
"package_info". run-as currently changes its effective group to
"system" and is thus unable to read the database.

This CL fixes the issue by making run-as change its effective group
to "package_info" for reading the package database.

Bug: 10411916
Change-Id: Id23059bfb5b43264824917873a31c287f057ce4e
un-as/package.c
3899f522f181b6c99ad37c09234bdaf7625f12fb 13-Oct-2012 Andrew Boie <andrew.p.boie@intel.com> init: load factory properties

These properties are typically set at device provisioning time
or in the factory. They contain unit-specific data that isn't
touched by software updates or factory data reset. Only
read-only properties can be read by this mechanism.

Change-Id: Ifff9184f039072c3c0ce99f825c3075afb524514
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
nit/property_service.c
f2904a7b63c2005ab588a9ba2fb309e73200ec81 05-Aug-2013 Alex Klyubin <klyubin@google.com> Fix run-as which was broken in Android 4.3

In Android 4.3 the run-as binary no longer has the SUID/SGID bits
set. Instead, it requires to be installed with setuid and setgid
file-based capabilities. As a result of the above two changes, the
binary no longer executes as root when invoked by the "shell" user
but can still change its UID/GID to that of the target package.

Unfortunately, run-as attempts to chdir into the target package's
data directory before changing its effective UID/GID. As a result,
when run-as is invoked by the "shell" user, the chdir operation
fails.

The fix is for run-as to chdir after changing the effective UID/GID
to those of the target package.

Bug: 10154652
Change-Id: I48ecfeab7cd36991968d49e2382ceb4110694709
un-as/run-as.c
1ca0168238d5e3c03dd74be3f76815279dca43e7 20-Aug-2013 Alex Klyubin <klyubin@google.com> am 0d872d8b: Seed Linux RNG from Hardware RNG at boot during init.

* commit '0d872d8bb4f5371200601b7615ea48993383befb':
Seed Linux RNG from Hardware RNG at boot during init.
bd442a74ecd6a03fb623d32fcac47a5ff85789be 20-Aug-2013 Jeff Brown <jeffbrown@google.com> am c7a4f74d: Merge "Add helpers for audio remote submix devices." into klp-dev

* commit 'c7a4f74dad2b91bebad608618f3fda434563be74':
Add helpers for audio remote submix devices.
0d872d8bb4f5371200601b7615ea48993383befb 16-Aug-2013 Alex Klyubin <klyubin@google.com> Seed Linux RNG from Hardware RNG at boot during init.

The Linux RNG may have little entropy during boot. As more and more
devices have a Hardware RNG, we mix in 512 bytes from Hardware RNG
(if present) into Linux RNG early during boot (after
wait_for_coldboot_done and before property_service_init actions in
init).

To avoid having to trust the output of Hardware RNG, we do not mix it
into the Linux RNG's primary pool or increase the Linux RNG's entropy
estimates.

Bug: 10362513
Change-Id: I80617f21710400747f5e7533e518d90ea74e2f11
nit/init.c
c7a4f74dad2b91bebad608618f3fda434563be74 20-Aug-2013 Jeff Brown <jeffbrown@google.com> Merge "Add helpers for audio remote submix devices." into klp-dev
3c0eef67f7e6385710d69bda40e50b23fa91c081 20-Aug-2013 Michael Wright <michaelwr@google.com> am 9f50abde: Add basic readlink command

* commit '9f50abdee00a9571393ce4a589080b4d6129aaf3':
Add basic readlink command
9f50abdee00a9571393ce4a589080b4d6129aaf3 20-Aug-2013 Michael Wright <michaelwr@google.com> Add basic readlink command

Change-Id: I693c1098e6c6d107a9e97285bf826ab153a1c8f0
oolbox/Android.mk
oolbox/readlink.c
8ecc7afca42d0bb27aad25733790309f71f307d6 17-Aug-2013 Jeff Brown <jeffbrown@google.com> Add helpers for audio remote submix devices.

Bug: 10265163
Change-Id: Iea7ecab4f2a655b719ff14b04c757d6dbd7a7ef3
nclude/system/audio.h
88ea2f669f914596f934ed50f67f7360aae71b68 17-Aug-2013 Elliott Hughes <enh@google.com> am 3042c265: am b3644d8f: Merge "Add USB Vendor ID for WACOM"

* commit '3042c265bf3123426e99fed856c9d3b7fa3b3ad6':
Add USB Vendor ID for WACOM
3042c265bf3123426e99fed856c9d3b7fa3b3ad6 17-Aug-2013 Elliott Hughes <enh@google.com> am b3644d8f: Merge "Add USB Vendor ID for WACOM"

* commit 'b3644d8f6b6485769c7712aaf7749d042aacbc09':
Add USB Vendor ID for WACOM
b3644d8f6b6485769c7712aaf7749d042aacbc09 17-Aug-2013 Elliott Hughes <enh@google.com> Merge "Add USB Vendor ID for WACOM"
699249f9e4f8f5db6e798420fb1b5c6d2e16d42d 16-Aug-2013 Jesse Hall <jessehall@google.com> am 08380deb: Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev

* commit '08380deb247865b862f7f284c80eeea4f5ec38f6':
Replace sRGB_888 with sRGB_X_8888
08380deb247865b862f7f284c80eeea4f5ec38f6 16-Aug-2013 Jesse Hall <jessehall@google.com> Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev
dbf6de9064aed95a2c17f150f537ccfa3fc15b16 16-Aug-2013 Lorenzo Colitti <lorenzo@google.com> am 3984276c: Get rid of an infinite loop in NetlinkEvent.cpp.

* commit '3984276ce47c965ad02a522280a139e0a0c7e5cf':
Get rid of an infinite loop in NetlinkEvent.cpp.
3984276ce47c965ad02a522280a139e0a0c7e5cf 16-Aug-2013 Lorenzo Colitti <lorenzo@google.com> Get rid of an infinite loop in NetlinkEvent.cpp.

Bug: 10358527
Bug: 10263310
Bug: 10232006
Change-Id: I750e4bdf2000040adf214d6a772591d7bd25b350
ibsysutils/src/NetlinkEvent.cpp
1e26356da14d78abd18eb66ddd980741e2207f1e 16-Aug-2013 Jesse Hall <jessehall@google.com> Replace sRGB_888 with sRGB_X_8888

Bug: 10357459
Change-Id: I23a3eca77acd8b4b40b1a67e7c050a7245b1821a
nclude/system/graphics.h
c9a4c55c915df23b7b08c1b26a107fc922ac6094 16-Aug-2013 Lorenzo Colitti <lorenzo@google.com> am 341ed242: Merge "Parse IP address changes in NetlinkEvent." into klp-dev

* commit '341ed242d400951dd8436cbc988e64c1c075df41':
Parse IP address changes in NetlinkEvent.
341ed242d400951dd8436cbc988e64c1c075df41 16-Aug-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Parse IP address changes in NetlinkEvent." into klp-dev
516836d4712860fc1e5bd351b4def90550ed07e8 15-Aug-2013 Ken Sumrall <ksumrall@android.com> am 57d4b4ea: Merge "Fix handle_opendir() in the sdcard daemon" into klp-dev

* commit '57d4b4ea6fc7d8014ebdf691ae8fbe204c67881b':
Fix handle_opendir() in the sdcard daemon
57d4b4ea6fc7d8014ebdf691ae8fbe204c67881b 15-Aug-2013 Ken Sumrall <ksumrall@android.com> Merge "Fix handle_opendir() in the sdcard daemon" into klp-dev
3a8768804ce4b4797359d5df03ec8897fe43de90 15-Aug-2013 Ken Sumrall <ksumrall@android.com> Fix handle_opendir() in the sdcard daemon

The fuse_open_out structure returned to the kernel by handle_opendir()
was not properly initializing all the fields. The symptom was recursive
ls (ls -R) failing on the emulated sdcard filesystem, because rewinddir(3)
was failing with ESPIPE.

Bug: 7168594
Change-Id: I56ddfd3453e6aac34fe6e001e88c4c46fb2eb271
dcard/sdcard.c
64a602942e159c73ceee5c584064f364137d1f47 13-Aug-2013 Wing Tseng <Wing_Tseng@pegatroncorp.com> Add USB Vendor ID for WACOM

Change-Id: I3deee6d5bdfb9c5bbc0fddcfa39814d27ee281c2
Signed-off-by: Wing Tseng <Wing_Tseng@pegatroncorp.com>
db/usb_vendors.c
01f7cf79e5bea23fdf966b23558d43566685f284 14-Aug-2013 Jeff Sharkey <jsharkey@android.com> am 7e64c143: Merge "Add legacy layout support to FUSE, enforce write." into klp-dev

* commit '7e64c1436b7693d94d22e45add85c74284c88273':
Add legacy layout support to FUSE, enforce write.
7e64c1436b7693d94d22e45add85c74284c88273 14-Aug-2013 Jeff Sharkey <jsharkey@android.com> Merge "Add legacy layout support to FUSE, enforce write." into klp-dev
977a9f3b1a05e6168e8245a1e2061225b68b2b41 13-Aug-2013 Jeff Sharkey <jsharkey@android.com> Add legacy layout support to FUSE, enforce write.

The legacy internal layout places users at the top-level of the
filesystem, so handle with new PERM_LEGACY_PRE_ROOT when requested.

Mirror single OBB directory between all users without requiring fancy
bind mounts by letting a nodes graft in another part of the
underlying tree.

Move to everything having "sdcard_r" GID by default, and verify that
calling apps hold "sdcard_rw" when performing mutations. Determines
app group membership from new packages.list column.

Flag to optionally enable sdcard_pics/sdcard_av permissions
splitting. Flag to supply a default GID for all files. Ignore
attempts to access security sensitive files. Fix run-as to check for
new "package_info" GID.

Change-Id: Id5f3680779109141c65fb8fa1daf56597f49ea0d
un-as/package.c
dcard/sdcard.c
a4b4e9ad8e35ab424e61d76ebe6654445fc61e63 01-Aug-2013 Lorenzo Colitti <lorenzo@google.com> Parse IP address changes in NetlinkEvent.

This adds support for parsing RTM_NEWADDR and RTM_DELADDR
netlink messages received on netd's netlink socket and
formatting them them so NetlinkHandler can process them.

Address changes are notified in subsystem "address". Interface
changes, which used to be notified in subsystem "net", are now
notified in subsystem "interface" to avoid confusion.

Bug: 10232006
Change-Id: I93a50e8de17014e118a42f5cc0eb90a0cbfa73cc
nclude/sysutils/NetlinkEvent.h
ibsysutils/src/NetlinkEvent.cpp
ceaf05faf0b1eacace938fdcc2e40877e0564864 14-Aug-2013 Todd Poynor <toddpoynor@google.com> am f5d3012d: healthd: Move power_supply attribute paths to healthd_config

* commit 'f5d3012d2c6ac343a0b8bcc95b9cd5137d9ef02f':
healthd: Move power_supply attribute paths to healthd_config
f5d3012d2c6ac343a0b8bcc95b9cd5137d9ef02f 13-Aug-2013 Todd Poynor <toddpoynor@google.com> healthd: Move power_supply attribute paths to healthd_config

Allow health HAL to select specific paths to be used, overriding
default search for arbitrary power supplies with the named paths.

Change-Id: I5f724739f58ef56087ab592b7403fc083db8f173
ealthd/BatteryMonitor.cpp
ealthd/BatteryMonitor.h
ealthd/healthd.cpp
ealthd/healthd.h
a52ea1c48ed653bff908a301ea1366137df752fb 14-Aug-2013 Todd Poynor <toddpoynor@google.com> am d65104ca: healthd: switch to HAL static libraries

* commit 'd65104ca31766922537c79ec2d7647584723407c':
healthd: switch to HAL static libraries
d65104ca31766922537c79ec2d7647584723407c 14-Aug-2013 Todd Poynor <toddpoynor@google.com> healthd: switch to HAL static libraries

Change-Id: I5a802f9b9a8ad4782c4d0c6376a068aef32a70cb
ealthd/Android.mk
3f17bda89498509fd56c3578ebff51ec0c2fb33f 12-Aug-2013 Todd Poynor <toddpoynor@google.com> am a41611f6: healthd: fix botched logging call

* commit 'a41611f638f82cb8066f83b32f2610f0d00dafc6':
healthd: fix botched logging call
a41611f638f82cb8066f83b32f2610f0d00dafc6 12-Aug-2013 Todd Poynor <toddpoynor@google.com> healthd: fix botched logging call

Change-Id: Ibf5e28c657e0d9d193b266acd7b2912bebc3e71f
ealthd/BatteryMonitor.cpp
49f2e1cedfcf1dac72efe6e3634a3cd2db299e30 12-Aug-2013 Elliott Hughes <enh@google.com> am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"

* commit 'cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9':
Add USB Vendor ID for MSI
cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9 12-Aug-2013 Elliott Hughes <enh@google.com> am 936032b4: Merge "Add USB Vendor ID for MSI"

* commit '936032b46be4fbf8a62fbaf7e4ab4cfa863fef90':
Add USB Vendor ID for MSI
936032b46be4fbf8a62fbaf7e4ab4cfa863fef90 12-Aug-2013 Elliott Hughes <enh@google.com> Merge "Add USB Vendor ID for MSI"
57fd0989cbb59f305514378e511e36c752b5aa20 09-Aug-2013 Todd Poynor <toddpoynor@google.com> healthd: preserve uA and uAh units for current_now and charge_counter

Change-Id: I20b3f47c541c4321b0593e504090ad6573b9cb01
ealthd/BatteryMonitor.cpp
dfe0cbab3f9039f34af1dc9e31faf8155737ec2d 04-Jul-2013 Jeff Sharkey <jsharkey@android.com> Richer SD card permissions through FUSE.

Changes the FUSE daemon to synthesize an Android-specific set of
filesystem permissions, even when the underlying media storage is
permissionless. This is designed to support several features:

First, apps can access their own files in /Android/data/com.example/
without requiring any external storage permissions. This is enabled
by allowing o+x on parent directories, and assigning the UID owner
based on the directory name (package name). The mapping from package
to appId is parsed from packages.list, which is updated when apps are
added/removed. Changes are observed through inotify. It creates
missing package name directories when requested and valid.

Second, support for separate permissions for photos and audio/video
content on the device through new GIDs which are assigned based on
top-level directory names.

Finally, support for multi-user separation on the same physical media
through new /Android/user/ directory, which will be bind-mounted
into place. It recursively applies the above rules to each secondary
user.

rwxrwx--x root:sdcard_rw /
rwxrwx--- root:sdcard_pics /Pictures
rwxrwx--- root:sdcard_av /Music

rwxrwx--x root:sdcard_rw /Android
rwxrwx--x root:sdcard_rw /Android/data
rwxrwx--- u0_a12:sdcard_rw /Android/data/com.example
rwxrwx--x root:sdcard_rw /Android/obb/
rwxrwx--- u0_a12:sdcard_rw /Android/obb/com.example

rwxrwx--- root:sdcard_all /Android/user
rwxrwx--x root:sdcard_rw /Android/user/10
rwxrwx--- u10_a12:sdcard_rw /Android/user/10/Android/data/com.example

These derived permissions are disabled by default. Switched option
parsing to getopt().

Change-Id: I21bf5d79d13f0f07a6a116122b16395f4f97505b
nclude/private/android_filesystem_config.h
dcard/Android.mk
dcard/sdcard.c
9face5cad5b4ffb883b23e1c45aafac73c712fd6 08-Aug-2013 Todd Poynor <toddpoynor@google.com> healthd: create healthd_board_init()

Subsume healthd_board_poll_intervals, make clear the call is for init-time
actions.

Change-Id: I9267e4ce7c62b78d2997a43822f20bfa13b54cd8
ealthd/healthd.cpp
ealthd/healthd.h
ealthd/healthd_board_default.cpp
10b235e7436256da9adc827125645f141bd8fac9 08-Aug-2013 Todd Poynor <toddpoynor@google.com> healthd: add health HAL support

Adds board-specific battery monitoring capabilities:

* processing of battery property values and additional charging logic.
* adjusted (or removed) polling intervals.
* replaced (or removed) battery status heartbeat in kernel log.

Change-Id: Ia77bca8dc92c6c2a51afa65d516cacca08da73ac
ealthd/Android.mk
ealthd/BatteryMonitor.cpp
ealthd/healthd.cpp
ealthd/healthd.h
ealthd/healthd_board_default.cpp
b45f1f5bd00c9a8380960d7c439eb14b3a334f50 31-Jul-2013 Todd Poynor <toddpoynor@google.com> healthd: add optional current_now and charge_counter to tracked state

uA and uAh units are converted to mA and mAh.

If current_now is present, add it to the heartbeat log (c=nnn).

Change-Id: I2b5fe7b4505c98ca2d11c3f94564c1c38493c8b9
ealthd/BatteryMonitor.cpp
ealthd/BatteryMonitor.h
d893e39d4ff19312096849b2d66bbfbb24d061d1 07-Aug-2013 Geremy Condra <gcondra@google.com> Merge "Add basic verity support to fs_mgr."
de807f2ed8af63a75174933c13705a7529a82914 08-Jul-2013 Geremy Condra <gcondra@google.com> Add append2simg.

Append2simg is a small utility designed to glue data to the end
of a sparse image. Beware that it doesn't do anything clever with
that data.

Change-Id: I33af330cb4f77e0842375797a35aebbb6af60163
ibsparse/Android.mk
ibsparse/append2simg.c
3ad3d1c4b5856d4e314febc5671c74e78a76db00 23-Feb-2013 Geremy Condra <gcondra@google.com> Add basic verity support to fs_mgr.

This change adds a "verify" fs_mgr flag specifying that
the device in question should be verified.

Devices marked with this flag are expected to have a
footer immediately after their data containing all
the information needed to set up a verity instance.

Change-Id: I10101f2c3240228ee0932e3767fe35e673d2e720
s_mgr/Android.mk
s_mgr/fs_mgr.c
s_mgr/fs_mgr_priv.h
s_mgr/fs_mgr_priv_verity.h
s_mgr/fs_mgr_verity.c
s_mgr/include/fs_mgr.h
nit/Android.mk
856b6cbd9b3ba624ad7044c3e5fa3e0207d4e934 05-Aug-2013 Pavel Chupin <pavel.v.chupin@intel.com> Fix build with gcc-4.8 and array boundaries issue

Remove unused parameters of static functions to avoid warning with 4.8.
Fix array index out of bounds issue when register number exceeds limit.
It shouldn't occur in real world, but static verifiers can detect it.

Change-Id: Id237df905b40bad02fc8cbbeac31084040f58076
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
ibcorkscrew/arch-x86/backtrace-x86.c
9de3fd115a020868d4d1fb6c6d2de3fed176bf60 05-Aug-2013 Glenn Kasten <gkasten@google.com> Merge "Add audio_input_flags_t"
d98e07fdf9c338589f263c47ce5c844ed43efad5 02-Aug-2013 Alex Ray <aray@google.com> move libs/utils to libutils

Change-Id: I6cf4268599460791414882f91eeb88a992fbd29d
ibs/utils/Android.mk
ibs/utils/BasicHashtable.cpp
ibs/utils/BlobCache.cpp
ibs/utils/CallStack.cpp
ibs/utils/CleanSpec.mk
ibs/utils/FileMap.cpp
ibs/utils/JenkinsHash.cpp
ibs/utils/LinearAllocator.cpp
ibs/utils/LinearTransform.cpp
ibs/utils/Log.cpp
ibs/utils/Looper.cpp
ibs/utils/MODULE_LICENSE_APACHE2
ibs/utils/NOTICE
ibs/utils/PropertyMap.cpp
ibs/utils/README
ibs/utils/RefBase.cpp
ibs/utils/SharedBuffer.cpp
ibs/utils/Static.cpp
ibs/utils/StopWatch.cpp
ibs/utils/String16.cpp
ibs/utils/String8.cpp
ibs/utils/SystemClock.cpp
ibs/utils/Threads.cpp
ibs/utils/Timers.cpp
ibs/utils/Tokenizer.cpp
ibs/utils/Trace.cpp
ibs/utils/Unicode.cpp
ibs/utils/VectorImpl.cpp
ibs/utils/misc.cpp
ibs/utils/primes.py
ibs/utils/tests/Android.mk
ibs/utils/tests/BasicHashtable_test.cpp
ibs/utils/tests/BitSet_test.cpp
ibs/utils/tests/BlobCache_test.cpp
ibs/utils/tests/Looper_test.cpp
ibs/utils/tests/LruCache_test.cpp
ibs/utils/tests/String8_test.cpp
ibs/utils/tests/TestHelpers.h
ibs/utils/tests/Unicode_test.cpp
ibs/utils/tests/Vector_test.cpp
ibutils/Android.mk
ibutils/BasicHashtable.cpp
ibutils/BlobCache.cpp
ibutils/CallStack.cpp
ibutils/CleanSpec.mk
ibutils/FileMap.cpp
ibutils/JenkinsHash.cpp
ibutils/LinearAllocator.cpp
ibutils/LinearTransform.cpp
ibutils/Log.cpp
ibutils/Looper.cpp
ibutils/MODULE_LICENSE_APACHE2
ibutils/NOTICE
ibutils/PropertyMap.cpp
ibutils/README
ibutils/RefBase.cpp
ibutils/SharedBuffer.cpp
ibutils/Static.cpp
ibutils/StopWatch.cpp
ibutils/String16.cpp
ibutils/String8.cpp
ibutils/SystemClock.cpp
ibutils/Threads.cpp
ibutils/Timers.cpp
ibutils/Tokenizer.cpp
ibutils/Trace.cpp
ibutils/Unicode.cpp
ibutils/VectorImpl.cpp
ibutils/misc.cpp
ibutils/primes.py
ibutils/tests/Android.mk
ibutils/tests/BasicHashtable_test.cpp
ibutils/tests/BitSet_test.cpp
ibutils/tests/BlobCache_test.cpp
ibutils/tests/Looper_test.cpp
ibutils/tests/LruCache_test.cpp
ibutils/tests/String8_test.cpp
ibutils/tests/TestHelpers.h
ibutils/tests/Unicode_test.cpp
ibutils/tests/Vector_test.cpp
be06210c508d5878dcc7d185e5613f4c7e38dfe8 25-Jul-2013 Dmitry Shmidt <dimitrysh@google.com> libnetutils: Get mtu together with dhcp session results

Change-Id: I517fd1f62d451b07466a21a2b770d9ce389dac19
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
nclude/netutils/dhcp.h
ibnetutils/dhcp_utils.c
c051ffd7c24bbe989c9e39c793c6bbbac3ee3eff 01-Aug-2013 Glenn Kasten <gkasten@google.com> Add audio_input_flags_t

Change-Id: Ie65398cc67218cc63be4baa8a2a61d0ea591a2a3
nclude/system/audio.h
b4802413a72e74b41c674d93f30a56a4a693a862 02-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Merge "Window: Add query for consumer usage bits."
ddff6230495b66312ad93f652d0c79069a64dbbd 01-Aug-2013 Mathias Agopian <mathias@google.com> minor tweaks to FlattenableUtils

Change-Id: Ibfceec36434baac92c8815a18d902375d3fa1a6d
nclude/utils/Flattenable.h
307d96a6e6377e4c250999305db540fdf4926516 01-Aug-2013 astonehuang <astonehuang@msi.com> Add USB Vendor ID for MSI

Change-Id: I4f4bfb6ef08058bf749917119a2b08952e7bc337
db/usb_vendors.c
0f10d0abf3e6f6b5631c091256f8b4e7a20a33d0 01-Aug-2013 Dianne Hackborn <hackbod@google.com> Add a new utf8-to-utf16 conversion function.

Change-Id: I957c22fb219596ca4239db7a169473d3894b09eb
nclude/utils/Unicode.h
ibs/utils/Unicode.cpp
d43eae5e399a1e6464def8227083988c0a090dee 31-Jul-2013 Alex Ray <aray@google.com> Merge remote-tracking branch 'goog/libutils-import' into HEAD
5189f9a263c6732329c79f38c6ca9019cfaa6476 31-Jul-2013 Brian Carlstrom <bdc@google.com> Fix BlobCache_test

Change-Id: I5b20aeb4dcff80f1e18e1165b8461d20034dc1ac
ibs/utils/tests/BlobCache_test.cpp
6d611a891d0c818bf3a34a7cad036f3f0064bc4a 30-Jul-2013 Mathias Agopian <mathias@google.com> Make Flattenable not virtual (libutils)

Making an object Flattenable doesn't force it to
become virtual anymore. For instance, Fence and GraphicBuffer
are now non-virtual classes.

Also change Flatennable protocol a bit so that it updates
its parameters (pointers, sizes) to make it easier
to implement a flattenable in terms of other flattenables.

Change-Id: Ie81dc7637180b3c2cfcbaf644f8987ca804eb891
nclude/utils/BlobCache.h
nclude/utils/Flattenable.h
ibs/utils/Android.mk
ibs/utils/BlobCache.cpp
ibs/utils/Flattenable.cpp
f88a5b4f887bddd478e9fb35d609b684c54d5204 30-Jul-2013 Eino-Ville Talvala <etalvala@google.com> Window: Add query for consumer usage bits.

Bug: 9592202
Change-Id: Ied2fdb985dc59dd9c0f26c515353abdc37f0eb77
nclude/system/window.h
0d8f3d6c452883ab7295573c4ff7437d68d1d936 18-Jul-2013 Alex Ray <aray@google.com> libutils: give BasicHashtableImpl a virtual destructor

Change-Id: I4ec590b060d732af5fe525670becbe778684247b
nclude/utils/BasicHashtable.h
ibs/utils/BasicHashtable.cpp
946003ae6472ab4661c10d11c2b6ded42fe701ca 24-Jul-2013 Colin Cross <ccross@android.com> add static dependency on liblog

Change-Id: Ibf8733142d52e4ffac2e3b26932d7196fb79c5a7
ibs/utils/Android.mk
ibs/utils/CleanSpec.mk
567ea471ffdee67150da4d0aaebb4fcbe84b6a0c 24-Jul-2013 Alex Ray <aray@google.com> utils: move thread enums to system/core

Change-Id: Ia97963cc9acf8661d01355786f5e7e7bf54581c2
nclude/utils/ThreadDefs.h
d614ee455705047fd27db0ad7f3013e6ea64204d 21-May-2013 Michael Wright <michaelwr@google.com> Added bitwise-or and bitwise-and to BitSet

Change-Id: I9bbf41f9d2d4a2593b0e6d7d8be7e283f985bade
nclude/utils/BitSet.h
ibs/utils/tests/Android.mk
ibs/utils/tests/BitSet_test.cpp
214c701ec6de8bd4b57f6aec8874fb343c79d874 23-May-2013 Tim Murray <timmurray@google.com> Make trace macros slightly more robust

Change-Id: I9544eb7b27fc1a971cabadd8d5b4b4b80678febf
nclude/utils/Trace.h
e45a9acd6390d68e902b1f0a25f90b96b8849a3c 17-May-2013 Nick Kralevich <nnk@google.com> Remove unnecessary header file.

In b2cac4ff37ed2a3521efb307b807b12f649634b8, the last
reference to property_get was removed, but the include
file remained. Remove it.

This is causing me unrelated problems.

Change-Id: I87bbfbfa5871f6da4a1b00037a225f67bbd75881
ibs/utils/Threads.cpp
8db925f7777834eae5af386f7f92a22478c88346 09-May-2013 Mathias Agopian <mathias@google.com> remove unused declarations and reformat

Change-Id: I4e168fb62c275e02621c4b6e0c6000d0f006c327
nclude/utils/StrongPointer.h
d3d3fceb7c00f09fd8a02bf81145017e8af37d2e 09-May-2013 Mathias Agopian <mathias@google.com> remove reserved virtual slots

these consume small amount of space (plt) in every library that
links against libutils.

Change-Id: I1b6b3dd9098aa5a051243f7a5dbf91cd7dcb8b2c
nclude/utils/VectorImpl.h
ibs/utils/VectorImpl.cpp
4485d0d966d062d1b45b635e2447a2d2f96c3f38 09-May-2013 Mathias Agopian <mathias@google.com> new String8, String16 ctors to initialize empty static strings with static linkage

when libutils is statically linked, the ordering of the static
initializer is not guaranteed and therefore it's unsafe to use
empty static strings: e.g.:

static String8 sThisStaticStringIsNotSafe;

instead, this new constructor can be used:

static String8 sThisStaticStringIsSafe(kEmptyString);

Change-Id: Ia3daf1cab1c97d021c0ee9c2b394b5e27e8d6c0d
nclude/utils/String16.h
nclude/utils/String8.h
ibs/utils/String16.cpp
ibs/utils/String8.cpp
9eb2a3b1c0cc1ff3082a9283e24c8babc112f56b 07-May-2013 Mathias Agopian <mathias@google.com> libutils clean-up

Change-Id: I6ff4cfc736751de2912c697f954e45e275f2d386
nclude/utils/BufferedTextOutput.h
nclude/utils/Debug.h
nclude/utils/GenerationCache.h
nclude/utils/LruCache.h
nclude/utils/String16.h
nclude/utils/String8.h
nclude/utils/StringArray.h
nclude/utils/StrongPointer.h
nclude/utils/SystemClock.h
nclude/utils/TextOutput.h
nclude/utils/Timers.h
nclude/utils/WorkQueue.h
nclude/utils/ZipFileCRO.h
nclude/utils/ZipFileRO.h
nclude/utils/ZipUtils.h
nclude/utils/misc.h
ibs/utils/Android.mk
ibs/utils/BufferedTextOutput.cpp
ibs/utils/Debug.cpp
ibs/utils/RefBase.cpp
ibs/utils/Static.cpp
ibs/utils/String16.cpp
ibs/utils/String8.cpp
ibs/utils/StringArray.cpp
ibs/utils/SystemClock.cpp
ibs/utils/TextOutput.cpp
ibs/utils/Timers.cpp
ibs/utils/WorkQueue.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/misc.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/ZipFileRO_test.cpp
19159f90020c04ac2f4dcb39424d740f765ed9a3 06-May-2013 Dianne Hackborn <hackbod@google.com> Add new Looper API to check whether the looper is idle.

This is just to support the watchdog to give it a faster
way to determine if a thread is deadlocked without having
to post a message to it.

Change-Id: I068dc8b9387caf94fe5811fb4aeb0f9b57b1a080
nclude/utils/Looper.h
ibs/utils/Looper.cpp
d9ad7d8d73918d44d41811e9b4d0cc722dae338d 03-May-2013 Todd Poynor <toddpoynor@google.com> String8: ensure static init done prior to empty string reference

Avoid NULL deref on static initialization of empty String8 objects prior
to libutils static init.

Change-Id: I3d420041ba62b97ed8c2dfd2532a2dcd72b84ff1
ibs/utils/String8.cpp
00c14b4be46bf08cc0a351663e247690f59acfa8 22-Mar-2013 Bjorn Bringert <bringert@android.com> Build a static device libutils

This is needed to make tools such as aapt more compatible when
built for the device.

Change-Id: I1261d47b6e24595f1be547b9202892863f66a1de
ibs/utils/Android.mk
d34a8cad1efa1c8da1c7b5ad81226b822064cf73 22-Mar-2013 Mathias Agopian <mathias@google.com> improved CallStack a bit

- added a ctor that updates and dumps the stack immediately
- added a "logtag" parameter to dump()

Change-Id: Ie51c256071d282591752243bdb4f68cf9ff8829d
nclude/utils/CallStack.h
ibs/utils/CallStack.cpp
ibs/utils/RefBase.cpp
da8ec4b634ffc165fc12f8ae2671d61e684bd248 20-Mar-2013 Mathias Agopian <mathias@google.com> disable RefBase consistency checks (NDEBUG)

Bug: 8328715
Change-Id: Ib57646ff909fd8744610f37f3b50d90d884dff31
ibs/utils/RefBase.cpp
6cd548c7154c1633a0ed318c31dd22c50a5f5d02 19-Mar-2013 Mathias Agopian <mathias@google.com> Fix a crasher with RefBase debugging and vectors of wp<>

background:
we have some code to fix-up the IDs of references when
using RefBase's DEBUG_REFS when those refs are managed by
arrays wp<> or sp<> (this is because wp<> / sp<> don't have
a trivial ctor when DEBUG_REFS is enabled, and Vector
treats them as trivial for obvious performance reasons)

this is complicated by the fact that we don't want to have
to recompile everything when enabling DEBUG_REFs (i.e.: the
Vector code cannot know wheter it's enabled or not for its
template stuff).

problem:
there was a bug in the fix-up code for wp<> which was trying
to access the weakref_impl from the RefBase* however, this was
moronic since RefBase could have been destroyed if there wasn't
any more strong refs -- and this happned. Instead we need to get
the weakref_impl directly from the wp<>

Change-Id: Ie16e334204205fdbff142acb9faff8479a78450b
nclude/utils/RefBase.h
ibs/utils/RefBase.cpp
6d4419d9b130719dd2355861907dc8f87368a51c 19-Mar-2013 Mathias Agopian <mathias@google.com> A few tweaks to RefBase debugging

- stacks are now saved in /data/debug which must be
created and writable by the user.

- removed "always fatal" DEBUG_REFS option, it wasn't
really needed.

- DEBUG_REFS_ENABLED_BY_DEFAULT is not the default anymore
(usually people want to target which refs they're tracking)

Change-Id: I37fae72e9dacde6ce1fa8f7dbe2bc01b1a1b95e5
ibs/utils/RefBase.cpp
b73559d86c9017166da28e1d59a884f13417426d 11-Mar-2013 Jesse Hall <jessehall@google.com> Add Vector::resize()

Bug: 8384764
Change-Id: Icee83d389f3e555eba7d419b64c8d52a9aa21b8b
nclude/utils/Vector.h
nclude/utils/VectorImpl.h
ibs/utils/VectorImpl.cpp
a729ab1e3be17ed20073f7c035df0433888164d6 14-Mar-2013 Dianne Hackborn <hackbod@google.com> fix a couple race-conditions in RefBase::promote()

Bug: 8390295
Change-Id: I7a48e3bf5b213cc1da2b8e844c6bb37ee24cb047
ibs/utils/RefBase.cpp
8a4cdbcdb935554a660c78e20686afdad8e8ca75 12-Mar-2013 Mathias Agopian <mathias@google.com> temporary: enable ASSERTs in RefBase

this is in an attempt to get more data on
bug 8328715.

Change-Id: I9333a67c2d7f67f4d9b2fc5eb1ad8a7b2d1c6dcb
ibs/utils/RefBase.cpp
31ba37f1c80801ee128749d4772c47f23323a3be 11-Mar-2013 Romain Guy <romainguy@google.com> Add Thread::isRunning and Condition::signal(WakeUpType)

The signal() method is useful to choose whether to wake up one or
all threads.

Change-Id: I062ab6d3ddd306a9fb735549ea140e2a76eed75a
nclude/utils/Condition.h
nclude/utils/Thread.h
ibs/utils/Threads.cpp
6090df85a8a227db0bf407b7877b2777937e6427 08-Mar-2013 Mathias Agopian <mathias@google.com> rename binder services main thread to Binder_*

When a binder service's main thread joins the thread pool
it retains its name (whatever the exec name was), which is
very confusing in systrace.

we now rename that thread just like its friends in the
thread pool.

Change-Id: Ibb3b6ff07304b247cfc6fb1694e72350c579513e
nclude/utils/AndroidThreads.h
ibs/utils/Threads.cpp
769828d2d44fca3829e628bb424aa426aa468ee9 07-Mar-2013 Mathias Agopian <mathias@google.com> Fix RefBase debugging. O_CREAT must specify the mode.

Change-Id: I51c6df3cfd59b20ca73c3edee86bc2f74dbde1b1
ibs/utils/RefBase.cpp
ca3e2a276afa03cfffb2b989e28adfc44ec50d6f 13-Feb-2013 Naseer Ahmed <naseer@codeaurora.org> utils: Allow non android namespaces to use ALOGD_IF_SLOW

Change-Id: I9207b64954fae2f56cc5f6aa5796a2e737400623
nclude/utils/Log.h
d30884aa0cb6e8286aca78fc73d9b239f727627e 03-Feb-2013 Nick Kralevich <nnk@google.com> Revert "try to fix win_sdk build."

A better change was checked into system/core. See commit
941daef629bd571032851edf7ae1dce24266640e

This reverts commit fa99d30ec773c5f9653d96570fb8961426bfe966.
ibs/utils/Threads.cpp
0656c9764a77b919d707624404546b10ec7fa9f8 02-Feb-2013 Nick Kralevich <nnk@google.com> try to fix win_sdk build.

Change-Id: I55e78e339874a6d6a3381c2550556b65c7ec1ca0
ibs/utils/Threads.cpp
99ec303e459ea4ded9981337e10651aee08016b0 17-Dec-2012 Marco Nelissen <marcone@google.com> Add NULL check to CallStack::toString

CallStack::toString() has a 0 default argument, which ends up getting
passed to strlen(), resulting in a crash.

Change-Id: If706aff8c400983670f49cdbb66e11191ac76e0e
ibs/utils/CallStack.cpp
551fcf4fe39e68fab17d56cc6c4b8a61164891ff 05-Dec-2012 Chris Craik <ccraik@google.com> Add LinearAllocator

Moving from external/webkit/Source/WebCore/platform/graphics/android/utils/

Change-Id: If91830aa9b207dbc8692b2ca7c4a0b76778addd5
nclude/utils/LinearAllocator.h
ibs/utils/Android.mk
ibs/utils/LinearAllocator.cpp
a27c1e08396aa2969511dad1f661d10c2b835ac1 06-Dec-2012 Igor Murashkin <iam@google.com> utils: fix warnings for unused parameters

Change-Id: Ibfb755a30ba2923669060fe0aed019beecbe38a1
nclude/utils/Mutex.h
nclude/utils/RWLock.h
nclude/utils/RefBase.h
fcb349ff75272c802519a20abc0e083c35bbe8cf 01-Dec-2012 Alex Ray <aray@google.com> utils: clarify scoped tracing functionality

ScopedTrace objects were being used in place of ATRACE_NAME because of a
misunderstanding of it's function. Cleared up documentation for usage.

Also explicitly use global namespace for sysprop callback.

Change-Id: I7c248b486b614ccdb841659ca0dcfc644fda670a
nclude/utils/Trace.h
ibs/utils/Trace.cpp
0a19c906f20fe7ded0c2ab5b1c8cf29137fb0fa9 30-Nov-2012 Chad Jones <chadj@google.com> Remove copy of atrace imported to wrong location
trace/Android.mk
trace/MODULE_LICENSE_APACHE2
trace/NOTICE
trace/atrace.c
5b2d36e38adcc09e72f81b06c324bf3c5c92e043 15-Nov-2012 Alex Ray <aray@google.com> utils: Use cutils tracing functionality.

Tracing functionality has moved to cutils.

Change-Id: Ie78ccc1d59dd5178f5058fbc3858a37f9adce552
nclude/utils/Trace.h
ibs/utils/Trace.cpp
5ca402a4e2537fa694de120264c5a5e2a4e777bf 29-Nov-2012 Romain Guy <romainguy@google.com> Add LruCache::Iterator

Required by libhwui

Change-Id: I164b9a4a82d89d132da01a56535c0df084de86f7
nclude/utils/LruCache.h
bdce9baa880990f521061bc7d1498cb07d7efc01 29-Nov-2012 Romain Guy <romainguy@google.com> Add another ifndef and a couple of methods to LruCache

The new methods on LruCache are needed by libhwui to manage
the cache of paths.

Change-Id: If54fa325c54e2b04e7fe5dfe6dad66066c40127c
nclude/utils/JenkinsHash.h
nclude/utils/LruCache.h
b3176acd5fa7a35cee7b6722cd5869f13542afdd 28-Nov-2012 Romain Guy <romainguy@google.com> Add #ifndef to prevent multiple definitions

Change-Id: Ib861eee0f333fe29290437b7e67623622d8dabd0
nclude/utils/LruCache.h
45ad8f44d0cb60b6c930a4afd1ecd05e9501d381 30-Oct-2012 Andy McFadden <fadden@android.com> Reduce emulator logspam

The emulator doesn't support systrace, but we should point that out
at most once per process.

Bug 7436352

Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
nclude/utils/Trace.h
ibs/utils/Trace.cpp
b6ea175b6b4d0aaac85ed6cd8ccac01ab896486b 26-Oct-2012 Raph Levien <raph@google.com> Add an LRU cache plus hashing primitives

This patch adds a hashtable-based LRU cache. This should be
significantly higher performance than the GenerationCache it is intended
to replace. It is a large part of the fix for bug 7271109
TextLayoutCache low-level performance issues.

We added a new method to BasicHashtable to detect when rehashing is
needed, because the internal linked list pointers would get invalidated
by that rehashing.

Also, the hash_type specialized to pointers had a small flaw.

Change-Id: I950c2083f96519777b851dbe157100e0a334caec
nclude/utils/BasicHashtable.h
nclude/utils/JenkinsHash.h
nclude/utils/LruCache.h
nclude/utils/TypeHelpers.h
ibs/utils/Android.mk
ibs/utils/BasicHashtable.cpp
ibs/utils/JenkinsHash.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/LruCache_test.cpp
fe34e45c217e67e32fa56b7e01fd4163a621c647 01-May-2012 Glenn Kasten <gkasten@google.com> Continue removing property debug.sys.noschedgroups

Also 0 means gettid() for get_sched_policy() and set_sched_policy().

Change-Id: Ic12edc3df6c9b3e99eae5cffaf9f6fe56cf14043
ibs/utils/Threads.cpp
61db1669f491b221411269f62bd1cb458a543181 26-Oct-2012 Jason Simmons <jsimmons@google.com> Ensure that Vector::erase() returns a valid iterator

Vector::erase may reallocate the Vector's storage while removing an element.
However, erase() calls begin() before calling removeItemsAt(), thus caching
a pointer the the Vector's old storage. If the storage is reallocated,
the iterator returned by erase() will be based on the old storage pointer
and will thus be invalid.

Change-Id: I2450c55fd418e6b1c558a4ca7c024573abbaa098
nclude/utils/Vector.h
d49555291a356fae02430a5f8fa33b37306bec42 25-Oct-2012 Dave Burke <daveburke@google.com> Revert "Revert "put back the unused virtuals in Vector<>""

This reverts commit 225c66a48cdc3acef21ee380dc134449749d3cb3

Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d
nclude/utils/VectorImpl.h
ibs/utils/VectorImpl.cpp
3fc49adfd2887d01e54c4ad6a62eae5383101f62 19-Oct-2012 Romain Guy <romainguy@google.com> Add runtime debugging capabilities to OpenGL

The shell property debug.egl.trace can now be set to:

0
disables tracing
1
logs all GL calls
error
checks glGetError after every GL call, logs a stack trace on error
systrace
logs each GL call to systrace

Change-Id: I34a2a2d4e19c373fd9eaa1b0cd93e67c87378996
nclude/utils/Trace.h
b9fd6f986492d74125274722b8ea1a3819cd216a 16-Oct-2012 Kenny Root <kroot@google.com> Add TEMP_FAILURE_RETRY to ZipUtils

Change-Id: I275c415f14eeffaf9a58d45f3ea014d766441ec3
nclude/utils/Compat.h
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
5625087e6e56493ad26d4171b78687d17c7136f4 12-Oct-2012 Kenny Root <kroot@google.com> Add TEMP_FAILURE_RETRY around open and write calls

Bug: 7330849
Change-Id: I9aef3c3d3a248c3eea7ca060124ad6decaa6b4da
ibs/utils/ZipFileRO.cpp
2fe13f185de6e94fb88f17a832a6b3fcc38587c7 02-Oct-2012 Kenny Root <kroot@google.com> Update tests for new build target

Change-Id: Ia1740d1b2c0b611c4559c5c846b12fb5c3e81b07
ibs/utils/tests/Android.mk
f4722b5910eb4e1394763da636b72a8431baea5b 19-Sep-2012 Ben Cheng <bccheng@google.com> Disable the use of clock_gettime for now.

Bug: 7100774
Change-Id: I6ede2a37a5d485134fe419b5dc766f70ae4af9d4
ibs/utils/SystemClock.cpp
ad0a959aeec262971c64e68ca1b78f4c69ab9139 14-Sep-2012 Ben Cheng <bccheng@google.com> Print warnings when backwards timestamps are detected.

Bug: 7100774

Change-Id: I752fd1680b32ce33d17d6042d6c82e27d7ba9dd2
ibs/utils/SystemClock.cpp
e79aadd143a6467d70969e3cd4cb31a1623870f3 01-Sep-2012 Mathias Agopian <mathias@google.com> minor SharedBuffer clean-up

Change-Id: If38b7ce85806ae628c00f2c938de4e3f75142543
nclude/utils/SharedBuffer.h
ibs/utils/VectorImpl.cpp
919fa297fe54d16e202752bd91a0a99ff59bef0d 01-Sep-2012 Mathias Agopian <mathias@google.com> Add a way to retrieve a Region as a SharedBuffer

Change-Id: Ia53cb905fbc88f899521658545f990fb9217b1e1
nclude/utils/SharedBuffer.h
11b9acf7651bc73dc72df950cd074fee743ce5c9 25-Aug-2012 Mathias Agopian <mathias@google.com> Revert "put back the unused virtuals in Vector<>"

This reverts commit 1648d4c13ba2eff3ea14cd87ee94028458a39f97.

Bug: 6977192

Change-Id: Idbb6b239aaed4fb1c054ce943f6ba06ede3492bb
nclude/utils/VectorImpl.h
ibs/utils/VectorImpl.cpp
cacf429b56522fe66862dd541860175f1bed739f 26-Jul-2012 Tareq A. Siraj <tareq.a.siraj@intel.com> Fixed clang build error for libgui

Fixed the order of the statements in ANDROID_SINGLETON_STATIC_INSTANCE
macro so that the templated static member variable initialization
comes before the instantiation of the Singleton class. This
fixes the clang compile error.

Change-Id: Ic47d17e152b657f2dff3191ccc3770753fdf002b
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Edwin Vane <edwin.vane@intel.com>
nclude/utils/Singleton.h
8d0c1a0316f583bc3835dbd7241bcffdb7fef7df 21-Aug-2012 Mathias Agopian <mathias@google.com> put back the unused virtuals in Vector<>

some binaries are using these private APIs and broke
(as they should!) with this change. Temporarily restore the
virtuals to work around this.

Bug: 6977550
Change-Id: I7c37f24b16e4d586b89205c493db5169cf87e024
nclude/utils/VectorImpl.h
ibs/utils/VectorImpl.cpp
156eb980918355dfc8a88ae4abf4df969acfbdef 20-Aug-2012 Mathias Agopian <mathias@google.com> get rid of mirrorItemAt() which isn't used anywhere

Change-Id: Id6f2dbeed21cabc127d39538c0ff464077ada83f
nclude/utils/SortedVector.h
nclude/utils/Vector.h
2497a1524dd909d0eb933544c94d2c2e9e2c3394 13-Aug-2012 Mathias Agopian <mathias@google.com> improve [un]marshalling of non-binder objects

this change introduces a new class LightFlattenable<> which is
a protocol to flatten simple objects that don't require
binders or file descriptors; the benefit of this protocol is that
it doesn't require the objects to have a virtual table and give us
a consitant way of doing this.

we also introduce an implementation of this protocol for
POD structures, LightFlattenablePod<>.

Parcel has been update to handle this protocol automatically.

Sensor, Rect, Point and Region now use this new protocol.

Change-Id: Icb3ce7fa1d785249eb666f39c2129f2fc143ea4a
nclude/utils/Flattenable.h
6454f461665a44b1e47d277d8b92415b5bbce2d8 11-Aug-2012 Jeff Brown <jeffbrown@google.com> Add a very simple helper function to log slow functions.

Change-Id: I2e2e072206d02b572a330dd25857c161b5b563bf
nclude/utils/Log.h
ibs/utils/Android.mk
ibs/utils/Log.cpp
bdf73c7efcfdefe990f55541b71e7869ac378090 10-Aug-2012 Mathias Agopian <mathias@google.com> improve Vector<> safety checks

- make errors that will always cause a memory corruption always fatal
(for eg: KeyedVector<>::editValue{For|At}() failure)
- make other errors fatal in debug mode, those that can be caught by
the caller.
- fix typos

Change-Id: I65cc7d81035c37ce2906fc4500c50e5d5b5c49eb
nclude/utils/KeyedVector.h
nclude/utils/SortedVector.h
nclude/utils/Vector.h
nclude/utils/VectorImpl.h
ibs/utils/VectorImpl.cpp
5363183d2a2acdf9163eac57203645e841c0ca0d 05-Aug-2012 Mathias Agopian <mathias@google.com> libutils cleanup: remove unused or seldom used code from misc.{cpp|h}

Change-Id: I72206f16619d81887e3b85603494563faab3b445
nclude/utils/misc.h
ibs/utils/ZipFileRO.cpp
ibs/utils/misc.cpp
67b585149111b68afc250fec978620687892bb67 03-Aug-2012 Mathias Agopian <mathias@google.com> We now have a real list of displays.

displays can be dynamically added or removed, and the
list is part of the SF's transaction.

Change-Id: I4186ea39f1317c0e7c044f869004017738968fab
nclude/utils/KeyedVector.h
af1e7b77217430cc2d423e9f552dcfb4e004539b 19-Jul-2012 Nick Pelly <npelly@google.com> Add elapsedRealtimeNano(), and use CLOCK_BOOTTIME where possible.

Change-Id: I4231c8ca32663e6e2cb5b7c126d091f837373807
nclude/utils/SystemClock.h
nclude/utils/Timers.h
ibs/utils/SystemClock.cpp
ibs/utils/Timers.cpp
e6bee12f943a5b6e7c596220dd02d5837322d09f 29-Jun-2012 Mathias Agopian <mathias@google.com> one more step towards multiple display support

- remove dependency on cached state in validateVisibility
- get rid of mVertices and mTransformedBounds
- get rid of validateVisibility
- get rid of unlockPageFlip
- handleTransaction now returns a dirty region
- computevisibileregion now uses window-manager space
nclude/utils/Vector.h
885a2fe3b5e79918d4e4fe9d5c675b3d1d724e02 28-Jun-2012 John Grossman <johngro@google.com> Utils: Fix a bug in the linear transformation code.

Hand merge from ics-aah

> Utils: Fix a bug in the linear transformation code.
>
> Fix a bug where an incorrect result would be computed if you used the
> linear transformation code to do a reverse transformation (from B's
> domain into A's domain) when the scaler fraction was negative.
>
> Change-Id: I8e5f109314d235a177ab41f65d3c4cd08cff78be
> Signed-off-by: John Grossman <johngro@google.com>

Change-Id: Id90e18f685c61c1a89fd91c32adcf01363b3e8f3
Signed-off-by: John Grossman <johngro@google.com>
ibs/utils/LinearTransform.cpp
dd1b0378cec939e7c90f8e8d8216b481f9f2035a 01-Jun-2012 Jeff Brown <jeffbrown@google.com> Support looper callbacks based on smart pointers.

Bug: 6559630
Change-Id: I5a667f219f431838638acefbc9fa6afa610971bd
nclude/utils/Looper.h
ibs/utils/Looper.cpp
970701fbd264d9b11d0937d0ac34e119cdb061df 01-Jun-2012 Eino-Ville Talvala <etalvala@google.com> Add camera as an ATRACE tag

Change-Id: Ib4f22d593836c4b973d122efa114d359f1529914
nclude/utils/Trace.h
5705e69825a94e9d02bff3d8c3dec5800b73f6a5 31-May-2012 Jeff Brown <jeffbrown@google.com> Delete unused poll() code.

We don't need this code anymore and it is just in the way.

Bug: 6559630
Change-Id: I1dc9decf85d5ea1feab159c2985da6c20baffdd5
nclude/utils/Looper.h
ibs/utils/Looper.cpp
55195d745c6a21f8a75f26716f2a9690e40a1331 31-May-2012 Jeff Brown <jeffbrown@google.com> Remove unused statistics code.

Bug: 6559630
Change-Id: Iacdf4bb4c1c125c09305cbd8cb443c7c80cfc010
nclude/utils/Looper.h
ibs/utils/Looper.cpp
03b168a69bd155be2675d7dffa342a30990259f7 18-May-2012 Mathias Agopian <mathias@google.com> fix a corruption in Vector<> when adding new items

would happen when vectors are copied and new items is
added in both vectors. we didn't duplicate the underlying
storage when adding items in vectors.

Bug: 6515797
Change-Id: If544c07d96c05821e088d7f2c9b5736f7e306c31
ibs/utils/VectorImpl.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/Vector_test.cpp
69fc3d4e1e73c47aec6c8e932b0f0239dd777dd3 11-May-2012 Jamie Gennis <jgennis@google.com> libutils: add a tracing tag for video

Change-Id: Icbecc7184844e95ee81a558b0a54d5513d5cf59f
nclude/utils/Trace.h
2b1d4999b86523f27a22bcaf9eb134173b60fb9b 11-May-2012 Glenn Kasten <gkasten@google.com> Workaround for add_tid_to_cgroup failed to write

Bug: 6467109
Change-Id: I6dff8e608d83c7a7c453c25c94ad100f113769b9
ibs/utils/Threads.cpp
c1309d74e8929f73e1b9cdb5dbf70aa8a2b09af3 09-May-2012 Dianne Hackborn <hackbod@google.com> Add callback hack to find out when to reload system properties.

Every IBinder object can accept a new transaction to tell it that
it might want to reload system properties, and in the process
anyone can register a callback to be executed when this happens.

Use this to reload the trace property.

This is very much ONLY for debugging.

Change-Id: I55c67c46f8f3fa9073bef0dfaab4577ed1d47eb4
nclude/utils/Trace.h
nclude/utils/misc.h
ibs/utils/Trace.cpp
ibs/utils/misc.cpp
6c1cf1c8f29263a1374991195ffa98b883f181ed 08-May-2012 Dianne Hackborn <hackbod@google.com> Change name of system property for traces.

This allows the property to be changed from the settings UI.

Change-Id: Ife7424b3549e5bbe51b6ad2fb8e5edde3a9fd608
ibs/utils/Trace.cpp
7e6e7e0a5467d50ef2aff1e6a4f8c86f8b4338e6 07-May-2012 Glenn Kasten <gkasten@google.com> Add audio tag to systrace

Change-Id: I4a558c43e4ccd81a4ed94684c5fad6b3c486bd14
nclude/utils/Trace.h
90dd9e188e39b2272ae3ec5f16f2ad53ce79475a 04-May-2012 Andy Stadler <stadler@google.com> Add System Tracing capability to Sync Manager

See also: Change-Id: Ia8bc01adbba345a568405b0ac8ade96e56b40cc1

Change-Id: I2678974cf85464fbc09072b06f647a0787e6e23f
nclude/utils/Trace.h
e8e5dc5478a237ffcd1a4c7fae774ea7d5aeed02 01-May-2012 Andrew Hsieh <andrewhsieh@google.com> Fixed 64-bit porting issues

Fixed two issues about casting between int and pointer which
cause compilation error in 64-bit mode (eg. for 64-bit emulator)

Change-Id: I5ca9a933a239db73e56d6f27de05aa42bd06a650
ibs/utils/ZipFileRO.cpp
265743abde39f6411ed46e1e38d08c3bb7ad4f53 26-Apr-2012 Dianne Hackborn <hackbod@google.com> Add traces for window manager and activity manager.

Change-Id: I6677ca64164f234efc7856ddd173ad6989b4f59e
nclude/utils/Trace.h
77ed15a31ad314a1e6052299108362388c1169fe 16-Mar-2012 Glenn Kasten <gkasten@google.com> Scheduling group cleanup

Remove C++ APIs androidSetThreadSchedulingGroup and
androidGetThreadSchedulingGroup, and the ANDROID_TGROUP_* constants.

Former callers of these should now use the C APIs set_sched_policy and
get_sched_policy, and the SP_* constants.

Note: debug.sys.noschedgroups is not supported by the C APIs,
this needs to be discussed.

Change-Id: I32bbfc539ef4090faf9ef0320380e8cca9eae07c
nclude/utils/AndroidThreads.h
nclude/utils/ThreadDefs.h
ibs/utils/Threads.cpp
2c1627dc49994f83a636efd1970825b519bd93cb 18-Apr-2012 Jeff Brown <jeffbrown@google.com> Support tokenizing arbitrary content.

Bug: 6110399
Change-Id: I37be63b68934fd451e6dffbf7d6079553619c0a3
nclude/utils/Tokenizer.h
ibs/utils/Tokenizer.cpp
52d59e2c48a1563ea4f7e9fef6dc3611a5d74aaa 17-Apr-2012 Chris Craik <ccraik@google.com> Add webview tracing bit

Change-Id: I82e54f5eeb2666a255e372fd3bfcc54c1b3d76a0
nclude/utils/Trace.h
ec2e1323a019e26f0eef73a263b536e8da73c4c6 05-Apr-2012 Glenn Kasten <gkasten@google.com> Add a log tag

Change-Id: If30aa8536130cf6ff9918ce97c5e4e8651ae2fef
ibs/utils/Trace.cpp
4e371cec7fa13273f81b9266c88ca846ece87096 26-Mar-2012 Keun young Park <keunyoung@google.com> add Looper.cpp to build for linux host to use in CTS audio

Change-Id: I59cfe30fd48fcba0bb949033f4d2aef5ce9916e4
ibs/utils/Android.mk
e29b5c384b0dc7658ba320d1fba38a4a772e1bf1 23-Mar-2012 Colin Cross <ccross@android.com> frameworks/native: link host libutils against external/zlib

Fix the SDK build by statically linking host libutils against libz
from external/zlib.

Change-Id: Id6805d3c9071e6fa0559024336642b5386cf3c52
ibs/utils/Android.mk
3abdea92efbe85c66d7f2dc662953d0b5ed59451 23-Mar-2012 Colin Cross <ccross@android.com> frameworks/native: move Zip* from libandroidfw to libutils

ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).

Change-Id: Ib8c41134ccdec6d6aa8d49860f8dddef49a24783
nclude/utils/ZipFileCRO.h
nclude/utils/ZipFileRO.h
nclude/utils/ZipUtils.h
ibs/utils/Android.mk
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/ZipFileRO_test.cpp
cd19987605f46133b5df4f1c8251bc21d48f74a9 23-Mar-2012 Kenny Root <kroot@google.com> Add UniquePtr.h to frameworks/native

This is a copy of libcore's UniquePtr.h header which is used until we
get C++11 which has std::unique_ptr which is essentially the same.

Taken from libcore project at commit
3e6dd45baa0d7f9b4fa06f4ade76e088b59cc7bf

Change-Id: I7537b016f9eae33bfc4c57b24f86260909719ab8
nclude/utils/UniquePtr.h
27e6eaae879309d6bbfb708e1e1aa75d7431a3a4 17-Mar-2012 Jeff Brown <jeffbrown@google.com> Add a simple work queue abstraction.

Makes it easy to schedule a bunch of work to happen in parallel.

Change-Id: Id9c0e52fc8b6d78d2b9ed4c2ee47abce0a01775c
nclude/utils/AndroidThreads.h
nclude/utils/WorkQueue.h
ibs/utils/Android.mk
ibs/utils/Threads.cpp
ibs/utils/WorkQueue.cpp
9a0a76df1e961ef4621e81814d8bf891a09bef66 16-Mar-2012 Jeff Brown <jeffbrown@google.com> Add traits to common utils data structures.

Many of our basic data structures are trivially movable using
memcpy() even if they are not trivially constructable, destructable
or copyable. It's worth taking advantage of this *ahem* trait.

Adding trivial_move_trait to String16 reduces appt running
time on frameworks/base/core/res by 40%!

Change-Id: I630a1a027e2d0ded96856e4ca042ea82906289fe
nclude/utils/BitSet.h
nclude/utils/KeyedVector.h
nclude/utils/RefBase.h
nclude/utils/SortedVector.h
nclude/utils/String16.h
nclude/utils/String8.h
nclude/utils/TypeHelpers.h
nclude/utils/Vector.h
a19d2c7e3bf4aadad064163029bccf3f03c300cb 13-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Added rules to build f/n/libs/utils in 64-bit: lib64utils.a

It's 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: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
ibs/utils/Android.mk
59322a36c610199417015bc4e58fa94bfc2febbc 09-Mar-2012 Jeff Brown <jeffbrown@google.com> Expose the set of enabled tags.

This is used by the Java trace wrappers to avoid JNI overhead
when trace tags are disabled.

Also added a new tag for the input subsystem and view hierarchy.

Change-Id: Ia04a507e42a37b1d3bbb19859e6c07a92f4fe9aa
nclude/utils/Trace.h
ibs/utils/Trace.cpp
f03fd0a87057558110019e80676279ef69859804 01-Mar-2012 Andreas Huber <andih@google.com> Instead of hardcoding OMX component names in our code, support

a config file instead.

Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
nclude/utils/Vector.h
24e57d5660a1f5daf37e36d449d31a342fbcb9cf 28-Feb-2012 Andrew Hsieh <andrewhsieh@google.com> Fixed several 64-bit porting issues

1. Use "%zu" instead of "%d" for size_t in printf
2. Variable precision specifier (eg. "%.*s") in printf should be of type int.
(iov_len is size_t which is 64-bit when compiled with -m64)
3. Use PRId64 instead of "%lld" to print variables of type int64_t

Change-Id: I2be40a6514b5dffa0038d62b9bccc3401b8756e6
ibs/utils/BlobCache.cpp
ibs/utils/Debug.cpp
ibs/utils/Static.cpp
ibs/utils/StopWatch.cpp
2bd99599bb9eef197e6d1ccacb9f808ebfbcc598 26-Feb-2012 Mathias Agopian <mathias@google.com> split utils/threads.h into multiple headers

AndroidDefs.h - C/C++ enums and types
Mutex.h - Mutex class declaration
Condition.h - Condition class declaration
RWLock.h - RWLock class declaration
Thread.h - Thread class declaration
AndroidThreads.h - low-level thread creation functions
threads.h - includes all the above for backward source compatibility

Change-Id: Ia2f80c175333b59a41d1720985810bb2346e94cb
Note: implementations are still in Threads.cpp
nclude/utils/AndroidThreads.h
nclude/utils/Condition.h
nclude/utils/Mutex.h
nclude/utils/RWLock.h
nclude/utils/Thread.h
nclude/utils/ThreadDefs.h
nclude/utils/threads.h
2ccfe1a0606f59b5cefd177f9dd5c837d0ea2d0b 23-Feb-2012 Jamie Gennis <jgennis@google.com> libutils: add a system-wide tracing utility

This change adds some utility functionality for doing userland tracing
into the kernel trace log.

Change-Id: Id0a8cee9ea515b1d8765afd1cecf472a88b4b9e8
nclude/utils/Trace.h
ibs/utils/Android.mk
ibs/utils/Trace.cpp
b11abadc247e5645832793f3ffff98fe9c6f8480 23-Feb-2012 Jamie Gennis <jgennis@google.com> Add the atrace utility.

This change adds a new system binary to help with capturing and dumping
kernel traces.

Change-Id: If2fc074480f822588a4c171312dc4c04fd305356
trace/Android.mk
trace/MODULE_LICENSE_APACHE2
trace/NOTICE
trace/atrace.c
eb63cf29dbd3b6cdffffcd7cf661e581bddb61d3 21-Feb-2012 Mathias Agopian <mathias@google.com> frameworks/base refactoring

create the new libandroidfw from parts of libui and libutils

Change-Id: I1584995616fff5d527a2aba63921b682a6194d58
ibs/utils/Android.mk
ibs/utils/Asset.cpp
ibs/utils/AssetDir.cpp
ibs/utils/AssetManager.cpp
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
ibs/utils/ObbFile.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/StreamingZipInflater.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/ObbFile_test.cpp
ibs/utils/tests/ZipFileRO_test.cpp
6c865b58aabe34d2fdcac6ce66a4a0db1e1196f5 19-Feb-2012 Al Sutton <al@funkyandroid.com> Xcode 4.3 compatibility checkin

The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant
bases of class templates to be qualified. This checkin fixes the issues
raised by the compiler by implementing the this-> recommendation from
the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases

Signed-off-by: Al Sutton <al@funkyandroid.com>
nclude/utils/KeyedVector.h
c2b7fb1f9118c1b9c1b9ac2d872dd0fb06ea6502 18-Feb-2012 Mathias Agopian <mathias@google.com> frameworks/base refactoring.

step 2: move libutils headers to their new home: androidfw

Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
nclude/utils/Asset.h
nclude/utils/AssetDir.h
nclude/utils/AssetManager.h
nclude/utils/BackupHelpers.h
nclude/utils/ObbFile.h
nclude/utils/ResourceTypes.h
nclude/utils/StreamingZipInflater.h
nclude/utils/ZipFileCRO.h
nclude/utils/ZipFileRO.h
nclude/utils/ZipUtils.h
ibs/utils/Asset.cpp
ibs/utils/AssetDir.cpp
ibs/utils/AssetManager.cpp
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
ibs/utils/ObbFile.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/StreamingZipInflater.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/tests/ObbFile_test.cpp
ibs/utils/tests/ZipFileRO_test.cpp
f21c255fde25e8ffcab62760716009e7182a6510 17-Feb-2012 Iliyan Malchev <malchev@google.com> libs/utils: replace malloc() + memset() to zero with calloc()

Change-Id: I8bdf4360147e51e35c162856c9a859aed6acac34
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibs/utils/BackupHelpers.cpp
ibs/utils/ResourceTypes.cpp
73e263e5d698fdd267168dff497e1f5facb9348d 19-Jan-2012 Glenn Kasten <gkasten@google.com> Update comments

We no longer put the filename at start of file.

Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
nclude/utils/KeyedVector.h
5db7269c89b546e57cfc6715405004c2416a264e 13-Feb-2012 Ramanan Rajeswaran <ramanan@google.com> DO NOT MERGE

Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
nclude/utils/ResourceTypes.h
413022bc90a4248a6947fbb5a3cbee26a42cec31 26-Jan-2012 Dianne Hackborn <hackbod@google.com> Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
nclude/utils/ResourceTypes.h
81beedda90443e42692d6842169ab953c227902a 13-Feb-2012 Ramanan Rajeswaran <ramanan@google.com> DO NOT MERGE

Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
nclude/utils/ResourceTypes.h
78eb46c8e8776278b16ea0cef460884685b852b4 31-Jan-2012 Dianne Hackborn <hackbod@google.com> aapt now sorts the strings in the resource string pool.

In our current environment with very many translations, this can
save a lot of RAM -- for example over 200K in Gmail just by sorting
the strings in the Gmail .apk (not the framework).

Also add a new aapt command to print the contents of the resource
table string pool.

Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
e956c5c1973e574e5ac2f90a905d773fb398b1e2 26-Jan-2012 Dianne Hackborn <hackbod@google.com> Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
nclude/utils/ResourceTypes.h
d731f07cc9ca7e8fc327c7910de7bea7e22c2fd3 12-Jul-2011 Glenn Kasten <gkasten@google.com> Thread::getTid returns pid_t gettid() after run

This is needed when the parent or any other thread besides the child
needs access to the child's kernel tid.

Change-Id: Ib148505913eb78314cfd76657c30d7b20663dffd
nclude/utils/threads.h
ibs/utils/Android.mk
ibs/utils/Threads.cpp
4cc144c4fbbcef72b1af3ec3ea86356790397025 13-Jan-2012 Evgeniy Stepanov <eugenis@google.com> Fix compilation with Clang.

warning: extraneous template parameter list in template specialization
template<>

Change-Id: If3e3e1d06a018343b40ac0984dfd9ecc12629f8d
nclude/utils/TypeHelpers.h
ae07445e9793724324b93bb593fe20be2a386707 09-Jan-2012 Steve Block <steveblock@google.com> Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE

See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
ibs/utils/RefBase.cpp
ibs/utils/String16.cpp
ibs/utils/String8.cpp
ibs/utils/VectorImpl.cpp
1b781ab0e0e8d59a7a8d1140bf6dee96a48a160c 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
nclude/utils/GenerationCache.h
ibs/utils/Asset.cpp
ibs/utils/AssetManager.cpp
ibs/utils/BackupHelpers.cpp
ibs/utils/BlobCache.cpp
ibs/utils/FileMap.cpp
ibs/utils/Looper.cpp
ibs/utils/PropertyMap.cpp
ibs/utils/RefBase.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/StreamingZipInflater.cpp
ibs/utils/Threads.cpp
ibs/utils/Tokenizer.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
61d341b8d3d771f4ef3dd54df0502b19b7a2ab4d 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
ibs/utils/Asset.cpp
ibs/utils/AssetManager.cpp
ibs/utils/BackupHelpers.cpp
ibs/utils/BlobCache.cpp
ibs/utils/FileMap.cpp
ibs/utils/Looper.cpp
ibs/utils/ObbFile.cpp
ibs/utils/PropertyMap.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/SystemClock.cpp
ibs/utils/Threads.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
a1d3391b1ec04dece202baf288f1741006afa552 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
nclude/utils/ResourceTypes.h
ibs/utils/Asset.cpp
ibs/utils/AssetManager.cpp
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
ibs/utils/ObbFile.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/Static.cpp
ibs/utils/ZipFileRO.cpp
eb0953307ce75cec031aedbf21abff08e5a737e5 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
ibs/utils/Asset.cpp
ibs/utils/AssetManager.cpp
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
ibs/utils/CallStack.cpp
ibs/utils/FileMap.cpp
ibs/utils/Looper.cpp
ibs/utils/PropertyMap.cpp
ibs/utils/RefBase.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/StopWatch.cpp
ibs/utils/SystemClock.cpp
ibs/utils/Tokenizer.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/tests/BasicHashtable_test.cpp
53ddace1a585c0515ea1c2e2091c4a8cd3a94864 15-Dec-2011 Joe Onorato <joeo@google.com> Add a new ui mode for "appliance"

The idea is that this is a device which is more-or-less headless. It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.

Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f
nclude/utils/ResourceTypes.h
587042dfa3544f2c4925724f91d87a2f31a72b9d 09-Dec-2011 Romain Guy <romainguy@google.com> GenerationCache::get would return a random value instead of NULL
Bug #5401917

This was causing a ton of random crashes in apps.

Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e
nclude/utils/GenerationCache.h
142dbcd817ac7960061735e5e7ea174e0938fb09 24-Nov-2011 Jeff Brown <jeffbrown@google.com> Use sized integer typedefs in hash_type specializations.

Change-Id: I3f9e004db2f3be1cb43a885c3ae142f251fd6845
nclude/utils/TypeHelpers.h
e735f23018b398f45bd052b63616d7a45e29515b 15-Nov-2011 Jeff Brown <jeffbrown@google.com> Add a basic hashtable data structure, with tests!

The basic hashtable is intended to be used to support a variety
of different datastructures such as map, set, multimap,
multiset, linkedmap, generationcache, etc.

Consequently its interface is fairly primitive.

The basic hashtable supports copy-on-write style functionality
using SharedBuffer.

The change introduces a simple generic function in TypeHelpers for
specifying hash functions. The idea is to add template
specializations of hash_type<T> next to the relevant data structures
such as String8, String16, sp<T>, etc.

Change-Id: I2c479229e9d4527b4fbfe3b8b04776a2fd32c973
nclude/utils/BasicHashtable.h
nclude/utils/TypeHelpers.h
ibs/utils/Android.mk
ibs/utils/BasicHashtable.cpp
ibs/utils/primes.py
ibs/utils/tests/Android.mk
ibs/utils/tests/BasicHashtable_test.cpp
11189f5f797ef29ee670ab4683f97c2cfc109899 22-Nov-2011 Jeff Brown <jeffbrown@google.com> Use libcorkscrew to format the stack trace.

Change-Id: I3a5439ada76bc77c2dd491eaed2272e16a811cc7
ibs/utils/CallStack.cpp
f36821289cfa4a1924be4c0800f0e1ac29241c0a 12-Nov-2011 Jeff Brown <jeffbrown@google.com> Clean up GenerationCache.

Use const references to keys and values where appropriate to avoid
copying them unnecessarily.

Deleted some dead code.

Simplified a few pieces that were doing unnecessary redundant work.

Change-Id: Ib2145b7094a40db2d679e05dafe050fe1e87b846
nclude/utils/GenerationCache.h
e7f371657255d0b407d375a3342d4fea3cf3cfa1 04-Nov-2011 Jeff Brown <jeffbrown@google.com> Slight change to the unwinder API.

Change-Id: I5424de76a21b74842e004e0281936b3f492d3c7a
ibs/utils/CallStack.cpp
7451bb44100d9d4915c3c4e4366ab92213947b4b 13-May-2011 Jamie Gennis <jgennis@google.com> BlobCache: implement cache serialization

This change adds serialization and deserialization functionality to
BlobCache, conforming to the Flattenable interface.

Change-Id: Ibc99cb1c3d015f363d57d0713eabccec07ff975e
nclude/utils/BlobCache.h
ibs/utils/BlobCache.cpp
ibs/utils/tests/BlobCache_test.cpp
90f43dce840b2a815426b6bfcdbe5f92358ab956 31-Oct-2011 Jamie Gennis <jgennis@google.com> BlobCache: remove the mutex locking

This change removes the mutex from the BlobCache class. The caller must
be responsible for thread synchronization in order to properly implement
the Flattenable interface, which is coming soon. Otherwise would be the
potential for the cache contents to change between the call to the
getFlattenedSize and flatten methods. Because the caller must do this
synchronization anyway there's no reason to also some synchronization
inside BlobCache.

Change-Id: Ie1f4f6f82b78744f46a41ce863cac0cad276a20e
nclude/utils/BlobCache.h
ibs/utils/BlobCache.cpp
b37fbe9f810545bf62468fea5958325caa3635be 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
ibs/utils/Asset.cpp
ibs/utils/AssetManager.cpp
ibs/utils/BlobCache.cpp
ibs/utils/FileMap.cpp
ibs/utils/RefBase.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/StreamingZipInflater.cpp
ibs/utils/VectorImpl.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
8b4cf779b29144d6d469afb4daabcbf069725db2 12-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/141576

Bug: 5449033
Change-Id: I42575e7c29cf1c0f465c357a5c97ab118df6f473
ibs/utils/Threads.cpp
ibs/utils/Timers.cpp
ea45b01f9bc2d1ef1f8d97ca0480336d23e0aa97 20-Oct-2011 Jeff Brown <jeffbrown@google.com> Use libcorkscrew for stack unwinding.

Change-Id: Iee1ee5a2018ab8cfc1ce12ec2a124809245eaa02
nclude/utils/CallStack.h
ibs/utils/Android.mk
ibs/utils/CallStack.cpp
26ad34522e85b4427ec0ae662dd43eb78a2c5f95 20-Oct-2011 Iliyan Malchev <malchev@google.com> add -ldl to host executables

This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.

Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibs/utils/Android.mk
5cd324794ccadfefcdcde849fb6d682622773944 12-Oct-2011 Romain Guy <romainguy@google.com> Reduce the size of libhwui by 50%

This change removes unnessary symbols. All symbols are hidden by
default, public APIs with exported symbols are explicitly marked
with ANDROID_API.

Change-Id: I692fde432a86c12108de1cfd1f6504919a7d5f3f
nclude/utils/Singleton.h
aa983c91caf848b9659599336a4156c28a125fa9 07-Oct-2011 Jeff Brown <jeffbrown@google.com> Fix regression in CursorWindow.copyStingToBuffer.
Bug: 5332296

Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
nclude/utils/Unicode.h
ibs/utils/Unicode.cpp
6c31a2fb6080049e444b4aac71b037eccd0d3ddc 29-Sep-2011 Dianne Hackborn <hackbod@google.com> Add mechanism for Parcel to not allow FDs to be written to it.

This is to help implement issue #5224703.

Change-Id: I026a5890495537d15b57fe61227a640aac806d46
nclude/utils/Errors.h
9c63a80f1f39fb969ec439e6b51614abb883d370 29-Sep-2011 Mathias Agopian <mathias@google.com> may fix the build

Change-Id: I065b1e6652f0e800ba5674a6d9aa954c3ac6c790
ibs/utils/Android.mk
7b4ce614cf350e08680a71712c00dc152c3fa6cc 16-Sep-2011 Andreas Huber <andih@google.com> Fix androidGetThreadPriority for non-pthread configurations.

related-to-build

Change-Id: Ic865af0865906f96fd615a56a030c8e3adaf13c4
ibs/utils/Threads.cpp
8ddbed9efdd879cee3553d7be2f534dc76c191d2 15-Sep-2011 Andreas Huber <andih@google.com> A new API "androidGetThreadPriority"

Change-Id: I6baeead8c70460863343fd557250635fb1e6a170
nclude/utils/threads.h
ibs/utils/Threads.cpp
f71114b6a4e350d389c6cdd314a4cbb970c71f5b 31-Aug-2011 Andy McFadden <fadden@android.com> Resurrect verbose binder logging

Updated the command name lists, and masked off the additional bits in
the command word when doing the name lookup.

Made descriptor values easier to grep for and consistent with kernel
output (i.e. decimal rather than hex). Attempt to show transaction
descriptors as such (they're in a union with a pointer).

Also, the writeLines() function in Static was using a no-op
logging call to write an iovec. It looks like all callers are using
N=1, so I just added a log for the first string.

Bug 5155269

Change-Id: I417b8d77da3eb6ee1d2069ba94047210f75738bc
ibs/utils/Static.cpp
9ee3fc4dc3219bc68f2efdffa38d6dfc158d8961 17-Aug-2011 Josiah Gaskin <josiahgaskin@google.com> Fix String16 operator+ to actually work

This change fixes the String16 utility's operator+ function.

Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
nclude/utils/String16.h
ad09965050f8226fda6f5238db060ce65abaa71c 11-Aug-2011 Mathias Agopian <mathias@google.com> fix a memory leak and memory corruption in RefBase

we would leak a weakref_impl if a RefBase was never incWeak()'ed.
there was also a dangling pointer that would cause memory corruption
and double-delete when a custom destroyer was used to delay the
execution of ~RefBase.

it turns out that the custom destroyer feature caused most of the
problems, so it's now gone. The only client was SurfaceFlinger
who now handles things on its own.

RefBase is essentially back its "gingerbread" state, but the
code was slightly cleaned-up.

Bug: 5151207, 5084978
Change-Id: Id6ef1d707f96d96366f75068f77b30e0ce2722a5
nclude/utils/RefBase.h
ibs/utils/RefBase.cpp
c3a5225d4ec0e98ca671ada8cba17878c656e3d5 10-Aug-2011 Mathias Agopian <mathias@google.com> Fix typos and use new HAL_PRIORITY_URGENT_DISPLAY constant

Change-Id: I703f8a96dd0dfec427e74363ad95729bfefc95c7
nclude/utils/threads.h
4ccb2fc8e129236f2832fc18b1ba0f8bbac5abbc 28-Jul-2011 Jeff Brown <jeffbrown@google.com> Refactor input reader to add stylus support.
Bug: 5064702

Introduced the concept of an InputListener to further decouple
the InputReader from the InputDispatcher. The InputListener
exposes just the minimum interface that the InputReader needs
to communicate with the outside world. The InputReader
passes arguments to the InputListener by reference, which makes
it easy to queue them up.

Consolidated all of the InputReader locks into one simple global
Mutex. The reason this wasn't done before was due to potential
re-entrance in outbound calls to the InputDispatcher. To fix this,
the InputReader now queues up all of the events it wants to send
using a QueuedInputListener, then flushes them outside of the
critical section after all of the event processing is finished.
Removing all of the InputMapper locks greatly simplifies the
implementation.

Added tests for new stylus features such as buttons, tool types,
and hovering.

Added some helpers to BitSet32 to handle common code patterns
like finding the first marked bit and clearing it.

Fixed a bug in VelocityTracker where the wrong pointer trace
could get cleared when handling ACTION_POINTER_DOWN. Oops.

Changed PointerCoords so it no longer stores useless zero
axis values. Removed editAxisValue because it is not very
useful when all zero value axes are absent and therefore
cannot be edited in place.

Added dispatch of stylus hover events.

Added support for distance and tool types.

Change-Id: I4cf14d134fcb1db7d10be5f2af7b37deef8f8468
nclude/utils/BitSet.h
88761b2796cf7b57be99d8141dae4a7e78ab5494 12-Jul-2011 Kenny Root <kroot@google.com> Move extract native libraries to JNI code

The built-in ZipFile class was quite a long time to find an unpack
libraries. Move everything to using the libutils ZipFileRO class that
goes quite a bit faster. Initial measurements are 6 times faster than
the Java code.

Also, read files off the disk and compare their CRC against the APK's
CRC to see if we need to write the new file to disk. This also cuts down
the bootup time by up to a second per APK that has native files.

Change-Id: Ic464a7969a17368fb6a6b81d026888c4136c7603
nclude/utils/ZipFileRO.h
ibs/utils/tests/Android.mk
ibs/utils/tests/ZipFileRO_test.cpp
7e01e60e5ee3f833d3017b575d5c449a5068148b 21-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove unimplemented memory pool.

dlmalloc does such a great job that we don't need a pool anyways.

Change-Id: I105b28c4a5c491543959190c7c0a9de75a5b8052
nclude/utils/Pool.h
ibs/utils/Android.mk
ibs/utils/Pool.cpp
d8734d19ec3a24f62b5c61af0dd20ec19dc145ec 14-Jul-2011 Le-Chun Wu <lcwu@google.com> Add a call to pthread_attr_destroy to avoid potential memory leaks.

Change-Id: Ib57efc3530e9793298190cc9cab19c9af54e11a7
ibs/utils/Threads.cpp
bbbd761de125b50ac83047bccb0b6e0e32ce74a1 14-Jul-2011 Jeff Brown <jeffbrown@google.com> Minor code cleanups in vector.

Fixed a potential bug where calling replaceAt with a reference to
an existing element in the vector at the same index would cause
the element to be destroyed while being copied to itself.

Refactored the conditions in _grow and _shrink for clarity.
The computations are exactly the same but I think it reads better
this way. In particular, the ssize_t variable 's' is gone: it didn't
need to be signed anyways because its value could never be negative.

Change-Id: If087841c15e6a87160eee874720c4a77eb0e99a6
ibs/utils/VectorImpl.cpp
aa5daede6a9e72f7611b19aa4e580a98878e6825 14-Jul-2011 Jeff Brown <jeffbrown@google.com> Replace Vector _grow/_shrink checks with assert.

On review of the code, _grow and _shrink are checking for conditions
that cannot happen and that don't even really make sense. For
example, if _shrink is called with where + amount > mCount then
this is really bad, however the check only considered the case
when where >= mCount and then it would arbitrarily choose a new
value for where. Huh?

As it happens, the callers are correctly validating the
arguments before passing them down to these methods so we can
get rid of this code.

Change-Id: I921852dba8997065bb0e9cac733e82028d14afcd
ibs/utils/VectorImpl.cpp
8c79cc91e4962339a4680fd5cfdb94fcd7e022f6 11-Jul-2011 Christopher Tate <ctate@google.com> Compress the backup output stream

Zlib compression, with a full flush between each application's
data. Encryption will be performed on the already-compressed data
once that's implemented.

On restore, the streamed data is similarly uncompressed on the fly.

Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
ibs/utils/BackupHelpers.cpp
37ba34b48775afb4bfe8d472b3ddd7632f8338da 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
ibs/utils/Android.mk
ibs/utils/tests/Android.mk
266a7d6223c90dd9707304f581d5e6c340335604 12-Jul-2011 Mathias Agopian <mathias@google.com> Fix typo in an assert's log

Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
ibs/utils/VectorImpl.cpp
6fbe0a86a8bb9da0ff879c3d237c2637eb0d5a8d 23-Jun-2011 Glenn Kasten <gkasten@google.com> Add C++ thread API androidGetThreadSchedulingGroup

This API is intended for applications that need to read a thread's
scheduling group, while using the higher-level (C++) family of thread APIs.

Change-Id: I5e58017f74c3989b20b5b1cc2bc4483c95720520
nclude/utils/threads.h
ibs/utils/Threads.cpp
82e14f67803d3457b639a8aea772a6490b34165c 02-Jul-2011 Jeff Brown <jeffbrown@google.com> Workaround apps that make assumptions about pointer ids.

Modified the touch input mapper to assign pointer ids sequentially
starting from 0 instead of using the tracking id or slot index
supplied by the driver. Applications should not depend on this
ordering but some do. (sigh)

Bug: 4980884
Change-Id: I0dfeb3ac27c57a7102a13c960c760e2a02eb7669
nclude/utils/BitSet.h
320a2b410329998a60d754171e06f872aa9c0467 29-Jun-2011 Mathias Agopian <mathias@google.com> SF transactions are now O(1) wrt IPC instead of O(N).

Change-Id: I57669852cbf6aabae244ea86940a08a5a27ffc43
nclude/utils/SortedVector.h
nclude/utils/Vector.h
b86c8e4e55c860a6a7e1009fda2a4803da45b412 29-Jun-2011 Jason Simmons <jsimmons@google.com> Add a linear transform library to libutils

Change-Id: Icdec5a6bebd9d8f24b3f335f8ec8b09a5810a774
nclude/utils/LinearTransform.h
ibs/utils/Android.mk
ibs/utils/LinearTransform.cpp
9d05973685fc6ebe8e2878597128c41a61e149f9 25-Jun-2011 Christopher Tate <ctate@google.com> Fix settings restore

Also correct the debug-mode logging of error locations in backup data.
Bug 4914182

Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
ibs/utils/BackupData.cpp
6839e8e9ee894191e3fa857859311337357fe191 23-Jun-2011 Glenn Kasten <gkasten@google.com> Add Thread::join

This new API will be used by applications that previously used the
lower-level pthread APIs (including pthread_join). Centralizing on the
Thread class instead of pthread will permit additional functionality to
be added later in only one location.

Change-Id: I8460169ac9c61ac9f85752405ed54c94651058d7
nclude/utils/threads.h
ibs/utils/Threads.cpp
5e0243f4d6313419fdc3affc205b790a2a965208 23-Jun-2011 Glenn Kasten <gkasten@google.com> Thread ID zero for androidSetThreadSchedulingGroup

Already implemented by androidSetThreadPriority but not documented

Change-Id: I85302b17092952065f3f3a4214d8d8abdd465dbd
nclude/utils/threads.h
ibs/utils/Threads.cpp
7f57eac6a706b471f2dcadd15868797ea081306a 17-Jun-2011 Mathias Agopian <mathias@google.com> Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)

Also revert all dependent changes:
This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b.

Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
nclude/utils/RefBase.h
967ad860da30d09c2003274389cb53abe165b6cc 16-Jun-2011 Kenny Root <kroot@google.com> Use rand() for MinGW

The version of MinGW we use doesn't have nrand48() which is really lame,
but we need to use libutils in the Windows SDK.

Change-Id: If854c03dbf02bc29e79f49e4539f08c2bf057517
nclude/utils/BlobCache.h
ibs/utils/BlobCache.cpp
9c8fa9ed4111c69c82ace01c8a7ac3beeacdce78 16-Jun-2011 Mathias Agopian <mathias@google.com> revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)

This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e.

Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
nclude/utils/RefBase.h
ibs/utils/RefBase.cpp
267ba69c2e4ae39b9fe98d4be592c7b59e7e57a1 16-Jun-2011 Mathias Agopian <mathias@google.com> Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"

This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16.

Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
nclude/utils/RefBase.h
ibs/utils/RefBase.cpp
dace0b45d00814dda275d81b82c1673dd88cf3e9 16-Jun-2011 Mathias Agopian <mathias@google.com> revert surfaceflinger leak fix as it uncovered a crasher on xoom

Bug: 4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
nclude/utils/RefBase.h
ibs/utils/RefBase.cpp
0151ac8945216bb6c7ae23b6a7e449e5ede8a69c 14-Jun-2011 Mathias Agopian <mathias@google.com> may fix build on some version of gcc

Change-Id: Ia88787c0432ec84d51fe505fd6a2b6f98ebe8f33
nclude/utils/RefBase.h
47f48572db6a5b4b1b890f93f07ff2bd7c7dc95c 14-Jun-2011 Glenn Kasten <gkasten@google.com> Bug 4608375

Update priority and policy together for audio threads

Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
ibs/utils/Threads.cpp
9b6259aa579291deb7334a968bd30878a5fec386 13-Jun-2011 Mathias Agopian <mathias@google.com> fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)

Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
nclude/utils/RefBase.h
ibs/utils/RefBase.cpp
a538e268e653d8fa1ea27659f507bc0ce5ceead0 02-Jun-2011 Glenn Kasten <gkasten@google.com> Remove redundant memory barrier

pthread_create already includes the necessary memory barriers:
- parent at pthread_create : pthread_mutex_unlock(start_mutex)
- child at __thread_entry : pthread_mutex_lock(start_mutex)

Add lock around uses of mThread.

Added comments:
- uses of mThread require lock
- androidCreateRawThreadEtc returned ID is not safe for direct use from non-parent threads.

Change-Id: I18cb296b41ddaf64cf127b57aab31154319b5970
nclude/utils/threads.h
ibs/utils/Threads.cpp
bf7a884f22299ad424e350c497248bf6cdcd6467 09-Jun-2011 Dianne Hackborn <hackbod@google.com> Enforce public resource restriction on bag parents.

Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
384f13a078cd6ac36b4c15be732036cdfb572ca8 09-Jun-2011 Christopher Tate <ctate@google.com> Fix handling of directory entries

Don't emit tar blocks for directories with an invalid nonzero size. Also, if
such an entry is encountered during restore, don't actually attempt to treat
it as valid and thus skip over the next actual tar entry.

This patch also adds tracking of the data actually consumed during restore,
and reports a total at the end of stream.

Change-Id: I625173f76df3c007e899209101ff2b587841f184
ibs/utils/BackupHelpers.cpp
f90c1e290acc7e5b68fcf6bf1fd7c9ea5136dd89 07-Jun-2011 Dianne Hackborn <hackbod@google.com> Work on issue #4518815: Compatibility mode introduces compatibility regression...

...for Market App iRunner

There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components. This addresses everything
I could find.

Unfortunately it does *not* fix this particular app. I am starting to think this
is just an issue in the app. This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.

Also a few changes here and there to get rid of $#*&^!! debug logs.

Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
ibs/utils/StreamingZipInflater.cpp
4571143fd31f03a63e7d251b28bb58f2c8b584e0 09-Jun-2011 Mathias Agopian <mathias@google.com> Fix a leak in RefBase (DO NOT MERGE)

this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
ibs/utils/RefBase.cpp
7c9f673ed619f0054dc6de45ac9c9396112c30d4 07-Jun-2011 Christopher Tate <ctate@google.com> Fix embedded spaces in tar stream EVEN HARDER

Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
ibs/utils/BackupHelpers.cpp
9ac51b0991a2a9f00f3b452eec805873781463cd 03-Jun-2011 Christopher Tate <ctate@google.com> Implement shared-storage full backup/restore

Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes. This is an approximation
of "internal + the external card". This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.

Also fixed a bug in the handling of files/dirs with spaces in
their names.

Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
ibs/utils/BackupHelpers.cpp
8deb51e8e492219c72b5f143868958af2ad56459 19-May-2011 Christopher Tate <ctate@google.com> Restore from a previous full backup's tarfile

Usage: adb restore [tarfilename]

Restores app data [and installs the apps if necessary from the backup
file] captured in a previous invocation of 'adb backup'. The user
must explicitly acknowledge the action on-device before it is allowed
to proceed; this prevents any "invisible" pushes of content from the
host to the device.

Known issues:

* The settings databases and wallpaper are saved/restored, but lots
of other system state is not yet captured in the full backup. This
means that for practical purposes this is usable for 3rd party
apps at present but not for full-system cloning/imaging.

Change-Id: I0c748b645845e7c9178e30bf142857861a64efd3
ibs/utils/BackupHelpers.cpp
2d57c038725fb59587600e0b74e1c9b4ad01c4ab 27-May-2011 Dianne Hackborn <hackbod@google.com> Add "tv" density for 720p screens.

Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
nclude/utils/ResourceTypes.h
4a8bf7977e7d3dbcd394a4f41948695343e14a5a 27-May-2011 Dianne Hackborn <hackbod@google.com> Small fixes and cleanup of resource config handling.

Change-Id: I402c31b68f2b4825cb4c610a65ee8e1da471c7bb
nclude/utils/ResourceTypes.h
19797e22ac241fe78a714e9159830de1a73e9e37 21-May-2011 Dianne Hackborn <hackbod@google.com> Add "television" mode.

Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
nclude/utils/ResourceTypes.h
2be848de6b7041da7f335a1053cbfbf841a5d1e3 20-May-2011 Mathias Agopian <mathias@google.com> Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default

Change-Id: Ifb2069e095dba57b7d97e9f2d942fd85fa975f58
ibs/utils/RefBase.cpp
d781137601c05b623305592fbbe7b2d7d69087dd 20-May-2011 Mathias Agopian <mathias@google.com> RefBase subclasses can now decide how they want to be destroyed.

This adds a destroy() virtual on RefBase which
sublasses can implement. destroy() is called
in lieu of the destructor whenthe last strong
ref goes away.
nclude/utils/RefBase.h
ibs/utils/RefBase.cpp
23138b63df8788333f09a468cce36fd76d562577 20-May-2011 Dianne Hackborn <hackbod@google.com> Add new "-swNNNdp" resource qualifier.

Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
b0ce850fac6b14a54990b98b3ac0b34bd2416653 19-May-2011 Mårten Kongstad <marten.kongstad@sonyericsson.com> Continue idmap generation even if name lookup fails.

In resources.arsc files, a resource is represented by a specification
block and one or more value blocks. In rare cases, a resource name
is also given a new resource ID, a specification block and no values
blocks. This commit ensures idmap generation does not fail if such an
entry is encountered.

Change-Id: I32302a0b07a7a320b7eeb31886931be3bb7b7e9a
ibs/utils/ResourceTypes.cpp
1a20993c1000da3f008b34b7a5e6dbbd6fe291a6 29-Apr-2011 Jamie Gennis <jgennis@google.com> libutils: add a binary blob cache implementation.

This change adds an implementation of a cache that stores key/value
pairs of unstructured binary blobs.

Change-Id: Idd01fdabedfa3aed6d359a6efb0592967af52651
nclude/utils/BlobCache.h
ibs/utils/Android.mk
ibs/utils/BlobCache.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/BlobCache_test.cpp
cd122333c9c45b531004f33f0cc9e059a0cd9d1e 14-May-2011 Christopher Tate <ctate@google.com> Full backup tweaks

* provide placeholder UI showing backup/restore start/stop/timeout
* don't kill the progress UI in mid stream
* tidy up the pax extended header data writing a little

Change-Id: Ife0cb78e3facb541d8327f1d5ca5fe77faa6cbca
ibs/utils/BackupHelpers.cpp
fc5e703bce2a2998985ed487b168fe5477c9d360 13-May-2011 Christopher Tate <ctate@google.com> Use pax extended tar format to support long filenames etc.

'tar' supports only 100-character paths; 'ustar' supports only
155+100 character prefix + paths; neither supports files larger
than about 8 gigabytes. We now use the POSIX.1-2001 'pax'
extended tar format for those files in the backup stream that
are too large or have too-long paths for the 'ustar' format.

Change-Id: I2f256823091deaec9b1ccea685d2344753c6cb67
ibs/utils/BackupHelpers.cpp
424ec5a8aa268e56520ed0c099109f400ebc40be 01-Apr-2011 Christopher Tate <ctate@google.com> Full local backup infrastructure

This is the basic infrastructure for pulling a full(*) backup of the
device's data over an adb(**) connection to the local device. The
basic process consists of these interacting pieces:

1. The framework's BackupManagerService, which coordinates the
collection of app data and routing to the destination.

2. A new framework-provided BackupAgent implementation called
FullBackupAgent, which is instantiated in the target applications'
processes in turn, and knows how to emit a datastream that contains
all of the app's saved data files.

3. A new shell-level program called "bu" that is used to bridge from
adb to the framework's Backup Manager.

4. adb itself, which now knows how to use 'bu' to kick off a backup
operation and pull the resulting data stream to the desktop host.

5. A system-provided application that verifies with the user that
an attempted backup/restore operation is in fact expected and to
be allowed.

The full agent implementation is not used during normal operation of
the delta-based app-customized remote backup process. Instead it's
used during user-confirmed *full* backup of applications and all their
data to a local destination, e.g. via the adb connection.

The output format is 'tar'. This makes it very easy for the end
user to examine the resulting dataset, e.g. for purpose of extracting
files for debug purposes; as well as making it easy to contemplate
adding things like a direct gzip stage to the data pipeline during
backup/restore. It also makes it convenient to construct and maintain
synthetic backup datasets for testing purposes.

Within the tar format, certain artificial conventions are used.
All files are stored within top-level directories according to
their semantic origin:

apps/pkgname/a/ : Application .apk file itself
apps/pkgname/obb/: The application's associated .obb containers
apps/pkgname/f/ : The subtree rooted at the getFilesDir() location
apps/pkgname/db/ : The subtree rooted at the getDatabasePath() parent
apps/pkgname/sp/ : The subtree rooted at the getSharedPrefsFile() parent
apps/pkgname/r/ : Files stored relative to the root of the app's file tree
apps/pkgname/c/ : Reserved for the app's getCacheDir() tree; not stored.

For each package, the first entry in the tar stream is a file called
"_manifest", nominally rooted at apps/pkgname. This file contains some
metadata about the package whose data is stored in the archive.

The contents of shared storage can optionally be included in the tar
stream. It is placed in the synthetic location:

shared/...

uid/gid are ignored; app uids are assigned at install time, and the
app's data is handled from within its own execution environment, so
will automatically have the app's correct uid.

Forward-locked .apk files are never backed up. System-partition
.apk files are not backed up unless they have been overridden by a
post-factory upgrade, in which case the current .apk *is* backed up --
i.e. the .apk that matches the on-disk data. The manifest preceding
each application's portion of the tar stream provides version numbers
and signature blocks for version checking, as well as an indication
of whether the restore logic should expect to install the .apk before
extracting the data.

System packages can designate their own full backup agents. This is
to manage things like the settings provider which (a) cannot be shut
down on the fly in order to do a clean snapshot of their file trees,
and (b) manage data that is not only irrelevant but actively hostile
to non-identical devices -- CDMA telephony settings would seriously
mess up a GSM device if emplaced there blind, for example.

When a full backup or restore is initiated from adb, the system will
present a confirmation UI that the user must explicitly respond to
within a short [~ 30 seconds] timeout. This is to avoid the
possibility of malicious desktop-side software secretly grabbing a copy
of all the user's data for nefarious purposes.

(*) The backup is not strictly a full mirror. In particular, the
settings database is not cloned; it is handled the same way that
it is in cloud backup/restore. This is because some settings
are actively destructive if cloned onto a different (or
especially a different-model) device: telephony settings and
AndroidID are good examples of this.

(**) On the framework side it doesn't care that it's adb; it just
sends the tar stream to a file descriptor. This can easily be
retargeted around whatever transport we might decide to use
in the future.

KNOWN ISSUES:

* the security UI is desperately ugly; no proper designs have yet
been done for it
* restore is not yet implemented
* shared storage backup is not yet implemented
* symlinks aren't yet handled, though some infrastructure for
dealing with them has been put in place.

Change-Id: Ia8347611e23b398af36ea22c36dff0a276b1ce91
nclude/utils/BackupHelpers.h
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
90d59043de5bf940c23688d7e1c9feadd1a85ddb 05-May-2011 Mårten Kongstad <marten.kongstad@sonyericsson.com> Add missing clean-up of idmap file descriptors.

Change-Id: I9bdc9a4b7962f1a8dce77f4b213c8b9dc26e4b0f
ibs/utils/AssetManager.cpp
0897fe5eaa3a7ad9529ba059cf8b1a5375cb8940 29-Apr-2011 Romain Guy <romainguy@google.com> This file should not be here.

Change-Id: I0ccb41869303fa765ed13763bf17c7e0ee9f036e
enerationCache.h
58dc2c8101d273b5fa29ac182183c3508b35dfd7 26-Apr-2011 Mathias Agopian <mathias@google.com> fix typo in Vector<>:: push_back and push_front

parameter were inverted.

Change-Id: I867b01de5f58354bb9668fa662dd2a7d78dd3b37
nclude/utils/Vector.h
bc55d727f3c7a5c95cc7a458ea8309bcff29919b 26-Apr-2011 Mathias Agopian <mathias@google.com> Add some basic STL compatibility to Vector<>

Change-Id: Iaf72623170ee415372c7989d7ba9ff627167449e
nclude/utils/Vector.h
8bb27951f592713bcb2c0e6605d89da665131637 22-Apr-2011 Josh Stone <cuviper@gmail.com> libutils: Fix an improper const-cast in RefBase

Under Fedora 15 Beta, gcc 4.6.0 warns:

frameworks/base/libs/utils/RefBase.cpp: In member function
‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
‘const android::RefBase::weakref_impl’ as ‘this’ argument of
‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
discards qualifiers [-fpermissive]

trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.

Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
ibs/utils/RefBase.cpp
aa13c1b90e5d9cae064bb425dd094ccbd411e073 13-Apr-2011 Jeff Brown <jeffbrown@google.com> Initial checkin of spot presentation for touchpad gestures.

Added a new PointerIcon API (hidden for now) for loading
pointer icons.

Fixed a starvation problem in the native Looper's sendMessage
implementation which caused new messages to be posted ahead
of old messages sent with sendMessageDelayed.

Redesigned the touch pad gestures to be defined in terms of
more fluid finger / spot movements. The objective is to reinforce
the natural mapping between fingers and spots which means there
must not be any discontinuities in spot motion relative to
the fingers.

Removed the SpotController stub and folded its responsibilities
into PointerController.

Change-Id: I5126b1e69d95252fda7f2a684c9287e239a57163
ibs/utils/Looper.cpp
aa3a2c561323b7c68594b2079b9d4f02ca9178d0 31-Mar-2011 Dianne Hackborn <hackbod@google.com> Add new resource configurations for screen width/height in "dp".

You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
3145b384626d8ddb4ff7673a29fee322374c0131 17-Mar-2011 Mårten Kongstad <marten.kongstad@sonyericsson.com> Runtime resource overlay, iteration 1.

Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.

This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.

This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.

Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
nclude/utils/AssetManager.h
nclude/utils/ResourceTypes.h
ibs/utils/AssetManager.cpp
ibs/utils/README
ibs/utils/ResourceTypes.cpp
36357bd7a7941265dca9e1905aaad06ccc66593c 22-Mar-2011 Carl Shapiro <cshapiro@google.com> Include strings.h for the strcasecmp prototype.

Change-Id: I0659ce2186547274e58f8b2027e16d3e45189353
ibs/utils/AssetManager.cpp
43550eee5bfeaf7832487a2285ae86be0f7ce561 17-Mar-2011 Jeff Brown <jeffbrown@google.com> Refactor how timeouts are calculated.

Added a timeout mechanism to EventHub and InputReader so that
InputMappers can request timeouts to perform delayed processing of
input when needed.

Change-Id: Iec2045baaf4e67690b15eef3c09a58d5cac76897
nclude/utils/Timers.h
ibs/utils/Looper.cpp
ibs/utils/Timers.cpp
7c123375ffee76d6e15b611e8146c13bb67a8c9f 17-Mar-2011 Mathias Agopian <mathias@google.com> fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out

a memory corruption happned when the buffer pool was resized
(like when playing a video or using camera) and there was
no current active buffer. In this case, the faulty code
would index into an array at position -1 which corrupted
24 bytes of data.

also improved region validation code (ifdef'ed out by default)

Bug: 4093196
Change-Id: I915c581d131148959d720e00e3892e9186ab733d
nclude/utils/Vector.h
349626eb76ed2618e9a57e63d7acb4b28a85dae4 16-Mar-2011 Romain Guy <romainguy@google.com> Modify the GL renderer's functor to pass the clip to WebView

Change-Id: If5efe399ca58f3000b2883e24e9f3736a2025184
nclude/utils/Functor.h
5e35370a3bd941d8e797b9e9beb1b378e00157d5 15-Mar-2011 Jeff Brown <jeffbrown@google.com> Improve VelocityTracker numerical stability.

Replaced VelocityTracker with a faster and more accurate
native implementation. This avoids the duplicate maintenance
overhead of having two implementations.

The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation. This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.

The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.

The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces. The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.

Bug: 4086785
Change-Id: I2632321232c64d6b8faacdb929e33f60e64dcdd3
nclude/utils/BitSet.h
29d4d20c24fa94f2db71bd0edcbe4b64d59e4d6e 14-Mar-2011 Glenn Kasten <gkasten@google.com> Bug 4016329 do full string comparisons

Use full string comparisons instead of partial for
file extension and MIME type.
Do case-insensitive comparison of MIME type and file extensions.
Fix error in comment for String8::getPathExtension.
Remove dead code -- StringTokenizer is unused.

Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
nclude/utils/String8.h
9ae794de4685c080d92d8c2a09d195a0d71ae2a8 10-Mar-2011 Jeff Brown <jeffbrown@google.com> Use touch pad gestures to manipulate the pointer.

1. Single finger tap performs a click.
2. Single finger movement moves the pointer (hovers).
3. Button press plus movement performs click or drag.
While dragging, the pointer follows the finger that is moving
fastest. This is important if there are additional fingers
down on the touch pad for the purpose of applying force
to an integrated button underneath.
4. Two fingers near each other moving in the same direction
are coalesced as a swipe gesture under the pointer.
5. Two or more fingers moving in arbitrary directions are
transformed into touches in the vicinity of the pointer.
This makes scale/zoom and rotate gestures possible.

Added a native VelocityTracker implementation to enable intelligent
switching of the active pointer during drags.

Change-Id: I5ada57e7f2bdb9b0a791843eb354a8c706b365dc
nclude/utils/BitSet.h
b6e92ae9a12f2fe0106e0187c252f39d5ad6bfa9 08-Mar-2011 Romain Guy <romainguy@google.com> Add support for partial invalidates in WebView
Bug #3461349

This change also fixes two bugs that prevented partial invalidates
from working with other views. Both bugs were in our EGL implementation:
they were preventing the caller from comparing the current context/surface
with another context/surface. This was causing HardwareRenderer to always
redraw the entire screen.

Change-Id: I33e096b304d4a0b7e6c8f92930f71d2ece9bebf5
nclude/utils/Functor.h
3e2e38bc5bbf658eb9940f72974270b11c5b84e1 02-Mar-2011 Jeff Brown <jeffbrown@google.com> Fade out the mouse pointer after inactivity or other events.

Fades out the mouse pointer:
- after 15 seconds of inactivity normally
- after 3 seconds of inactivity in lights out mode
- after a non-modifier key down
- after a touch down

Extended the native Looper to support enqueuing time delayed
messages. This is used by the PointerController to control
pointer fade timing.

Change-Id: I87792fea7dbe2d9376c78cf354fe3189a484d9da
nclude/utils/Looper.h
ibs/utils/Looper.cpp
ibs/utils/tests/Looper_test.cpp
5a14f4a721fe052be8cfbfaf603c4d262edd686a 25-Feb-2011 Fabrice Di Meglio <fdimeglio@google.com> Add TextLayout Cache

- use GenerationCache for caching
- move GenerationCache.h from libs/hwui/utils to include/utils
- add #define for cache activation / deactivation

Change-Id: Ifaf519f0b5e33b087a453e4aa6430162d8438f20
enerationCache.h
nclude/utils/GenerationCache.h
7332f80db5b942253f69b9b2e6cc3ae08d957d0e 26-Feb-2011 Mathias Agopian <mathias@google.com> Fix sp<> conversion operator / constructor

some of the conversion operators were not using the proper
pointer type when calling incStrong/decStrong, usually it
has no bad consequences, but for some implementation
of the ref-counted object it could lead to recording the wrong
owner id.

Change-Id: If574b9069b8a4cf6e0911a992c8f095aba799995
nclude/utils/StrongPointer.h
ibs/utils/RefBase.cpp
3e0f87541f7871ffde51c722d54550774fe1b7c3 25-Feb-2011 Mathias Agopian <mathias@google.com> Fix a wp<> bug where the owner ID would be wrong

this was introduced recently. we make sure to use
the correct owner id (the sp) instead of the wp.

Change-Id: I78fdc6ec0c2d3e687278b70442d74d1924b512a2
nclude/utils/RefBase.h
nclude/utils/StrongPointer.h
b26ea8b30f11cf0ad11ac7983208514a1bfafb75 17-Feb-2011 Mathias Agopian <mathias@google.com> Fix some issues with RefBase debugging.

First slipt sp<> out of RefBase into StrongPointer.h so it can be reused
more easily and to make it clear that it doesn't require RefBase.

Note: the rest of the change only affects the system when DEBUG_REFS is enabled.

The main problem we fix here is that the owner id associated with each
reference could get out of date when a sp<> or wp<> was moved, for
instance when they're used in a Vector< >.

We fix this issue by calling into RefBase::moveReferences from
a template specialization for sp<TYPE> and wp<TYPE> of the
type helpers. RefBase::moveReferences() has then a chance to
update the owner ids.

There is a little bit of trickery to implement this generically in
RefBase, where we need to use a templatized functor that can turn
a sp<TYPE>* casted to a void* into a RefBase*.

Introduced a new debug option DEBUG_REFS_FATAL_SANITY_CHECKS
currently set to 0 by default as there seem to be an issue
with sp<ANativeWindow> which trips the sanity checks.

Change-Id: I4825b21c8ec47d4a0ef35d760760ae0c9cdfbd7f
nclude/utils/RefBase.h
nclude/utils/StrongPointer.h
nclude/utils/TypeHelpers.h
ibs/utils/RefBase.cpp
966a48f3e78e75c3a4f3a2f23b98e970f06bf983 01-Feb-2011 Glenn Kasten <gkasten@google.com> Bug 3362814 Fix SMP race in access to mRequestExit

Also fix an unlikely SMP race in access to mHoldSelf on entry to _threadLoop.

Change-Id: I6cbc0b94739c7dd5e77e8a5ba0da22cdc0b1a4db
nclude/utils/threads.h
ibs/utils/Threads.cpp
84a23fa4a9a2dca0f53fae2283b57fff988d1c74 17-Feb-2011 Mathias Agopian <mathias@google.com> Remove RefBase.h dependency on TextOutput.h

Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
nclude/utils/RefBase.h
ibs/utils/RefBase.cpp
dafff0bcc10fe1ff80e68a31793bbdea2ec8d0c3 16-Feb-2011 Kenny Root <kroot@google.com> Clean up use of HAVE_ANDROID_OS

HAVE_ANDROID_OS was defined as "1" for targets, but never defined as "0"
for non-targets. Changing them to #ifdef should be safe and matches
all the other uses of HAVE_ANDROID_OS throughout the system.

Change-Id: I82257325a8ae5e4e4371ddfc4dbf51cea8ea0abb
ibs/utils/SystemClock.cpp
ibs/utils/Threads.cpp
ff49de731f3361afc77abe9b60bc7c8e6708f886 10-Feb-2011 Mathias Agopian <mathias@google.com> fix [3408713] Dialog window invisible sometimes

weak pointer comparison operators were implemented wrong,
they were using the internal "unsafe" pointer. We could end up
with two "equal" weak pointer pointing to different objects.

this caused KeyedVector keyed by weak pointer to work incorrectly, in
turn causing a window that just got added to a list to be immediately
removed.

Change-Id: Ib191010c39aafa9229109e4211f6c3b2b2f9696d
nclude/utils/RefBase.h
da74bc06a8e5c5c102fa06b0c64cd5dc00efeb97 28-Jan-2011 Dianne Hackborn <hackbod@google.com> Fix issue #3392073: At times soft keyboard comes up in...

...gallery while attaching picture to gmail message

In various places we could block switching the IME target incorrectly.

Change-Id: I7e647fb35f4ea6f2e39eb7efd911420ea9ee64fa
ibs/utils/ResourceTypes.cpp
741cbc33820cb7c8891f3ed0eae820ec447e298d 26-Jan-2011 Ritu Srivastava <rsrivast@sta.samsung.com> fix failing thread object run

A previously exited Thread object refuses to run again, if the
thread-id of the caller, conincides with the thread-id it previously
used in the worker thread. Hence reset the previously used worker
thread-id to -1 when it exits.

Signed-off-by: Ritu Srivastava <rsrivast@sta.samsung.com>

Change-Id: I873925c312a43ec8a16392b98cc959042ff6bfd2

Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
ibs/utils/Threads.cpp
a25d2caf15c8f75f94f49807e749cde298b7f631 25-Jan-2011 Mike Lockwood <lockwood@android.com> Revert "libutils: Fix race condition in Thread::requestExitAndWait()"

This change turned out to be unnecessary

This reverts commit 4a7f412e1d932f46f6adf079df4d9ee7279bd795.
ibs/utils/Threads.cpp
ac61abe286a768445670a2d0e0cf99de0e697718 25-Jan-2011 Mike Lockwood <lockwood@android.com> libutils: Fix race condition in Thread::requestExitAndWait()

Hold a reference to the thread in requestExitAndWait() so the
condition variable it is waiting on will not be destroyed before
its wait() call returns.

Change-Id: If8b6cf84117203926a4180f43f0224469e92a500
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibs/utils/Threads.cpp
b90c51a7258966c0372a84ec2059fd1b03e2a782 10-Jan-2011 Chet Haase <chet@google.com> Use optimized display lists for all hwaccelerated rendering

Previously, display lists were used only if hardware acceleration
was enabled for an application (hardwareAccelerated=true) *and* if
setDrawingCacheEnabled(true) was called. This change makes the framework
use display lists for all views in an application if hardware acceleration
is enabled.

In addition, display list renderering has been optimized so that
any view's recreation of its own display list (which is necessary whenever
the visuals of that view change) will not cause any other display list
in its parent hierarchy to change. Instead, when there are any visual
changes in the hierarchy, only those views which need to have new
display list content will recreate their display lists.

This optimization works by caching display list references in each
parent display list (so the container of some child will refer to its
child's display list by a reference to the child's display list). Then when
a view needs to recreate its display list, it will do so inside the same
display list object. This will cause the content to get refreshed, but not
the reference to that content. Then when the view hierarchy is redrawn,
it will automatically pick up the new content from the old reference.

This optimization will not necessarily improve performance when applications
need to update the entire view hierarchy or redraw the entire screen, but it does
show significant improvements when redrawing only a portion of the screen,
especially when the regions that are not refreshed are complex and time-
consuming to redraw.

Change-Id: I68d21cac6a224a05703070ec85253220cb001eb4
nclude/utils/Functor.h
0e05bd908d19a863333ec88f9c38b78181e81781 14-Jan-2011 Eric Laurent <elaurent@google.com> Fix omission in NOTICE file.

Added copyright notice for audio effects source files under
media/libeffects/lvm.

Change-Id: I5ac961000f7bbbfa1f95523712d8517844b1e5f9
OTICE
0c3faa3ee2c9a69f55af2bbab2d1d7c281d98753 13-Jan-2011 Dan Morrill <morrildl@google.com> Adding ASL2 attribution for VisualOn.

Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
OTICE
fe2c46327ff4bf5639d1634261797456a06d6ac4 04-Jan-2011 Eric Laurent <elaurent@google.com> Fix issue 3302649.

The cause of the problem is that AudioTrack::start() can fail if it is called from a newly created
thread that has the same ID as the AudioTrack callback thread that has just been stopped and not yet exited.
This is possible as the thread ID used by the Thread class is not the TID.

The fix consists in clearing the thread ID before exiting the thread loop.

Change-Id: I66e679665c384403cb3ba2c31746f5de72d5836d
ibs/utils/Threads.cpp
b69f49bab9502ddb0850280f2aea12fb34475777 20-Dec-2010 Shachar Shemesh <lingnu@gmail.com> Normalize output from aapt d

Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed
regardless of the content of the strings.

Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
8659f0be9a7cac99d55f58601d68c0c6da55af7b 24-Dec-2010 Jeff Brown <jeffbrown@google.com> Add initial support for cursor-based pointing devices.

Some parts stubbed out but you can plug in a mouse and move
a green cursor around to interact with the UI.

Change-Id: I80d597a7f11d3bd92041890f74b3c77326975e6e
nclude/utils/PropertyMap.h
ibs/utils/PropertyMap.cpp
c974d4dbe00c46bb9f12e4802b47d4b41bc1fca6 11-Dec-2010 Mathias Agopian <mathias@google.com> dump callstack on Surface use error

Change-Id: I38e260dd47349b9af3a999dda683a083a94be16d
nclude/utils/CallStack.h
e2fa7dc58eaf34f30b89350d143d97fd4a501199 24-Nov-2010 Kenny Root <kroot@google.com> Change assets to use 64-bit API

The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.

There is a new utils/Compat.h added for Mac OS compatibility.

Also fixed some size-related compiler warnings.

Bug: 3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
nclude/utils/Asset.h
nclude/utils/Compat.h
nclude/utils/FileMap.h
nclude/utils/StreamingZipInflater.h
nclude/utils/ZipFileCRO.h
nclude/utils/ZipFileRO.h
ibs/utils/Android.mk
ibs/utils/Asset.cpp
ibs/utils/FileMap.cpp
ibs/utils/ObbFile.cpp
ibs/utils/StreamingZipInflater.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
1d618d63c1bb99728b5b0afe320f5a6afa95436c 02-Dec-2010 Jeff Brown <jeffbrown@google.com> Improve support for external keyboards.

Use Vendor ID, Product ID and optionally the Version to
locate keymaps and configuration files for external devices.

Moved virtual key definition parsing to native code so that
EventHub can identify touch screens with virtual keys and load
the appropriate key layout file.

Cleaned up a lot of old code in EventHub.

Fixed a regression in ViewRoot's fallback event handling.

Fixed a minor bug in FileMap that caused it to try to munmap
or close invalid handled when released if the attempt to map
the file failed.

Added a couple of new String8 conveniences for formatting strings.

Modified Tokenizer to fall back to open+read when mmap fails since
we can't mmap sysfs files as needed to open the virtual key
definition files in /sys/board_properties/.

Change-Id: I6ca5e5f9547619fd082ddac47e87ce185da69ee6
nclude/utils/String8.h
nclude/utils/Tokenizer.h
ibs/utils/FileMap.cpp
ibs/utils/String8.cpp
ibs/utils/Tokenizer.cpp
04cbbc1c47c68e805d2674d9fc702fc44385805f 30-Nov-2010 Jeff Brown <jeffbrown@google.com> Support non-orientation aware keyboards and other devices.

Fixed a bug with dpad keys on external keyboards being rotated
according to the display orientation by adding a new input device
configuration property called "keyboard.orientationAware".

Added a mechanism for overriding the key layout and key character
map in the input device configuration file using the new
"keyboard.layout" and "keyboard.characterMap" properties.

Also added "trackball.orientationAware", "touch.orientationAware" and
"touch.deviceType" configuration properties.

Rewrote the configuration property reading code in native code
so that it can be used by EventHub and other components.

Added basic support for installable idc, kl, and kcm files
in /data/system/devices. However, there is no provision for
copying files there yet.

Disabled long-press character pickers on full keyboards so that
key repeating works as expected.

Change-Id: I1bd9f0c3d344421db444e7d271eb09bc8bab4791
nclude/utils/PropertyMap.h
ibs/utils/Android.mk
ibs/utils/PropertyMap.cpp
d36ec3afdac0ca4158a786b96599ee8bdf64b043 19-Nov-2010 Jeff Brown <jeffbrown@google.com> Fix SDK build on Windows due to use of mmap.

Change-Id: Id4bd9a6f932285c93c5853e540efc20b99876564
nclude/utils/Tokenizer.h
ibs/utils/Tokenizer.cpp
647925ddf053989b641b4c5c8a51efd55c931f22 11-Nov-2010 Jeff Brown <jeffbrown@google.com> Added support for full PC-style keyboards.

BREAKING CHANGE: Redesigned the key character map format to
accomodate full keyboards with more comprehensive suite of modifiers.
Old key character maps will not work anymore and must be updated.
The new format is plain text only and it not compiled to a binary
file (so the "kcm" tool will be removed in a subsequent check-in).

Added FULL keyboard type to support full PC-style keyboards.

Added SPECIAL_FUNCTION keyboard type to support special function
keypads that do not have any printable keys suitable for typing
and only have keys like HOME and POWER

Added a special VIRTUAL_KEYBOARD device id convention that maps
to a virtual keyboard with a fixed known layout. This is designed
to work around issues injecting input events on devices whose
built-in keyboard does not have a useful key character map (ie.
when the built-in keyboard is a special function keyboard only.)

Modified several places where events were being synthesized
to use the virtual keyboard.

Removed support for the "qwerty" default layout.
The new default layout is "Generic". For the most part "qwerty"
was being used as a backstop in case the built-in keyboard did
not have a key character map (probably because it was a special
function keypad) and the framework needed to be able to inject
key events anyways. The latter issue is resolved by using the
special VIRTUAL_KEYBOARD device instead of BUILT_IN_KEYBOARD.

Added the concept of a key modifier behavior so that
MetaKeyKeyListener can distinguish between keyboards that use
chorded vs. toggled modifiers.

Wrote more robust key layout and key character map parsers
to enable support for new keyboard features and user installable
key maps.

Fixed a bug in InputReader generating key ups when keys
are released out of sequence.

Updated tons of documentation.

Currently QwertyKeyListener is being used for full keyboards
with autotext and capitalization disabled. This mostly works
but causes some problems with character pickers, etc.
These issues will be resolved in subsequent changes.

Change-Id: Ica48f6097a551141c215bc0d2c6f7b3fb634d354
nclude/utils/String8.h
nclude/utils/Tokenizer.h
ibs/utils/Android.mk
ibs/utils/String8.cpp
ibs/utils/Tokenizer.cpp
ba0165bef09729a33ab8e0ca329342be05e0d859 09-Nov-2010 Kenny Root <kroot@google.com> Split UTF functions from String8/16

Split out all the UTF-8/16/32 handling code from String8/16 to its own
file to allow better reuse of code.

Change-Id: If9ce63920edc75472c38da4adce0d13cda9ad2f7
nclude/utils/String16.h
nclude/utils/String8.h
nclude/utils/Unicode.h
ibs/utils/Android.mk
ibs/utils/ResourceTypes.cpp
ibs/utils/String16.cpp
ibs/utils/String8.cpp
ibs/utils/Unicode.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/Unicode_test.cpp
3a91fca00c6b3db62b4dc0da95ba30671caf3283 02-Nov-2010 Kenny Root <kroot@google.com> Fix default return code for getResource

Reorganization of getResource to allow for other densities accidentally
overrode the default return code for getResource from BAD_VALUE to
BAD_INDEX. This corrects the default return to BAD_VALUE which restores
other things to working.

Bug: 3155824
Change-Id: I13dafff85bc6978c5f5435fc09ab0474c7885c4d
ibs/utils/ResourceTypes.cpp
328f501eb99e5b2502deb909de4209cf2dbdecc8 28-Oct-2010 Kenny Root <kroot@google.com> Add path to get different DPI drawables

Allow a caller to request a different density than their current display
allows. This can mean a device displaying mdpi can get a resource that's
in hdpi and have it pretend to be in mdpi resolution. If a drawable
that's returned is not in the requested density, it will set it at the
appropriate density to be scaled up later on.

The API for this is hidden currently.

Bug: 3134688
Change-Id: I6c3908cbdef4907b8d3f1576df9e3b0e7af1755a
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
e76184c81fba004b2a72fd8b98baef2b15ff1779 22-Oct-2010 Kenny Root <kroot@google.com> Initialized check in ZipFileRO::findEntryByName

If a ZipFileRO object is uninitialized, the hash table will not have
been initialized. This condition wasn't checked in findEntryByName.

Bug: 3121109
Change-Id: Ib696e0e7e0cb4dd0fb2e456d6a847e5e8f4fe14e
ibs/utils/ZipFileRO.cpp
9d589aa0d63e1eb088b10f065ee7fb0765d2e285 21-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> Revert "Add length-equality test in String operator== checks."

This reverts commit e28210d401ae4ed1258b84c9b17a172a757190e8.
nclude/utils/String16.h
nclude/utils/String8.h
2881c85e38c662050e9635c6ff3861a3be09674f 20-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> Add length-equality test in String operator== checks.

Change-Id: I6ebc6ef85aac4539269f137c1f29f95b9828d4f9
nclude/utils/String16.h
nclude/utils/String8.h
935d1bba3bf92992fba9a8322fe7ca7a5fbffb39 19-Oct-2010 David Deephanphongs <dpanpong@google.com> Add missing NOTICE entries.

Add missing NOTICE block for TagSoup in general NOTICE file.
Add comment in Android.mk to help reviewers locate the NOTICE for apache-http.
Modify build rule for 'am' command to pull in the NOTICE file.

Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
OTICE
d85b55697218655763eb644e677504e6cc66b5a2 19-Oct-2010 Joe Onorato <joeo@google.com> Reduce logging.

Remember, the system and main logs are
- Shared resources
- Primarily for recording problems
- To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
ibs/utils/StreamingZipInflater.cpp
48da31b735ebbc6a00c4e9fe9631f4af79e2c9df 13-Sep-2010 Jeff Brown <jeffbrown@google.com> Add keycodes and meta-key modifiers to support external keyboards.

Added new key maps for external keyboards. These maps are intended to
be shared across devices by inheriting the "keyboards.mk" product
makefile as part of the device's product definition.

One of the trickier changes here was to unwind some code in
MetaKeyKeyListener that assumed that only the low 8 bits of the meta key
state were actually used. The new code abandons bitshifts in favor
of simple conditionals that are probably easier to read anyways.
The special meta key state constants used by MetaKeyKeyListener
are now (@hide) defined in KeyEvent now so as to make it clearer that they
share the same code space even if those codes are not valid for KeyEvents.

The EventHub now takes care of detecting the appropriate key layout
map and key character map when the device is added and sets system
properties accordingly. This avoids having duplicate code in
KeyCharacterMap to probe for the appropriate key character map
although the current probing mechanism has been preserved for legacy
reasons just in case.

Added support for tracking caps lock, num lock and scroll lock and
turning their corresponding LEDs on and off as needed.

The key character map format will need to be updated to correctly support
PC style external keyboard semantics related to modifier keys.
That will come in a later change so caps lock doesn't actually do
anything right now except turn the shiny LEDs on and off...

Added a list of symbolic key names to KeyEvent and improved the toString()
output for debug diagnosis. Having this list in a central place in the
framework also allows us to remove it from Monkey so there is one less
thing to maintain when we add new keycodes.

Bug: 2912307
Change-Id: If8c25e8d50a7c29bbf5d663c94284f5f86de5da4
nclude/utils/String8.h
ibs/utils/String8.cpp
929e4ef26a7920dd6f3593f60d45a59ffeaedb14 14-Oct-2010 Raphael Moll <raphael@google.com> MinGW/Cygwin requires open() in O_BINARY mode.

Alsso printf %zd is not supported on MinGW/Cygwin.

Change-Id: I03811dabb46e2b05dd1d8abcc0ff97b125c77d54
ibs/utils/ZipFileRO.cpp
60cbc840393ccd98efd9963013bc61f2621d95ab 14-Oct-2010 Kenny Root <kroot@google.com> OBB: use PBKDF2 for key generation.

Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.

Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
nclude/utils/ObbFile.h
ibs/utils/ObbFile.cpp
ibs/utils/tests/ObbFile_test.cpp
fcefac26820933abeb40170b476b9d04efa3d35d 08-Oct-2010 Jeff Brown <jeffbrown@google.com> Revert to using epoll_wait().

This change depends on the kernel having been patched to use hrtimers
instead of jiffies for scheduling epoll timeouts.

Change-Id: I216bc1c4f565e67ebcb3d2ba4280cb615932bb9e
nclude/utils/Looper.h
8d15c74d50fd01d6e63970aadd261a9d3bed27e7 06-Oct-2010 Jeff Brown <jeffbrown@google.com> Switch Looper back to using poll() instead of epoll().

Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
nclude/utils/Looper.h
ibs/utils/Looper.cpp
ibs/utils/tests/Looper_test.cpp
bf2ad6dd136ba456cd48f15da59828e2f6743dd6 04-Oct-2010 Kenny Root <kroot@google.com> Use pread() in ZipFileRO for Linux

AssetManager instances are created by zygote and passed to all its
children so that they don't have to individually open
frameworks-res.apk. This creates a problem for determining the current
file offset when using lseek() on those files, because you can't
guarantee the cross-process locking of a mutex. Luckily, Linux
implements pread() to get around this suckiness.

The problem is that only Linux implements this, so we have to keep the
old locking for use on host builds with aapt and friends. aapt doesn't
have this same problem of sharing file descriptors across forked
processes, so we can keep the local AutoMutex to protect accesses of
those files.

Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
nclude/utils/ZipFileRO.h
ibs/utils/ZipFileRO.cpp
a1ef2e020664860de562eccd63c2c5895519763c 02-Oct-2010 Kenny Root <kroot@google.com> ZipFileRO: moar logging and wrap close

There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.

Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.

Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
nclude/utils/ZipFileRO.h
ibs/utils/ZipFileRO.cpp
7d90df8dc30e7b22aea030f7dca01095529cc6b1 27-Sep-2010 Jeff Brown <jeffbrown@google.com> Add suuport for splitting touch events across windows.

This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time. Could be used for
other things later.

Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.

Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
nclude/utils/BitSet.h
cea2778d14a84e4dff261b82f5d8d9badfaafa85 24-Sep-2010 Kenny Root <kroot@google.com> Revert "Revert "Free created FileMap when uncompressing files""

This revert reverts commit a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
ibs/utils/ZipFileRO.cpp
f7c1be0e62dea8a3f8b2d9b97689de964484f4db 24-Sep-2010 Kenny Root <kroot@google.com> Add locking around ZIP seeking

Since we switched to seeking to the LFH to verify its existence instead
of a huge mmap of the file, we have to guarantee that another seek
doesn't happen before we finish our read on the LFH.

Change-Id: If8135d9cb6f2f5cc4db734eafa4f6b5f6269c62a
nclude/utils/ZipFileRO.h
ibs/utils/ZipFileRO.cpp
d18051870e8e2a5f55237a2c11fde75f46082639 22-Sep-2010 Jeff Brown <jeffbrown@google.com> Looper: use pthread_once for TLS key initialization.

Also fix a Valgrind complaint by zeroing out the entire epoll event
struct since otherwise the data field union would be partly
uninitialized (but not in a harmful way).

Change-Id: I2091ce517e87fcad7c9caf90e2c5e4854a7ca465
nclude/utils/Looper.h
ibs/utils/Looper.cpp
9da1810050d8825e51dabdd0262173432d49c16c 18-Sep-2010 Jeff Brown <jeffbrown@google.com> Reduce lock thrashing in native Looper.

In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups. There is no point grabbing the
semaphore then.

Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
ibs/utils/Looper.cpp
905682a19609e862633f01e69bec58384df2cdf7 17-Sep-2010 Jeff Brown <jeffbrown@google.com> Looper: Drop default parameters in favor of a safer overload.

The idea is that if you're writing code that wants fd/events/data on
return from pollOnce() / pollAll() you should really pass in all of those
arguments. When I changed the Looper API earlier, it was difficult
to ensure that all callers were passing the right parameters since they
were relying on default parameters to some degree so usage mistakes
would not have been caught by the compiler.

Change-Id: I1f2812894270aaf1515017ac1616b6b312d9b565
nclude/utils/Looper.h
171bf9e69792f4796e27334c8a97dbd8576ad78a 17-Sep-2010 Jeff Brown <jeffbrown@google.com> Ensure input dispatcher and native looper handles EINTR.

Change-Id: I0a42db5f273b9bfe4ab174e4ee65d5d852f9f6bc
ibs/utils/Looper.cpp
7901eb25c60b1df00050d6c3772505d8dcfcdab9 14-Sep-2010 Jeff Brown <jeffbrown@google.com> Replace epoll() with poll() and rename PollLoop to Looper.

As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).

Removed the dependence on specific constants from sys/poll.h such as
POLLIN. Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports. That should help make any future
under-the-hood implementation changes easier.

Fixed a couple of compiler warnings along the way.

Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
nclude/utils/Looper.h
nclude/utils/PollLoop.h
ibs/utils/Android.mk
ibs/utils/Looper.cpp
ibs/utils/PollLoop.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/Looper_test.cpp
ibs/utils/tests/PollLoop_test.cpp
ac84a0a25d27b8dc537f1dff47581d3eff321014 08-Sep-2010 Jeff Brown <jeffbrown@google.com> Input dispatcher ANR handling enhancements.

This change is essentially a rewrite of the main input dispatcher loop
with the target identification folded in. Since the input dispatcher now
has all of the window state, it can make better decisions about
when to ANR.

Added a .5 second deadline for processing app switch keys. This behavior
predates Gingerbread but had not previously been ported.

Fixed some timing inaccuracies in the ANR accounting that could cause
applications to ANR sooner than they should have.

Added a mechanism for tracking key and motion events that have been
dispatched to a window so that appropriate cancelation events can be
synthesized when recovering from ANR. This change helps to keep
applications in sync so they don't end up with stuck buttons upon
recovery from ANRs.

Added more comments to describe the tricky parts of PollLoop.

Change-Id: I13dffca27acb436fc383980db536abc4d8b9e6f1
nclude/utils/PollLoop.h
ibs/utils/PollLoop.cpp
a78bab0359fb60f46f89978dbb4e135fb11ea68e 10-Sep-2010 Dianne Hackborn <hackbod@google.com> Always set the scheduling group when starting a new thread.

Change-Id: Ia33acf13fc3752707f3819928c36315e223fa1bd
ibs/utils/Threads.cpp
4e30623bdabfe392d5ef902666aad9be291cce73 09-Sep-2010 Romain Guy <romainguy@google.com> Purge Skia objects from GL caches as needed.

Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
nclude/utils/Singleton.h
b03e56d704af1a66b4552fb606418f3882e56a80 08-Sep-2010 Kenny Root <kroot@google.com> Revert "Free created FileMap when uncompressing files"

This reverts commit 52b8235238fb4d8cf141020cc1ae33880929dc3f.

munmap() on a region that overlaps something else (e.g, the ZIP Central
Directory in this case) unmaps those other regions as well making the
ZipFileRO class unhappy. Revert this for now until we can have FileMap
deal with this craziness.
ibs/utils/ZipFileRO.cpp
aeaad5f5e96af04d8d547ae6b40d2e8820dc9465 08-Sep-2010 Dianne Hackborn <hackbod@google.com> Modify native ALooper to take an explicit ident.

The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd. This allows
the APIs that had the fd to be a little more sane.

Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
nclude/utils/PollLoop.h
ibs/utils/PollLoop.cpp
193c18ca8a61116b74496e9bd0954ee864337dc3 07-Sep-2010 Dianne Hackborn <hackbod@google.com> Hopefully fix the build.

Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
ibs/utils/Threads.cpp
16d217efbbeb1fde5e3925ad4340856730ad0c98 04-Sep-2010 Dianne Hackborn <hackbod@google.com> Add system property to turn off scheduling groups.

Do this:

adb shell setprop debug.sys.noschedgroups 1

Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
ibs/utils/Threads.cpp
6bdd470cf1a74d136c911294f8c380bc13e9f3a2 02-Sep-2010 Kenny Root <kroot@google.com> Add better debug output for ResourceType errors

An error code is returned as -ESOMETHING, but the debug code was
printing out 0x%08x for these codes making -74 print out as 0xffffffb5
which is kind of silly.

Change-Id: I7d77fb3da2e146845949f121404f662b47288e61
ibs/utils/ResourceTypes.cpp
2349ee0996dea0168ff3ff9b504b328e7c2be105 27-Aug-2010 Kenny Root <kroot@google.com> Add debugging to ZipFileRO

Some assets are failing to read from ZIP files. This adds a bit more
debugging to figure out what's going on.

Change-Id: Id90e10546c54c85069a34478fbc28bc2523bda5d
ibs/utils/ZipFileRO.cpp
95f09be2917fa45b8d3e70e72a88869fa4019566 20-Aug-2010 Kenny Root <kroot@google.com> Free created FileMap when uncompressing files

Change-Id: Ice22c4ecb7c129b74bf60cd66ae79e110b017a4a
ibs/utils/ZipFileRO.cpp
6fab9b21caa35ba0dfb12757e5cf1e94109758b1 12-Aug-2010 Kenny Root <kroot@google.com> Add OBB flags to support overlays

* Add flags field in OBB footer to support overlays.

* Remove unused 'crypto' and 'filesystem' fields in obbtool (could
later be supported in the "flags" field of the OBB footer).

* Add notes to document OBB classes before shipping.

Change-Id: I386b43c32c5edef55210acb5d3322639c08010ba
nclude/utils/ObbFile.h
ibs/utils/ObbFile.cpp
38fb25b9d040ac16dc838027da2889301a38fc7d 11-Aug-2010 Jeff Brown <jeffbrown@google.com> Add support for the PointerLocation overlay.

This change involves adding a new method to IWindowManager,
monitorInput() that returns an InputChannel to receive a copy of all
input that is dispatched to applications. The caller must have
the READ_INPUT_STATE permission to make this request (similar to
other window manager methods such as getKeycodeState).

Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
nclude/utils/String8.h
4e248ec5c632d4261e50de4f5b34344c22889935 19-Jul-2010 Kenny Root <kroot@google.com> Initial tool for OBB manipulation

Add "obbtool" host command for adding, removing, and querying Opaque
Binary Blob (OBB) information from a file.

Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
nclude/utils/ObbFile.h
ibs/utils/ObbFile.cpp
0537db078bf7cd57dd8887fda548049d20594ca1 04-Aug-2010 Dianne Hackborn <hackbod@google.com> More native work.

Implement save/restore of state, and add native APIs for
configuration information.

Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
nclude/utils/AssetManager.h
nclude/utils/ResourceTypes.h
ibs/utils/AssetManager.cpp
23b4a0936f1ee11e587b7be9dc3bcae5b55d31cf 06-Aug-2010 Kenny Root <kroot@google.com> Fix String8::operator+

The LHS was ignored when using:
String8 + String8
String8 + (const char*)

Add unit tests for above.

Bug: 2898473
Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
nclude/utils/String8.h
ibs/utils/tests/Android.mk
ibs/utils/tests/String8_test.cpp
3da482eec2a6d893f80eb56c1670b0bc59b13c30 05-Aug-2010 Kenny Root <kroot@google.com> Free scanBuf in ZipFileRO

In the success case, the 65kB scanBuf was not freed!

Also, get rid of annoying complaints about ssize_t from printf in error
cases.

Change-Id: If154ac19bf47637f898b4ec8c8e27c9a073a7b81
ibs/utils/ZipFileRO.cpp
0374b429afdca0feba7e95548c1c2da6c4cfac43 29-Jul-2010 Christopher Tate <ctate@google.com> Attempt to fix the SDK build

On the assumption that the local min() function declaration is in
conflict with some 'min' #define floating around, rename the local
function to min_of().

Change-Id: I62aa27f213c6093cc78805de611cf4aa75f0eef2
ibs/utils/StreamingZipInflater.cpp
f2729494e83a7d44445b397e60d9f395890c34c2 29-Jul-2010 Kenny Root <kroot@google.com> Change unistd.h to stddef.h to be correct

size_t should be defined through inclusion of stddef.h instead of unistd.h

Change-Id: Ieaadacfca1e1c44c2533ea95f73fc060c1519b52
ibs/utils/StreamingZipInflater.cpp
b9590bde9a93b7f86c7386747045e025f3bd4fbc 29-Jul-2010 Kenny Root <kroot@google.com> Add unistd.h for size_t typedef to fix sim-eng

Change-Id: Ida4f1742547f39539b601f13182c722aa7cf863e
ibs/utils/StreamingZipInflater.cpp
c28f214f6c65c56936b11fff68564d9631cfae70 26-Jul-2010 Christopher Tate <ctate@google.com> Support streaming of compressed assets > 1 megabyte

Compressed assets larger than one megabyte are now decompressed on demand
rather than being decompressed in their entirety and held in memory. Reading
the data in order is relatively efficient, as is seeking forward in the stream.
Seeking backwards is supported, but requires reprocessing the compressed data
from the beginning, so is very inefficient.

In addition, the size limit on compressed assets has been eliminated.

Change-Id: I6e68247957e6c53e7e8ba70d12764695f1723bad
nclude/utils/Asset.h
nclude/utils/StreamingZipInflater.h
ibs/utils/Android.mk
ibs/utils/Asset.cpp
ibs/utils/StreamingZipInflater.cpp
35a154e57f2f59722de580395ccd5172e44842cb 16-Jul-2010 Jeff Brown <jeffbrown@google.com> Fix bug with phantom input windows.

Add dumpsys integration for the native input dispatcher.
Add some InputDevice API stubs.
Add an appendFormat helper method to String8 for printf style
string formatting mainly for debugging purposes.
Use generic ArrayList<WindowState> everywhere in WindowManagerService
to eliminate unnecessary casts all over.

Change-Id: I9d1e3bd90eb7222d10620200477f11b7bfd25e44
nclude/utils/String8.h
ibs/utils/String8.cpp
9f43945b7cba2698500c1f4adb17492c5e70ee86 13-Jul-2010 Christopher Tate <ctate@google.com> Add native C APIs for working with the Asset Manager

Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
nclude/utils/AssetManager.h
3f607c1c84631e61ddc11234466620e38fabfc1f 15-Jul-2010 Jeff Brown <jeffbrown@google.com> Don't build framework tests for simulator target.

Change-Id: I70f29c7eb307e4f3ec5702f4eb9d97b4342e2f36
ibs/utils/tests/Android.mk
7aba23129b339f6f6ea4c378aa5f3a78d7f677dd 01-Jul-2010 Jeff Brown <jeffbrown@google.com> Add initial gamepad support.

Change-Id: I0439648f6eb5405f200e4223c915eb3a418b32b9
ibs/utils/Android.mk
51e2fb7086548af8610308a54d8f7c241c8b0932 12-Jul-2010 Kenny Root <kroot@google.com> Tweak ObbFile class

* Move error messages around to clarify the errors.

* Add extra error check when reading a file.

* Seek to the end of a file when writing the signature so the users of
the API don't have to remember to do it.

Change-Id: I2337051b9f9fa8147c5900237deec790dcd92436
ibs/utils/ObbFile.cpp
ibs/utils/tests/ObbFile_test.cpp
245708a1bec5f50581b0093aed573bbe7ad6c708 07-Jul-2010 Dianne Hackborn <hackbod@google.com> Add new glue code for writing native apps.

This factors out the boiler-plate code from the sample
app to a common glue code that can be used for everyone
writing this style of app: a dedicated app thread that
takes care of waiting for events and processing them.

As part of doing this, ALooper has a new facility to allow
registration of fds that cause ALooper_pollOnce() to return
the fd that has data, allowing the app to drive the loop
without callbacks. Hopefully this makes some people feel better. :)

Also do some other cleanup of the ALooper API, plus some
actual documentation.

Change-Id: Ic53bd56bdf627e3ba28a3c093faa06a92be522b8
nclude/utils/PollLoop.h
ibs/utils/PollLoop.cpp
ibs/utils/tests/PollLoop_test.cpp
1d2aeb673f9e757521ea0fd3717c7d4277f30b9f 01-Jun-2010 Kenny Root <kroot@google.com> Add OBB file helper class

ObbFile is a binary blob that will be used in packaging large files
with smaller APKs.

Change-Id: Ib1594346cfa2f49113de6565af77c24efbd89d63
nclude/utils/ObbFile.h
ibs/utils/Android.mk
ibs/utils/ObbFile.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/ObbFile_test.cpp
26fc52b1d46d14880913f6b3a8d853d0bcd117f2 03-Jul-2010 Dianne Hackborn <hackbod@google.com> Add new native Looper API.

This allows us to avoid exposing the file descriptor of
the event queue; instead, you attach an event queue to
a looper. This will also should allow native apps to be
written without the need for a separate thread, by attaching
the event queue to the main thread's looper and scheduling
their own messages there.

Change-Id: I38489282635895ae2cbfacb88599c1b1cad9b239
nclude/utils/PollLoop.h
ibs/utils/PollLoop.cpp
7b1516795e6174fea6b12b3c4c3177e64e329ba6 25-Jun-2010 Mathias Agopian <mathias@google.com> Fix a bug in sp<> and wp<> which could cause memory corruptions

when assigning a smart pointer to another one, we need to make
sure to read all the data we need from the right-hand-side
reference (the assignee) before we decRef the assigned.

This bug would cause linked-list of smart-pointers to fail
miserably.

Change-Id: Ibb554c15fddf909f7737c632b7c80322e80ea93f
nclude/utils/RefBase.h
9efaaa43595307786dbf06760823c25cb16b1925 16-Jun-2010 Jeff Brown <jeffbrown@google.com> Even more native input dispatch work in progress.

Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.

Modified the internal representation of MotionEvent to be more
efficient and more consistent.

Added code to skip/cancel virtual key processing when there are multiple
pointers down. This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).

Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
nclude/utils/PollLoop.h
nclude/utils/Vector.h
nclude/utils/VectorImpl.h
ibs/utils/PollLoop.cpp
ibs/utils/VectorImpl.cpp
ibs/utils/tests/PollLoop_test.cpp
ibs/utils/tests/TestHelpers.h
80d9c1cfb0642e680c559a854d09514c2fc72edc 15-Jun-2010 Jeff Brown <jeffbrown@google.com> Support for multiple tests

The build system enforces some invariants that were being ignored
before.

Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
ibs/utils/tests/Android.mk
ea5c46b7c180f741762f1a66203e3c99ffccc752 14-Jun-2010 Jeff Brown <jeffbrown@google.com> Remove PollLoop from host build.

We can't build (and we don't need) PollLoop in the SDK on all platforms.

Change-Id: I3b0f327bbb8bc58b9b8630b0161cf360403fea68
ibs/utils/Android.mk
4d643d6fdb469a603e0645e7a8fecad334341141 14-Jun-2010 Jeff Brown <jeffbrown@google.com> Fix include paths.

Change-Id: Ifda45688f9f02710a74d5d7a7d902bacf1441e2e
nclude/utils/PollLoop.h
66db68948c83f1940fa66d76d28208b49bed7815 23-Apr-2010 Jeff Brown <jeffbrown@google.com> Native input dispatch rewrite work in progress.

The old dispatch mechanism has been left in place and continues to
be used by default for now. To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.

Includes part of the new input event NDK API. Some details TBD.

To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument. The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points. The ViewRoot then
provides the InputChannel to the InputQueue. Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue. This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.

There can be zero or more targets for any given input event. Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets). Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.

End-to-end event dispatch mostly works!

To do: event injection, rate limiting, ANRs, testing, optimization, etc.

Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
nclude/utils/BitSet.h
nclude/utils/Buffer.h
nclude/utils/PollLoop.h
nclude/utils/Pool.h
nclude/utils/StopWatch.h
nclude/utils/Vector.h
nclude/utils/VectorImpl.h
ibs/utils/Android.mk
ibs/utils/PollLoop.cpp
ibs/utils/Pool.cpp
ibs/utils/StopWatch.cpp
ibs/utils/VectorImpl.cpp
ibs/utils/tests/Android.mk
ibs/utils/tests/PollLoop_test.cpp
ibs/utils/tests/TestHelpers.h
10e5da58e4c22f2262f7ec7f82745d9673bed14b 10-Jun-2010 Andreas Huber <andih@google.com> Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents.

Change-Id: I6961f3cf10ba3b728579ea63262db750a4cf8577
ibs/utils/String8.cpp
ad4f2e59af9fe207056099dc002eb80cacbc0f4f 08-Jun-2010 Kenny Root <kroot@google.com> Add invariant check for stylesString size

It was possible for stylesStrings to claim to start past the end of the
data area thereby making mStringPoolSize larger than the data area.

Change-Id: Ibc4d5b429e3a388516135801c8abc3681daae291
ibs/utils/ResourceTypes.cpp
65d3c95a4d9a5fb4f61de952af0abd0db5380c77 08-Jun-2010 Kenny Root <kroot@google.com> Range checking for ResTable_map

Correct previous offset change and get ready for safe-iop.

Change-Id: Ib276c726f32b0711a72f47d3263eb21640e5a800
ibs/utils/ResourceTypes.cpp
076618172d3c6910d09b063fd57f3eb97c91ee40 08-Jun-2010 Kenny Root <kroot@google.com> Improve checking in aapt dump

The aapt dump reading had less error checking than the actual parsing,
so this change brings it more into parity so that bad APKs don't crash
"aapt dump"

Change-Id: Ib30e63e41be5c652645c4aa0de580a87b184529d
ibs/utils/ResourceTypes.cpp
7517432a5589d4098d435ba82bb28c363fec0467 04-Jun-2010 Konstantin Lopyrev <klopyrev@google.com> Fix 1684100: Making sure that empty package, type and resource ids are not accepted.

Change-Id: I4c94877e4312e9a5b4d22c8625069ca056c62e40
ibs/utils/ResourceTypes.cpp
f16344acab081bf89ae1a9797ba81025ce67e662 04-Jun-2010 Daisuke Miyakawa <dmiyakawa@google.com> Delete vCard code to platform/framework/opt/vcard.

Now all the code and related tests are in (top)/framework/opt/vcard.

See also 33mb46cb82 in platform/framework/opt/vcard.

Bug: 2735156
Change-Id: Ic3413110580874761e596b8fe9ad3c2e3c60795b
card/Android.mk
card/java/com/android/vcard/JapaneseUtils.java
card/java/com/android/vcard/VCardBuilder.java
card/java/com/android/vcard/VCardComposer.java
card/java/com/android/vcard/VCardConfig.java
card/java/com/android/vcard/VCardConstants.java
card/java/com/android/vcard/VCardEntry.java
card/java/com/android/vcard/VCardEntryCommitter.java
card/java/com/android/vcard/VCardEntryConstructor.java
card/java/com/android/vcard/VCardEntryCounter.java
card/java/com/android/vcard/VCardEntryHandler.java
card/java/com/android/vcard/VCardInterpreter.java
card/java/com/android/vcard/VCardInterpreterCollection.java
card/java/com/android/vcard/VCardParser.java
card/java/com/android/vcard/VCardParserImpl_V21.java
card/java/com/android/vcard/VCardParserImpl_V30.java
card/java/com/android/vcard/VCardParser_V21.java
card/java/com/android/vcard/VCardParser_V30.java
card/java/com/android/vcard/VCardSourceDetector.java
card/java/com/android/vcard/VCardUtils.java
card/java/com/android/vcard/exception/VCardAgentNotSupportedException.java
card/java/com/android/vcard/exception/VCardException.java
card/java/com/android/vcard/exception/VCardInvalidCommentLineException.java
card/java/com/android/vcard/exception/VCardInvalidLineException.java
card/java/com/android/vcard/exception/VCardNestedException.java
card/java/com/android/vcard/exception/VCardNotSupportedException.java
card/java/com/android/vcard/exception/VCardVersionException.java
card/tests/Android.mk
card/tests/AndroidManifest.xml
card/tests/res/raw/v21_backslash.vcf
card/tests/res/raw/v21_complicated.vcf
card/tests/res/raw/v21_invalid_comment_line.vcf
card/tests/res/raw/v21_japanese_1.vcf
card/tests/res/raw/v21_japanese_2.vcf
card/tests/res/raw/v21_multiple_entry.vcf
card/tests/res/raw/v21_org_before_title.vcf
card/tests/res/raw/v21_pref_handling.vcf
card/tests/res/raw/v21_simple_1.vcf
card/tests/res/raw/v21_simple_2.vcf
card/tests/res/raw/v21_simple_3.vcf
card/tests/res/raw/v21_title_before_org.vcf
card/tests/res/raw/v21_winmo_65.vcf
card/tests/res/raw/v30_comma_separated.vcf
card/tests/res/raw/v30_simple.vcf
card/tests/src/com/android/vcard/tests/VCardExporterTests.java
card/tests/src/com/android/vcard/tests/VCardImporterTests.java
card/tests/src/com/android/vcard/tests/VCardJapanizationTests.java
card/tests/src/com/android/vcard/tests/VCardTestsBase.java
card/tests/src/com/android/vcard/tests/VCardUtilsTests.java
card/tests/src/com/android/vcard/tests/test_utils/ContactEntry.java
card/tests/src/com/android/vcard/tests/test_utils/ContentValuesBuilder.java
card/tests/src/com/android/vcard/tests/test_utils/ContentValuesVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/ContentValuesVerifierElem.java
card/tests/src/com/android/vcard/tests/test_utils/ExportTestProvider.java
card/tests/src/com/android/vcard/tests/test_utils/ExportTestResolver.java
card/tests/src/com/android/vcard/tests/test_utils/ImportTestProvider.java
card/tests/src/com/android/vcard/tests/test_utils/ImportTestResolver.java
card/tests/src/com/android/vcard/tests/test_utils/LineVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/LineVerifierElem.java
card/tests/src/com/android/vcard/tests/test_utils/PropertyNode.java
card/tests/src/com/android/vcard/tests/test_utils/PropertyNodesVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/PropertyNodesVerifierElem.java
card/tests/src/com/android/vcard/tests/test_utils/VCardVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/VNode.java
card/tests/src/com/android/vcard/tests/test_utils/VNodeBuilder.java
3073020282de4910fe1d3e65b0fc003078a109f8 02-Jun-2010 Daisuke Miyakawa <dmiyakawa@google.com> Remove stale and inappropriate dependency.

Change-Id: I2e9412075c157a8649ac06e89a8987a36544d78b
card/Android.mk
card/tests/Android.mk
24ed9052bd607b303f8aff0b0e027a3eb39315ac 29-May-2010 Mathias Agopian <mathias@google.com> Fix a typo in Singleton<>

it could cause the sLock field to be emitted several times
in different compilation unit. it also prevented to
have 2 Singleton<> in the same file.
nclude/utils/Singleton.h
fcf836d32f181e522f4cc01332319d786a7579b7 22-May-2010 Daisuke Miyakawa <dmiyakawa@google.com> Small fix around intermideate charset (ISO-8859-1).

After a few investigation, it is found that ISO-8859-1 is confirmed to be the
best charset for that use.

Modify comment so that we explicitly mention it.

Change-Id: I16e487fab33964a1665a1dd6991f2e8598f8895e
card/java/com/android/vcard/VCardConfig.java
card/java/com/android/vcard/VCardEntryConstructor.java
card/java/com/android/vcard/VCardParserImpl_V21.java
card/java/com/android/vcard/VCardParserImpl_V30.java
card/java/com/android/vcard/VCardParser_V21.java
card/java/com/android/vcard/VCardParser_V30.java
card/tests/src/com/android/vcard/tests/test_utils/ContentValuesVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/ContentValuesVerifierElem.java
card/tests/src/com/android/vcard/tests/test_utils/VNodeBuilder.java
e6cbafd07dfd56e98d28ca93bd31cdd80d9f37a9 14-May-2010 Daisuke Miyakawa <dmiyakawa@google.com> Make vCard code a separated static library.

- Move the library to a separate directory in framewokr/base, and rename its package from
android.pim.vcard to com.android.vcard.
- Move all tests for the library under the directory.
- Confirm all tests for vCard are successful.

It would be better for us to have this directory somewhere else (like external/).
But I'll submit this here now and move it to the right place as soon as possible.
From the view of build mechanism, we can do that immediately.

BUG: 2689523
Change-Id: I435e10571b7160bfcc029bed7c37aaac1c6fd69a
card/Android.mk
card/java/com/android/vcard/JapaneseUtils.java
card/java/com/android/vcard/VCardBuilder.java
card/java/com/android/vcard/VCardComposer.java
card/java/com/android/vcard/VCardConfig.java
card/java/com/android/vcard/VCardConstants.java
card/java/com/android/vcard/VCardEntry.java
card/java/com/android/vcard/VCardEntryCommitter.java
card/java/com/android/vcard/VCardEntryConstructor.java
card/java/com/android/vcard/VCardEntryCounter.java
card/java/com/android/vcard/VCardEntryHandler.java
card/java/com/android/vcard/VCardInterpreter.java
card/java/com/android/vcard/VCardInterpreterCollection.java
card/java/com/android/vcard/VCardParser.java
card/java/com/android/vcard/VCardParserImpl_V21.java
card/java/com/android/vcard/VCardParserImpl_V30.java
card/java/com/android/vcard/VCardParser_V21.java
card/java/com/android/vcard/VCardParser_V30.java
card/java/com/android/vcard/VCardSourceDetector.java
card/java/com/android/vcard/VCardUtils.java
card/java/com/android/vcard/exception/VCardAgentNotSupportedException.java
card/java/com/android/vcard/exception/VCardException.java
card/java/com/android/vcard/exception/VCardInvalidCommentLineException.java
card/java/com/android/vcard/exception/VCardInvalidLineException.java
card/java/com/android/vcard/exception/VCardNestedException.java
card/java/com/android/vcard/exception/VCardNotSupportedException.java
card/java/com/android/vcard/exception/VCardVersionException.java
card/tests/Android.mk
card/tests/AndroidManifest.xml
card/tests/res/raw/v21_backslash.vcf
card/tests/res/raw/v21_complicated.vcf
card/tests/res/raw/v21_invalid_comment_line.vcf
card/tests/res/raw/v21_japanese_1.vcf
card/tests/res/raw/v21_japanese_2.vcf
card/tests/res/raw/v21_multiple_entry.vcf
card/tests/res/raw/v21_org_before_title.vcf
card/tests/res/raw/v21_pref_handling.vcf
card/tests/res/raw/v21_simple_1.vcf
card/tests/res/raw/v21_simple_2.vcf
card/tests/res/raw/v21_simple_3.vcf
card/tests/res/raw/v21_title_before_org.vcf
card/tests/res/raw/v21_winmo_65.vcf
card/tests/res/raw/v30_comma_separated.vcf
card/tests/res/raw/v30_simple.vcf
card/tests/src/com/android/vcard/tests/VCardExporterTests.java
card/tests/src/com/android/vcard/tests/VCardImporterTests.java
card/tests/src/com/android/vcard/tests/VCardJapanizationTests.java
card/tests/src/com/android/vcard/tests/VCardTestsBase.java
card/tests/src/com/android/vcard/tests/VCardUtilsTests.java
card/tests/src/com/android/vcard/tests/test_utils/ContactEntry.java
card/tests/src/com/android/vcard/tests/test_utils/ContentValuesBuilder.java
card/tests/src/com/android/vcard/tests/test_utils/ContentValuesVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/ContentValuesVerifierElem.java
card/tests/src/com/android/vcard/tests/test_utils/ExportTestProvider.java
card/tests/src/com/android/vcard/tests/test_utils/ExportTestResolver.java
card/tests/src/com/android/vcard/tests/test_utils/ImportTestProvider.java
card/tests/src/com/android/vcard/tests/test_utils/ImportTestResolver.java
card/tests/src/com/android/vcard/tests/test_utils/LineVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/LineVerifierElem.java
card/tests/src/com/android/vcard/tests/test_utils/PropertyNode.java
card/tests/src/com/android/vcard/tests/test_utils/PropertyNodesVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/PropertyNodesVerifierElem.java
card/tests/src/com/android/vcard/tests/test_utils/VCardVerifier.java
card/tests/src/com/android/vcard/tests/test_utils/VNode.java
card/tests/src/com/android/vcard/tests/test_utils/VNodeBuilder.java
9b0be73f2aca790774e7a85f5653afe33947c8ed 20-May-2010 Mathias Agopian <mathias@google.com> added RWLock C++ wrapper

Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
nclude/utils/threads.h
c2b77d2fad41ffc583171156eb54b01a61ea6890 23-Apr-2010 Kenny Root <kroot@google.com> ZipUtilsRO rewrite based on Dalvik Zip rewrite

Change the way zip archives are handled. This is necessary to deal with
very large (~1GB) APK files, for which our current approach of mapping
the entire file falls over.

We now do the classic scavenger hunt for the End Of Central Directory
magic on a buffer of data read from the file, instead of a memory-mapped
section. We use what we find to create a map that covers the Central
Directory only.

If the caller is interested in unpacking the file contents, we have to
do an additional file read to discover the size of the Local File Header
section so we can skip past it.

This is based on Change I745fb15abb in the dalvik tree. Both
implementations share a common ancestry, but the cost of unifying them
outweighs the benefits of wrapping C calls.

Change-Id: Iddacb50fe913917c2845708a530872d65fdbe620
nclude/utils/ZipFileCRO.h
nclude/utils/ZipFileRO.h
ibs/utils/AssetManager.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
eb502abd56e74b11abe7467566938c6711f88515 06-May-2010 Dan Morrill <morrildl@google.com> Adding PacketVideo attribution in NOTICE.

Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
OTICE
88753ae9d8f5432590df5e5338e0906834124c1d 06-May-2010 Dan Egnor <egnor@google.com> Make static versions of libutils and libbinder.

Fix some small static-initialization-order issues (and a static-
initializers-missing issue) that result from doing so. The static
libraries don't actually get used for anything real at the moment --
they're used for perf tests of bug 2660235.

Bug: 2660235
Change-Id: Iee2f38f79cc93b395e8d0a5a144ed92461f5ada0
ibs/utils/Android.mk
ibs/utils/String8.cpp
88e49600255db6060e56f8633a79fcb24439b109 24-Apr-2010 Dianne Hackborn <hackbod@google.com> New xlarge screen size.

Not complete, only for experimentation at this point.

This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.

The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.

Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
2937406b0d5db61852088361789e48be1b51e6f9 31-Mar-2010 Dianne Hackborn <hackbod@google.com> Revert "fix [2542425] memory leak during video recording"

This reverts commit 544592e14f8d7643238e40ba9879727497900f35.
ibs/utils/VectorImpl.cpp
4e0ee2fd89a32f406a2065f7115d7ee2bdbc92b5 31-Mar-2010 Mathias Agopian <mathias@google.com> fix [2542425] memory leak during video recording

[Sorted|Keyed]Vector<TYPE> would leak their whole storage when resized
from the end and TYPE had trivial dtor and copy operators.

Change-Id: I8555bb1aa0863df72de27d67ae50e20706e90cf5
ibs/utils/VectorImpl.cpp
15d0edcba018d99a356077c8769148e769585a48 29-Mar-2010 Mathias Agopian <mathias@google.com> fix [2542425] memory leak during video recording

Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.

Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
ibs/utils/VectorImpl.cpp
68f64818203cf7d2ef1b4707448191829221898e 20-Mar-2010 Mathias Agopian <mathias@google.com> libutils Condition are now PRIVATE by default

Condition must be initialized with SHARED for the old behavior, where
they can be used accross processes.

Updated the two places android that require SHARED conditions.

PRIVATE conditions (and mutexes) use more efficient syscalls.

Change-Id: I9a281a4b88206e92ac559c66554e886b9c62db3a
nclude/utils/threads.h
30a8e2e1359df7abf4af2078bd1ed694e969f84b 10-Mar-2010 Dianne Hackborn <hackbod@google.com> Add ability for some manifest attributes to reference resources.

This loosens our restriction on many manifest attributes requiring
literal string values, to allow various ones to use values from
resources. This is only allowed if the resource value does not change
from configuration changes, and the restriction is still in place
for attributes that are core to security (requesting permissions) or
market operation (used libraries and features etc).

Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
df6e753fa7a9e51daa5940e4180ba507de342313 09-Mar-2010 Tom Taylor <tomtaylor@google.com> Remove mms-common library

Put the Mms files back in the framework where they've been since 1.0.

Change-Id: I3c449468053ddd82d35c45a06d71957de660bf99
ms-common/Android.mk
ms-common/java/com/android/mmscommon/CharacterSets.java
ms-common/java/com/android/mmscommon/ContentType.java
ms-common/java/com/android/mmscommon/EncodedStringValue.java
ms-common/java/com/android/mmscommon/InvalidHeaderValueException.java
ms-common/java/com/android/mmscommon/MmsException.java
ms-common/java/com/android/mmscommon/PduHeaders.java
ms-common/java/com/android/mmscommon/mms/ContentType.java
ms-common/java/com/android/mmscommon/mms/pdu/AcknowledgeInd.java
ms-common/java/com/android/mmscommon/mms/pdu/DeliveryInd.java
ms-common/java/com/android/mmscommon/mms/pdu/GenericPdu.java
ms-common/java/com/android/mmscommon/mms/pdu/MultimediaMessagePdu.java
ms-common/java/com/android/mmscommon/mms/pdu/NotificationInd.java
ms-common/java/com/android/mmscommon/mms/pdu/NotifyRespInd.java
ms-common/java/com/android/mmscommon/mms/pdu/PduBody.java
ms-common/java/com/android/mmscommon/mms/pdu/PduComposer.java
ms-common/java/com/android/mmscommon/mms/pdu/PduContentTypes.java
ms-common/java/com/android/mmscommon/mms/pdu/PduParser.java
ms-common/java/com/android/mmscommon/mms/pdu/PduPart.java
ms-common/java/com/android/mmscommon/mms/pdu/PduPersister.java
ms-common/java/com/android/mmscommon/mms/pdu/QuotedPrintable.java
ms-common/java/com/android/mmscommon/mms/pdu/ReadOrigInd.java
ms-common/java/com/android/mmscommon/mms/pdu/ReadRecInd.java
ms-common/java/com/android/mmscommon/mms/pdu/RetrieveConf.java
ms-common/java/com/android/mmscommon/mms/pdu/SendConf.java
ms-common/java/com/android/mmscommon/mms/pdu/SendReq.java
ms-common/java/com/android/mmscommon/mms/util/AbstractCache.java
ms-common/java/com/android/mmscommon/mms/util/PduCache.java
ms-common/java/com/android/mmscommon/mms/util/PduCacheEntry.java
ms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java
44ca383c5f564f1b5f6bd88026950be1c5fc68ad 06-Mar-2010 Christopher Tate <ctate@google.com> Rename cleanspec => CleanSpec to match the build rule

Change-Id: I9cc9027ea82a90af5f369976823f0feb0a1eeda0
leanspec.mk
73308880cf1ca5ae9385c2ab26e03a857bfd77c3 06-Mar-2010 Christopher Tate <ctate@google.com> Fix up missed refactoring in JNI reg and preloaded-classes

Change-Id: I079bdf4edfb9083eba3e15d8e4dbf3b2bad9190c
leanspec.mk
a77468038b47b70bba9386762da0ee1c699e4dea 06-Mar-2010 Christopher Tate <ctate@google.com> Refactor android.backup => android.app.backup

Change-Id: I0b21316ff890d7f3c7d4b82837bb60670724c2e8
leanspec.mk
70592f2c4734681521fd49fd9654967907901127 05-Mar-2010 Dianne Hackborn <hackbod@google.com> Refactor car mode.

Extract all UI behavior from dock observer and ACTION_DOCK_EVENT.

Also introduce a desk type to go along with the car type all through
the resource system, since we now need to have corresponding high-level
broadcasts for desk dock mode. As part of that I also reworked some
of the logic for switching modes to all funnel through a single
update() call that looks all of the current state to decide what to
do next, and fixed various locking issues.

In addition I found there were bugs in the configuration change
handling causing us to only switch into the car mode config and
then never get out of it. Unfortunately now that we are actually
changing the configuration for each mode change, the transitions
between them are really crummy as we restart all kinds of
activities. :(
nclude/utils/ResourceTypes.h
8b51a1a88b8f2193d787c3f1285c48da8281ff8f 04-Mar-2010 Dianne Hackborn <hackbod@google.com> Fix some bugs.

Bug #2376231: Apps lose window focus (and back key causes ANR) if the
lock screen is dismissed while the phone is in landscape mode

This is another case where we weren't recomputing the focused window
after changing the visibility policy.

bug #2479958: Investigate source of "Resources don't contain package
for resource number 0x7f0a0000"

Um, okay, so it turns out there were bugs all over the place where
we would load an XML resource from a another application, but not
use the Resources for that application to retrieve its resources...!
I think the only reason any of this stuff was working at all was
because it typically only cared about retrieving the resource
identifiers of the items (it would look up the values later).

Bug #2401082: Passion ERE26 monkey crash - InputMethodManagerService

Add some null checks.
ibs/utils/ResourceTypes.cpp
64d40b5e5d987f69240fa1e5269b606fc3ed54b6 02-Mar-2010 Ken Shirriff <kens@google.com> Remove calendar.jar.

This jar file failed to meet its goal of unbundling calendar.

bug 2468654
alendar/Android.mk
aeb43bd6dfc146c86105fb85e59e452da422a7c1 02-Mar-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links

And related:

- The aapt tool now sets a resource configurations sdk level to match any configs
that have been set (for example if you specify density your sdk level will be
at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
7925ea7735a70929655d319c46edbe962dcd3943 02-Mar-2010 Ficus Kirkpatrick <ficus@android.com> Demote the famous ResourceTypes warning to LOGV.

It is spamming the log bigtime and can be promoted back to LOGW
or worse by whoever decides to actually investigate the bug.

Change-Id: I72d950155378f641ebdfbacabae774f5736a52bc
ibs/utils/ResourceTypes.cpp
806246a598d56c3069866d95bbba6098c369c320 01-Mar-2010 Ken Shirriff <kens@google.com> Remove DateException and obsolete DateUtils functions.

These functions are deprecated and no longer used.
alendar/Android.mk
47c6fcb973d27d7cfe7cddc31cb4f6ad37b92607 26-Feb-2010 Wei Huang <weih@google.com> define the "seen" column for sms and pdu tables.
ms-common/java/com/android/mmscommon/mms/pdu/PduPersister.java
ms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java
d882653c22d6277b46d01aeadccbae3f7870cf62 25-Feb-2010 Dianne Hackborn <hackbod@google.com> Re-arrange android-common so framework no longer links with it.

This is the framework part, moving classes around so the framework
no longer needs to link to android-common. Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
ms-common/Android.mk
ms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java
60ed8d122a19e97ed3a168ccb0e4d3cba94c3825 23-Feb-2010 Kenny Root <kroot@google.com> Use UTF-8 strings to avoid duplicate caching, part 1

StringBlock instances containing UTF-8 strings use a cache to convert
into UTF-16, but using that cache and then using a JNI call to NewString
causes the UTF-8 string as well as two copies of the UTF-16 string to
be held in memory. Getting the UTF-8 string directly from the StringPool
eliminates one copy of the UTF-16 string being held in memory.

This is part 1. Part 2 will include ResXMLParser optimizations.

Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
a580e68cc3bea688167eb5e55122bec8e83ab939 12-Feb-2010 Mathias Agopian <mathias@google.com> remove a dependency of GraphicBuffer (libui) on Parcel (libbinder).

Add a Flattenable interface to libutils which can be used to flatten
an object into bytestream + filedescriptor stream.
Parcel is modified to handle Flattenable. And GraphicBuffer implements
Flattenable.

Except for the overlay classes libui is now independent of libbinder.
nclude/utils/Flattenable.h
ibs/utils/Android.mk
ibs/utils/Flattenable.cpp
8f0251fd36eac0348f9321712436f972a6179715 10-Feb-2010 Doug Zongker <dougz@android.com> use framework base64 implementation

Change-Id: Ib1dc595e53d64901f81d06350c6ab9b138beff7e
ms-common/java/com/android/mmscommon/mms/pdu/Base64.java
ms-common/java/com/android/mmscommon/mms/pdu/PduParser.java
e81635474cbf376c94282f34084fe9cffc4334c2 12-Feb-2010 Kenny Root <kroot@google.com> Totally remove Unicode.cpp and rely on ICU

Unicode.cpp used a packed data table for character data that essentially
duplicated ICU's functionality.

Change-Id: Ia68fe4ac94e89dc68d9a3f45f33f6e648a5500b7
nclude/utils/AndroidUnicode.h
ibs/utils/Android.mk
ibs/utils/CharacterData.h
ibs/utils/Unicode.cpp
861e14ff9f8180e1bb0e6d1a16756689a0197c82 12-Feb-2010 Kenny Root <kroot@google.com> Excise code from Unicode.cpp that was dead

Remove some utility functions for discovering character data
that ICU probably took over a while ago.

Change-Id: I97abe4de2f51eb2bf48679941258bc501184c3dc
nclude/utils/AndroidUnicode.h
ibs/utils/CharacterData.h
ibs/utils/Unicode.cpp
4ef8aea3b501e8122559080d4ff2e1b0f1f9dbcb 09-Feb-2010 Tobias Haamel <haamel@google.com> Introduce special UI modes for night and car usage.

The device mode is now called ui mode. Furthermore is the order of
precedence for the resources now in such a way that the ui mode needs
to be specified after the orientation and before the density.

The ui mode can be set, like it is done for the locale, as follows:

IActivityManager am = ActivityManagerNative.getDefault();
Configuration config = am.getConfiguration();
config.uiMode = Configuration.UI_MODE_TYPE_CAR | Configuration.UI_MODE_NIGHT_ANY;
am.updateConfiguration(config);

To allow users to disable the car mode and set the night mode the IUiModeManager
interface is used.

The automatic night mode switching will be added in a separate change.
nclude/utils/ResourceTypes.h
7e3befe696d8b218e5a98163e18a7f17c212e104 03-Feb-2010 Ficus Kirkpatrick <ficus@android.com> Fix mms-common's pathnames to match package spec.

Change-Id: I4ae65227ea29dff8a79bd1d9373dec46c4b53598
ms-common/java/com/android/common/CharacterSets.java
ms-common/java/com/android/common/ContentType.java
ms-common/java/com/android/common/EncodedStringValue.java
ms-common/java/com/android/common/InvalidHeaderValueException.java
ms-common/java/com/android/common/MmsException.java
ms-common/java/com/android/common/PduHeaders.java
ms-common/java/com/android/common/mms/ContentType.java
ms-common/java/com/android/common/mms/pdu/AcknowledgeInd.java
ms-common/java/com/android/common/mms/pdu/Base64.java
ms-common/java/com/android/common/mms/pdu/DeliveryInd.java
ms-common/java/com/android/common/mms/pdu/GenericPdu.java
ms-common/java/com/android/common/mms/pdu/MultimediaMessagePdu.java
ms-common/java/com/android/common/mms/pdu/NotificationInd.java
ms-common/java/com/android/common/mms/pdu/NotifyRespInd.java
ms-common/java/com/android/common/mms/pdu/PduBody.java
ms-common/java/com/android/common/mms/pdu/PduComposer.java
ms-common/java/com/android/common/mms/pdu/PduContentTypes.java
ms-common/java/com/android/common/mms/pdu/PduParser.java
ms-common/java/com/android/common/mms/pdu/PduPart.java
ms-common/java/com/android/common/mms/pdu/PduPersister.java
ms-common/java/com/android/common/mms/pdu/QuotedPrintable.java
ms-common/java/com/android/common/mms/pdu/ReadOrigInd.java
ms-common/java/com/android/common/mms/pdu/ReadRecInd.java
ms-common/java/com/android/common/mms/pdu/RetrieveConf.java
ms-common/java/com/android/common/mms/pdu/SendConf.java
ms-common/java/com/android/common/mms/pdu/SendReq.java
ms-common/java/com/android/common/mms/telephony/TelephonyProvider.java
ms-common/java/com/android/common/mms/util/AbstractCache.java
ms-common/java/com/android/common/mms/util/PduCache.java
ms-common/java/com/android/common/mms/util/PduCacheEntry.java
ms-common/java/com/android/mmscommon/CharacterSets.java
ms-common/java/com/android/mmscommon/ContentType.java
ms-common/java/com/android/mmscommon/EncodedStringValue.java
ms-common/java/com/android/mmscommon/InvalidHeaderValueException.java
ms-common/java/com/android/mmscommon/MmsException.java
ms-common/java/com/android/mmscommon/PduHeaders.java
ms-common/java/com/android/mmscommon/mms/ContentType.java
ms-common/java/com/android/mmscommon/mms/pdu/AcknowledgeInd.java
ms-common/java/com/android/mmscommon/mms/pdu/Base64.java
ms-common/java/com/android/mmscommon/mms/pdu/DeliveryInd.java
ms-common/java/com/android/mmscommon/mms/pdu/GenericPdu.java
ms-common/java/com/android/mmscommon/mms/pdu/MultimediaMessagePdu.java
ms-common/java/com/android/mmscommon/mms/pdu/NotificationInd.java
ms-common/java/com/android/mmscommon/mms/pdu/NotifyRespInd.java
ms-common/java/com/android/mmscommon/mms/pdu/PduBody.java
ms-common/java/com/android/mmscommon/mms/pdu/PduComposer.java
ms-common/java/com/android/mmscommon/mms/pdu/PduContentTypes.java
ms-common/java/com/android/mmscommon/mms/pdu/PduParser.java
ms-common/java/com/android/mmscommon/mms/pdu/PduPart.java
ms-common/java/com/android/mmscommon/mms/pdu/PduPersister.java
ms-common/java/com/android/mmscommon/mms/pdu/QuotedPrintable.java
ms-common/java/com/android/mmscommon/mms/pdu/ReadOrigInd.java
ms-common/java/com/android/mmscommon/mms/pdu/ReadRecInd.java
ms-common/java/com/android/mmscommon/mms/pdu/RetrieveConf.java
ms-common/java/com/android/mmscommon/mms/pdu/SendConf.java
ms-common/java/com/android/mmscommon/mms/pdu/SendReq.java
ms-common/java/com/android/mmscommon/mms/util/AbstractCache.java
ms-common/java/com/android/mmscommon/mms/util/PduCache.java
ms-common/java/com/android/mmscommon/mms/util/PduCacheEntry.java
ms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java
25d6d1576add4ce67778d96a74ff9a8ff8f1a985 29-Jan-2010 Tom Taylor <tomtaylor@google.com> Remove MMS from the framework

The MMS code has been moved into the mms-common library.
Move SqliteWrapper (and make it hidden) into the database
directory because Telephony.java depends on it. Create a mmscommon
library similar to androidcommon for a number of files used both
by the telephony layer, by mms, and by myfaves.

Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
ms-common/Android.mk
ms-common/java/com/android/common/CharacterSets.java
ms-common/java/com/android/common/ContentType.java
ms-common/java/com/android/common/EncodedStringValue.java
ms-common/java/com/android/common/InvalidHeaderValueException.java
ms-common/java/com/android/common/MmsException.java
ms-common/java/com/android/common/PduHeaders.java
ms-common/java/com/android/common/mms/ContentType.java
ms-common/java/com/android/common/mms/pdu/AcknowledgeInd.java
ms-common/java/com/android/common/mms/pdu/Base64.java
ms-common/java/com/android/common/mms/pdu/DeliveryInd.java
ms-common/java/com/android/common/mms/pdu/GenericPdu.java
ms-common/java/com/android/common/mms/pdu/MultimediaMessagePdu.java
ms-common/java/com/android/common/mms/pdu/NotificationInd.java
ms-common/java/com/android/common/mms/pdu/NotifyRespInd.java
ms-common/java/com/android/common/mms/pdu/PduBody.java
ms-common/java/com/android/common/mms/pdu/PduComposer.java
ms-common/java/com/android/common/mms/pdu/PduContentTypes.java
ms-common/java/com/android/common/mms/pdu/PduParser.java
ms-common/java/com/android/common/mms/pdu/PduPart.java
ms-common/java/com/android/common/mms/pdu/PduPersister.java
ms-common/java/com/android/common/mms/pdu/QuotedPrintable.java
ms-common/java/com/android/common/mms/pdu/ReadOrigInd.java
ms-common/java/com/android/common/mms/pdu/ReadRecInd.java
ms-common/java/com/android/common/mms/pdu/RetrieveConf.java
ms-common/java/com/android/common/mms/pdu/SendConf.java
ms-common/java/com/android/common/mms/pdu/SendReq.java
ms-common/java/com/android/common/mms/telephony/TelephonyProvider.java
ms-common/java/com/android/common/mms/util/AbstractCache.java
ms-common/java/com/android/common/mms/util/PduCache.java
ms-common/java/com/android/common/mms/util/PduCacheEntry.java
1443fdf9336da1fd51a11e04efb8f56d7d62cc60 10-Dec-2009 Kenny Root <kroot@google.com> Add string resource type inspection

Allows "aapt dump --values resource" to print out whether a string in a
ResStringPool is in UTF-8 or UTF-16 encoding.

Change-Id: I6478884a70a3b46fee862dece6cb33454fc34843
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
aaa7ef86c623541b85a36f208ca1c0c9f8c2c2c6 09-Dec-2009 Dianne Hackborn <hackbod@google.com> Maybe really fix windows build.
ibs/utils/Threads.cpp
3432efa95e93776f0e45ff9729a0e4580b4c8eba 09-Dec-2009 Dianne Hackborn <hackbod@google.com> Hopefully fix Windows build
ibs/utils/Threads.cpp
235af97debd4b75263dfdb9e3be78e50eff2a53a 08-Dec-2009 Dianne Hackborn <hackbod@google.com> Propagate background scheduling class across processes.

This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group. Plus an API to turn this off for the process, which is
used by the system process.

This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
nclude/utils/threads.h
ibs/utils/Threads.cpp
9a2d83e698b16ec86ad2751b6e7cf103ad645cce 04-Dec-2009 Kenny Root <kroot@google.com> Optional use of UTF-8 strings in resource bundles

Allows the use of UTF-8 for packing resources instead of the
default of UTF-16 for Java. When strings are extracted from the
ResStringPool, they are converted to UTF-16 and the result is
cached for subsequent calls.

When using aapt to package, add in the "-8" switch to pack the
resources using UTF-8. This will result in the value, key, and
type strings as well as the compiled XML string values taking
significantly less space in the final application package in
most scenarios.

Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
nclude/utils/ResourceTypes.h
nclude/utils/String16.h
nclude/utils/String8.h
ibs/utils/ResourceTypes.cpp
ibs/utils/String16.cpp
ibs/utils/String8.cpp
09b41cbf9fe74a831c0ad883406e03dfe0568d78 02-Dec-2009 Ken Shirriff <kens@google.com> Generate a calendar static Java library.

This contains the calendar contract and pim functions for use by the
sync adapter. This library is a duplicate of the functions in the
framework.
alendar/Android.mk
9b9d67363b10e466e4627f67b9b6536a3409a1f9 20-Nov-2009 Dianne Hackborn <hackbod@google.com> Debugging for issue #2228381 android.view.InflateException

Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)

Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
ibs/utils/ResourceTypes.cpp
198df9e70cfa72762712678cea243a4fd34c18d1 12-Nov-2009 Dan Egnor <egnor@google.com> Rename [I]DropBox[Service] to [I]DropBoxManager[Service].

Un-hide the DropBoxManager interface, and update the public API accordingly.
leanspec.mk
6b8297700b5f947cb959edb56d34751bd74d5e81 02-Nov-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2226370: Resource versions match with equality

Also fixed turned-around increment of version number for resources. :(

Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
nclude/utils/ResourceTypes.h
62b7796351a3f0ee3fe9985fbc11c8d73ab304ef 01-Oct-2009 Christopher Tate <ctate@android.com> Turn off most of the backup-related debug logging

The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.

Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
ibs/utils/BackupData.cpp
56aa1ada4014aa0beb575fe5e918574ebbaf784e 28-Sep-2009 Doug Zongker <dougz@android.com> fix "pacakge" typo in error log message
ibs/utils/ResourceTypes.cpp
df6d39adf3344a1c5505d3d83527715fa2f7ef48 22-Sep-2009 Christopher Tate <ctate@android.com> Clear the device's data from the transport when backup is disabled

Turning off backup in the Settings UI constitutes an opt-out of the whole
mechanism. For privacy reasons we instruct the backend to wipe all of the data
belonging to this device when the user does this. If the attempt fails it is
rescheduled in the future based on the transport's requestBackupTime()
suggestion. If network connectivity changes prompt the transport to indicate a
backup pass is appropriate "now," any pending init operation is processed before
the backup schedule is resumed.

The broadcasts used internally to the backup manager are now fully protected;
third party apps can neither send nor receive them.

(Also a minor logging change; don't log 'appropriate' EOF encountered during
parsing of a backup data stream.)
ibs/utils/BackupData.cpp
f660ea533bc4a9312de1f07cdefc2411038e22e5 20-Sep-2009 Dianne Hackborn <hackbod@google.com> Fix issue #1862317: Browser does not appear to honor anchors (#es) in links

Also a little improved debugging output of bad resource identifiers.

Change-Id: I054064ef22855608ffd722e4ccf12ce57d1992b2
ibs/utils/ResourceTypes.cpp
7f4b32fd75ab441f478e86a8b755ba38a58473c0 16-Sep-2009 Dianne Hackborn <hackbod@google.com> Implement issue #1780928: Need support hiding nav keys.

This implements support for devices whose hardware can hide
their navigation keys. It works much like the existing keyboardHidden
configuration, and for compatibility uses the same configuration
change bit.

Also add FLAG_TURN_ON_SCREEN for windows, which has the system
cause the screen to be turned on when the window is displayed.
Great fun when used with FLAG_SHOW_WHEN_LOCKED!

Change-Id: I0b867f19af85cfd8786a14cea194b34f7bdd9b7a
nclude/utils/ResourceTypes.h
f4d57661befb874bff67d20f39ed737dbea62c67 12-Sep-2009 San Mehat <san@google.com> process: Switch to common cutils sched_policy api

Signed-off-by: San Mehat <san@google.com>
nclude/utils/threads.h
7089ab8b38b626c79a55fdf216e07ec0c8088d01 09-Sep-2009 San Mehat <san@google.com> Process: Add support for using scheduler policies instead of cgroups.
Preference is given to cgroups if available.

Signed-off-by: San Mehat <san@google.com>
nclude/utils/threads.h
51ce3ad7607a4b5ac533e6a3fd90709b30dba03f 09-Sep-2009 Mathias Agopian <mathias@google.com> use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for

we could have several thread waiting on the condition and they all need to wake-up.
also added a debug "mTid" field in the class, which contains the tid of the thread (as opposed to pthread_t), this
is useful when debugging under gdb for instance.
nclude/utils/threads.h
ibs/utils/Threads.cpp
641b630d2b08fa1cc48ee8e03b69b498f246c08e 08-Sep-2009 Mathias Agopian <mathias@google.com> fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly

Rewrote SurfaceFlinger's buffer management from the ground-up.
The design now support an arbitrary number of buffers per surface, however the current implementation is limited to four. Currently only 2 buffers are used in practice.

The main new feature is to be able to dequeue all buffers at once (very important when there are only two).

A client can dequeue all buffers until there are none available, it can lock all buffers except the last one that is used for composition. The client will block then, until a new buffer is enqueued.

The current implementation requires that buffers are locked in the same order they are dequeued and enqueued in the same order they are locked. Only one buffer can be locked at a time.

eg. Allowed sequence: DQ, DQ, LOCK, Q, LOCK, Q
eg. Forbidden sequence: DQ, DQ, LOCK, LOCK, Q, Q
nclude/utils/Errors.h
7e3953f3434e2b8bb3cc0127c9f493b06045ecd7 02-Sep-2009 Eric Fischer <enf@google.com> Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.

In practice, no one ever writes an apostrophe in an aapt string with the
intent of using it to quote whitespace -- they always mean to include a
literal apostrophe in the string and then are surprised when they find
the apostrophe missing. Make this an error so that it is discovered
right away instead of waiting until late in QA or after the strings have
already been sent for translation. (And fix a recently-introduced string
that has exactly this problem.)

Silence the warning about an empty span in a string, since this seems to
annoy people instead of finding any real problems.

Make the error about having a translated string with no base string into
a warning, since this is a big pain when making changes to an application
that has already had some translations done, and the dead translations
should be removed by a later translation import anyway.
ibs/utils/ResourceTypes.cpp
023a9546adc3e2c506a76b27583e92ade0988f25 17-Aug-2009 Andreas Huber <andih@google.com> Support for marshalling pointers / intptr_t in Parcel.

Some refactoring to eliminate code duplication in Parcel implementation.
nclude/utils/Debug.h
0042a806ce64e9d6f3ae838c4d8ce87311f89354 12-Aug-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2048263: More debugging information

We now hopefully do better about generating the anr reports, and include
information about the malloc loaded assets in meminfo.
nclude/utils/Asset.h
ibs/utils/Asset.cpp
9bafd12fa18b74e30995525a32b1be5d7804656a 01-Aug-2009 David 'Digit' Turner <digit@google.com> Fix Win32 libutils to get a working SDK build.
ibs/utils/Threads.cpp
ce87c24b3ab6f06a04c1e480814d7d66881aa007 30-Jul-2009 Dianne Hackborn <hackbod@google.com> Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA

It turns out we were not returning the density for anything retrieved from a
TypedArray... which basically means any bitmap references from a layout or style...!!!

This is now fixed.

Also fiddle with the density compatibility mode to turn on smoothing in certain situations,
helping the look of things when they need to scale and we couldn't do the scaling at
load time.
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
01025b2e804468f62b85887e8f2b80c2012f774b 29-Jul-2009 Joe Onorato <joeo@android.com> Only restore the bits for wallpapers that aren't built in.
ibs/utils/BackupData.cpp
045a17c6bfd1a49ad30d4b149c2d6250ee2896e4 29-Jul-2009 Joe Onorato <joeo@android.com> Fix the IOException in wallpaper restore -- the padding isn't required at the end.
ibs/utils/BackupData.cpp
af30c1b0bac0d9dc114f02e9f590a5a510eb8682 22-Jul-2009 Dianne Hackborn <hackbod@google.com> First pass at reworking screen density/size APIs.

This changes the names of the directories in aapt, to what you see
in the list of DpiTest resources. Also adds a new "long" configuration
for wide screens, which the platform sets appropriate, and introduces
a new kind of resizeability for not large but significantly larger
than normal screens which may have compatibility issues.
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
ae7a402db054f5c5aa78c3d9a210f91126982c4d 21-Jul-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ibs/utils/file_backup_helper.cpp
5fcc03f9b212d9011c6d9123d96a6462cd4ba91c 17-Jul-2009 Dianne Hackborn <hackbod@google.com> Add "nodpi" density, and expose a bunch of density-related APIs.

Also update the DpiTest app to use nodpi images, and try to have a mode
where it turns off compatibility though it's not quite working.
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
2d8baa06b5b4987c203817b4adffebe5424fb017 16-Jul-2009 Doug Zongker <dougz@android.com> fix FILE* version of ZipUtils::inflateToBuffer

This can't have ever worked; a successful fread() was returning 1
instead of getSize.
ibs/utils/ZipUtils.cpp
c18deadb84c36fce1e184dc4f02f189105bae5be 13-Jul-2009 Joe Onorato <joeo@android.com> Need to skip the padding after reading.

m_dataEndPos points to the end of the data, not the beginning
of the next entity.
ibs/utils/BackupData.cpp
de6926bc94a2e73fc2b5364840deebc6f2ff7f6e 14-Jul-2009 Mathias Agopian <mathias@google.com> add a ctor to Mutex to specify the type, which can be shared. This is used by sf and af an soon will allow some optimization in the kernel for non shared mutexes
nclude/utils/threads.h
1555436473afd296488235f0aa22bb17162a929f 13-Jul-2009 Mathias Agopian <mathias@google.com> implement Mutex and Condition with pthread instead of calling futex directly.

internally pthread uses futex. the implementation consists of simple inlines
there are no implementation files anymore.
nclude/utils/threads.h
ibs/utils/Android.mk
ibs/utils/Threads.cpp
ibs/utils/futex_synchro.c
d8cc052fafdc7a5580a36d1b27f819551e6f06ac 09-Jul-2009 Dianne Hackborn <hackbod@google.com> Fix resources not being set correctly.
ibs/utils/ResourceTypes.cpp
56d6326a0ef3a98dbdac5de540aebf569c0bca34 09-Jul-2009 Daisuke Miyakawa <dmiyakawa@google.com> quick fix; utf8_codepoint_count must be utf8_length
ibs/utils/String8.cpp
44dad3e006e0a966d93473dde3d74b2b43555519 30-Jun-2009 Daisuke Miyakawa <dmiyakawa@google.com> Add useful functions to String8, which enables users to convert between UTF-8 and UTF-32
It will be used in SQL functions in external/sqlite/android.
See https://android-git.corp.google.com/g/Gerrit#change,5511 for example.

Related internal bug id: 1707173
nclude/utils/String8.h
ibs/utils/String8.cpp
34ed82706a56c94993efa2b679ff1520e5db5bb7 07-Jul-2009 Andy McFadden <fadden@android.com> Fix sim build.

Looks like older gcc (4.1.x) doesn't properly handle templated
fanciness. Apparently that's what we have on the build server.
nclude/utils/List.h
bd875d2638625ef959a98d8bd69c58e9a52d6cf4 06-Jul-2009 Dianne Hackborn <hackbod@google.com> Don't re-parse the framework resources all the time.

A small optimization to the resource code, to not re-parse the framework
resources every time we build a new AssetManager. Instead, you can now
construct a ResTable from a previously created one... of course, like the
existing code for using the data in-place, you can't delete the original
ResTable until you have deleted the one that has been constructed from it.
nclude/utils/AssetManager.h
nclude/utils/ResourceTypes.h
ibs/utils/Asset.cpp
ibs/utils/AssetManager.cpp
ibs/utils/ResourceTypes.cpp
cfd03822f0ac8a78407dd85876e4d532591f620f 30-Jun-2009 Dianne Hackborn <hackbod@google.com> Fix issue #1673793: Theme styles don't apply.

It turns out this was not a problem in the resource code at all. Rather,
the system process has a cache of pre-loaded attributes it uses to avoid
continually reloading things as it needs them. Well it turns out this
cache wasn't flushed after a package was uninstalled or a configuration
changed, so you could re-install an app where you change its style resources
so its theme now points to one that is inconsistent in the cache.

This is mostly a problem for developers, where they continually install
new versions of an app where resources have changed. This could possibly
show up when updating an app on a normal phone, although the problem would
eventually correct itself since this cache uses weak references.

Anyway, the cache is now reworked to be flushed appropriately.

This change also includes an update to aapt to be able to dump the
contents of bags in resources.
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
ff574337456993b671b503bf1f65efcfc3ac6794 26-Jun-2009 Joe Onorato <joeo@android.com> Better (and less) logging from backup.
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
8b72a9bb4e06e447b3dee91ba9b82b08bc8783f4 26-Jun-2009 Dianne Hackborn <hackbod@google.com> Expand support for different screen sizes.

Applications can now declare that they support small, normal, or
large screens. Resource selection can also be done based on these
sizes. By default, pre-Donut apps are false for small and large,
and Donut or later apps are assumed to support all sizes. In either
case they can use <supports-screens> in their manifest to declare
what they actually support.
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
35b4039b48e9edf1be2fff916a8e8f0430e619f3 25-Jun-2009 Mathias Agopian <mathias@google.com> move ui/Time.cpp to core/jni, since this is the only place it is used
nclude/utils/TimeUtils.h
585d4f410e818434f41fa024e3db6ce562f86d54 24-Jun-2009 Christopher Tate <ctate@google.com> Only report "unknown metadata" once per restore helper

Also removes the auto-free object, replacing it with direct memory manipulation.
nclude/utils/BackupHelpers.h
ibs/utils/BackupHelpers.cpp
aacacf7f7502198606ab4615ed88ab6f6174b7e6 24-Jun-2009 Christopher Tate <ctate@google.com> Put back LOGP -> printf in the backup helper code
ibs/utils/BackupHelpers.cpp
ad2030d99e904d4ed97ffd43786e730998cdccb0 24-Jun-2009 Christopher Tate <ctate@google.com> Preserve file access mode when backing up / restoring files

This change adds a fixed-size metadata block at the head of each file's content
entity. The block is versioned, and fixed-size on the theory that it might be
nice to be able to recover the content (if not the full metadata) of the files
if we're ever confronted with data backed up some hypothetical future helper
that stored expanded metadata.

The net effect is that now on restore, we assign the same access mode to the
file that it originally had when backed up.

Also, some of the code was failing to properly free transient heap-based buffers
when it encountered errors. This has been fixed with the addition of a tiny
stack-based object whose job it is to free() its designated pointer from its
destructor.
ibs/utils/BackupHelpers.cpp
02abe53d8a8610d7704ed5a9e90f6393251898a1 23-Jun-2009 Christopher Tate <ctate@google.com> Add file mode to the file-backup saved state blobs

This change puts the file's access mode into the saved-state blob used by the
file backup helpers. The tests have been updated for the new blob content
format.

What this change *doesn't* do is actually backup/restore the file mode. This
change is a prerequisite for that, but mode preservation in backup/restore will
require adding metadata to the backup data stream itself, so will be approached
a bit more carefully.

(Also fixed one outright bug in the test program: ReadEntityData() had been
changed to return a ssize_t union of either a byte-count or a negative number
indicating error, but the test program was still assuming that nonzero == error,
and was spuriously failing.)
nclude/utils/BackupHelpers.h
ibs/utils/BackupHelpers.cpp
109518880c9f5fa8f7564bcc644403565e6203d3 19-Jun-2009 Joe Onorato <joeo@android.com> Helper API cleanup. Allows multiple helpers to function,
because they'll always go in the same order, and this lets
us not have to write headers to keep them paired.
nclude/utils/BackupHelpers.h
ibs/utils/BackupData.cpp
fe3b5edcf13e1aee1c411693dc29e362856e9aa1 22-Jun-2009 Mathias Agopian <mathias@google.com> fix warnings that will show up with GCC 4.4 (in master)
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
a33bd1672fab3ac2ca72f2921716bf860d500aa3 22-Jun-2009 Mathias Agopian <mathias@google.com> improve Vector<> with types that can be trivially moved and remove some unused code.

This optimization applies to sp<> and wp<> which should now perform about the same as regular pointers when placed in to Vector<>.
nclude/utils/SortedVector.h
nclude/utils/TypeHelpers.h
nclude/utils/Vector.h
nclude/utils/VectorImpl.h
4538dd85da70de8e654a558a1f4cf156502855c8 20-Jun-2009 Dianne Hackborn <hackbod@google.com> Report densities in badging, debugging for nine patch bug.

The aapt tool now reports all available densities like it already did
for locales. Also this includes more resource data output, which I
was using to examine bug #1867049 (which at this point I am unable to
reproduce).
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
aebb1ce05e5a76012c6600713645846da29d4300 19-Jun-2009 Joe Onorato <joeo@android.com> backup stuff
nclude/utils/BackupHelpers.h
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
b90ae5522a1be6bd25894f5773f5e19a4e7a0d9e 18-Jun-2009 Joe Onorato <joeo@android.com> Make RestoreHelper and friends also write out the snapshot state.
nclude/utils/BackupHelpers.h
ibs/utils/BackupHelpers.cpp
f9f76ac29179b9eee521760e4f876b7c15a20dba 18-Jun-2009 Joe Onorato <joeo@android.com> FileRestoreHelper and RestoreHelperDispatcher work.
nclude/utils/BackupHelpers.h
ibs/utils/BackupData.cpp
1781fd1ae77d28917f91daa265449532f8329c8a 16-Jun-2009 Joe Onorato <joeo@android.com> checkpoint BackupDatAInput / RestoreHelper
nclude/utils/BackupHelpers.h
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
6890e0bc52eff1419619f7fab7594e9a0af03b6e 12-Jun-2009 Joe Onorato <joeo@android.com> Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
ibs/utils/BackupData.cpp
9becbac780d2389c552c4776688c258321e7c938 11-Jun-2009 Joe Onorato <joeo@android.com> Make the file backup helper not crash if a file you requested
can't be stated. This means you don't need to know if the files
you are backing up exist or not -- we'll figure it out for you.
nclude/utils/BackupHelpers.h
ibs/utils/BackupHelpers.cpp
0d1d7ae49a69cd885b7728add8be0bf6984dc5f8 11-Jun-2009 Joe Onorato <joeo@android.com> Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.

This took quite a bit of refactoring.
nclude/utils/BackupHelpers.h
ibs/utils/BackupHelpers.cpp
14d978d02d93f8976ff8b01c2f827fc7c83f4fbd 06-Jun-2009 Mathias Agopian <mathias@google.com> get rid of LogSocket which wasn't even implemented (enabled)
nclude/utils/LogSocket.h
ibs/utils/Android.mk
ibs/utils/LogSocket.cpp
09e2b145ff574261da93fc7980d2beb22ae55a46 05-Jun-2009 Mathias Agopian <mathias@google.com> break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used
nclude/utils/Socket.h
nclude/utils/ZipEntry.h
nclude/utils/ZipFile.h
nclude/utils/inet_address.h
ibs/utils/Android.mk
ibs/utils/InetAddress.cpp
ibs/utils/Socket.cpp
ibs/utils/ZipEntry.cpp
ibs/utils/ZipFile.cpp
254406e313f8fcb2b63e63494573673e82036dd9 05-Jun-2009 Mathias Agopian <mathias@google.com> rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.

StringArray is used in two places in framework/base and in the Sim. Ideally we should get rid of it and use Vector<String8> instead of creating new code.
nclude/utils/StringArray.h
nclude/utils/string_array.h
ibs/utils/Android.mk
ibs/utils/StringArray.cpp
ba6a87f916cb706e510d541b1272edad1fb0b061 05-Jun-2009 Mathias Agopian <mathias@google.com> cleanup Debug.h a bit
nclude/utils/Debug.h
2972a14f48e9240582535d9870ac5d5bed078f21 05-Jun-2009 Christopher Tate <ctate@google.com> Fix back_up_files() error detection when opening/CRCing the file
ibs/utils/BackupHelpers.cpp
7c88914df4623b8f11bd5341369af60397734537 04-Jun-2009 Mathias Agopian <mathias@google.com> rename a few files to camel-case, add copyright notices
nclude/utils/BackupHelpers.h
nclude/utils/backup_helpers.h
ibs/utils/Android.mk
ibs/utils/BackupData.cpp
ibs/utils/BackupHelpers.cpp
ibs/utils/CharacterData.h
ibs/utils/Unicode.cpp
ibs/utils/ZipEntry.cpp
ibs/utils/ZipFile.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/backup_data.cpp
ibs/utils/backup_helper_file.cpp
ibs/utils/characterData.h
9f2dc70fd18bcf30a4ae3143c5bd502dc07df4cd 01-Jun-2009 Mathias Agopian <mathias@google.com> move utils/Pipe.h to the simulator
nclude/utils/Pipe.h
861db31eb9dd3e47855fdd9d5f7e57a4e1d8799b 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of TimerProbe which is never used
nclude/utils/TimerProbe.h
ibs/utils/Android.mk
ibs/utils/TimerProbe.cpp
d12529a1492f2fb5609a8934dea68e5533756d39 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of sleepForInterval() which didn't seem to be used anywhere in the source tree. Also get rid of ported.h which seem to be used only (possibly) in the sim. moved the implementation there.
nclude/utils/Timers.h
nclude/utils/ported.h
ibs/utils/Android.mk
ibs/utils/Timers.cpp
ibs/utils/ported.cpp
ec8fb949cad6576d3de6d62f02e52d6994d97607 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of utils.h
nclude/utils.h
nclude/utils/misc.h
cbae9a27ce48019c9a930780068b7e3aadbd725f 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of utils/executablepath.h, which now lives in the simulator
nclude/utils/executablepath.h
624756e7ede9e9f64f7f2a0b85c29b213ef3d26f 28-May-2009 Mathias Agopian <mathias@google.com> force explicit instantiation of Singleton<> objects
nclude/utils/Singleton.h
69197b60200c571cc43b0e8726ed8f1e18c39882 28-May-2009 Andy McFadden <fadden@android.com> Sim-only files move, part 2/2.

Move Pipe and executablepath from libutils to the simulator, since nothing
else uses them.
ibs/utils/Android.mk
ibs/utils/Pipe.cpp
ibs/utils/executablepath_darwin.cpp
ibs/utils/executablepath_linux.cpp
d0ef3d46f90b030b4b6d1a667e99ba92d7cf84bd 23-May-2009 Mathias Agopian <mathias@google.com> some work to try to reduce the code size of some native libraries

- make sure that all binder Bn classes define a ctor and dtor in their respective library.
This avoids duplication of the ctor/dtor in libraries where these objects are instantiated.
This is also cleaner, should we want these ctor/dtor to do something one day.

- same change as above for some Bp classes and various other non-binder classes

- moved the definition of CHECK_INTERFACE() in IInterface.h instead of having it everywhere.

- improved the CHECK_INTERFACE() macro so it calls a single method in Parcel, instead of inlining its code everywhere

- IBinder::getInterfaceDescriptor() now returns a "const String16&" instead of String16, which saves calls to String16 and ~String16

- implemented a cache for BpBinder::getInterfaceDescriptor(), since this does an IPC. HOWEVER, this method never seems to be called.
The cache makes BpBinder bigger, so we need to figure out if we need this method at all.
nclude/utils/TextOutput.h
nclude/utils/Timers.h
nclude/utils/threads.h
ibs/utils/CallStack.cpp
ibs/utils/TextOutput.cpp
d5e0fd44bcaeefe6f4ad516e130f95ef4cf68ce4 22-May-2009 Nicolas Catania <niko@google.com> Fix for the simultor build breakage.

Added missing include sys/time.h for utimes.

Detects when stat64 uses a timespec for the modif and access times
and work around the missing st_*time_nsec.

Apologies for the whitespace changes, emacs removed them automatically.
ibs/utils/backup_helper_file.cpp
a7470e498c8cb94f704cc9c5a2951b43748cba73 22-May-2009 Marco Nelissen <marcone@google.com> This should fix the simulator build.
ibs/utils/futex_synchro.c
61c60b1a81ea43fcefa743fba97a11ef2999cd19 20-May-2009 Mathias Agopian <mathias@google.com> move libbinder's header files under includes/binder
nclude/utils/Binder.h
nclude/utils/BpBinder.h
nclude/utils/IBinder.h
nclude/utils/IInterface.h
nclude/utils/IMemory.h
nclude/utils/IPCThreadState.h
nclude/utils/IPermissionController.h
nclude/utils/IServiceManager.h
nclude/utils/MemoryBase.h
nclude/utils/MemoryDealer.h
nclude/utils/MemoryHeapBase.h
nclude/utils/MemoryHeapPmem.h
nclude/utils/Parcel.h
nclude/utils/ProcessState.h
b8db306e1abc58d960a66ffa1485fcfb6eb93a05 19-May-2009 Mathias Agopian <mathias@google.com> checkpoint: split libutils into libutils + libbinder
ibs/utils/Android.mk
ibs/utils/Binder.cpp
ibs/utils/BpBinder.cpp
ibs/utils/IDataConnection.cpp
ibs/utils/IInterface.cpp
ibs/utils/IMemory.cpp
ibs/utils/IPCThreadState.cpp
ibs/utils/IPermissionController.cpp
ibs/utils/IServiceManager.cpp
ibs/utils/MemoryBase.cpp
ibs/utils/MemoryDealer.cpp
ibs/utils/MemoryHeapBase.cpp
ibs/utils/MemoryHeapPmem.cpp
ibs/utils/Parcel.cpp
ibs/utils/ProcessState.cpp
ibs/utils/Static.cpp
a393a7dd947469da6f0d694e938a4c4c7bbd9813 20-May-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ibs/utils/file_backup_helper.cpp
062a488f1e6dd4ad2e1bc1a64bbfbbfdf40b9836 19-May-2009 Joe Onorato <joeo@android.com> Hook up the backup data writer, and add a utility to read the backup data files.
nclude/utils/backup_helpers.h
ibs/utils/backup_data.cpp
ibs/utils/backup_helper_file.cpp
7ac7ecb6bd7358f7e9b159a112d8a0a260145664 19-May-2009 Dianne Hackborn <hackbod@google.com> Update aapt badging for native code, configs, density, etc.
nclude/utils/AssetManager.h
ibs/utils/AssetManager.cpp
cd1c1c86c3cf6a952b5f175753460a8fa0477731 16-May-2009 Joe Onorato <joeo@android.com> Add the backup data file writer C++ class.
nclude/utils/backup_helpers.h
ibs/utils/backup_data.cpp
ibs/utils/backup_helper_file.cpp
9db34413c7326960377c982a1844ffa13e020334 13-May-2009 Eric Fischer <enf@google.com> Start using CLDR for some date-and-time strings and formats.

Use java.text.DateFormat where possible, since that is already using
the CLDR data for the things it supports. Remove an unused date format
object from DatePickerDialog.

Add a new method for getting the standalone month names from applications,
although @hidden for now because it is an API change.

Pass the standalone month names down to native code in Time so that
tztime's strftime() can use them.

And then the bulk of the change: replace all the names for the months
and the days of the week, and AM and PM, and yesterday, today, and tomorrow,
with strings from CLDR. And replace several of the date format strings
with ones derived from CLDR, but reformatted to use strftime() style
instead of SimpleDateFormat style.

All these resource changes go into new donottranslate-cldr.xml files
and are removed from strings.xml so that they aren't part of the
normal translation process and the translators don't have to bother
with them (and risk messing them up).
OTICE
62a381bd134ab0b7874ef4ffa6793fc3210ff7c1 15-May-2009 Joe Onorato <joeo@android.com> Implement the C++ class to write the backed up file data.
nclude/utils/ByteOrder.h
nclude/utils/backup_helpers.h
ibs/utils/Android.mk
ibs/utils/backup_data.cpp
ibs/utils/backup_helper_file.cpp
ibs/utils/file_backup_helper.cpp
b81a9a18e502ec04a10d847322da21389a85868a 14-May-2009 Joe Onorato <joeo@android.com> Get the backup calling through to the file backup helper.

This includes some cleanup to make the parameters match
between BackupService.onBackup and FileBackupHelper.performBackup.
nclude/utils/backup_helpers.h
ibs/utils/file_backup_helper.cpp
5222355ad877881a52a6804d16558bc81ef1f1d5 06-May-2009 Joe Onorato <joeo@android.com> fix the sim build. disables the tests for now.
nclude/utils/backup_helpers.h
ibs/utils/file_backup_helper.cpp
aaead201642faec52df1424d8ab3fcc21a69224f 05-May-2009 Joe Onorato <joeo@android.com> Add some C++ code to do raw files for backup
nclude/utils/backup_helpers.h
ibs/utils/Android.mk
ibs/utils/file_backup_helper.cpp
019f8ed4274f788c90ca5f8a395fed706af5584c 04-May-2009 Mathias Agopian <mathias@google.com> update surfaceflinger, libui and libagl to the new gralloc api

- Currently the lock/unlock path is naive and is done for each drawing operation (glDrawElements and glDrawArrays). this should be improved eventually.
- factor all the lock/unlock code in SurfaceBuffer.
- fixed "showupdate" so it works even when we don't have preserving eglSwapBuffers().
- improved the situation with the dirty-region and fixed a problem that caused GL apps to not update.
- make use of LightRefBase() where needed, instead of duplicating its implementation
- add LightRefBase::getStrongCount()
- renamed EGLNativeWindowSurface.cpp to FramebufferNativeWindow.cpp

- disabled copybits test, since it clashes with the new gralloc api

- Camera/Video will be fixed later when we rework the overlay apis
nclude/utils/RefBase.h
0077a0dd692e38ee7d90725727f311f0f9c24d04 28-Apr-2009 Mathias Agopian <mathias@google.com> improvements (I hope) to to List.h implementation:

- made the helper Node and Iterator classes protected inner classes of List so they don't pollute the android namespace.
- use "int foo()" instead of "int foo(void)" which is more C++ stylish
- made distance() a template function, this way we write it once and it will work with combinations of iterator and const_iterator
- added the inline keyword on some function to make it clear to the compiler and the programmer that we want/intend these to be small inline functions
- added templated comparison operators to Iterator so it can compare iterator and const_iterator
- use size_t instead of "unsigned int" at places
- distance() should return a ptrdiff_t (it's kind of mening less here because it won't really work if the distance is < 0)
- made sure we handle conversions from iterator to const_iterator, but but fail at compile time in the other direction
- added operator->() on iterator and const_iterator
- made a bunch of private constructors explicit to avoid unwanted conversions
nclude/utils/List.h
ebd9dd5521acddb8017380b1483732b2f25e1ccd 28-Apr-2009 Mathias Agopian <mathias@google.com> small fix to List.h, the post-increment iterators should return "const" objects to disallow constructs such as i++++
nclude/utils/List.h
624a35ee485df833765d4367e10975921a92c16e 21-Apr-2009 San Mehat <san@google.com> Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background

Signed-off-by: San Mehat <san@google.com>
nclude/utils/threads.h
76f6b453a201cd7547ade56c456bb5c1dbce79ff 21-Apr-2009 Mathias Agopian <mathias@google.com> a brand new MessageQueue for SurfaceFlinger.
nclude/utils/MemoryDealer.h
d8c95cc027409a21735a7e910a26116cbc6849ea 17-Apr-2009 Mathias Agopian <mathias@google.com> Squashed commit of the following:

commit e5c24638f98162c3b75b4c67a16b510d38e31341
Author: Mathias Agopian <mathias@google.com>
Date: Fri Apr 17 14:09:03 2009 -0700

oops forgot this file.

commit 282642632d0cb12882eecf42e0fdfb2343275de1
Author: Mathias Agopian <mathias@google.com>
Date: Fri Apr 17 14:07:32 2009 -0700

use a helper macro for creating Singleton<>'s static attributes instances.
nclude/utils/Singleton.h
8dbfd35c6065022ee82b69f55b90193ca6990c73 22-Apr-2009 Robert Greenwalt <robdroid@android.com> Squashed commit of the following:

commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date: Wed Apr 22 14:31:26 2009 -0700

Additional fixes and tests for density.

commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date: Tue Apr 14 14:39:00 2009 -0700

Fix runtime resource selection logic.

Fix isBetterThan so that o or this may be supperior at any stage.
Used to only handle this-better or tie at each stage, biasing against o.
Also allows reset of unit test to succeed. Fixes bug 1709202.
nclude/utils/ResourceTypes.h
ibs/utils/ResourceTypes.cpp
592392f8164e459ecc417b4eca9c7bba551f05d7 20-Apr-2009 Marco Nelissen <marcone@google.com> AI 146964: tabs -> spaces

Automated import of CL 146964
ibs/utils/ZipFile.cpp
544e3e3606abebd2e5016bdb33a3ed05a1650e5b 16-Apr-2009 Mathias Agopian <mathias@google.com> fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off.

Squashed commit of the following:

commit 04e9cae7f806bd65f2cfe35c011b47a36773bbe5
Author: Mathias Agopian <mathias@google.com>
Date: Wed Apr 15 18:30:30 2009 -0700

fix and improve BufferMapper's tracking of mapped buffers.

commit 1a8deaed15811092b2349cc3c40cafb5f722046c
Author: Mathias Agopian <mathias@google.com>
Date: Wed Apr 15 00:52:02 2009 -0700

fix some bugs with the Singleton<> class. untested.

commit ed01cc06ad70cf640ce1258f01189cb1a96fd3a8
Author: Mathias Agopian <mathias@google.com>
Date: Tue Apr 14 19:29:25 2009 -0700

some work to debug the Singleton<> template.
nclude/utils/Singleton.h
cf89aa42ef888ba1f9787d6bec96394bcb529604 11-Apr-2009 Mathias Agopian <mathias@google.com> fix KeyedVector::replaceValueAt, which wouldn't even compile if used.
nclude/utils/KeyedVector.h
6b35f970ea136a115120ddb55a119f80b151308f 10-Apr-2009 Mathias Agopian <mathias@google.com> Integrate from //sandbox/mathias/donut/...@145728

SurfaceFlinger rework for new EGL driver model support.
nclude/utils/Parcel.h
nclude/utils/Singleton.h
ibs/utils/Parcel.cpp
4e3ea4acea9cf4ddc1706003831c8ae4943184be 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
nclude/utils/ResourceTypes.h
ae31e705de96c769333652d187a896460d27320b 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
ibs/utils/String16.cpp
7a4c83922e551506fdc6c5fbca6d107ebdeef867 05-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136594
nclude/utils/threads.h
ibs/utils/CallStack.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/String16.cpp
ibs/utils/Threads.cpp
cbb1011c95e0c25c29e40e203a6a31bccd029da3 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ODULE_LICENSE_APACHE2
OTICE
nclude/utils.h
nclude/utils/AndroidUnicode.h
nclude/utils/Asset.h
nclude/utils/AssetDir.h
nclude/utils/AssetManager.h
nclude/utils/Atomic.h
nclude/utils/Binder.h
nclude/utils/BpBinder.h
nclude/utils/Buffer.h
nclude/utils/BufferedTextOutput.h
nclude/utils/ByteOrder.h
nclude/utils/CallStack.h
nclude/utils/Debug.h
nclude/utils/Endian.h
nclude/utils/Errors.h
nclude/utils/FileMap.h
nclude/utils/IBinder.h
nclude/utils/IInterface.h
nclude/utils/IMemory.h
nclude/utils/IPCThreadState.h
nclude/utils/IPermissionController.h
nclude/utils/IServiceManager.h
nclude/utils/KeyedVector.h
nclude/utils/List.h
nclude/utils/Log.h
nclude/utils/LogSocket.h
nclude/utils/MemoryBase.h
nclude/utils/MemoryDealer.h
nclude/utils/MemoryHeapBase.h
nclude/utils/MemoryHeapPmem.h
nclude/utils/Parcel.h
nclude/utils/Pipe.h
nclude/utils/ProcessState.h
nclude/utils/RefBase.h
nclude/utils/ResourceTypes.h
nclude/utils/SharedBuffer.h
nclude/utils/Socket.h
nclude/utils/SortedVector.h
nclude/utils/StopWatch.h
nclude/utils/String16.h
nclude/utils/String8.h
nclude/utils/SystemClock.h
nclude/utils/TextOutput.h
nclude/utils/TimeUtils.h
nclude/utils/TimerProbe.h
nclude/utils/Timers.h
nclude/utils/TypeHelpers.h
nclude/utils/Vector.h
nclude/utils/VectorImpl.h
nclude/utils/ZipEntry.h
nclude/utils/ZipFile.h
nclude/utils/ZipFileCRO.h
nclude/utils/ZipFileRO.h
nclude/utils/ZipUtils.h
nclude/utils/ashmem.h
nclude/utils/executablepath.h
nclude/utils/inet_address.h
nclude/utils/misc.h
nclude/utils/ported.h
nclude/utils/string_array.h
nclude/utils/threads.h
ibs/utils/Android.mk
ibs/utils/Asset.cpp
ibs/utils/AssetDir.cpp
ibs/utils/AssetManager.cpp
ibs/utils/Binder.cpp
ibs/utils/BpBinder.cpp
ibs/utils/BufferedTextOutput.cpp
ibs/utils/CallStack.cpp
ibs/utils/Debug.cpp
ibs/utils/FileMap.cpp
ibs/utils/IDataConnection.cpp
ibs/utils/IInterface.cpp
ibs/utils/IMemory.cpp
ibs/utils/IPCThreadState.cpp
ibs/utils/IPermissionController.cpp
ibs/utils/IServiceManager.cpp
ibs/utils/InetAddress.cpp
ibs/utils/LogSocket.cpp
ibs/utils/MODULE_LICENSE_APACHE2
ibs/utils/MemoryBase.cpp
ibs/utils/MemoryDealer.cpp
ibs/utils/MemoryHeapBase.cpp
ibs/utils/MemoryHeapPmem.cpp
ibs/utils/NOTICE
ibs/utils/Parcel.cpp
ibs/utils/Pipe.cpp
ibs/utils/ProcessState.cpp
ibs/utils/README
ibs/utils/RefBase.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/SharedBuffer.cpp
ibs/utils/Socket.cpp
ibs/utils/Static.cpp
ibs/utils/StopWatch.cpp
ibs/utils/String16.cpp
ibs/utils/String8.cpp
ibs/utils/SystemClock.cpp
ibs/utils/TextOutput.cpp
ibs/utils/Threads.cpp
ibs/utils/TimerProbe.cpp
ibs/utils/Timers.cpp
ibs/utils/Unicode.cpp
ibs/utils/VectorImpl.cpp
ibs/utils/ZipEntry.cpp
ibs/utils/ZipFile.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/characterData.h
ibs/utils/executablepath_darwin.cpp
ibs/utils/executablepath_linux.cpp
ibs/utils/futex_synchro.c
ibs/utils/misc.cpp
ibs/utils/ported.cpp
cf59fa8dc7ddca5a172860223b06afed5d4ec0e0 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ODULE_LICENSE_APACHE2
OTICE
nclude/utils.h
nclude/utils/AndroidUnicode.h
nclude/utils/Asset.h
nclude/utils/AssetDir.h
nclude/utils/AssetManager.h
nclude/utils/Atomic.h
nclude/utils/Binder.h
nclude/utils/BpBinder.h
nclude/utils/Buffer.h
nclude/utils/BufferedTextOutput.h
nclude/utils/ByteOrder.h
nclude/utils/CallStack.h
nclude/utils/Debug.h
nclude/utils/Endian.h
nclude/utils/Errors.h
nclude/utils/FileMap.h
nclude/utils/IBinder.h
nclude/utils/IInterface.h
nclude/utils/IMemory.h
nclude/utils/IPCThreadState.h
nclude/utils/IPermissionController.h
nclude/utils/IServiceManager.h
nclude/utils/KeyedVector.h
nclude/utils/List.h
nclude/utils/Log.h
nclude/utils/LogSocket.h
nclude/utils/MemoryBase.h
nclude/utils/MemoryDealer.h
nclude/utils/MemoryHeapBase.h
nclude/utils/MemoryHeapPmem.h
nclude/utils/Parcel.h
nclude/utils/Pipe.h
nclude/utils/ProcessState.h
nclude/utils/RefBase.h
nclude/utils/ResourceTypes.h
nclude/utils/SharedBuffer.h
nclude/utils/Socket.h
nclude/utils/SortedVector.h
nclude/utils/StopWatch.h
nclude/utils/String16.h
nclude/utils/String8.h
nclude/utils/SystemClock.h
nclude/utils/TextOutput.h
nclude/utils/TimeUtils.h
nclude/utils/TimerProbe.h
nclude/utils/Timers.h
nclude/utils/TypeHelpers.h
nclude/utils/Vector.h
nclude/utils/VectorImpl.h
nclude/utils/ZipEntry.h
nclude/utils/ZipFile.h
nclude/utils/ZipFileCRO.h
nclude/utils/ZipFileRO.h
nclude/utils/ZipUtils.h
nclude/utils/ashmem.h
nclude/utils/executablepath.h
nclude/utils/inet_address.h
nclude/utils/misc.h
nclude/utils/ported.h
nclude/utils/string_array.h
nclude/utils/threads.h
ibs/utils/Android.mk
ibs/utils/Asset.cpp
ibs/utils/AssetDir.cpp
ibs/utils/AssetManager.cpp
ibs/utils/Binder.cpp
ibs/utils/BpBinder.cpp
ibs/utils/BufferedTextOutput.cpp
ibs/utils/CallStack.cpp
ibs/utils/Debug.cpp
ibs/utils/FileMap.cpp
ibs/utils/IDataConnection.cpp
ibs/utils/IInterface.cpp
ibs/utils/IMemory.cpp
ibs/utils/IPCThreadState.cpp
ibs/utils/IPermissionController.cpp
ibs/utils/IServiceManager.cpp
ibs/utils/InetAddress.cpp
ibs/utils/LogSocket.cpp
ibs/utils/MODULE_LICENSE_APACHE2
ibs/utils/MemoryBase.cpp
ibs/utils/MemoryDealer.cpp
ibs/utils/MemoryHeapBase.cpp
ibs/utils/MemoryHeapPmem.cpp
ibs/utils/NOTICE
ibs/utils/Parcel.cpp
ibs/utils/Pipe.cpp
ibs/utils/ProcessState.cpp
ibs/utils/README
ibs/utils/RefBase.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/SharedBuffer.cpp
ibs/utils/Socket.cpp
ibs/utils/Static.cpp
ibs/utils/StopWatch.cpp
ibs/utils/String16.cpp
ibs/utils/String8.cpp
ibs/utils/SystemClock.cpp
ibs/utils/TextOutput.cpp
ibs/utils/Threads.cpp
ibs/utils/TimerProbe.cpp
ibs/utils/Timers.cpp
ibs/utils/Unicode.cpp
ibs/utils/VectorImpl.cpp
ibs/utils/ZipEntry.cpp
ibs/utils/ZipFile.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/characterData.h
ibs/utils/executablepath_darwin.cpp
ibs/utils/executablepath_linux.cpp
ibs/utils/futex_synchro.c
ibs/utils/misc.cpp
ibs/utils/ported.cpp
7aa707a5d654b7af67b133955c454c8e23a12abc 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
nclude/utils/ResourceTypes.h
ibs/utils/Threads.cpp
c739660fb7c06a845f829a86302bd4a91641318f 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
nclude/utils/ResourceTypes.h
ibs/utils/Threads.cpp
3fec108e6c2a90fbb1976f69407805ff653eb0e7 14-Feb-2009 Rebecca Schultz Zavin <rebecca@android.com> Need to dup file descriptor when reading from the binder for native handles

When reading a native handle that has passed through the binder,
the fds have to be duped to prevent them from getting closed when the binder
object is destructed.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
ibs/utils/Parcel.cpp
dccb00bd4c9a5232f96a641b6749ab8d55b6c04d 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
nclude/utils/logger.h
60dcc00861a1810deea7b31968578010556d4f3a 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
nclude/utils/ResourceTypes.h
ibs/utils/Parcel.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/String8.cpp
13e4bed7dbfc5d785f774539021cf428ca851601 05-Feb-2009 ralf <ralf@android.com> AAPT needs a buffer larger than 1 MB on the host to decode resources.arsc from SDK/android.jar.
This leaves the asset unzip buffer to 1 MB on the device and 2 MB on the host.
nclude/utils/Asset.h
7976caad7d3c1515b3a8f2e756fa62eb3d36722f 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
nclude/utils/Parcel.h
ibs/utils/Parcel.cpp
046e40caa03beba3b8b03527959ce97df9372b6a 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
nclude/utils/MemoryHeapBase.h
nclude/utils/RefBase.h
ibs/utils/MemoryHeapBase.cpp
7810449ca1c0bbb7429188df96eab2dca8fbddca 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
nclude/utils/IPCThreadState.h
nclude/utils/MemoryHeapPmem.h
nclude/utils/ResourceTypes.h
nclude/utils/TimeUtils.h
nclude/utils/string_array.h
ibs/utils/Android.mk
ibs/utils/CallStack.cpp
ibs/utils/IPCThreadState.cpp
ibs/utils/LogSocket.cpp
ibs/utils/MemoryDealer.cpp
ibs/utils/MemoryHeapPmem.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/futex_synchro.c
d245d1d09731d6a19e8a25559d3907f54441ac3d 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ODULE_LICENSE_APACHE2
OTICE
nclude/utils.h
nclude/utils/AndroidUnicode.h
nclude/utils/Asset.h
nclude/utils/AssetDir.h
nclude/utils/AssetManager.h
nclude/utils/Atomic.h
nclude/utils/Binder.h
nclude/utils/BpBinder.h
nclude/utils/Buffer.h
nclude/utils/BufferedTextOutput.h
nclude/utils/ByteOrder.h
nclude/utils/CallStack.h
nclude/utils/Debug.h
nclude/utils/Endian.h
nclude/utils/Errors.h
nclude/utils/FileMap.h
nclude/utils/IBinder.h
nclude/utils/IInterface.h
nclude/utils/IMemory.h
nclude/utils/IPCThreadState.h
nclude/utils/IPermissionController.h
nclude/utils/IServiceManager.h
nclude/utils/KeyedVector.h
nclude/utils/List.h
nclude/utils/Log.h
nclude/utils/LogSocket.h
nclude/utils/MemoryBase.h
nclude/utils/MemoryDealer.h
nclude/utils/MemoryHeapBase.h
nclude/utils/MemoryHeapPmem.h
nclude/utils/Parcel.h
nclude/utils/Pipe.h
nclude/utils/ProcessState.h
nclude/utils/RefBase.h
nclude/utils/ResourceTypes.h
nclude/utils/SharedBuffer.h
nclude/utils/Socket.h
nclude/utils/SortedVector.h
nclude/utils/StopWatch.h
nclude/utils/String16.h
nclude/utils/String8.h
nclude/utils/SystemClock.h
nclude/utils/TextOutput.h
nclude/utils/TimeUtils.h
nclude/utils/TimerProbe.h
nclude/utils/Timers.h
nclude/utils/TypeHelpers.h
nclude/utils/Vector.h
nclude/utils/VectorImpl.h
nclude/utils/ZipEntry.h
nclude/utils/ZipFile.h
nclude/utils/ZipFileCRO.h
nclude/utils/ZipFileRO.h
nclude/utils/ZipUtils.h
nclude/utils/ashmem.h
nclude/utils/executablepath.h
nclude/utils/inet_address.h
nclude/utils/logger.h
nclude/utils/misc.h
nclude/utils/ported.h
nclude/utils/string_array.h
nclude/utils/threads.h
ibs/utils/Android.mk
ibs/utils/Asset.cpp
ibs/utils/AssetDir.cpp
ibs/utils/AssetManager.cpp
ibs/utils/Binder.cpp
ibs/utils/BpBinder.cpp
ibs/utils/BufferedTextOutput.cpp
ibs/utils/CallStack.cpp
ibs/utils/Debug.cpp
ibs/utils/FileMap.cpp
ibs/utils/IDataConnection.cpp
ibs/utils/IInterface.cpp
ibs/utils/IMemory.cpp
ibs/utils/IPCThreadState.cpp
ibs/utils/IPermissionController.cpp
ibs/utils/IServiceManager.cpp
ibs/utils/InetAddress.cpp
ibs/utils/LogSocket.cpp
ibs/utils/MODULE_LICENSE_APACHE2
ibs/utils/MemoryBase.cpp
ibs/utils/MemoryDealer.cpp
ibs/utils/MemoryHeapBase.cpp
ibs/utils/MemoryHeapPmem.cpp
ibs/utils/NOTICE
ibs/utils/Parcel.cpp
ibs/utils/Pipe.cpp
ibs/utils/ProcessState.cpp
ibs/utils/README
ibs/utils/RefBase.cpp
ibs/utils/ResourceTypes.cpp
ibs/utils/SharedBuffer.cpp
ibs/utils/Socket.cpp
ibs/utils/Static.cpp
ibs/utils/StopWatch.cpp
ibs/utils/String16.cpp
ibs/utils/String8.cpp
ibs/utils/SystemClock.cpp
ibs/utils/TextOutput.cpp
ibs/utils/Threads.cpp
ibs/utils/TimerProbe.cpp
ibs/utils/Timers.cpp
ibs/utils/Unicode.cpp
ibs/utils/VectorImpl.cpp
ibs/utils/ZipEntry.cpp
ibs/utils/ZipFile.cpp
ibs/utils/ZipFileCRO.cpp
ibs/utils/ZipFileRO.cpp
ibs/utils/ZipUtils.cpp
ibs/utils/characterData.h
ibs/utils/executablepath_darwin.cpp
ibs/utils/executablepath_linux.cpp
ibs/utils/futex_synchro.c
ibs/utils/misc.cpp
ibs/utils/ported.cpp
13f4c9fb279f1b34a3b47a6eac80b8a09d2d3a79 20-Jun-2013 Todd Poynor <toddpoynor@google.com> healthd: normal and charger mode startup

Command line flag -n tells healthd not to use (or wait for) servicemanager
in charger mode.

Change-Id: I255f9597dff6fc904f5ed20fd02f52c0531d14f8
ootdir/init.rc
5ba57f9a951728593aed559ece93ba821c33e45c 27-Jul-2013 Colin Cross <ccross@android.com> Merge "add property to adjust extra_free_kbytes kernel vm tunable"
6bac41f1bf9b651523a2f9f119c2adb0836eb6b7 26-Jul-2013 Mathias Agopian <mathias@google.com> get rid of HAL pixelformats 5551 and 4444

Change-Id: I047d948f2f3b5c681a0b187589775f92b4f01541
nclude/system/graphics.h
224445c83055e04d2091340b400d8b7d9aee5ead 26-Jul-2013 Mathias Agopian <mathias@google.com> Merge "add sRGB pixel formats to the HALs"
e2eb69db6d818b41f5c0f2090cc643f7cff31734 16-Apr-2013 Stephen Smalley <sds@tycho.nsa.gov> Handle policy reloads within ueventd rather than restarting it.

Restarting ueventd upon policy reloads has reportedly created
stability problems for some users and could cause events to be lost.
Stop restarting ueventd and instead handle policy reloads within ueventd.

Also stops restarting installd upon policy reloads.

Change-Id: Ic7f310d69a7c420e48fbc974000cf4a5b9ab4a3b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/devices.c
ootdir/init.rc
752faf2c18407fd79127fb3f3773910b4ddf669d 12-Jun-2013 Todd Poynor <toddpoynor@google.com> healthd: Add system health monitoring daemon

Initially moving battery health monitoring here.

Command line flag -n tells healthd not to use (or wait for) servicemanager
in this execution, for charger and recovery modes.

Change-Id: I1720594724af0c068497b359f9c6ad65aeaa1519
ealthd/Android.mk
ealthd/BatteryMonitor.cpp
ealthd/BatteryMonitor.h
ealthd/BatteryPropertiesRegistrar.cpp
ealthd/BatteryPropertiesRegistrar.h
ealthd/healthd.cpp
57fdb5cfd2b20f47299a12c2050ff8bb2707c788 25-Jul-2013 Colin Cross <ccross@android.com> add property to adjust extra_free_kbytes kernel vm tunable

ActivityManager can't directly write to extra_free_kbytes because
/proc/sys rejects all chown and chmod syscalls. Proxy the writes
through init by using the sys.sysctl.extra_free_kbytes property.

Bug: 10024467
Change-Id: I441e00478421254355fcafb252bc878166483d4c
ootdir/init.rc
8d9da28ab5f32e3cd83858a5b31f45bb5d03a1fd 26-Jul-2013 Mathias Agopian <mathias@google.com> add sRGB pixel formats to the HALs

Change-Id: I1d5f9dd14a6485dd3a29fb5960edfa79aa86da42
nclude/system/graphics.h
64f923ede06940017102ac0ef2c1031aefac37a5 26-Jul-2013 Ying Wang <wangying@google.com> Merge "Generate init.environ.rc by populating BOOTCLASSPATH"
44f5c157240bd9ba3077ca7f444fee4ea56ce5cf 25-Jul-2013 Colin Cross <ccross@android.com> Merge "Move liblog headers to system/core/include/log"
b815810f477aa39e28705dda1713152927e5adc6 25-Jul-2013 Elliott Hughes <enh@google.com> am 09f240e0: am 5d855432: Merge "Add USB Vendor ID for ECS"

* commit '09f240e0b06326531e64e9826859a774cd456ad7':
Add USB Vendor ID for ECS
09f240e0b06326531e64e9826859a774cd456ad7 25-Jul-2013 Elliott Hughes <enh@google.com> am 5d855432: Merge "Add USB Vendor ID for ECS"

* commit '5d8554323caddfa3ca02f31625ea72634312521f':
Add USB Vendor ID for ECS
5d8554323caddfa3ca02f31625ea72634312521f 25-Jul-2013 Elliott Hughes <enh@google.com> Merge "Add USB Vendor ID for ECS"
80292a7d75208fa4a99e3fb06e0565366cfe4643 25-Jul-2013 Colin Cross <ccross@android.com> Merge "fastbootd: userspace implementation of the fastboot device-side protocol"
9227bd385504ace739d4451a6c5dc3d777b5bf21 24-Jul-2013 Colin Cross <ccross@android.com> Move liblog headers to system/core/include/log

Move the liblog headers to log/ instead of cutils/ to complete
the separation of libcutils and liblog. cutils/log.h still
exists and includes log/log.h in order to support the many existing
modules that use cutils/log.h.

Change-Id: I2758c9f4aedcb809ca7ba8383d0f55041dd44345
db/Android.mk
db/log_service.c
ebuggerd/debuggerd.c
ebuggerd/tombstone.c
ebuggerd/utility.c
nclude/cutils/event_tag_map.h
nclude/cutils/log.h
nclude/cutils/logd.h
nclude/cutils/logger.h
nclude/cutils/logprint.h
nclude/cutils/uio.h
nclude/log/event_tag_map.h
nclude/log/log.h
nclude/log/logd.h
nclude/log/logger.h
nclude/log/logprint.h
nclude/log/uio.h
ibcutils/Android.mk
ibcutils/uio.c
iblog/Android.mk
iblog/event_tag_map.c
iblog/fake_log_device.c
iblog/logd_write.c
iblog/logprint.c
iblog/uio.c
ogcat/logcat.cpp
oolbox/log.c
5748ee972de22e3a53bd3ef7d998ed15ea726a69 24-Jul-2013 Ying Wang <wangying@google.com> Generate init.environ.rc by populating BOOTCLASSPATH

- BOOTCLASSPATH now is derived from PRODUCT_BOOT_JARS, which is a product
configuration variable set up by the core build system.
- Moved files from the legacy ALL_PREBUILT to PRODUCT_COPY_FILES in
build/target/product/embedded.mk.

Bug: 9990214
Change-Id: I98bac36c1ca8c779dda572a0a5e0a22b7e4c4a7a
ootdir/Android.mk
ootdir/init.environ.rc.in
ootdir/init.rc
a3d386ea56ef53bb070b87ea7c28e103c5a53e45 07-Feb-2013 Colin Cross <ccross@android.com> fastbootd: userspace implementation of the fastboot device-side protocol

Initial commit of fastbootd. A few commands work, but not
fully functional yet.

Change-Id: I589dee7b327b4460e94b4434aaf9bcf780faa839
astbootd/Android.mk
astbootd/bootimg.h
astbootd/commands.c
astbootd/config.c
astbootd/debug.h
astbootd/fastbootd.c
astbootd/protocol.c
astbootd/protocol.h
astbootd/transport.c
astbootd/transport.h
astbootd/usb_linux_client.c
87bc464a9f62f026fd841d3b54cfb1a5d57d83a3 24-Jul-2013 Glenn Kasten <gkasten@google.com> Merge "Valid channel mask must have at least one channel"
cae8b9df5c9368cabda380d82f9b6c4903e1e2e5 24-Jul-2013 ecsgms <ecs.gms@ecs.com.tw> Add USB Vendor ID for ECS

Change-Id: Ib2fa70204d37f53dc642091eb927d865ddc585b5
db/usb_vendors.c
000b1d0c5058d9da4dfec3a6f16b58fd50c34374 24-Jul-2013 Alex Ray <aray@google.com> thread_defs: remove trailing whitespace

Change-Id: Idba19c64dfde67c40a98c29f68d5e8d4e555a4cf
nclude/system/thread_defs.h
42cf2b5945c6e7cefc84b1146ba5057faae91322 24-Jul-2013 Colin Cross <ccross@android.com> fix windows build

thread_defs.h gets included by the windows host libandroidfw build,
which does not have sys/cdefs.h or BEGIN_DECLS. Switch to using
extern "C" manually.

Change-Id: I363e6f2d3a64c5efeff54049a2e5dab080fd4715
nclude/system/thread_defs.h
511f9efff726c82a1f6a53a11cb39c8513fb0c4f 24-Jul-2013 Alex Ray <aray@google.com> Merge "cutils: add thread_defs header"
8a84c71acbc84138a685e2482b4c53d4973abf9a 24-Jul-2013 Alex Ray <aray@google.com> cutils: add thread_defs header

Change-Id: I3b70054d9f9740a5980df514221de07df55e7176
nclude/system/thread_defs.h
f7326dc0aa2da2df6bf1fa1ae7ef259a0ebdbd7b 19-Jul-2013 Glenn Kasten <gkasten@google.com> Valid channel mask must have at least one channel

Also:
- Use correct type name audio_channel_mask_t
- Use the parameter name 'channelMask' instead of the more ambiguous 'channels'

Change-Id: I22bc1821a1bded0e69fe7d99e7b981ff60d77cee
nclude/system/audio.h
776751ad79b878e98017039bad87ca27a1c86ad0 23-Jul-2013 Colin Cross <ccross@android.com> am 8c4b1539: am f9873987: am 5954ecb8: Merge "Allow more characters in partition name links"

* commit '8c4b153911e399f00fdf0ed4e39782d0d49396d6':
Allow more characters in partition name links
8c4b153911e399f00fdf0ed4e39782d0d49396d6 23-Jul-2013 Colin Cross <ccross@android.com> am f9873987: am 5954ecb8: Merge "Allow more characters in partition name links"

* commit 'f987398723b06538821162dadde7d7d2c9e0fb29':
Allow more characters in partition name links
f987398723b06538821162dadde7d7d2c9e0fb29 23-Jul-2013 Colin Cross <ccross@android.com> am 5954ecb8: Merge "Allow more characters in partition name links"

* commit '5954ecb87b8c77425d8cc766c0cc798957a07a7d':
Allow more characters in partition name links
5954ecb87b8c77425d8cc766c0cc798957a07a7d 23-Jul-2013 Colin Cross <ccross@android.com> Merge "Allow more characters in partition name links"
70cdc26dfcb04676d981afb62be038440296bf94 22-Jul-2013 The Android Open Source Project <initial-contribution@android.com> am ef6ef967: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'ef6ef9673ddd66861e51ef077ff3cbe8cb7fe0e1':
init: Increase maximum number of Android properties to 372
ef6ef9673ddd66861e51ef077ff3cbe8cb7fe0e1 22-Jul-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I686cdf493c592d52eb2718fa4e42f22b902dd84c
f1ae7bd998bb236c1ef4eafb73945856c132f626 22-Jul-2013 The Android Open Source Project <initial-contribution@android.com> am b441a2b9: Merge 821678e1

* commit 'b441a2b930b5a85ea0189fbb99618823bf560037':
init: Increase maximum number of Android properties to 372
b441a2b930b5a85ea0189fbb99618823bf560037 22-Jul-2013 The Android Open Source Project <initial-contribution@android.com> Merge 821678e1

Change-Id: Ia6b827e03d8a62c4682e304a4f7f3b839c8cbbc3
6647bf7285defdd4d5a51677d63d5ec2e722a104 21-Jul-2013 Ajay Dudani <adudani@codeaurora.org> init: Increase maximum number of Android properties to 372

Bug: 9941046 -- encryption failed
Change-Id: Ib9c2921a2b574542cce98d2eadbd9204a1ad0bf0
Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/property_service.c
821678e1c7bd0af12fa4adc314c9024def9ba7c0 21-Jul-2013 Ajay Dudani <adudani@codeaurora.org> init: Increase maximum number of Android properties to 372

Bug: 9941046 -- encryption failed
Change-Id: Ib9c2921a2b574542cce98d2eadbd9204a1ad0bf0
Signed-off-by: Iliyan Malchev <malchev@google.com>
nit/property_service.c
b37f3fe9e52c10273ac629cd316763a9a8cc5823 20-Jul-2013 The Android Open Source Project <initial-contribution@android.com> am 56884c62: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '56884c62d2959c0023cf16f34707ca98c4d38279':
Add writable data space for radio.
f498ec8fafcce6fe30ba3a80bbdbce6577b6b921 20-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> am dafa66af: am 2aa33a3d: Add writable data space for radio.

* commit 'dafa66afdd3729e2c65ccb8dced8ca3e137db437':
Add writable data space for radio.
56884c62d2959c0023cf16f34707ca98c4d38279 19-Jul-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I428d9dcbe7008645e5dbf3a35946a6de34229299
dafa66afdd3729e2c65ccb8dced8ca3e137db437 19-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> am 2aa33a3d: Add writable data space for radio.

* commit '2aa33a3dbd1147558098d9a2948450d363ffe468':
Add writable data space for radio.
d6f4c27a13f6155b51dd29853155f2c42ec1f5db 16-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> Add writable data space for radio.

Storing carrier provisioning urls updates in /data/misc/radio.
bug:9623159

Change-Id: I8d62d4638229733dea0f11f1729c4d22ae2295d1
I36697ed341353b7a3dbec5afe20241102e76f6f1
ootdir/init.rc
93ca79b44535ee24ece08001e1948070db6ab6ed 18-Apr-2012 Johan Redestig <johan.redestig@sonymobile.com> Allow more characters in partition name links

We have several partitions with underscores in their names
which would not be properly linked in:
/dev/block/platform/msm_sdcc.1/by-name/

With this change more characters (_-.) are allowed in
partition name links. Also, any other character is
replaced with '_' so the resulting link names have the
same length as the partition name.

Change-Id: I746566c03db98b10326c755692362d2c10e528ae
nit/devices.c
nit/util.c
57fc1ceebc6a8c84fa6e9cbf268b5ffca3052c2d 18-Jul-2013 Jeff Brown <jeffbrown@google.com> Split framework jar.

Change-Id: I590de05f23669cf625030b479c786423f21c6159
ootdir/init.rc
2aa33a3dbd1147558098d9a2948450d363ffe468 16-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> Add writable data space for radio.

Storing carrier provisioning urls updates in /data/misc/radio.
bug:9623159

Change-Id: I8d62d4638229733dea0f11f1729c4d22ae2295d1
I36697ed341353b7a3dbec5afe20241102e76f6f1
ootdir/init.rc
0246f8f6f6e4b9ebee7d683a48ce37728ea39340 16-Jul-2013 Elliott Hughes <enh@google.com> am a570312a: am f265426f: am 596ee9ea: Merge "Improve the crasher stack-overflow command."

* commit 'a570312a56938f6ebfcadc3ec9830ab8a2407654':
Improve the crasher stack-overflow command.
a570312a56938f6ebfcadc3ec9830ab8a2407654 16-Jul-2013 Elliott Hughes <enh@google.com> am f265426f: am 596ee9ea: Merge "Improve the crasher stack-overflow command."

* commit 'f265426f020162b9e8c20fb051f613de3640254b':
Improve the crasher stack-overflow command.
f265426f020162b9e8c20fb051f613de3640254b 16-Jul-2013 Elliott Hughes <enh@google.com> am 596ee9ea: Merge "Improve the crasher stack-overflow command."

* commit '596ee9ea8ae37b17fbdff91508f55250d528f1d2':
Improve the crasher stack-overflow command.
596ee9ea8ae37b17fbdff91508f55250d528f1d2 16-Jul-2013 Elliott Hughes <enh@google.com> Merge "Improve the crasher stack-overflow command."
b1be27e29b01009d66ac66c20e275506673e962c 16-Jul-2013 Elliott Hughes <enh@google.com> Improve the crasher stack-overflow command.

Runs a lot quicker, with no intermediate noise.

Change-Id: Icd911ff305da2e0889029dc78d5c2b39f32111c5
ebuggerd/crasher.c
3884a9b252c1852e88a2ad75c22b042d25a633f4 13-Jul-2013 Jeff Brown <jeffbrown@google.com> init.rc: Add input flinger.

Change-Id: Ibcb1116bdcd9189272db620910b9958c8ffb4552
ootdir/init.rc
459d879160a31f16f6d5a8f12399197c775da989 15-Jul-2013 Nick Kralevich <nnk@google.com> Merge "init: call restorecon on /sys"
4a291b339e1ab682609485aef6fbb46b66b0de90 15-Jul-2013 Rom Lemarchand <romlem@google.com> Merge "init.rc: configure memory cgroups"
56adf992676e39175f227ac1a542d841bb6c0c24 15-Jul-2013 Nick Kralevich <nnk@google.com> am 9a4913d4: init.rc: remove "on fs" section

* commit '9a4913d422f4c18033333afe8e2e1d699b112d44':
init.rc: remove "on fs" section
f29c533c49ab1c90eae612b1c454f2c6879a6658 12-Jul-2013 Nick Kralevich <nnk@google.com> init: call restorecon on /sys

Not all files on /sys are not getting labeled properly. Fix them.

Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
nit/init.c
nit/util.c
nit/util.h
435a52ef07a5c97bdd717f20cb3115a585eb6d3c 10-Jul-2013 Rom Lemarchand <romlem@google.com> init.rc: configure memory cgroups

Create the memory cgroups folders and configure them

Change-Id: I06c4bb486b204f7e98b0bc6757deec8bd7f6349e
ootdir/init.rc
9a4913d422f4c18033333afe8e2e1d699b112d44 12-Jul-2013 Nick Kralevich <nnk@google.com> init.rc: remove "on fs" section

This was only ever used by the emulator. Now the emulator
uses an fstab file.

Change-Id: I1a071e567e1f1a379f9c8079cc2dc17660d8455f
ootdir/init.rc
e1dbdd697894f84e2cb8882160f0e4104f739064 12-Jul-2013 Nick Kralevich <nnk@google.com> am 7d6ddc7d: am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs"

* commit '7d6ddc7d395e909d841bb7eadfc12a167076aecf':
use ext4 instead of yaffs
7d6ddc7d395e909d841bb7eadfc12a167076aecf 12-Jul-2013 Nick Kralevich <nnk@google.com> am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs"

* commit '2713be91a84078e8b0b9b755ce17881b750e85a7':
use ext4 instead of yaffs
2713be91a84078e8b0b9b755ce17881b750e85a7 12-Jul-2013 Nick Kralevich <nnk@google.com> am fb1c9cf6: Merge "use ext4 instead of yaffs"

* commit 'fb1c9cf6fa4efafb3e0c6b0bc93c7f087d926a48':
use ext4 instead of yaffs
fb1c9cf6fa4efafb3e0c6b0bc93c7f087d926a48 12-Jul-2013 Nick Kralevich <nnk@google.com> Merge "use ext4 instead of yaffs"
81274e9e6c71510af9ca3a86c6ace3a73af976bd 12-Jul-2013 Elliott Hughes <enh@google.com> am 6b78fad1: am a9396549: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.

* commit '6b78fad147c772075eae5cfc25f5a50748bc4015':
Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.
6b78fad147c772075eae5cfc25f5a50748bc4015 12-Jul-2013 Elliott Hughes <enh@google.com> am a9396549: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.

* commit 'a9396549b37d13c518c662c04f6ff42e9ae47c24':
Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.
a9396549b37d13c518c662c04f6ff42e9ae47c24 12-Jul-2013 Elliott Hughes <enh@google.com> Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.

Change-Id: I3f8bc955f035b49407540053462e53b3f262d381
s_mgr/fs_mgr_priv.h
ae118966dacfba0e0cd8425cf9059148262ea973 12-Jul-2013 Elliott Hughes <enh@google.com> am 43564031: am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.

* commit '435640312ce48dab201d6f26a6258143a82f551e':
Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.
435640312ce48dab201d6f26a6258143a82f551e 12-Jul-2013 Elliott Hughes <enh@google.com> am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.

* commit '7b9c33b1e0e47f72d0af35d8a948900697da5871':
Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.
7b9c33b1e0e47f72d0af35d8a948900697da5871 12-Jul-2013 Elliott Hughes <enh@google.com> Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.

The conflict was the actual intended change.

Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b
s_mgr/fs_mgr_priv.h
ad989d038eda613819245db2541ecca60a2f99d9 12-Jul-2013 Elliott Hughes <enh@google.com> am dccd7773: am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master

* commit 'dccd77730754b681f3517308359a34f86aecd99f':
fs_mgr_priv: Extend fs wait timeout to 20 seconds
dccd77730754b681f3517308359a34f86aecd99f 12-Jul-2013 Elliott Hughes <enh@google.com> am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master

* commit '786b1232d201d46f59bd9da84bfcfcb9ad80bb6c':
fs_mgr_priv: Extend fs wait timeout to 20 seconds
786b1232d201d46f59bd9da84bfcfcb9ad80bb6c 12-Jul-2013 Elliott Hughes <enh@google.com> resolved conflicts for merge of 42031e0e to stage-aosp-master

Change-Id: I3e6337c258b3e7fb6eee4ed8e3664a69ae219fd6
42031e0ed7c1149c6ff3d2f2dc0ef64ff3573fe6 11-Jul-2013 Ken Sumrall <ksumrall@android.com> Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds"
a76baaabe56b98e23861e89722bd1425f92dbc2c 10-Jul-2013 Ken Sumrall <ksumrall@android.com> Add swapon_all to init's builtin commands

For enabling swap devices found in the fstab file

Change-Id: Iec4fd4d208df3d7a161a90d95f8606e8b516334a
nit/builtins.c
nit/init_parser.c
nit/keywords.h
f4c1512db8f0d2fd19d80487d96db3af7ceaacb5 10-Jul-2013 Nick Kralevich <nnk@google.com> use ext4 instead of yaffs

This is needed to allow the emulator to use ext4 images.

Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I02fde6382ad67cf7f4f3b695396841f70bb9301d
ootdir/init.rc
5bc31a2632f453e03edac714b865773970bba608 09-Jul-2013 Ken Sumrall <ksumrall@android.com> Add support for swap entries in fstab

Swap entries can optionally specify a swapprio= or zramsize= flag
in the fs_mgr flags field.

Change-Id: I30530501efd4112af4e158898a9f65f6443c4fdb
s_mgr/fs_mgr.c
s_mgr/fs_mgr_priv.h
s_mgr/include/fs_mgr.h
894de2202162a528d035e6189d2ea927547f669d 04-Jul-2013 Colin Cross <ccross@android.com> am 983939f7: am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."

* commit '983939f79453433ca67b5382673b891d94343273':
Added net.dns1 prop for emulator, as Android emulator ignores it by default.
983939f79453433ca67b5382673b891d94343273 04-Jul-2013 Colin Cross <ccross@android.com> am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."

* commit '149a9b68ab09e4934556e9247ee5f98008a65662':
Added net.dns1 prop for emulator, as Android emulator ignores it by default.
149a9b68ab09e4934556e9247ee5f98008a65662 04-Jul-2013 Colin Cross <ccross@android.com> am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."

* commit 'fafcabd0dd4432de3c7f5956edec23f6ed241b56':
Added net.dns1 prop for emulator, as Android emulator ignores it by default.
fafcabd0dd4432de3c7f5956edec23f6ed241b56 04-Jul-2013 Colin Cross <ccross@android.com> Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
fb3280886d9366d26e9c2ce41f95d8265c025aa1 02-Jul-2013 Rom Lemarchand <romlem@google.com> Merge "toolbox: swap utils"
622810ceff6d98779171c68391465c7434adeb1d 28-Jun-2013 Rom Lemarchand <romlem@google.com> fastboot: add support for sparse images in flashall and update

Change-Id: I66a73b16a988a65fc91fb22a26d11986025089de
Signed-off-by: Rom Lemarchand <romlem@google.com>
astboot/fastboot.c
c9cce4b981c79d543d2d10d2365e81fb39ad3da9 28-Jun-2013 Rom Lemarchand <romlem@google.com> fastboot: Remove legacy MINGW workarounds

The version of MINGW we compile with has more advanced POSIX support.
Removing legacy MINGW workarounds as those are not needed anymore.

Change-Id: Id5d67176b719db6c3667be6d63c41432e0ba9f30
Signed-off-by: Rom Lemarchand <romlem@google.com>
astboot/engine.c
astboot/fastboot.c
astboot/util_windows.c
1d932e2bc6f09705320804215149ec072bdf9805 28-Jun-2013 Nick Kralevich <nnk@google.com> Merge "init: allow disabling selinux via a kernel command line"
4838aa1b7b0f279ae6194ab1606922e2d1540f90 27-Jun-2013 Nick Kralevich <nnk@google.com> init: allow disabling selinux via a kernel command line

Create a new "androidboot.selinux" option, to control how userspace
handles SELinux. This kernel command line can have three options:

* disabled
* permissive
* enforcing

"disabled" completely disables userspace support for SELinux. No
policy is ever loaded, nor is the SELinux filesystem /sys/fs/selinux
ever mounted.

"permissive" loads the SELinux policy, but puts SELinux into
permissive mode. SELinux policy violations are logged, but not rejected.

"enforcing", the default, loads the SELinux policy, and places
SELinux into enforcing mode. Policy violations are rejected.

This change addresses post review comments for change
b710ed21dec88c0dde8209264df054c842561589 .

Change-Id: I912583db8e6a0e9c63380de32ad8ffc47a8a440f
nit/init.c
f519c04d280895287b93f13b6f1c42debb2f7565 28-Jun-2013 Eric Laurent <elaurent@google.com> Merge "Add defines for audio offload and non-blocking write"
cf0b4d94fae2009daaed135124971625dfece77b 28-Jun-2013 Ken Sumrall <ksumrall@android.com> Merge "Do not exit early on errors when -f is specified"
3b2b2b51376b1cf9da21155dacd8d9df106bf92d 28-Jun-2013 Ken Sumrall <ksumrall@android.com> Merge "Update the touch command to take a human readable timestamp"
05529a1a10711d93745a9fcf07520f65a3eb4f3d 25-Mar-2013 Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Add defines for audio offload and non-blocking write

- Defines audio output flags for offloaded playback of compressed
streams, and non-blocking HAL write()/drain()
- Adds audio_offload_info_t to pass additional information about a
compressed stream when offloading

Change-Id: I4592d0877edd39e68d0c1035d0652adbd397bf3a
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
nclude/system/audio.h
035482976368dea4ddbda62230a6ec69025a65c3 26-Jun-2013 Ken Sumrall <ksumrall@android.com> Do not exit early on errors when -f is specified

When running with the -f option, do not stop recursion or proccessing
command line args if an error occurs. Continue trying to remove all
the items specified on the command line. However, still return an
error status if some files could not be removed.

Change-Id: I83d66babe833da8a68aad68248647ba0601c5d32
oolbox/rm.c
13495a1cbb6c6b7ec617488f272bc02f2107a63c 26-Jun-2013 Ken Sumrall <ksumrall@android.com> Update the touch command to take a human readable timestamp

Now the -t option to the toolbox touch command takes a timestamp
in the form of YYYYMMDD.hhmmss

Change-Id: I3812700edaa1a06590a07c15b050721b49e9b7e0
oolbox/touch.c
eecf40fce8d502a9b35f79d73bba708bc35c9632 26-Jun-2013 jp abgrall <jpa@google.com> Merge "Revert "fastboot: add preflash command to help with large downloads+flash""
88e8f61a9ef5cda24932f669d3b224e0216deba9 26-Jun-2013 jp abgrall <jpa@google.com> Revert "fastboot: add preflash command to help with large downloads+flash"

This reverts commit 6f1cd0b2ad7a16d4ec0b5324f992cae33dc34f34.

It causes some devices to fail (b/9581613). Revert for now.

Change-Id: I076158c704c2b4f0459322aa157c19ebd0c4615f
astboot/engine.c
astboot/fastboot_protocol.txt
2a25ca0a2462d58e2b9ade17cb146e03a0476add 26-Jun-2013 Colin Cross <ccross@android.com> am b1e3bb27: am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master

* commit 'b1e3bb2798bb6002b186081d9b0234bdfa432a14':
init: move initial property area allocation into bionic
property_service: make /dev/__properties__ readable
95b87907178ab9288128d88a13de2b135274eb70 26-Jun-2013 JP Abgrall <jpa@google.com> Merge "fastboot: add preflash command to help with large downloads+flash"
cbc76fcadb9b04007cc693aab39e86b33cb394aa 25-Jun-2013 Nick Kralevich <nnk@google.com> Merge "init: move SELinux into enforcing mode."
367297c3d764eaf6e60880964e1739df13f0b703 05-Jun-2013 Rom Lemarchand <romlem@google.com> toolbox: swap utils

Add swap utilities (mkswap, swapon, swapoff) to the toolbox

Change-Id: If5ed6981670a1cdda6b528b587dbc1be7ccdf832
Signed-off-by: Rom Lemarchand <romlem@google.com>
oolbox/Android.mk
oolbox/mkswap.c
oolbox/swapoff.c
oolbox/swapon.c
6f1cd0b2ad7a16d4ec0b5324f992cae33dc34f34 25-Jun-2013 JP Abgrall <jpa@google.com> fastboot: add preflash command to help with large downloads+flash

Without the partition name, the bootloader would have to store all
of the data until the next flash command, which potentially wastes
time.
To help the bootloader deal with the data more efficiently, we now
issue a flashing hint ("preflash:%s", partname).
"preflash:" is used to indicate that the following download
should ignore any previous "preflash:%s".

Bug: 6045918
Change-Id: I4e9708f64f28a4781bde14eb3714d36b281ec5be
astboot/engine.c
astboot/fastboot_protocol.txt
b710ed21dec88c0dde8209264df054c842561589 25-Jun-2013 Nick Kralevich <nnk@google.com> init: move SELinux into enforcing mode.

When init starts up, immediately put SELinux into enforcing mode.

This is currently a no-op. We currently have everything in the
unconfined domain, so this should not break anything.
(if it does, I'll roll it back immediately)

If the kernel doesn't have SELinux support compiled in, then
don't try loading a policy and continue without SELinux protections.

Change-Id: Id0279cf82c545ea0f7090137b7566a5bc3ddd641
nit/init.c
25383a5da2ce4ada76df46e1bc7ae56ac0e41fc4 25-Jun-2013 Colin Cross <ccross@android.com> am 372d668a: am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8

* commit '372d668a279934ff3b2ec2f07a76fe2f351789d5':
init: Retain traditional restart behavior for critical and oneshot services.
init: Safely restart services to avoid race conditions.
b1e3bb2798bb6002b186081d9b0234bdfa432a14 25-Jun-2013 Colin Cross <ccross@android.com> am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master

* commit 'b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a':
init: move initial property area allocation into bionic
property_service: make /dev/__properties__ readable
b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a 25-Jun-2013 Colin Cross <ccross@android.com> resolved conflicts for merge of b6c60285 to stage-aosp-master

Change-Id: I5afba55b668065499fa28369cf217d4f5eafab4a
b6c602859496e212db78435e2b05ec9418189d6c 25-Jun-2013 Colin Cross <ccross@android.com> Merge changes Ieb94caab,I762da21e

* changes:
init: move initial property area allocation into bionic
property_service: make /dev/__properties__ readable
372d668a279934ff3b2ec2f07a76fe2f351789d5 25-Jun-2013 Colin Cross <ccross@android.com> am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8

* commit '39021a48a0e0687c654423acd5a4c99a1d79440d':
init: Retain traditional restart behavior for critical and oneshot services.
init: Safely restart services to avoid race conditions.
39021a48a0e0687c654423acd5a4c99a1d79440d 25-Jun-2013 Colin Cross <ccross@android.com> am 83ada447: Merge changes Ib54f39fd,I7e36edd8

* commit '83ada447aed69dfcd0a88e952eced8db1e4d6584':
init: Retain traditional restart behavior for critical and oneshot services.
init: Safely restart services to avoid race conditions.
83ada447aed69dfcd0a88e952eced8db1e4d6584 25-Jun-2013 Colin Cross <ccross@android.com> Merge changes Ib54f39fd,I7e36edd8

* changes:
init: Retain traditional restart behavior for critical and oneshot services.
init: Safely restart services to avoid race conditions.
2baad525205c944e6ef9005fcb324439f99bcdc8 12-Feb-2013 Greg Hackmann <ghackmann@google.com> init: move initial property area allocation into bionic

bionic's __system_property_add() now expands the property area as needed
by mapping in more pages. Rather than duplicate the mapping code, move
it inside bionic and have bionic's __system_property_area_init() set up
the first page.

Signed-off-by: Greg Hackmann <ghackmann@google.com>

(cherry picked from commit f14eef0c3c456bfe39f7e9d57c8f7ae4ec775972)

Change-Id: Ieb94caab1527c71f2155efe3795490b0ea215a29
nit/property_service.c
26f2d2f51941dda585009ae5cbd6f2ae1926ab2d 23-Jan-2013 Nick Kralevich <nnk@google.com> property_service: make /dev/__properties__ readable

Currently, system properties are passed via the environment
variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed
from parent to child. This is insecure for setuid executables,
as the environment variable can be changed by the caller.

Make the /dev/__properties__ file accessible, so an app can
get properties directly from the file, rather than relying on
environment variables.

Preserve the environment variable for compatibility with pre-existing
apps.

Bug: 8045561

(cherry picked from commit 7ece0a862cf97e85bbe69458a32a2bd165456874)

Change-Id: I762da21ef4075f288745efed0ec7d16c2b71303c
nit/property_service.c
62362e1a64e09c6223ad6598601bb0adca28d296 19-Jun-2013 Greg Hackmann <ghackmann@google.com> Merge "init: move initial property area allocation into bionic"
856d1dcecd48a1e6dfa733d158c824f1c4f2a63d 19-Jun-2013 Colin Cross <ccross@android.com> am 9270f125: am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144e

* commit '9270f12529fdcadaacd9d2bce3ceeeb07d037aa8':
toolbox: reimplement watchprops using __system_property_foreach()
libcutils: reimplement property_list() using __system_property_foreach()
9270f12529fdcadaacd9d2bce3ceeeb07d037aa8 19-Jun-2013 Colin Cross <ccross@android.com> am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144e

* commit 'a44c31cc91bce7124e896adb072a10f2740a96b4':
toolbox: reimplement watchprops using __system_property_foreach()
libcutils: reimplement property_list() using __system_property_foreach()
a44c31cc91bce7124e896adb072a10f2740a96b4 19-Jun-2013 Colin Cross <ccross@android.com> am e755dfd4: Merge changes I1db3137b,I0f66144e

* commit 'e755dfd43812ebd9a0d0d6a2106316f343ffb5a2':
toolbox: reimplement watchprops using __system_property_foreach()
libcutils: reimplement property_list() using __system_property_foreach()
e755dfd43812ebd9a0d0d6a2106316f343ffb5a2 19-Jun-2013 Colin Cross <ccross@android.com> Merge changes I1db3137b,I0f66144e

* changes:
toolbox: reimplement watchprops using __system_property_foreach()
libcutils: reimplement property_list() using __system_property_foreach()
e3662ea7069f13264db585f2b2baf4d92afb9fc7 19-Jun-2013 Nick Kralevich <nnk@google.com> Merge "debuggerd: Ignore SIGPIPE"
68e9b6bc947eaca4135085615860ba90a8656ca4 13-Feb-2013 Greg Hackmann <ghackmann@google.com> toolbox: reimplement watchprops using __system_property_foreach()

Internally, replace the watchlist array with a hashmap since the array
assumes properties are enumerated in a consistent order and foreach()
probably won't. (find_nth() never guaranteed this either but it usually
worked in practice.)

Signed-off-by: Greg Hackmann <ghackmann@google.com>

(cherry picked from commit 389e358017ad15485f2bd9120feebfffa489131b)

Change-Id: I1db3137b130474f4bb205f01f0bdcf37cf974764
oolbox/watchprops.c
6967935eb30875ca9caf4717684141c92a0b6d4b 12-Feb-2013 Greg Hackmann <ghackmann@google.com> libcutils: reimplement property_list() using __system_property_foreach()

Signed-off-by: Greg Hackmann <ghackmann@google.com>

(cherry picked from commit e7bb159d16f9e60850a3c79cc388587959015a65)

Change-Id: I0f66144eb8a4a48e04e4fcd125ad37f19ad94b8e
ibcutils/properties.c
96bcd488c286ebc131e6caf6132b77c66343e5e2 19-Jun-2013 Nick Kralevich <nnk@google.com> debuggerd: Ignore SIGPIPE

The system server may prematurely close the connection to
/data/system/ndebugsocket if it's not interested in the data
from debuggerd. If it does so, we don't want to die due to a
SIGPIPE.

Change-Id: Iaef1f497bcd630144e6df6a06644a3293b85b6e0
ebuggerd/debuggerd.c
f14eef0c3c456bfe39f7e9d57c8f7ae4ec775972 12-Feb-2013 Greg Hackmann <ghackmann@google.com> init: move initial property area allocation into bionic

bionic's __system_property_add() now expands the property area as needed
by mapping in more pages. Rather than duplicate the mapping code, move
it inside bionic and have bionic's __system_property_area_init() set up
the first page.

Change-Id: If9917d5f775c1a82eb89be55b84635395145ca49
Signed-off-by: Greg Hackmann <ghackmann@google.com>
nit/property_service.c
389e358017ad15485f2bd9120feebfffa489131b 13-Feb-2013 Greg Hackmann <ghackmann@google.com> toolbox: reimplement watchprops using __system_property_foreach()

Internally, replace the watchlist array with a hashmap since the array
assumes properties are enumerated in a consistent order and foreach()
probably won't. (find_nth() never guaranteed this either but it usually
worked in practice.)

Change-Id: I83843facdd671edd09652edf472e88ec3d1edd3b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
oolbox/watchprops.c
e7bb159d16f9e60850a3c79cc388587959015a65 12-Feb-2013 Greg Hackmann <ghackmann@google.com> libcutils: reimplement property_list() using __system_property_foreach()

Change-Id: I273fbf7151908ee57b9b951e7d8c5f4925bbc109
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ibcutils/properties.c
f5d79aa4bb712fa5d8bd1b838317772c63720b3f 18-Jun-2013 Nick Kralevich <nnk@google.com> Merge "Don't use __attribute__(__error__)"
bda25e4ed5f2fdd65cf32e7454774f5937c4ede4 18-Jun-2013 Nick Kralevich <nnk@google.com> Don't use __attribute__(__error__)

__attribute(__error__) isn't supported on clang, and generates
compiler warnings. Use __errordecl instead, which does the right thing
for different compilers.

Change-Id: Ifb0797a5de703cc5b3c39dcd97bcfaf404f1cafa
nclude/cutils/properties.h
228ee639be8b75ad13b945950b62529aa6615abd 18-Jun-2013 Elliott Hughes <enh@google.com> am 98c02528: am 19188955: am d92e35eb: Merge "Add Qisda usb config"

* commit '98c02528a2f8bdc0f31a78a8b0b086f4ae823310':
Add Qisda usb config
98c02528a2f8bdc0f31a78a8b0b086f4ae823310 18-Jun-2013 Elliott Hughes <enh@google.com> am 19188955: am d92e35eb: Merge "Add Qisda usb config"

* commit '19188955b50ef6cb133780f66384e9fa055acfac':
Add Qisda usb config
19188955b50ef6cb133780f66384e9fa055acfac 18-Jun-2013 Elliott Hughes <enh@google.com> am d92e35eb: Merge "Add Qisda usb config"

* commit 'd92e35eb7b97f349054390cfee1d40154dba6d66':
Add Qisda usb config
d92e35eb7b97f349054390cfee1d40154dba6d66 18-Jun-2013 Elliott Hughes <enh@google.com> Merge "Add Qisda usb config"
001fe87e0228b72bc0c048ecd92f31be023b72e5 13-Jun-2013 esther <esther530@gmail.com> Add Qisda usb config

add Qisda usb config
Signed-off-by: esther <esther530@gmail.com>

Change-Id: I5b8a0e5bd2218ecdf417de357c9a7d9307c91932

Conflicts:
adb/usb_vendors.c
db/usb_vendors.c
da4c1d141ac3c1afeca6ea5a9aaa30cbb1df31c5 18-Jun-2013 Stephen Hines <srhines@google.com> Merge "Set ATRACE_ENABLE() to '0' if not availble"
9ede33233f97da5c9fb079ac4b373fb7eeb6a3ee 18-Jun-2013 Tobias Grosser <grosser@google.com> Set ATRACE_ENABLE() to '0' if not availble

Change-Id: Iec61d275cd7b2be65f828c282f97cc59adf4cc0b
nclude/cutils/trace.h
755ced8064786dfe3f23a92faddecc7aeca93c70 18-Jun-2013 Colin Cross <ccross@android.com> am 44d1f3c7: am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master

* commit '44d1f3c703015b065f009604907033aac8bedf32':
init: fix copying boot properties
toolbox: hide property implementation from watchprops
init: verify size of property buffers passed to property_get
init: move the system property writer implementation
init: switch property_get to use __system_property_get
44d1f3c703015b065f009604907033aac8bedf32 18-Jun-2013 Colin Cross <ccross@android.com> am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master

* commit '99c1a4168ba792437f298d31cd4631ff01661476':
init: fix copying boot properties
toolbox: hide property implementation from watchprops
init: verify size of property buffers passed to property_get
init: move the system property writer implementation
init: switch property_get to use __system_property_get
99c1a4168ba792437f298d31cd4631ff01661476 18-Jun-2013 Colin Cross <ccross@android.com> resolved conflicts for merge of 95a41f6b to stage-aosp-master

Change-Id: Icfae29edf989fb43a7f0b8bda188a9807f76a3b9
95a41f6b20c678c5f475558ac00ab449ffd1f481 18-Jun-2013 Colin Cross <ccross@android.com> Merge changes Ia7b337e1,I7a2d8aa5,Iacc2b42b,Idf6100d1,If3fba2cc

* changes:
init: fix copying boot properties
toolbox: hide property implementation from watchprops
init: verify size of property buffers passed to property_get
init: move the system property writer implementation
init: switch property_get to use __system_property_get
5e484e9c439f8c065270209f32bdbfb731729250 18-Jun-2013 Colin Cross <ccross@android.com> init: fix copying boot properties

The previous patch "init: verify size of property buffers passed
to property_get" incorrectly modified one of the callers,
resulting in ro.serialno, ro.bootmode, ro.baseband, and
ro.bootloader always being set to their default values.

Bug: 9469860

(cherry picked from commit 67e3663fc93c65b69b5d121db05b0833b98d97f1)

Change-Id: Ia7b337e1fab6e334729f47ee1269e6c736615177
nit/init.c
81963164113f98f5917c7d7990ae2b76f2d4044e 29-Jan-2013 Colin Cross <ccross@android.com> toolbox: hide property implementation from watchprops

(cherry picked from commit 91779634debc79bc75d3df4e0f59d964ad4f5f78)

Change-Id: I7a2d8aa507ac61cedc5f67c563531a7d4ec8e4c2
oolbox/watchprops.c
a5a860ef20cc5e65d4fa9b57cd72231f63f6d316 29-Jan-2013 Colin Cross <ccross@android.com> init: verify size of property buffers passed to property_get

Verify that the buffer passed as the value parameter to property_get
is always big enough.

(cherry picked from commit 88ac54a4e8d2a63e4fd9c465e115795ace316776)

Change-Id: Iacc2b42bfe4069e0bfcbb1c48474f30126a93139
nit/property_service.c
nit/property_service.h
993b6ceeb05677229dee60f1a68c2102c205a7bd 24-Jan-2013 Colin Cross <ccross@android.com> init: move the system property writer implementation

Move the system property writer implementation into bionic to keep
it next to the reader implementation and allow for better testing.

(cherry picked from commit 9f5af635010a7ba92edf1fca543f7271cc9d75c8)

Change-Id: Idf6100d1d0170751acd5163a22597912bff480f0
nit/property_service.c
1a6f4c3bf29a4d474c4582e70fb279d0d28fb7f1 29-Jan-2013 Colin Cross <ccross@android.com> init: switch property_get to use __system_property_get

(cherry picked from commit 2deedfe0b1ac86ebd62d19cf7da9e7dcb508ab09)

Change-Id: If3fba2cc1dd5c167b0924ddfe42dbe2e6387208a
nit/init.c
nit/init_parser.c
nit/keychords.c
nit/property_service.c
nit/property_service.h
67e3663fc93c65b69b5d121db05b0833b98d97f1 18-Jun-2013 Colin Cross <ccross@android.com> init: fix copying boot properties

The previous patch "init: verify size of property buffers passed
to property_get" incorrectly modified one of the callers,
resulting in ro.serialno, ro.bootmode, ro.baseband, and
ro.bootloader always being set to their default values.

Bug: 9469860
Change-Id: Id45bd8dd657e8d61f4cfaf7e6b2559d2bfd05181
nit/init.c
e80e0319ae9ad8b6c29f83acb725c7ea913a9639 17-Jun-2013 Colin Cross <ccross@android.com> Merge changes Ia6609116,Ie5b6fcd9,I9026e604,I4fc0502a

* changes:
toolbox: hide property implementation from watchprops
init: verify size of property buffers passed to property_get
init: move the system property writer implementation
init: switch property_get to use __system_property_get
e39057b68798807f67179baac8bc61860fa1ab7a 17-Jun-2013 Elliott Hughes <enh@google.com> am 88411498: am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"

* commit '88411498b3341dbf8f2976991524b1e21dedc6f6':
adb: fix reported transfer size for transfer over 4 GiB
88411498b3341dbf8f2976991524b1e21dedc6f6 17-Jun-2013 Elliott Hughes <enh@google.com> am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"

* commit '520f4f060325496741f600692f3582536fa43a8f':
adb: fix reported transfer size for transfer over 4 GiB
8df29c9b61be76c786100d36194b54a871d604f0 17-Jun-2013 Elliott Hughes <enh@google.com> am 1aeefcd6: am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK"

* commit '1aeefcd6900d85911028e6d3e344e338e0a05158':
adb: add vendor ID's for Nook, Haier, Hisense, and MTK
520f4f060325496741f600692f3582536fa43a8f 17-Jun-2013 Elliott Hughes <enh@google.com> am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"

* commit '865bb05dd0db1531f252de5e137605beec171ca2':
adb: fix reported transfer size for transfer over 4 GiB
1aeefcd6900d85911028e6d3e344e338e0a05158 17-Jun-2013 Elliott Hughes <enh@google.com> am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK"

* commit '0173ebd531b2b443b56d1c12d598f2f89c95fb0a':
adb: add vendor ID's for Nook, Haier, Hisense, and MTK
0173ebd531b2b443b56d1c12d598f2f89c95fb0a 17-Jun-2013 Elliott Hughes <enh@google.com> am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK"

* commit '5f8d9c012cf28fad57d0896b938b05e2c976073f':
adb: add vendor ID's for Nook, Haier, Hisense, and MTK
865bb05dd0db1531f252de5e137605beec171ca2 17-Jun-2013 Elliott Hughes <enh@google.com> Merge "adb: fix reported transfer size for transfer over 4 GiB"
5f8d9c012cf28fad57d0896b938b05e2c976073f 17-Jun-2013 Elliott Hughes <enh@google.com> Merge "adb: add vendor ID's for Nook, Haier, Hisense, and MTK"
91779634debc79bc75d3df4e0f59d964ad4f5f78 29-Jan-2013 Colin Cross <ccross@android.com> toolbox: hide property implementation from watchprops

Change-Id: Ia6609116d641d3354971ca40a16ffcab38484150
oolbox/watchprops.c
88ac54a4e8d2a63e4fd9c465e115795ace316776 29-Jan-2013 Colin Cross <ccross@android.com> init: verify size of property buffers passed to property_get

Verify that the buffer passed as the value parameter to property_get
is always big enough.

Change-Id: Ie5b6fcd94bb908215cfd55d0c9b07f717ddb70b1
nit/property_service.c
nit/property_service.h
9f5af635010a7ba92edf1fca543f7271cc9d75c8 24-Jan-2013 Colin Cross <ccross@android.com> init: move the system property writer implementation

Move the system property writer implementation into bionic to keep
it next to the reader implementation and allow for better testing.

Change-Id: I9026e604109e30546b2849b60cab2e7e5ff00ba5
nit/property_service.c
2deedfe0b1ac86ebd62d19cf7da9e7dcb508ab09 29-Jan-2013 Colin Cross <ccross@android.com> init: switch property_get to use __system_property_get

Change-Id: I4fc0502a1a5b331087618a4d2e3d90948743d7bd
nit/init.c
nit/init_parser.c
nit/keychords.c
nit/property_service.c
nit/property_service.h
71150ce4efdaba3d60cb39ed085b3476969ab95e 17-Jun-2013 Jeff Smith <whydoubt@gmail.com> adb: add vendor ID's for Nook, Haier, Hisense, and MTK

Change-Id: I156ff750ef9ae66113d1e0e3ceffea047abc03b9
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
db/usb_vendors.c
406c3bb885538e5003efc3736cd2b57ffef2b5cc 16-Jun-2013 The Android Open Source Project <initial-contribution@android.com> am 0c3de6af: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '0c3de6aff3cceb6e041a46a12e596b8e8819aa15':
0c3de6aff3cceb6e041a46a12e596b8e8819aa15 16-Jun-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I4ec0a42f3e59ad0bc4d26ca2b1132ec55ce6fa6d
1ccbcc963345042f7c965faba6d5b48192096ec1 16-Jun-2013 The Android Automerger <android-build@google.com> merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
d9a1430ff2b2d2a52b586dfba1db5ac0128dd85b 15-Jun-2013 Jeff Smith <whydoubt@gmail.com> adb: fix reported transfer size for transfer over 4 GiB

When transferring files over 4 GiB with adb, the size of the transfer
is misreported.

Change-Id: Ia3d4cae1e9f82b4f7432341820b101ea9a44f85b
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
db/file_sync_client.c
fd914ee94c6a6a6383b88f6fc4ab296979f45dd9 14-Jun-2013 Ajay Dudani <adudani@codeaurora.org> am 05a52055: am 76c58893: Free file handle for /firmware/image after use

* commit '05a52055661701c20f71124161798fdea8ea2982':
Free file handle for /firmware/image after use
05a52055661701c20f71124161798fdea8ea2982 14-Jun-2013 Ajay Dudani <adudani@codeaurora.org> am 76c58893: Free file handle for /firmware/image after use

* commit '76c5889325c2ada5dda07fd9af20a4a485978538':
Free file handle for /firmware/image after use
c2362101cbf7f5a0c84bc9339d856d7e5b72e131 14-Jun-2013 Colin Cross <ccross@android.com> am 890f37da: am c620f095: Merge "init: prevent action being added to the action_queue twice"

* commit '890f37da1050916a8dc470b25f9e1d0e7712464d':
init: prevent action being added to the action_queue twice
890f37da1050916a8dc470b25f9e1d0e7712464d 14-Jun-2013 Colin Cross <ccross@android.com> am c620f095: Merge "init: prevent action being added to the action_queue twice"

* commit 'c620f095fef62114ffdc6c0ed0749c56b5e817b8':
init: prevent action being added to the action_queue twice
c620f095fef62114ffdc6c0ed0749c56b5e817b8 14-Jun-2013 Colin Cross <ccross@android.com> Merge "init: prevent action being added to the action_queue twice"
76c5889325c2ada5dda07fd9af20a4a485978538 13-Jun-2013 Ajay Dudani <adudani@codeaurora.org> Free file handle for /firmware/image after use

Change-Id: Id59e25486b45dffc87a89a961970a6e8128a5237
nit/devices.c
b77ba5669345cc5e0cf4b480b334e42a4ecb9efc 12-Jun-2013 Elliott Hughes <enh@google.com> am 65d8ec09: am 6ef0dfec: Merge "Add a new test to crasher to upset dlmalloc."

* commit '65d8ec099dbaa3e4fc56430060853f51a7687ac0':
Add a new test to crasher to upset dlmalloc.
65d8ec099dbaa3e4fc56430060853f51a7687ac0 12-Jun-2013 Elliott Hughes <enh@google.com> am 6ef0dfec: Merge "Add a new test to crasher to upset dlmalloc."

* commit '6ef0dfecca9fde5abe15ceea30e0615897d7b374':
Add a new test to crasher to upset dlmalloc.
6ef0dfecca9fde5abe15ceea30e0615897d7b374 12-Jun-2013 Elliott Hughes <enh@google.com> Merge "Add a new test to crasher to upset dlmalloc."
6f40cafd9fe90fb83536c31d84273bf3572e5a32 12-Jun-2013 Elliott Hughes <enh@google.com> Add a new test to crasher to upset dlmalloc.

We should also add a test for heap corruption, but I failed to come up
with a kind of corruption that dlmalloc actually detects (rather than
just crashing accidentally).

Change-Id: I7457e732729635b171ffc44517c3de71f55608e6
ebuggerd/crasher.c
945ff923b7dde38bc308a7732e486fac04dda576 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge "Add webviewchromium to BOOTCLASSPATH."
7527362eb3b9124e45905201a27cb30bb53904c7 11-Jun-2013 Colin Cross <ccross@android.com> am 0a0a8768: resolved conflicts for merge of c0df50af to stage-aosp-master

* commit '0a0a8768cbc9ce36d3c9a0cc712dc8c309811565':
fix bad return value in dhcp_do_request_*
0a0a8768cbc9ce36d3c9a0cc712dc8c309811565 11-Jun-2013 Colin Cross <ccross@android.com> resolved conflicts for merge of c0df50af to stage-aosp-master

Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c
c0df50afdb8e738df311c44ab80507b9470070ed 10-Jun-2013 Colin Cross <ccross@android.com> Merge "fix bad return value in dhcp_do_request_*"
e9ab162f30e88d5d9f8a9264d83745b8c3f381ad 07-Mar-2013 Colin Cross <ccross@android.com> init: prevent action being added to the action_queue twice

Property triggers may cause an action to be queued twice, resulting
in a loop in the action queue. Keep actions that are not on the queue
in the list_empty state (act->qlist->next == act->qlist), and only
add them to the list if they are in that state.

Bug: 8335133
Change-Id: I3a3ec18176cf19cbaa3a45220a03c7560eacfe79
nit/init_parser.c
317ec9246b28c8be373d2915be5fbfd85b2854e2 04-Jun-2013 Torne (Richard Coles) <torne@google.com> Add webviewchromium to BOOTCLASSPATH.

Add /system/framework/webviewchromium.jar to BOOTCLASSPATH. This jar
contains the implementation classes for the new WebView. It has been
processed with jarjar to ensure that it doesn't define any classes
outside of com.android.

Change-Id: If65913638df0088f4dd7d62a087750b90038a7fb
ootdir/init.rc
32a9d696c4d8172789a19a4f7de43d96d0c4d3e6 05-Jun-2013 Mathias Agopian <mathias@google.com> remove unused SF event log tags

Change-Id: I1271875c575aac31568017a17622f4dc9ff40032
ogcat/event.logtags
897df50f4cdc55339261a9fde83d650e7d85f081 05-Jun-2013 Michael Wu <michaelstay@gmail.com> fix bad return value in dhcp_do_request_*

1. bad return status make it return uninitialized prefixLength with a magic
number in android_net_utils_runDhcpCommon()
2. it will make DhcpInfoInternal.makeLinkAddress() to throw
IllegalArgumentException when try to connect a Wifi AP
3. the exception will make system reboot, of cource it random.

Change-Id: Iabc0cd5b69c1316f4eeae0aa1b8a91444dca4562
Signed-off-by: Michael Wu <michaelstay@gmail.com>
ibnetutils/dhcp_utils.c
ab22b99de6df32cd0a51a5096483b1c363f936b5 04-Jun-2013 Dima Zavin <dima@android.com> Merge "HACK: cutils: restore record_stream temporarily"
89c2be335dcae504c89b804c6781cdd2bdd3112c 04-Jun-2013 Brian Carlstrom <bdc@google.com> am 603746f0: am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"

* commit '603746f0e3b645954f33be36f7602cc8205cb71c':
Fixed reversed output in netstat Recv-Q Send-Q columns
abb7d58010da1fcd466e6e032c5f7bf8810ed4dd 04-Jun-2013 Dima Zavin <dima@android.com> HACK: cutils: restore record_stream temporarily

Restore the record_stream code in cutils that was removed
in e00a12bf8a99eb6c4f278efa503488aa21dd8d4d as part of cutils
cleanup.

Unfortunately, there are some prebuilt vendor libs that rely on
this functionality that we cannot currently rebuild.

Remove at the earliest possible convenience once the vendor libs
have been fixed.

Bug: 9189218
Change-Id: I5d44126756f1e3ed194d1b5873d64d9154183199
Signed-off-by: Dima Zavin <dima@android.com>
nclude/cutils/record_stream.h
ibcutils/Android.mk
ibcutils/record_stream.c
603746f0e3b645954f33be36f7602cc8205cb71c 04-Jun-2013 Brian Carlstrom <bdc@google.com> am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"

* commit '59fa7e107d43a4ef521413ec0bb7b0c2a5525071':
Fixed reversed output in netstat Recv-Q Send-Q columns
59fa7e107d43a4ef521413ec0bb7b0c2a5525071 04-Jun-2013 Brian Carlstrom <bdc@google.com> Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"
3c412f6260d88765f06232e7e9799f7bf68d7741 30-May-2013 Brian Carlstrom <bdc@google.com> Fixed reversed output in netstat Recv-Q Send-Q columns

Change-Id: I2bc7ac6c886808910212432497f05e34596f5e85
oolbox/netstat.c
29393d69b3baed12ebe1530c29f59f4fe18ad029 03-Jun-2013 Nick Kralevich <nnk@google.com> fix another misuse of strncat

This has the potential to overflow "buffer" if the command line
is more than 4K.

Change-Id: Icdfed0d9d21804f290b75787ef3809e0475b14f0
oolbox/log.c
960ac434a4960b0524993544949ef892c08339ed 03-Jun-2013 Nick Kralevich <nnk@google.com> fix strncat misuse

The third argument of strncat() tells how much data to append from
src, not the total size of the buffer.

Change uses of strncat() to strlcat(), which has the buffer overflow
protection behavior intended by the original author.

This fixes the following compiler warning:

In function 'strncat',
inlined from 'print_type' at system/core/toolbox/lsof.c:76:12:
bionic/libc/include/string.h:142:5: warning: call to __builtin___strncat_chk might overflow destination buffer [enabled by default]

Change-Id: Id69edc641de3cb87d1867a409cd57b04b12f90a7
oolbox/lsof.c
e44c6b7183985a6ac586642e9ffc9c99a9140057 24-May-2013 Nick Kralevich <nnk@google.com> Merge "property_get: do argument checking."
1c743de2bd39750e107f98012afa9c3182226942 24-May-2013 Nick Kralevich <nnk@google.com> Merge "properties.h: avoid duplicating constant values"
90900689e653a63bbe6651c1fbba544790e47cee 24-May-2013 Nick Kralevich <nnk@google.com> Merge "libcutils: Don't build host property support"
cf41bbf3116a3a349e5bd9155214e003f11a10b2 24-May-2013 Nick Kralevich <nnk@google.com> Merge "adb: Only use properties on device builds"
d8b11c1ddd071e91f2ff8121be4f91e84cb9729a 23-May-2013 Tim Murray <timmurray@google.com> Add ATRACE_TAG_RS.

Change-Id: Iaff497a1cb04a797441b5bb47b30ad6f09db8e95
nclude/cutils/trace.h
0e54ec825e6eae234a486c2049039fb6986a39b8 23-May-2013 Nick Kralevich <nnk@google.com> property_get: do argument checking.

Try to verify, at compile time, that the supplied
value buffer is large enough.

Change-Id: I91fa560d3ceff87609194269356ac634bdbf2ede
nclude/cutils/properties.h
53df3ade9bacce57099bb9eeb2a34bb5945d463e 23-May-2013 Nick Kralevich <nnk@google.com> properties.h: avoid duplicating constant values

Use the constant value from sys/system_properties.h,
rather than having two copies of this constant in two
different places.

This partially addresses the TODO in the header file.

Change-Id: Ic0b098cb8caf562ed2a25a0cf8cd412ba2e06884
nclude/cutils/properties.h
b39e3a8a4fa9b4121a9ceb45cacce843b32b1a65 23-May-2013 Nick Kralevich <nnk@google.com> libcutils: Don't build host property support

Only build property support for the device, not for the
host. Host side property support is being removed, as it
was only really used for the simulator.

process_name.c: When building this for the host, don't
reference properties.

Change-Id: Idcea5ad52a85e47eef17a381cb0601657efbdf13
ibcutils/Android.mk
ibcutils/process_name.c
893a4a47e8c9290128b9254af0246e36f821c260 23-May-2013 Nick Kralevich <nnk@google.com> adb: Only use properties on device builds

When building for the host, don't make reference to
property_get / property_set. I'm in the process of removing
host side support for properties.

Change-Id: I691c5872b5fd538e78bc38a3fe72574cdc7f43c3
db/adb.c
db/services.c
db/sysdeps.h
db/transport_local.c
1c1593079433e696348195c9e3e7dc1176acc0bb 23-May-2013 The Android Open Source Project <initial-contribution@android.com> am 54d19aa6: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '54d19aa66c6d446c97172599a9317caa6c456741':
54d19aa66c6d446c97172599a9317caa6c456741 23-May-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I43fb882425fac784151bbf0a313661f3b684ac89
cd07446afea9a3e5090eb9a92597794f37f85130 23-May-2013 The Android Automerger <android-build@google.com> merge in jb-mr2-release history after reset to jb-mr2-dev
17775724b89e942b06c67144317697924039ad99 22-May-2013 Matthew Xie <mattx@google.com> am 5cb9a02b: am 7e723498: Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev

* commit '5cb9a02b0322c18b48eb9ce261502c3b830c113c':
Add permission for bluetooth app in non-primary users
5cb9a02b0322c18b48eb9ce261502c3b830c113c 22-May-2013 Matthew Xie <mattx@google.com> am 7e723498: Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev

* commit '7e72349865db83d62f98eec8bca4b170712fe0e0':
Add permission for bluetooth app in non-primary users
7e72349865db83d62f98eec8bca4b170712fe0e0 22-May-2013 Matthew Xie <mattx@google.com> Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev
40a91a2884333e48aacf266fde53960e03fa1cc4 20-May-2013 Matthew Xie <mattx@google.com> Add permission for bluetooth app in non-primary users

bug 8954114
Change-Id: Id6a42f5a5beefa22c3cc8eecfb39a2222017a3b4
nit/property_service.c
9c917a4c162d3581dc402827d837c477cfdbec2a 21-May-2013 Ben Cheng <bccheng@google.com> Merge "Format stack trace PC offset to 8 digits with leading zeros."
ea1917f82ef8bd4d8c7b9e69354f89f6bf77195c 21-May-2013 Colin Cross <ccross@android.com> am a9e08d3e: am 51a2e4d5: Merge "libsysutils: fix null pointer and memory leak issue"

* commit 'a9e08d3ed60a12f58fc5fdf89f74b4f215ce066f':
libsysutils: fix null pointer and memory leak issue
a9e08d3ed60a12f58fc5fdf89f74b4f215ce066f 21-May-2013 Colin Cross <ccross@android.com> am 51a2e4d5: Merge "libsysutils: fix null pointer and memory leak issue"

* commit '51a2e4d5d44a6f788da207dff301356e16b4e283':
libsysutils: fix null pointer and memory leak issue
51a2e4d5d44a6f788da207dff301356e16b4e283 21-May-2013 Colin Cross <ccross@android.com> Merge "libsysutils: fix null pointer and memory leak issue"
ddc50e67e2ef33f20e76fca1c3fc04474cd9df9d 21-May-2013 Ben Cheng <bccheng@google.com> Format stack trace PC offset to 8 digits with leading zeros.

BUG: 9067999
Change-Id: Ib5bbf2d5c166dc27e35386d589536eeb6b078c6a
ibcorkscrew/backtrace.c
4508ef49c00319af7ad0e9630b385b4f786ee959 21-May-2013 The Android Open Source Project <initial-contribution@android.com> am 084753ee: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '084753eedba485673fd070c44bc4a7feb63af483':
084753eedba485673fd070c44bc4a7feb63af483 21-May-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I7aa2dccba44773db134e6bef703ff9477ed159ba
149cbfdafe6e5a17202994609cd9c248fbee5e36 21-May-2013 The Android Automerger <android-build@google.com> merge in jb-mr2-release history after reset to jb-mr2-dev
71952461310cff9f35a4852415c608d14c92236a 21-May-2013 Colin Cross <ccross@android.com> am 5f1a938e: am 3d8e8c14: am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"

* commit '5f1a938e9c65829c3afebb4d92c8e93caecc3e11':
init.rc: remove duplicated led-related nodes
5f1a938e9c65829c3afebb4d92c8e93caecc3e11 21-May-2013 Colin Cross <ccross@android.com> am 3d8e8c14: am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"

* commit '3d8e8c147b41dbc6a5e4edf6da1610a83623b5b2':
init.rc: remove duplicated led-related nodes
3d8e8c147b41dbc6a5e4edf6da1610a83623b5b2 21-May-2013 Colin Cross <ccross@android.com> am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"

* commit '9246f8d6def40a50933a980fac773a909f2138d7':
init.rc: remove duplicated led-related nodes
a022ce7c80872957e3e54faaedcd2d8f0a144f5a 21-May-2013 gcondra@google.com <gcondra@google.com> am 8f6adcfc: am 49be2407: Revert "Add logic to fixup file contexts after a policy update."

* commit '8f6adcfcc55414cc07c18fe47d7c4314da148544':
Revert "Add logic to fixup file contexts after a policy update."
1e47a7466868ff90f6afa2d20d1b209b7b8fcfae 21-May-2013 gcondra@google.com <gcondra@google.com> am 253e91b4: am 477e35d6: Revert "Add persistent property for SELinux enforcment status."

* commit '253e91b4ffb631b188fdac0c1624786103471f05':
Revert "Add persistent property for SELinux enforcment status."
acef650dbc11355f9792923b69d8277a4ce89fab 21-May-2013 gcondra@google.com <gcondra@google.com> am 43329bc1: am 8a387870: Revert "Reload policy after setting up the data partition."

* commit '43329bc1c99c0f5f3670a8aaab39e54df34819a1':
Revert "Reload policy after setting up the data partition."
104c33992f40aeffbd788ae37b9b26e91a6bfdca 21-May-2013 gcondra@google.com <gcondra@google.com> am f5410f2b: am 3d32cd93: Revert "Remove /system from the dirs to relabel."

* commit 'f5410f2bde6fd5295cad36e3ba3efba0beb92780':
Revert "Remove /system from the dirs to relabel."
9a8cb3abf8985586172d8f891933b04ff419f81c 21-May-2013 gcondra@google.com <gcondra@google.com> am b9866649: am 52351300: Revert "Add a version check for SELinux policy on device."

* commit 'b9866649e24d7b6eedcaf2e03ffc605a3417537d':
Revert "Add a version check for SELinux policy on device."
8f6adcfcc55414cc07c18fe47d7c4314da148544 21-May-2013 gcondra@google.com <gcondra@google.com> am 49be2407: Revert "Add logic to fixup file contexts after a policy update."

* commit '49be240735a06f44e1d91aa51dd299779ad36d96':
Revert "Add logic to fixup file contexts after a policy update."
253e91b4ffb631b188fdac0c1624786103471f05 21-May-2013 gcondra@google.com <gcondra@google.com> am 477e35d6: Revert "Add persistent property for SELinux enforcment status."

* commit '477e35d6d56c7fe9b2305becdf3ed4f590ddfbd6':
Revert "Add persistent property for SELinux enforcment status."
43329bc1c99c0f5f3670a8aaab39e54df34819a1 21-May-2013 gcondra@google.com <gcondra@google.com> am 8a387870: Revert "Reload policy after setting up the data partition."

* commit '8a3878700eb9cd8ecf495cd01f15face5c3879c8':
Revert "Reload policy after setting up the data partition."
f5410f2bde6fd5295cad36e3ba3efba0beb92780 21-May-2013 gcondra@google.com <gcondra@google.com> am 3d32cd93: Revert "Remove /system from the dirs to relabel."

* commit '3d32cd938746215e5fa9b1a3c3b78903e043ae73':
Revert "Remove /system from the dirs to relabel."
b9866649e24d7b6eedcaf2e03ffc605a3417537d 21-May-2013 gcondra@google.com <gcondra@google.com> am 52351300: Revert "Add a version check for SELinux policy on device."

* commit '52351300d156826bf22c493828571f45a1cea16a':
Revert "Add a version check for SELinux policy on device."
9246f8d6def40a50933a980fac773a909f2138d7 20-May-2013 Colin Cross <ccross@android.com> Merge "init.rc: remove duplicated led-related nodes"
544a7f7a36cb9434505fe5cdc9e79d16937ac23f 01-Apr-2013 Hong-Mei Li <a21834@motorola.com> libsysutils: fix null pointer and memory leak issue

In SocketClient::quoteArg function
1. Fix potential null pointer accessing issue
2. Fix potential memory leak introduced by realloc fail

Change-Id: I1ca0f9089290d43452e9a71428244545f4ed866b
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
ibsysutils/src/SocketClient.cpp
a8d392da915b46a59dc5eab82a2b6cf17a9b3a86 20-May-2013 Sungmin Choi <sungmin.choi@lge.com> init.rc: remove duplicated led-related nodes

Change-Id: Ibee7ef9137594fc4c30d3ab6ee7bdf3515836c62
ootdir/init.rc
49be240735a06f44e1d91aa51dd299779ad36d96 17-May-2013 repo sync <gcondra@google.com> Revert "Add logic to fixup file contexts after a policy update."

This reverts commit ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea.
nit/init.c
477e35d6d56c7fe9b2305becdf3ed4f590ddfbd6 17-May-2013 repo sync <gcondra@google.com> Revert "Add persistent property for SELinux enforcment status."

This reverts commit b89bdfde422eff751b3f939f10ab57e22af83eaa.
nit/property_service.c
ootdir/init.rc
8a3878700eb9cd8ecf495cd01f15face5c3879c8 17-May-2013 repo sync <gcondra@google.com> Revert "Reload policy after setting up the data partition."

This reverts commit fee250d27a9c03af1ba439047b976d89563b1887.
nit/builtins.c
nit/init_parser.c
nit/keywords.h
nit/property_service.c
ootdir/init.rc
3d32cd938746215e5fa9b1a3c3b78903e043ae73 17-May-2013 repo sync <gcondra@google.com> Revert "Remove /system from the dirs to relabel."

This reverts commit 3d4d07b2fa3b2447646d3c87a0b401e993ad8363.
nit/init.c
52351300d156826bf22c493828571f45a1cea16a 17-May-2013 repo sync <gcondra@google.com> Revert "Add a version check for SELinux policy on device."

This reverts commit 921be8b6568df0057c4eacbac2e1022b71e09620.
nit/init.c
ootdir/init.rc
b1b45b9bd4f8610d7bda99849cac0b14e9ad771d 16-May-2013 Ron Munitz <ron@nubosoftware.com> Added net.dns1 prop for emulator, as Android emulator ignores it by default.

This commit sets up the system property which is actually used by the
Connectivity Service
(frameworks/base/services/java/com/android/server/ConnectivityService.java).
It fixes an (obsolete?) convention where the dns was affected directly by
the interface (i.e. "net.eth0.dns1=10.0.2.3"), which causes the Android
Emulator (goldfish) to ignore this value, and effectively have no DNS
resolving at all.

An immediate fix can be either add reference to net.eth%s.dns%s in the
ConnectivityService and possibly on the dhcp code as well which would be
bloated, or just stick to the apparant new convention.

I chose the latter as a one line fix which gets the job done.

Change-Id: Id4364129e9a82c1f48403068a837aca54de07944
ootdir/etc/init.goldfish.rc
a9228942f0a6291e2721729ddf9a28f2318683e0 16-May-2013 The Android Open Source Project <initial-contribution@android.com> am 19ec15b2: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '19ec15b247523ec8b0c6651e01bf746674d424d1':
19ec15b247523ec8b0c6651e01bf746674d424d1 16-May-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I731b1db7da9f82dbb92a3e1dc40bfab1a3f307e2
2579dbcfcf4d1efb0231e9b545de19fc6350f406 15-May-2013 Brian Carlstrom <bdc@google.com> am 3ce15fcc: am de1dadb7: Merge "Disable darwin build"

* commit '3ce15fcc916e097b6a98efc57302e012dab69d6f':
Disable darwin build
3ce15fcc916e097b6a98efc57302e012dab69d6f 15-May-2013 Brian Carlstrom <bdc@google.com> am de1dadb7: Merge "Disable darwin build"

* commit 'de1dadb73903a3b8d080ed6d2b5e916fe9654fc4':
Disable darwin build
de1dadb73903a3b8d080ed6d2b5e916fe9654fc4 15-May-2013 Brian Carlstrom <bdc@google.com> Merge "Disable darwin build"
b0df2f1525c655cea583423af28d8aead1c28a6d 15-May-2013 Brian Carlstrom <bdc@google.com> Disable darwin build

Change-Id: Ie72bbaab8604cdc14082859b735458a2f73c3074
ibcorkscrew/Android.mk
4a21072095e80986d577bf482fce7cf387e39863 15-May-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
e45710f19f3843dd0ec02d1a5c7f679f34a33846 15-May-2013 gcondra@google.com <gcondra@google.com> am 5a98566d: am 921be8b6: Add a version check for SELinux policy on device.

* commit '5a98566d589408c78e35f4476f478a2fa1c13e78':
Add a version check for SELinux policy on device.
5a98566d589408c78e35f4476f478a2fa1c13e78 15-May-2013 gcondra@google.com <gcondra@google.com> am 921be8b6: Add a version check for SELinux policy on device.

* commit '921be8b6568df0057c4eacbac2e1022b71e09620':
Add a version check for SELinux policy on device.
cabb75e42743e22975e8dda1035fc0aa51d8e92a 15-May-2013 kongfanqing <kong.fanqing@byd.com> Modify BYD's USB Vendor ID

Change-Id: I391487a12ba7ed86aac81457f8026acd3fd7576c
db/usb_vendors.c
9186d8502194e4b6439df6b117d59d629bf63a74 15-May-2013 Brian Carlstrom <bdc@google.com> am a817ff9c: resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp

* commit 'a817ff9cf61daeb69e8b8382c80677e3e5c573a9':
Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
Add basic Darwin support to libcorkscrew.
a817ff9cf61daeb69e8b8382c80677e3e5c573a9 15-May-2013 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp

Change-Id: Idf344a1fc7e2f8ec76232ae14a00298ddd322a55
07db297045b33d5c0aaa37194da1616d764edd26 15-May-2013 Brian Carlstrom <bdc@google.com> Merge changes I5578fe06,I197b06c4

* changes:
Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
Add basic Darwin support to libcorkscrew.
921be8b6568df0057c4eacbac2e1022b71e09620 10-May-2013 repo sync <gcondra@google.com> Add a version check for SELinux policy on device.

This helps to ensure that when a new system image is installed,
old userdata policy isn't applied over the top of it.

Bug: 8841348
Change-Id: I135af32250aa62979763e775842ce0af3c8b6f9f
nit/init.c
ootdir/init.rc
89054056a755b275498fd2eb951dafccc1d6b886 13-Jun-2012 Elliott Hughes <enh@google.com> Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().

(If you fclose(3) rather than pclose(3) a FILE* you got from popen(3),
future popen(3)s fail obscurely, at least on Mac OS.)

(cherry picked from commit 2bf76e143da933184d1392fb9bea3a3896c37e76)

Change-Id: I5578fe06753061b0dbc5ee951ebf31eb2bab0389
nclude/corkscrew/map_info.h
ibcorkscrew/map_info.c
ibcorkscrew/test.cpp
bfec3a315000e9fcfc8e2d3fcef25e747e3d2053 25-May-2012 Elliott Hughes <enh@google.com> Add basic Darwin support to libcorkscrew.

This might not seem like much, but it's already better than Mac OS'
backtrace(3).

(cherry picked from commit 2a46f6293f19b9d6100187fbd53088088e671b88)

Change-Id: I197b06c4c19f728ad6f194b2f473bd9dcd99b8a6
ibcorkscrew/Android.mk
ibcorkscrew/arch-x86/backtrace-x86.c
ibcorkscrew/backtrace.c
ibcorkscrew/demangle.c
ibcorkscrew/map_info.c
ibcorkscrew/ptrace.c
ibcorkscrew/symbol_table.c
ibcorkscrew/test.c
ibcorkscrew/test.cpp
8577e8649062953a59e0ac652b5ac16c96c1c1f4 09-May-2013 Mathias Agopian <mathias@google.com> surfaceflinger is now always running in its own process

Change-Id: I1ae63347a8b6d406306ed894665674dd726b7d51
ootdir/init.rc
2fd3cc4c0f211017814e2d3e30e79771ede94437 09-May-2013 gcondra@google.com <gcondra@google.com> am ac5cf925: am 683aa89b: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev

* commit 'ac5cf925f86706d2bf89948e7cd3379376185d3b':
Remove /system from the dirs to relabel.
a0e780edd3dc10cb4110689642e2380b72906712 09-May-2013 Jamie Gennis <jgennis@google.com> am 6e46a3b8: am a1ee12ca: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev

* commit '6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b':
libcutils: add a trace tag for Dalvik
a64b3f001fe1a0844a583d81148586b0ac75dfc8 08-May-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
1a8bb3e815629d603886b8f7f6842bd69b559a8f 08-May-2013 Dima Zavin <dima@android.com> Merge "cutils: first pass at cleaning up legacy/obsolete code in cutils"
ac5cf925f86706d2bf89948e7cd3379376185d3b 08-May-2013 gcondra@google.com <gcondra@google.com> am 683aa89b: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev

* commit '683aa89bfdf2439d1c5d9a4dc240d6a673678a98':
Remove /system from the dirs to relabel.
683aa89bfdf2439d1c5d9a4dc240d6a673678a98 08-May-2013 repo sync <gcondra@google.com> Merge "Remove /system from the dirs to relabel." into jb-mr2-dev
3d4d07b2fa3b2447646d3c87a0b401e993ad8363 08-May-2013 repo sync <gcondra@google.com> Remove /system from the dirs to relabel.

Bug: 8841348
Change-Id: Ia1545288e8a8184feffaaa6158faad62f95cbcce
nit/init.c
6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b 08-May-2013 Jamie Gennis <jgennis@google.com> am a1ee12ca: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev

* commit 'a1ee12ca3a0ec44bb8a3eb917d13c0b5178075d9':
libcutils: add a trace tag for Dalvik
a1ee12ca3a0ec44bb8a3eb917d13c0b5178075d9 08-May-2013 Jamie Gennis <jgennis@google.com> Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
2b68e0675b3e3e2f45001e4597872609d26956ae 08-May-2013 Jamie Gennis <jgennis@google.com> libcutils: add a trace tag for Dalvik

This change adds a trace tag bit for Dalvik. It also allows the ATRACE_*
macros to be called from code compiled for the host with no effect.

Bug: 8856374
Change-Id: I9c17129d6cc170cae00b6500485b5b5fa4b5e647
nclude/cutils/trace.h
e00a12bf8a99eb6c4f278efa503488aa21dd8d4d 07-May-2013 Dima Zavin <dima@android.com> cutils: first pass at cleaning up legacy/obsolete code in cutils

Removed unused code and moved libraries with single clients
near their respective users.

Change-Id: I65f90f8659f27bd0f44ca5ddf33da2bce14674c1
Signed-off-by: Dima Zavin <dima@android.com>
nclude/cutils/abort_socket.h
nclude/cutils/array.h
nclude/cutils/mq.h
nclude/cutils/qsort_r_compat.h
nclude/cutils/record_stream.h
nclude/cutils/selector.h
nclude/cutils/zygote.h
ibcutils/Android.mk
ibcutils/abort_socket.c
ibcutils/array.c
ibcutils/buffer.c
ibcutils/buffer.h
ibcutils/mq.c
ibcutils/qsort_r_compat.c
ibcutils/record_stream.c
ibcutils/selector.c
ibcutils/zygote.c
8da4fa3504d14aa886b9d88f10af38fc03accbbe 02-May-2013 Ying Wang <wangying@android.com> am 6119cffa: am 7382459e: Merge "Host builds: add fastboot and adb"

* commit '6119cffa63d1b5d49c23a25353fc40ad0d99f82e':
Host builds: add fastboot and adb
6119cffa63d1b5d49c23a25353fc40ad0d99f82e 02-May-2013 Ying Wang <wangying@android.com> am 7382459e: Merge "Host builds: add fastboot and adb"

* commit '7382459eca9632168b9d393bc77fb62bc21bb67a':
Host builds: add fastboot and adb
7382459eca9632168b9d393bc77fb62bc21bb67a 02-May-2013 Ying Wang <wangying@android.com> Merge "Host builds: add fastboot and adb"
928116ceef8dbd5ef38dfe0fd587b5d62c2c0c96 26-Sep-2012 Kenny Root <kroot@google.com> Host builds: add fastboot and adb

Add fastboot and adb host utilities to debug builds for debugging
and development purposes.

Change-Id: If77699a27497b8641998930f14d4ee418b856080
db/Android.mk
astboot/Android.mk
2f8b6a036b7057b4a6eade5ea4b6b569b55badcc 01-May-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
69e9b17fa1a7ac4dea56963008096a4961245277 01-May-2013 Colin Cross <ccross@android.com> am cb4b9605: am 8794b2ee: Merge "Fix perms on /data/security"

* commit 'cb4b9605cb923d071a546b444d10cbe21367d878':
Fix perms on /data/security
72b1ffd375b27143b9e8f7bfddc5904c34b3f0e1 01-May-2013 Colin Cross <ccross@android.com> am 803eda6a: am f69cc564: Merge "Update ueventd set the SELinux context on sysfs"

* commit '803eda6a2dfcb50f61dd4a6a616e560a87453cb0':
Update ueventd set the SELinux context on sysfs
51ef5882e79d72b03400812a4f37c32a36c80ebc 01-May-2013 Colin Cross <ccross@android.com> am 55d69a96: am 032be7a4: Merge "Log an error if property pool is exhausted"

* commit '55d69a9681061b97d6bdcc0b1b92a7de63d0a07b':
Log an error if property pool is exhausted
cb4b9605cb923d071a546b444d10cbe21367d878 01-May-2013 Colin Cross <ccross@android.com> am 8794b2ee: Merge "Fix perms on /data/security"

* commit '8794b2eeb2bbd717ca18b8bef5d853f99334aabc':
Fix perms on /data/security
803eda6a2dfcb50f61dd4a6a616e560a87453cb0 01-May-2013 Colin Cross <ccross@android.com> am f69cc564: Merge "Update ueventd set the SELinux context on sysfs"

* commit 'f69cc564f4129ad7f223bb7d83ebec9fe3438b62':
Update ueventd set the SELinux context on sysfs
55d69a9681061b97d6bdcc0b1b92a7de63d0a07b 01-May-2013 Colin Cross <ccross@android.com> am 032be7a4: Merge "Log an error if property pool is exhausted"

* commit '032be7a4c5be8c015063084d162d1f394279aa3d':
Log an error if property pool is exhausted
8794b2eeb2bbd717ca18b8bef5d853f99334aabc 01-May-2013 Colin Cross <ccross@android.com> Merge "Fix perms on /data/security"
f69cc564f4129ad7f223bb7d83ebec9fe3438b62 01-May-2013 Colin Cross <ccross@android.com> Merge "Update ueventd set the SELinux context on sysfs"
032be7a4c5be8c015063084d162d1f394279aa3d 01-May-2013 Colin Cross <ccross@android.com> Merge "Log an error if property pool is exhausted"
efbe7fc6cc871e95760b9b01d674a09f7e80eb6a 01-May-2013 gcondra@google.com <gcondra@google.com> am 63577d92: am fee250d2: Reload policy after setting up the data partition.

* commit '63577d9280e7919bfb7221030d211b833e66bb1e':
Reload policy after setting up the data partition.
63577d9280e7919bfb7221030d211b833e66bb1e 01-May-2013 gcondra@google.com <gcondra@google.com> am fee250d2: Reload policy after setting up the data partition.

* commit 'fee250d27a9c03af1ba439047b976d89563b1887':
Reload policy after setting up the data partition.
fee250d27a9c03af1ba439047b976d89563b1887 30-Apr-2013 repo sync <gcondra@google.com> Reload policy after setting up the data partition.

This forces a policy reload + fixcon to deal with dynamically
delivered policy changing labels on device nodes.

It's implemented as a new keyword in init.

Bug: 8702843
Change-Id: I803cf1ecf6ff8318ce25dcc5cda4f292adc9738c
nit/builtins.c
nit/init_parser.c
nit/keywords.h
nit/property_service.c
ootdir/init.rc
152a43215143f62ee4bedda96ce73604530a6f1d 30-Apr-2013 Kenny Root <kroot@google.com> am d14586e3: resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp

* commit 'd14586e35a3df39cc3aa6aff6a54463270a5e1a7':
Track change to JSSE provider
d14586e35a3df39cc3aa6aff6a54463270a5e1a7 30-Apr-2013 Kenny Root <kroot@google.com> resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp

Change-Id: If41560f0fef3103cad2172061a7988ceb5556377
a69af5af3daf7901bb66cd6318b6018a48b819f4 30-Apr-2013 Kenny Root <kroot@google.com> Merge "Track change to JSSE provider"
ca0404b83e9e5712531e040675212a4bd0d7f6a8 24-Apr-2013 Kenny Root <kroot@google.com> Track change to JSSE provider

Change-Id: Iff9103fff3591983f2b172f83fd2a6e924986aa7
ootdir/init.rc
97de3e8c46f0e99f7578f0d960e7a63478fd580d 29-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
fd7ffb1089cf3ce43a33a157ed748641adb7b95b 29-Apr-2013 Johan Redestig <johan.redestig@sonymobile.com> Log an error if property pool is exhausted

Failing to set properties due to an exhausted pool leads
to difficult to debug problems. This change adds an
error log to make the situation a bit easier to handle.

Change-Id: Icc1d97a80882fb23e74428a0195f1d28dba68fa8
nit/property_service.c
ada3291c8d13a9c3896102932abefed155a5b3fe 26-Apr-2013 gcondra@google.com <gcondra@google.com> am 14ad7861: am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev

* commit '14ad786183455ad9c8298e24946d4da0f24458d7':
Add persistent property for SELinux enforcment status.
14ad786183455ad9c8298e24946d4da0f24458d7 26-Apr-2013 gcondra@google.com <gcondra@google.com> am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev

* commit '538b5d4e8e4c480b2120aa957fe3e11a2836a1b3':
Add persistent property for SELinux enforcment status.
538b5d4e8e4c480b2120aa957fe3e11a2836a1b3 26-Apr-2013 repo sync <gcondra@google.com> Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
15e84ad0425a2a98c0f7db0f0b723fbbd6082cf4 26-Apr-2013 Benoit Goby <benoit@android.com> Merge "adb: Handle adb connect in a thread"
b89bdfde422eff751b3f939f10ab57e22af83eaa 24-Apr-2013 repo sync <gcondra@google.com> Add persistent property for SELinux enforcment status.

Also adds triggers for going between enforcing and
permissive status.

Bug: 8702843
Change-Id: I841d80999b96acf6b6fd0a5408fb074952d6ae72
nit/property_service.c
ootdir/init.rc
44a5fb57045709f7f3feead4c8444baa2bdfc658 25-Apr-2013 Nick Kralevich <nnk@google.com> Merge "fs_mgr: make block devices read-only"
1c45ee92e2372f3c552744823143fb093fdbda9d 30-Mar-2013 Benoit Goby <benoit@android.com> adb: Handle adb connect in a thread

adb connect calls connect() in the event loop. If you pass a wrong ip
address or the server is slow to respond, this will block the event loop
and you can't even kill the adb server with adb kill-server. Handle connect
requests in a service thread instead.

Change-Id: I2ee732869a3dc22a6d3b87cf8ac80acaa7790037
db/adb.c
db/adb.h
db/services.c
db/transport.c
db50747c933be0d87658385e3fad04ae824a8e5e 25-Apr-2013 Benoit Goby <benoit@android.com> Merge "adb: Cleanup dead code"
c0a29aeb85343ec746031cbb984b9e48d3b60399 25-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
7629bf19a139cbc204e8ae78cb82c2faeba6d2f0 25-Apr-2013 Jeff Tinker <jtinker@google.com> am 9e9ed1b4: am 131ee07b: Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev

* commit '9e9ed1b40010745e709157a6977ba6d053d46c49':
Add a new group for MediaDrm engine plugins
9e9ed1b40010745e709157a6977ba6d053d46c49 25-Apr-2013 Jeff Tinker <jtinker@google.com> am 131ee07b: Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev

* commit '131ee07b77e0250c16cebe2b0e226c5bff8e9587':
Add a new group for MediaDrm engine plugins
131ee07b77e0250c16cebe2b0e226c5bff8e9587 25-Apr-2013 Jeff Tinker <jtinker@google.com> Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev
9470c2f1ab555311633d52e5ed8303a813061cdf 21-Feb-2013 Benoit Goby <benoit@android.com> adb: Cleanup dead code

dns_service is unused and recover_service has been replaced by adb
sideload

Change-Id: Ie90000d7f672e8299ee1622a9690c7371b214dc1
db/Android.mk
db/SERVICES.TXT
db/adb.h
db/mutex_list.h
db/services.c
db/sockets.c
db/utils.c
db/utils.h
49edc0acf8c78171751676af0f530d9529987075 25-Apr-2013 Nick Kralevich <nnk@google.com> am 4c1840e6: am 5ea58543: Merge "mount: fix incorrect string length calculation"

* commit '4c1840e6547266ba251d8c34905036d73240ff57':
mount: fix incorrect string length calculation
4c1840e6547266ba251d8c34905036d73240ff57 25-Apr-2013 Nick Kralevich <nnk@google.com> am 5ea58543: Merge "mount: fix incorrect string length calculation"

* commit '5ea58543154a97c42c0b7fc58c2639a4fea64f5b':
mount: fix incorrect string length calculation
5ea58543154a97c42c0b7fc58c2639a4fea64f5b 25-Apr-2013 Nick Kralevich <nnk@google.com> Merge "mount: fix incorrect string length calculation"
29a5298366f0070bcc359e982eb31d49f84a92c1 25-Apr-2013 Nick Kralevich <nnk@google.com> mount: fix incorrect string length calculation

Fix bug https://code.google.com/p/android/issues/detail?id=54192
which incorrectly calculated the length of a string.

Fix compiler warning:

system/core/toolbox/mount.c:59:2: warning: initializer-string for array of chars is too long [enabled by default]
system/core/toolbox/mount.c:59:2: warning: (near initialization for 'options[16].str') [enabled by default]

Change-Id: If8663f8311c6348a730fcf731d402b57fee10cb5
oolbox/mount.c
af1cbd4c10cfc28235d7a60941290986a77affda 24-Apr-2013 Matthew Xie <mattx@google.com> am 0db6600a: am 7ee2e26e: Remove DBUS from make and header files

* commit '0db6600a60e8d604aaef5e43db9ae52ed7380979':
Remove DBUS from make and header files
0db6600a60e8d604aaef5e43db9ae52ed7380979 24-Apr-2013 Matthew Xie <mattx@google.com> am 7ee2e26e: Remove DBUS from make and header files

* commit '7ee2e26eb98da10eaddf5a8e864d508cceab946b':
Remove DBUS from make and header files
e18c0d508a6d8b4376c6f0b8c22600e5aca37f69 17-Apr-2013 Nick Kralevich <nnk@google.com> fs_mgr: make block devices read-only

When a filesystem is mounted read-only, make the underlying
block device read-only too. This helps prevent an attacker
who is able to change permissions on the files in /dev
(for example, symlink attack) from modifying the block device.

In particular, this change would have stopped the LG Thrill / Optimus
3D rooting exploit
(http://vulnfactory.org/blog/2012/02/26/rooting-the-lg-thrill-optimus-3d/)
as that exploit modified the raw block device corresponding to /system.

This change also makes UID=0 less powerful. Block devices cannot
be made writable again without CAP_SYS_ADMIN, so an escalation
to UID=0 by itself doesn't give full root access.

adb/mount: Prior to mounting something read-write, remove the
read-only restrictions on the underlying block device. This avoids
messing up developer workflows.

Change-Id: I135098a8fe06f327336f045aab0d48ed9de33807
db/remount_service.c
s_mgr/fs_mgr.c
oolbox/mount.c
072ee0143048a6bbd4068002352a4201ac853b6e 24-Apr-2013 Nick Kralevich <nnk@google.com> Merge "Make init handle reboots"
08d64308b93594c587036cffcd8f6780eaf2c417 24-Apr-2013 Jeff Tinker <jtinker@google.com> Add a new group for MediaDrm engine plugins

bug: 8702754
Change-Id: I3b7988b64b1dcf4685624e4c1af938e132b82696
nclude/private/android_filesystem_config.h
ootdir/init.rc
6d8ffa8845736017d9890bfed85958c20327c183 24-Apr-2013 Elliott Hughes <enh@google.com> am 82081f71: am cb6a842c: Merge "Add a stack overflow test to crasher, and document all the options."

* commit '82081f71f69bdca08f382e5e212005dbaa301b35':
Add a stack overflow test to crasher, and document all the options.
82081f71f69bdca08f382e5e212005dbaa301b35 24-Apr-2013 Elliott Hughes <enh@google.com> am cb6a842c: Merge "Add a stack overflow test to crasher, and document all the options."

* commit 'cb6a842c6e2048e6cd3c5a2d478113347c75d7aa':
Add a stack overflow test to crasher, and document all the options.
cb6a842c6e2048e6cd3c5a2d478113347c75d7aa 24-Apr-2013 Elliott Hughes <enh@google.com> Merge "Add a stack overflow test to crasher, and document all the options."
3808c4ecb4c2d4f05261e6631a765464b055d8b1 24-Apr-2013 Elliott Hughes <enh@google.com> Add a stack overflow test to crasher, and document all the options.

Change-Id: Iebe80c24ef43f08d258881e7847516d414436931
ebuggerd/crasher.c
7ee2e26eb98da10eaddf5a8e864d508cceab946b 23-Apr-2013 Matthew Xie <mattx@google.com> Remove DBUS from make and header files

DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904

Change-Id: I3fa41c1dd4ac80bc679d5950b3b20c7f6d12265f
nclude/private/android_filesystem_config.h
ootdir/Android.mk
ootdir/etc/dbus.conf
ca8e66a8b0f843812014a28d49208f9f6f64ecbc 18-Apr-2013 Nick Kralevich <nnk@google.com> Make init handle reboots

Move the responsibility for rebooting the system from the
reboot command to init. Init is in a better position to take
actions to bring the system down cleanly, including making sure
filesystems are mounted read-only.

The only UIDs which can perform an init triggered reboot are
root, system, and shell.

Modify the reboot command so that it calls into init to perform
the reboot. The reboot command no longer requires CAP_SYS_BOOT.

Remove the -n reboot option and code which supports it. Anyone needing
to do an unclean shutdown can just do a 'echo c > /proc/sysrq-trigger'.

Modify adb so that it calls into init to perform a shutdown.

Bug: 8646621
Change-Id: I84c0513acb549720cb0e8c9fcbda0050f5c396f5
db/adb.c
db/services.c
nclude/cutils/android_reboot.h
nclude/private/android_filesystem_config.h
nit/builtins.c
nit/init_parser.c
nit/keywords.h
nit/property_service.c
ibcutils/android_reboot.c
eboot/reboot.c
ootdir/init.rc
451a6ba829ddfdf2c1d8605611342397340534df 19-Apr-2013 Todd Poynor <toddpoynor@google.com> klog: error handling fixups

Change-Id: I9014e62010c589ec30d5e99eef420353e35418b5
ibcutils/klog.c
fc1906de158373b39d7b6387dc16512321be8f5f 22-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
ba4ac0cc3aa69075d6cbcee4eddb314ef753aa8d 19-Apr-2013 Colin Cross <ccross@android.com> am 03546553: am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"

* commit '03546553205b56fc1ba0318b146971f43f54a155':
use lseek64 to resolve offset oveflow
03546553205b56fc1ba0318b146971f43f54a155 19-Apr-2013 Colin Cross <ccross@android.com> am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"

* commit 'b73a0ef4d05ad594ba07b98e1f4aa7fe66a18c2e':
use lseek64 to resolve offset oveflow
82fe6dae6aadf66a8f7adccbbc236bc436d9c31a 18-Apr-2013 Christopher Tate <ctate@google.com> am 7b329880: am b3478f4a: Merge "Fix regression: log mem maps around native fault address" into jb-mr2-dev

* commit '7b3298804c6ac57bce9eb4f590f22ac836818a8b':
Fix regression: log mem maps around native fault address
7b3298804c6ac57bce9eb4f590f22ac836818a8b 18-Apr-2013 Christopher Tate <ctate@google.com> am b3478f4a: Merge "Fix regression: log mem maps around native fault address" into jb-mr2-dev

* commit 'b3478f4a50fc44bf573dc4caf4f7e1ddcc4f0eea':
Fix regression: log mem maps around native fault address
b3478f4a50fc44bf573dc4caf4f7e1ddcc4f0eea 18-Apr-2013 Christopher Tate <ctate@google.com> Merge "Fix regression: log mem maps around native fault address" into jb-mr2-dev
300fd6fdbc19bbb64a13b0a9d0ea7d284a831e33 18-Apr-2013 Christopher Tate <ctate@google.com> Fix regression: log mem maps around native fault address

Restore the logging of the mem maps around the fault address along
with the rest of the faulting thread's information. (It was still
being written to the tombstone file, but the logging got dropped on
the floor in the refactoring around AM report integration).

Bug 8654694

Change-Id: Id8851fa765dfe6b6ce41ccfc39e85eaac0acc629
ebuggerd/tombstone.c
4fcd7af279e318643a931a95a0e8edf4e6c485b4 18-Apr-2013 Alex Ray <aray@google.com> am 3d35db33: am ca0cb785: Merge "graphics: add Android flexible YCbCr format" into jb-mr2-dev

* commit '3d35db33eb9e5b0769732d4baa43729fac50d467':
graphics: add Android flexible YCbCr format
3d35db33eb9e5b0769732d4baa43729fac50d467 18-Apr-2013 Alex Ray <aray@google.com> am ca0cb785: Merge "graphics: add Android flexible YCbCr format" into jb-mr2-dev

* commit 'ca0cb785cb6a2316e9102059993e0a173220c92d':
graphics: add Android flexible YCbCr format
ca0cb785cb6a2316e9102059993e0a173220c92d 18-Apr-2013 Alex Ray <aray@google.com> Merge "graphics: add Android flexible YCbCr format" into jb-mr2-dev
b73a0ef4d05ad594ba07b98e1f4aa7fe66a18c2e 18-Apr-2013 Colin Cross <ccross@android.com> Merge "use lseek64 to resolve offset oveflow"
519236322615102b27c0d759ca75c349f6c5da6c 18-Apr-2013 Colin Cross <ccross@android.com> am b544da0b: am d7cab8bf: Merge "adb : add missing connection states"

* commit 'b544da0be42cdd1e28d6562a26215d57c51b2f2b':
adb : add missing connection states
b544da0be42cdd1e28d6562a26215d57c51b2f2b 18-Apr-2013 Colin Cross <ccross@android.com> am d7cab8bf: Merge "adb : add missing connection states"

* commit 'd7cab8bff1334ba48620a16d1b98f2ae623fee7d':
adb : add missing connection states
d7cab8bff1334ba48620a16d1b98f2ae623fee7d 17-Apr-2013 Colin Cross <ccross@android.com> Merge "adb : add missing connection states"
c05aae4ac4d8d43519b35de7be0645080393a259 17-Apr-2013 Jongrak Kwon <jongrak.kwon@lge.com> use lseek64 to resolve offset oveflow

The offset variable in lseek is 32 bit and get easily overflow
when accessing with large offset in dd command.
Use lseek64 to resolve it.

Change-Id: Ib75d9dcb587004a6851365ab5bb8584ce1010b57
oolbox/dd.c
50970341bfaf0c218e7fff29e0b2fb652387e274 17-Apr-2013 Elliott Hughes <enh@google.com> am ac76c1f1: am ffc5a4a5: Merge "Add OUYA VID to known VID list"

* commit 'ac76c1f16f889140ec5c56faccd676c2ff15d7bc':
Add OUYA VID to known VID list
ac76c1f16f889140ec5c56faccd676c2ff15d7bc 17-Apr-2013 Elliott Hughes <enh@google.com> am ffc5a4a5: Merge "Add OUYA VID to known VID list"

* commit 'ffc5a4a529338c834954e58de2701572eb0752f0':
Add OUYA VID to known VID list
ffc5a4a529338c834954e58de2701572eb0752f0 17-Apr-2013 Elliott Hughes <enh@google.com> Merge "Add OUYA VID to known VID list"
21ec0516cf0fb6b5a849ca8f47258554a99e386c 16-Apr-2013 Al Sutton <al@funkyandroid.com> Add OUYA VID to known VID list

Add the OUYA VID to the list of known USB VIDs to allow developers with OUYA
consoles to have their device automatically recognized.

Change-Id: I499114d8071747b972c24681fc0771f000ad9f9d
db/usb_vendors.c
a5ad539cff9dba92650425b8bec79c071ef5993b 17-Apr-2013 trevd <trevd1234@gmail.com> adb : add missing connection states

Both CS_RECOVERY and CS_SIDELOAD where not being checked by
connection_state_name which resulted in adb get-state returning
unknown when a device is in those modes.

Change-Id: I00716024d6a0bdb68d6e2380c8cd7b5d056bd15f
Signed-off-by: trevd <trevd1234@gmail.com>
db/adb.c
05e178af2b09979b7dff17b06bbc02d4b3451b22 17-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
dcbe6b4b17decc878394818bbe53d60f378f04a4 17-Apr-2013 Jamie Gennis <jgennis@google.com> am b7b2c71b: am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev

* commit 'b7b2c71bf8bf685af4c716e78d5c70decab98b54':
cutils: add a way to disable tracing for a process
b7b2c71bf8bf685af4c716e78d5c70decab98b54 17-Apr-2013 Jamie Gennis <jgennis@google.com> am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev

* commit '2553825797c40b14981b1b24e44475e07b02267f':
cutils: add a way to disable tracing for a process
2553825797c40b14981b1b24e44475e07b02267f 17-Apr-2013 Jamie Gennis <jgennis@google.com> Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev
11e1bb5eecf241f7e832ad6015d32a0c822f0cf7 16-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
b13ea45a04a463646a7098b03f9f64d91b29d2b9 16-Apr-2013 Jamie Gennis <jgennis@google.com> cutils: add a way to disable tracing for a process

This change adds the atrace_set_tracing_enabled call to libcutils. The call
can be used to disable all tracing (of the atrace variety) for the current
process. This is to be used to disable tracing in the Zygote process, as there
is no way for Zygote to be notified of changes to the enabled trace tags.

Change-Id: I0b691cc0dcfc65b16e3d17e1db2866a4deb253a7
nclude/cutils/trace.h
ibcutils/trace.c
e6a1f57b03cda4273495e8392ea7a676310ac2f9 16-Apr-2013 Geremy Condra <gcondra@google.com> am 7e25fa18: am ebcf93e3: Add logic to fixup file contexts after a policy update.

* commit '7e25fa1859c5bccdc6599fbbd4f6344bc5bf7998':
Add logic to fixup file contexts after a policy update.
7e25fa1859c5bccdc6599fbbd4f6344bc5bf7998 16-Apr-2013 Geremy Condra <gcondra@google.com> am ebcf93e3: Add logic to fixup file contexts after a policy update.

* commit 'ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea':
Add logic to fixup file contexts after a policy update.
ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea 11-Apr-2013 Geremy Condra <gcondra@google.com> Add logic to fixup file contexts after a policy update.

Bug: 8116902

(cherry picked from commit 47677a506febfe386d186f8f854d967f165a342f)

Change-Id: I2a50f68a53aee2c94d03d3e5ced1ea36337fde33
nit/init.c
dbdd280ea6189d40edec07e886712e60f0dbae18 15-Apr-2013 Geremy Condra <gcondra@google.com> Merge "Add logic to fixup file contexts after a policy update."
d43bab7b98d329ead0b5304be79d430b5a92ad10 15-Apr-2013 William Roberts <w.roberts@sta.samsung.com> Fix perms on /data/security

installd and zygote need to be able
to search the directory to access
the policy files.

Change-Id: I0679fd2084d2664dfb5a594f493317eff058415d
ootdir/init.rc
47677a506febfe386d186f8f854d967f165a342f 11-Apr-2013 Geremy Condra <gcondra@google.com> Add logic to fixup file contexts after a policy update.

Bug: 8116902
Change-Id: Ifa1785c75a24a9b3cfcb700f22ded7d16a917f79
nit/init.c
000f5cf7c6874034bf5ef6dda98533e80dd4d628 15-Apr-2013 Ken Sumrall <ksumrall@android.com> am 6673886d: am ebbe9807: Include liblog in fs_mgr to fix the build.

* commit '6673886d4a9166608fa152e2c922fe3b6022273a':
Include liblog in fs_mgr to fix the build.
6673886d4a9166608fa152e2c922fe3b6022273a 15-Apr-2013 Ken Sumrall <ksumrall@android.com> am ebbe9807: Include liblog in fs_mgr to fix the build.

* commit 'ebbe9807906dad946659b6e9f849030eaa87731b':
Include liblog in fs_mgr to fix the build.
ebbe9807906dad946659b6e9f849030eaa87731b 15-Apr-2013 Ken Sumrall <ksumrall@android.com> Include liblog in fs_mgr to fix the build.

A recent change to how libcutils is built requires liblog
to be explicitly included in the link list if it's needed.

Change-Id: I8547f5e65c488c8f6e314ccd4eb96606742272be
s_mgr/Android.mk
81099a92b9946b03ee64a3fd8fd2ca4d15acbc66 15-Apr-2013 The Android Open Source Project <initial-contribution@android.com> am 160a22b8: Reconcile with jb-mr2-release - do not merge

* commit '160a22b8fbc2c25cb893e92fcad2db8fc26e24b2':
160a22b8fbc2c25cb893e92fcad2db8fc26e24b2 15-Apr-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I5bcebe96be1d96d4e9f694eef967ca076310cfa1
ea4b3867c4db9e5dc64f39bab8a6eb2ee18a560b 15-Apr-2013 Ken Sumrall <ksumrall@android.com> am d45dcbd5: am 1a6d9ec2: Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into jb-mr2-dev

* commit 'd45dcbd5f825dfde943791c1fb5eaa27e1fc02f5':
fs_mgr: Capture the output of e2fsck and add to the kernel log
d6590f00aaf77f2b68b76409832523cee5b59213 15-Apr-2013 Ken Sumrall <ksumrall@android.com> am 23d1a02f: am 1f75eb1e: Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-dev

* commit '23d1a02f7cf60bf1db70f5580c77a27ac4dfd29d':
logwrapper: Add ability to log to kernel log
cb1300a2558d29f39d9f1fd2409c2de5363fc75c 15-Apr-2013 Ken Sumrall <ksumrall@android.com> am 3b051178: am 774814d1: Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev

* commit '3b0511788c86968860a682b6652c26c4415fa222':
klog: Have klog_write() call klog_init() if needed
d45dcbd5f825dfde943791c1fb5eaa27e1fc02f5 15-Apr-2013 Ken Sumrall <ksumrall@android.com> am 1a6d9ec2: Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into jb-mr2-dev

* commit '1a6d9ec2af7b3151c64a167162c87d258d30735b':
fs_mgr: Capture the output of e2fsck and add to the kernel log
23d1a02f7cf60bf1db70f5580c77a27ac4dfd29d 15-Apr-2013 Ken Sumrall <ksumrall@android.com> am 1f75eb1e: Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-dev

* commit '1f75eb1eae4dde3e7d8c625fca3063cf5a488079':
logwrapper: Add ability to log to kernel log
3b0511788c86968860a682b6652c26c4415fa222 15-Apr-2013 Ken Sumrall <ksumrall@android.com> am 774814d1: Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev

* commit '774814d1940a87175fc7dc692fef5c626d893968':
klog: Have klog_write() call klog_init() if needed
1a6d9ec2af7b3151c64a167162c87d258d30735b 15-Apr-2013 Ken Sumrall <ksumrall@android.com> Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into jb-mr2-dev
1f75eb1eae4dde3e7d8c625fca3063cf5a488079 15-Apr-2013 Ken Sumrall <ksumrall@android.com> Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-dev
774814d1940a87175fc7dc692fef5c626d893968 15-Apr-2013 Ken Sumrall <ksumrall@android.com> Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev
d8c0d8dcbd562e8facb5aa584ed5ddca96e790c1 15-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
bf021b4cd760a48b38c58347a35157180593c4b8 20-Mar-2013 Ken Sumrall <ksumrall@android.com> fs_mgr: Capture the output of e2fsck and add to the kernel log

Currently, the output of e2fsck is not saved, and we have no insight
into how many errors e2fsck is finding and fixing. Using the new
abbreviated logging feature in liblogwrap, up to the first 100 lines,
and last 4K bytes of the output of e2fsck is captured by fs_mgr, and
added to the kernel log.

Usually, the filesystem will be clean, and this will only add a few
lines to the kernel log on boot, but when things go wrong, it should
save enough to indicate what the problem is, without potentially
filling the kernel log with only e2fsck output if the filesystem is
really corrupted.

Change-Id: I9c264798e6fe721c8f818b5ce15d0975027ddbdd
s_mgr/Android.mk
s_mgr/fs_mgr.c
nit/Android.mk
96e11b5bc473918d61b088f1840e4d1ec48fd3ab 03-Apr-2013 Ken Sumrall <ksumrall@android.com> logwrapper: Add ability to log to kernel log

Also add ability to do abbreviated logging where only the first
4K bytes and last 4K bytes of output are added to the desginated log.

Also update standalog logwrapper command to support the new options.

Change-Id: Ia49cbe58479b9f9ed077498d6852e20b21287bad
ogwrapper/Android.mk
ogwrapper/include/logwrap/logwrap.h
ogwrapper/logwrap.c
ogwrapper/logwrapper.c
9bd89925ef1513189960604771028f57099c335c 13-Apr-2013 Dianne Hackborn <hackbod@google.com> am c08b50df: am 24bc41b7: Add new resources trace.

* commit 'c08b50dfc68504b692c13194e86d33328d373019':
Add new resources trace.
c08b50dfc68504b692c13194e86d33328d373019 13-Apr-2013 Dianne Hackborn <hackbod@google.com> am 24bc41b7: Add new resources trace.

* commit '24bc41b78ca004ac7a6873054ff919da1ba9a6f8':
Add new resources trace.
24bc41b78ca004ac7a6873054ff919da1ba9a6f8 12-Apr-2013 Dianne Hackborn <hackbod@google.com> Add new resources trace.

Change-Id: I63398f282fe7bf04f1c4cefa8f602100f403fa7c
nclude/cutils/trace.h
7425fd1b231fcdb3c260877a13f794a0c7361e80 03-Apr-2013 Ken Sumrall <ksumrall@android.com> klog: Have klog_write() call klog_init() if needed

Also change klog_init() to do nothing if already initialized.

Change-Id: Ia2dfe914c9d9fd119fb8939508d57b15c9884663
nclude/cutils/klog.h
ibcutils/klog.c
a14d6fda714e6d1c1578325eaec991032ce0558f 12-Apr-2013 Ying Wang <wangying@google.com> am 821620f5: am c796ed97: We need libcutils to include liblog

* commit '821620f593bef6c9765fe6ee2973b0b8df0f2d40':
We need libcutils to include liblog
821620f593bef6c9765fe6ee2973b0b8df0f2d40 12-Apr-2013 Ying Wang <wangying@google.com> am c796ed97: We need libcutils to include liblog

* commit 'c796ed97466510dd5239008554decbe72825e19c':
We need libcutils to include liblog
bc7494fb7eab3e1d2a1c6942d127c1271c8be749 12-Apr-2013 Doug Zongker <dougz@android.com> Merge "mincrypt: merge the two RSA verifiers"
fead1c0acd89ff7b9ddc8e3796a8caa35e4ae565 12-Apr-2013 Doug Zongker <dougz@android.com> Merge "mincrypt: support SHA-256 hash algorithm"
8fdbf97652b76b19b4faff522ddcf4a9da543a86 11-Apr-2013 Doug Zongker <dougz@android.com> mincrypt: merge the two RSA verifiers

The e=3 and e=65537 implementations are nearly identical, refactor
them down into one.

Change-Id: I537a368a6cc195f373b9354d7472957fd683beea
ibmincrypt/Android.mk
ibmincrypt/rsa.c
ibmincrypt/rsa_e_3.c
ibmincrypt/rsa_e_f4.c
ibmincrypt/test/Android.mk
ibmincrypt/test/rsa_test.c
c796ed97466510dd5239008554decbe72825e19c 11-Apr-2013 Ying Wang <wangying@google.com> We need libcutils to include liblog

For some prebuilts were built against libcutils with liblog in it.
Unfortunately that means in the future if someone checks in prebuilts
that are built against libcutils and they don't explicitly link against
liblog, they will again prevent us from removing liblog from libcutils.

Bug: 8587800
Bug: 8580410
Change-Id: I2a5ed6233df7e7d542d1e4167bec405750c0e671
ibcutils/Android.mk
515e1639ef0ab5e3149fafeffce826cf654d616f 10-Apr-2013 Doug Zongker <dougz@android.com> mincrypt: support SHA-256 hash algorithm

- adds a library to compute the SHA-256 hash

- updates the RSA verifier to take an argument specifying either SHA-1
or SHA-256

- updates DumpPublicKey to with new "key" version numbers for
specifying SHA-256

- adds new argument to adb auth code to maintain existing behavior

Change-Id: I5b1406cf57c2b8993f6032eda3e29139f7740839
db/adb_auth_client.c
nclude/mincrypt/hash-internal.h
nclude/mincrypt/rsa.h
nclude/mincrypt/sha.h
nclude/mincrypt/sha256.h
ibmincrypt/Android.mk
ibmincrypt/rsa.c
ibmincrypt/rsa_e_3.c
ibmincrypt/rsa_e_f4.c
ibmincrypt/sha.c
ibmincrypt/sha256.c
ibmincrypt/tools/DumpPublicKey.java
bf6c100a8c06ec3a50669ab4d9d8c9419ca8b2e8 10-Apr-2013 The Android Open Source Project <initial-contribution@android.com> am cdbddac7: Reconcile with jb-mr2-release - do not merge

* commit 'cdbddac7b62c78a998ffce85f6a0e9b2209421f2':
cdbddac7b62c78a998ffce85f6a0e9b2209421f2 10-Apr-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I4e13e11a8c42a8b316f60e9d37170e4787643099
2c61db947a260b50a3950b15cd56e5fa9ce15457 10-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
39f6dd65f9be1aeb40438dac180ab046e4b8a335 10-Apr-2013 Ying Wang <wangying@google.com> am 129b6d90: am 083b5ccb: Add liblog

* commit '129b6d907b3c32a0f0a2e4fc585502484d47a1e4':
Add liblog
129b6d907b3c32a0f0a2e4fc585502484d47a1e4 10-Apr-2013 Ying Wang <wangying@google.com> am 083b5ccb: Add liblog

* commit '083b5ccba345ed2b4950454f16bd89c5d86b6b27':
Add liblog
083b5ccba345ed2b4950454f16bd89c5d86b6b27 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
harger/Android.mk
ebuggerd/Android.mk
ibcorkscrew/Android.mk
ibnetutils/Android.mk
ibpixelflinger/Android.mk
ibsysutils/Android.mk
oolbox/Android.mk
e13f15ab55d957976bc66f314c3f58090e903207 19-Mar-2013 Alex Ray <aray@google.com> graphics: add Android flexible YCbCr format

Change-Id: I3f6676873febc793f7a4a5e06892cd9fadb35665
nclude/system/graphics.h
5cad7119761d3074497fbf33f2cd5854ae5c19d6 08-Apr-2013 The Android Open Source Project <initial-contribution@android.com> am 2e1be175: Reconcile with jb-mr2-release - do not merge

* commit '2e1be1756081ef7300c42f2e7906c316539d7930':
2e1be1756081ef7300c42f2e7906c316539d7930 08-Apr-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I4d242b2cbadf2c9bcdeeff721a83528cd02b3c0e
1520fb4fa2cd28713c760c017379e630165b0e77 08-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
7066da4ea9d9fa8be3a5416ab68a27efb141abf6 06-Apr-2013 Colin Cross <ccross@android.com> am dd0a6cdf: am 578b7473: Merge "libsparse: Fix null pointer issue"

* commit 'dd0a6cdf1f88fcbe16070f678911702c81c4fd4a':
libsparse: Fix null pointer issue
58b0642abbe7c540ccb370824948aaf2b409022c 06-Apr-2013 Colin Cross <ccross@android.com> am d3859e43: am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"

* commit 'd3859e433d5a4e0da3f24851c5f5f6c9c8b97849':
toolbox/dmesg: do not hardcode KLOG_BUF_LEN
dd0a6cdf1f88fcbe16070f678911702c81c4fd4a 06-Apr-2013 Colin Cross <ccross@android.com> am 578b7473: Merge "libsparse: Fix null pointer issue"

* commit '578b74734c1cfc773f3213a23a7195aa4b5b97aa':
libsparse: Fix null pointer issue
d3859e433d5a4e0da3f24851c5f5f6c9c8b97849 06-Apr-2013 Colin Cross <ccross@android.com> am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"

* commit '6e0b9ecb503b5611d815214e0a134ea0b1395089':
toolbox/dmesg: do not hardcode KLOG_BUF_LEN
578b74734c1cfc773f3213a23a7195aa4b5b97aa 06-Apr-2013 Colin Cross <ccross@android.com> Merge "libsparse: Fix null pointer issue"
6e0b9ecb503b5611d815214e0a134ea0b1395089 06-Apr-2013 Colin Cross <ccross@android.com> Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"
3be5c95d5f2b72f0672a3f02ed02684e364c9ca2 06-Apr-2013 Colin Cross <ccross@android.com> am a5ca229a: am 1615c09a: Merge "init: Fix potential null pointer issue"

* commit 'a5ca229a4571f6df42c96e760257b7ca95c7fdeb':
init: Fix potential null pointer issue
a5ca229a4571f6df42c96e760257b7ca95c7fdeb 06-Apr-2013 Colin Cross <ccross@android.com> am 1615c09a: Merge "init: Fix potential null pointer issue"

* commit '1615c09ac1065104f56ddc444f5467aff76c0daa':
init: Fix potential null pointer issue
1615c09ac1065104f56ddc444f5467aff76c0daa 06-Apr-2013 Colin Cross <ccross@android.com> Merge "init: Fix potential null pointer issue"
30874aff274641aa1aaec1509a4f87b66d98f2dd 06-Apr-2013 Christopher Tate <ctate@google.com> am 2c170667: am 7716aef1: Uploaded native crash dumps do not include memory contents

* commit '2c1706675dfcab3205f4e065b63a5cef8acc3668':
Uploaded native crash dumps do not include memory contents
2c1706675dfcab3205f4e065b63a5cef8acc3668 06-Apr-2013 Christopher Tate <ctate@google.com> am 7716aef1: Uploaded native crash dumps do not include memory contents

* commit '7716aef138e8029357a7b3dc6a73b41f4de4b0ad':
Uploaded native crash dumps do not include memory contents
7716aef138e8029357a7b3dc6a73b41f4de4b0ad 02-Apr-2013 Christopher Tate <ctate@google.com> Uploaded native crash dumps do not include memory contents

Also fixed the LOG() macro to actually write to the log again, tracking
the change in _LOG() argument semantics.

Bug 8322568

Change-Id: I79330c85c26d3ffb734315b6d0f2c0bb80bd234a
ebuggerd/arm/machine.c
ebuggerd/backtrace.c
ebuggerd/mips/machine.c
ebuggerd/tombstone.c
ebuggerd/utility.c
ebuggerd/utility.h
ebuggerd/x86/machine.c
c44e1f84c2c5b2258e98739bae66c426e823f077 06-Apr-2013 Elliott Hughes <enh@google.com> am c3d750b7: am e5f8a692: Modify debuggerd to cope with the abort message.

* commit 'c3d750b74b7bd2760d6359e0e10e1320276b5ca6':
Modify debuggerd to cope with the abort message.
c3d750b74b7bd2760d6359e0e10e1320276b5ca6 06-Apr-2013 Elliott Hughes <enh@google.com> am e5f8a692: Modify debuggerd to cope with the abort message.

* commit 'e5f8a692e44be89dc4c062517eadfb88184c4770':
Modify debuggerd to cope with the abort message.
e5f8a692e44be89dc4c062517eadfb88184c4770 04-Apr-2013 Elliott Hughes <enh@google.com> Modify debuggerd to cope with the abort message.

(cherry picked from commit 707b8bbe1800dbebd932f54e86347563ee86c36e)

Bug: 8531731
Change-Id: I2785a07ef83e085f338d3094f9972de23117807c
ebuggerd/debuggerd.c
ebuggerd/tombstone.c
ebuggerd/tombstone.h
nclude/cutils/debugger.h
879d21ebc314f242c15ca590b259abc914481cda 05-Apr-2013 Elliott Hughes <enh@google.com> am 8a4ae0a8: resolved conflicts for merge of f79c0518 to jb-mr2-dev-plus-aosp

* commit '8a4ae0a873862ea0a4764cd3492467843485f1e5':
Modify debuggerd to cope with the abort message.
8a4ae0a873862ea0a4764cd3492467843485f1e5 05-Apr-2013 Elliott Hughes <enh@google.com> resolved conflicts for merge of f79c0518 to jb-mr2-dev-plus-aosp

Change-Id: I106a2aa7ec393a68e51132bf277b22bece155a8e
09e534931aa6dcba7da603bddc231011bf2dbcb8 05-Apr-2013 Jeff Sharkey <jsharkey@android.com> am c307aa5f: am b4d52a43: Only handle keycodes when adb is enabled.

* commit 'c307aa5f038cea2a0fb5bb535f5930758bdfbb81':
Only handle keycodes when adb is enabled.
c307aa5f038cea2a0fb5bb535f5930758bdfbb81 05-Apr-2013 Jeff Sharkey <jsharkey@android.com> am b4d52a43: Only handle keycodes when adb is enabled.

* commit 'b4d52a437e97489710182ebc6a8a3e00d6fbd6f0':
Only handle keycodes when adb is enabled.
f79c05186fb48c89bc6036a751cbe455b99028cb 05-Apr-2013 Elliott Hughes <enh@google.com> Merge "Modify debuggerd to cope with the abort message."
d8ded8e941c6ee5d3c47bfc5f4676c3caa1c7eb4 05-Apr-2013 Keun-young Park <keunyoung@google.com> am ca02a136: am ad999a09: (-s ours) Merge "rootdir: goldfish: mount debugfs on boot time"

* commit 'ca02a136902ba44c64e90c87dd3be82a0ca7877f':
rootdir: goldfish: mount debugfs on boot time
ca02a136902ba44c64e90c87dd3be82a0ca7877f 05-Apr-2013 Keun-young Park <keunyoung@google.com> am ad999a09: (-s ours) Merge "rootdir: goldfish: mount debugfs on boot time"

* commit 'ad999a09ab973c5ed5c54a78cdaa4dbc06eb485e':
rootdir: goldfish: mount debugfs on boot time
ad999a09ab973c5ed5c54a78cdaa4dbc06eb485e 05-Apr-2013 Keun-young Park <keunyoung@google.com> Merge "rootdir: goldfish: mount debugfs on boot time"
e5920ffdca9974321fd9cb45c5080867dde194d3 05-Apr-2013 Geremy Condra <gcondra@google.com> am a7096004: am 911ba269: Merge "Add -i option to toolbox cmd ls"

* commit 'a7096004f220dd7578d7b2e26a3513fa5efc0fc1':
Add -i option to toolbox cmd ls
a7096004f220dd7578d7b2e26a3513fa5efc0fc1 05-Apr-2013 Geremy Condra <gcondra@google.com> am 911ba269: Merge "Add -i option to toolbox cmd ls"

* commit '911ba269e369035f9a4a250fa22233b37d724356':
Add -i option to toolbox cmd ls
911ba269e369035f9a4a250fa22233b37d724356 05-Apr-2013 Geremy Condra <gcondra@google.com> Merge "Add -i option to toolbox cmd ls"
707b8bbe1800dbebd932f54e86347563ee86c36e 04-Apr-2013 Elliott Hughes <enh@google.com> Modify debuggerd to cope with the abort message.

Bug: 8531731
Change-Id: I416ec1da38a8a1b0d0a582ccd7c8aaa681ed4a29
ebuggerd/debuggerd.c
ebuggerd/tombstone.c
ebuggerd/tombstone.h
nclude/cutils/debugger.h
b4d52a437e97489710182ebc6a8a3e00d6fbd6f0 04-Apr-2013 Jeff Sharkey <jsharkey@android.com> Only handle keycodes when adb is enabled.

This prevents accidental bugreports on userdebug/eng devices.

Bug: 8541006
Change-Id: Iefd15826090fd91434403f197cfd166e64400224
nit/keychords.c
f2661be2157fd81e0306f0c8c1a928b13358dc4d 04-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
7d960c961875a5d7ad6d577974c0e3e2b17cf51e 04-Apr-2013 The Android Open Source Project <initial-contribution@android.com> am a7672f42: Reconcile with jb-mr2-release - do not merge

* commit 'a7672f42478fae4150b32e5210fc6eb8f1b17bb1':
5f7b017f41b5bd0b86b5078b17c41ef7bc201c8d 03-Apr-2013 Stephen Smalley <sds@tycho.nsa.gov> Update ueventd set the SELinux context on sysfs

This change enables labeling of dynamically created sysfs nodes
with specific SELinux security contexts.

Change-Id: If8b8d66120453123c1371ce063b6f20e8b96b6ef
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/devices.c
403b195548e0b8e692ad9871ae1fb2301959d6a7 04-Apr-2013 William Roberts <w.roberts@sta.samsung.com> Add -i option to toolbox cmd ls

Change-Id: I4690fc10dc07bf1883bcf8ec18399235dc97d317
oolbox/ls.c
a7672f42478fae4150b32e5210fc6eb8f1b17bb1 04-Apr-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I1442a44754b64c868210578faf00006c5aaa6b58
294c9ce2177a24d5034b81e965373ff1d3287178 03-Apr-2013 Brian Carlstrom <bdc@google.com> am 76c67445: Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp

* commit '76c674451c831c1e9c3e3ee134ea8af26ae19ac1':
Add OkHttp to the boot classpath.
709928de499013270f4f788e40f975df3d7dd38b 03-Apr-2013 Geremy Condra <gcondra@google.com> am 977e1f26: am c1e47294: Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev

* commit '977e1f263cee9023baf12cb430b5547e415e763e':
Give system ownership of selinux load and enforce files.
4042393454a3260951f8b555370592cd3bfac4a6 03-Apr-2013 Geremy Condra <gcondra@google.com> am 5fa4d26c: am 8e15eabd: Apply the correct SELinux label for the properties workspace.

* commit '5fa4d26c572ca130f7c99040149e8aa7122888a5':
Apply the correct SELinux label for the properties workspace.
76c674451c831c1e9c3e3ee134ea8af26ae19ac1 03-Apr-2013 Brian Carlstrom <bdc@google.com> Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp
977e1f263cee9023baf12cb430b5547e415e763e 03-Apr-2013 Geremy Condra <gcondra@google.com> am c1e47294: Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev

* commit 'c1e47294c9ca69f32bae24036eb0f19db3af7b2e':
Give system ownership of selinux load and enforce files.
5fa4d26c572ca130f7c99040149e8aa7122888a5 03-Apr-2013 Geremy Condra <gcondra@google.com> am 8e15eabd: Apply the correct SELinux label for the properties workspace.

* commit '8e15eabdc0b40e68426eaf3179dc076d20df75b6':
Apply the correct SELinux label for the properties workspace.
d3f0e0ae379f4420b01bb9de932a764c035ff2a6 03-Apr-2013 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp

Change-Id: I63d6a2f975a6c0df5c238a2f7592f357441eb767
c1e47294c9ca69f32bae24036eb0f19db3af7b2e 03-Apr-2013 Geremy Condra <gcondra@google.com> Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev
02e8d73079e279fac152d1d3caf36afaeab6c5bf 03-Apr-2013 Brian Carlstrom <bdc@google.com> Merge "Add OkHttp to the boot classpath."
8e15eabdc0b40e68426eaf3179dc076d20df75b6 01-Mar-2013 Geremy Condra <gcondra@google.com> Apply the correct SELinux label for the properties workspace.

Change-Id: Ibb9c8044caa9d39ee6ec9fe06d54bb9dc4b56ff3
nit/init.c
c2594f36e789bbd49cbeeb9421a7b6a16cd30ba4 31-Mar-2013 Geremy Condra <gcondra@google.com> Give system ownership of selinux load and enforce files.

This is necessary to enable remote updates.

Change-Id: I05fb979c0360eca4cc6e4add48bb42f712a1ba17
ootdir/init.rc
f135302f31320c3753f9e08ed80b64f567e93a82 03-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
d701099cd14518b88b7133ec2723d2371c20f67c 03-Apr-2013 Geremy Condra <gcondra@google.com> Merge "Apply the correct SELinux label for the properties workspace."
78c8f3577ec0c7814365566fd6f977ac20e353ce 01-Mar-2013 Geremy Condra <gcondra@google.com> Apply the correct SELinux label for the properties workspace.

Change-Id: Ibb9c8044caa9d39ee6ec9fe06d54bb9dc4b56ff3
nit/init.c
c43d6185bd752ecf512c902449ccde689ae46736 03-Apr-2013 Mathias Agopian <mathias@google.com> am 145d61e0: am 69de9ac0: Merge "move tinyutils into its own namespace" into jb-mr2-dev

* commit '145d61e0c7f2584c65d6eb454496013408d707af':
move tinyutils into its own namespace
145d61e0c7f2584c65d6eb454496013408d707af 03-Apr-2013 Mathias Agopian <mathias@google.com> am 69de9ac0: Merge "move tinyutils into its own namespace" into jb-mr2-dev

* commit '69de9ac00bd3db3bfdb04ac5686e4b2cbfc372b5':
move tinyutils into its own namespace
8637e8186ac572df92a34253f93bf405bf634b03 30-Mar-2013 jwilson <jwilson@squareup.com> Add OkHttp to the boot classpath.

Change-Id: I185b803b5b804ff8680ef928ce5163727adbf0bd
ootdir/init.rc
69de9ac00bd3db3bfdb04ac5686e4b2cbfc372b5 03-Apr-2013 Mathias Agopian <mathias@google.com> Merge "move tinyutils into its own namespace" into jb-mr2-dev
be8892a33a8ff4416e7d5e575680d268b71ecde9 02-Apr-2013 The Android Open Source Project <initial-contribution@android.com> am 9de1633b: Reconcile with jb-mr2-release - do not merge

* commit '9de1633b6bc8ed8bc324b0741209bdb73944048c':
05d6a649a3e3106c762c4da8df1fb5ef0e3f9435 02-Apr-2013 Benoit Goby <benoit@android.com> am 9f25178a: am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev

* commit '9f25178a9dd0aa8fab5e74f785c9997ae230a325':
adb: Prevent registering usb_disconnect twice
9ee72b0b16f71a07e62eaa4725c4e9de2631891f 02-Apr-2013 Christopher Tate <ctate@google.com> am a72f0ff0: am ded2e5ac: debuggerd now notifies the Activity Manager about native crashes

* commit 'a72f0ff08376a2ebe6036869fb3144584fc4e395':
debuggerd now notifies the Activity Manager about native crashes
74b6b3ca7f19725cec9437fec3f1b65bb5eb6081 02-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
9de1633b6bc8ed8bc324b0741209bdb73944048c 02-Apr-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: Icffab869a16395b5985c14995d49333302f0bc0a
9f25178a9dd0aa8fab5e74f785c9997ae230a325 02-Apr-2013 Benoit Goby <benoit@android.com> am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev

* commit '7f8fb3ffa2a234b704fc975fc9b1001f17df9cac':
adb: Prevent registering usb_disconnect twice
a72f0ff08376a2ebe6036869fb3144584fc4e395 02-Apr-2013 Christopher Tate <ctate@google.com> am ded2e5ac: debuggerd now notifies the Activity Manager about native crashes

* commit 'ded2e5acfcf0c705f08577d0ccb720bd5037f4ba':
debuggerd now notifies the Activity Manager about native crashes
7f8fb3ffa2a234b704fc975fc9b1001f17df9cac 02-Apr-2013 Benoit Goby <benoit@android.com> Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev
b66356cab6cd47ecbe26513f36614dda1052eb11 02-Apr-2013 Benoit Goby <benoit@android.com> adb: Prevent registering usb_disconnect twice

adbd can receive multiple AUTH_RSAPUBLICKEY packets. This happens for
example when booting with usb attached when we retry authenticating
after the framework is done booting. Make sure usb_disconnect is only
registered once, otherwise this creates a loop in the disconnects list.

Bug: 8504991
Change-Id: Ia1f9a37005dd17b7eefee1493d622e1679263eea
db/adb_auth_client.c
9857d99eecc389389da261a72461322d5cfb8eeb 02-Apr-2013 Mathias Agopian <mathias@google.com> move tinyutils into its own namespace

I was fed-up with the constant conflicts in Eclipse
with the "libutils" version.

Also fix a few copyright notices.

Change-Id: I8ffcb845af4b5d0d178f5565f64dfcfbfa27fcd6
ibpixelflinger/Android.mk
ibpixelflinger/codeflinger/ARMAssembler.cpp
ibpixelflinger/codeflinger/ARMAssembler.h
ibpixelflinger/codeflinger/ARMAssemblerInterface.cpp
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/MIPSAssembler.cpp
ibpixelflinger/codeflinger/MIPSAssembler.h
ibpixelflinger/codeflinger/blending.cpp
ibpixelflinger/codeflinger/load_store.cpp
ibpixelflinger/codeflinger/texturing.cpp
ibpixelflinger/codeflinger/tinyutils/Errors.h
ibpixelflinger/codeflinger/tinyutils/KeyedVector.h
ibpixelflinger/codeflinger/tinyutils/SharedBuffer.cpp
ibpixelflinger/codeflinger/tinyutils/SharedBuffer.h
ibpixelflinger/codeflinger/tinyutils/SortedVector.h
ibpixelflinger/codeflinger/tinyutils/TypeHelpers.h
ibpixelflinger/codeflinger/tinyutils/Vector.h
ibpixelflinger/codeflinger/tinyutils/VectorImpl.cpp
ibpixelflinger/codeflinger/tinyutils/VectorImpl.h
ibpixelflinger/codeflinger/tinyutils/smartpointer.h
ibpixelflinger/tinyutils/Errors.h
ibpixelflinger/tinyutils/KeyedVector.h
ibpixelflinger/tinyutils/SharedBuffer.cpp
ibpixelflinger/tinyutils/SharedBuffer.h
ibpixelflinger/tinyutils/SortedVector.h
ibpixelflinger/tinyutils/TypeHelpers.h
ibpixelflinger/tinyutils/Vector.h
ibpixelflinger/tinyutils/VectorImpl.cpp
ibpixelflinger/tinyutils/VectorImpl.h
ibpixelflinger/tinyutils/smartpointer.h
ded2e5acfcf0c705f08577d0ccb720bd5037f4ba 19-Mar-2013 Christopher Tate <ctate@google.com> debuggerd now notifies the Activity Manager about native crashes

The Activity Manager sets up a permission-guarded domain socket, which
debuggerd connects to when a crash happens. If this is successful,
the daemon then mirrors the logged crash report to that socket, then
closes it.

Bug 8322568

Change-Id: Ife0c772a628ef82e8457094e511ce1edbfe57460
ebuggerd/backtrace.c
ebuggerd/backtrace.h
ebuggerd/debuggerd.c
ebuggerd/tombstone.c
ebuggerd/utility.c
ebuggerd/utility.h
edee93dc5ba2dd1fd7b1e097a29cb40d1d8fe516 24-Jun-2012 James Sullins <jcsullins@gmail.com> toolbox/dmesg: do not hardcode KLOG_BUF_LEN

Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
oolbox/dmesg.c
73cf7bff51df0b027be3c8a8c76e79ca5e1e6cb1 01-Apr-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
83a6d36d4226f82c202ffb27f89e080f95b71c30 01-Apr-2013 Hong-Mei Li <a21834@motorola.com> libsparse: Fix null pointer issue

Fix the issue that "out" pointer is dereferenced without checking.

Change-Id: I76a57ad7309841218231346f4807ef2be8628737
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
ibsparse/output_file.c
11467189bc856c087de1fcc4b7abaf97220e3ada 01-Apr-2013 Hong-Mei Li <a21834@motorola.com> init: Fix potential null pointer issue

With the old strdup() mechanism, it may return NULL if insufficient memory was
available. So we check the return value or do not use strdup to avoid null
pointer issue.

Change-Id: Id684948d6cb6c2f06327f29a2ba692f9542fce80
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
nit/init.c
ca203fc23ebf6a64ffaa4a552a5e71f414d92f13 31-Mar-2013 Geremy Condra <gcondra@google.com> Give system ownership of selinux load and enforce files.

This is necessary to enable remote updates.

Change-Id: I05fb979c0360eca4cc6e4add48bb42f712a1ba17
ootdir/init.rc
b2ba42a5d3fc6d9d3d249fa1efb22a315b5a972e 30-Mar-2013 Colin Cross <ccross@android.com> am b1d20464: am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c"

* commit 'b1d204648eb8061aa59bed189ce41938fa40197a':
adb: Remove execute permission on usb_vendor.c
b1d204648eb8061aa59bed189ce41938fa40197a 30-Mar-2013 Colin Cross <ccross@android.com> am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c"

* commit 'f5562cb66c1c15d65bc372ede4c180430e1ce9d7':
adb: Remove execute permission on usb_vendor.c
f5562cb66c1c15d65bc372ede4c180430e1ce9d7 30-Mar-2013 Colin Cross <ccross@android.com> Merge "adb: Remove execute permission on usb_vendor.c"
243667a98ec8b1114ca0dcfe400aaab089623d78 30-Mar-2013 Benoit Goby <benoit@android.com> am 78420edc: resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp

* commit '78420edc0f3e99684c36f0d516744b4d9312a1c1':
Add BYD's USB Vendor ID
Add USB Vendor ID for Xiaomi
Add vendor IDs to adb
f8cfa8a1e46a8927065df0ce4ded78ced5bea46a 30-Mar-2013 Benoit Goby <benoit@android.com> adb: Remove execute permission on usb_vendor.c

Change-Id: Ia4f2e0171634764bde3593593b3c99184236528f
db/usb_vendors.c
78420edc0f3e99684c36f0d516744b4d9312a1c1 30-Mar-2013 Benoit Goby <benoit@android.com> resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp

Change-Id: I754b8b17a7e3a6e4ef3ccf0a02beca0fc72ba749
6c11676e899faa45b618cea7811dc3f8fc595069 30-Mar-2013 Keun-young Park <keunyoung@google.com> am 9c37960c: am 9b32f87a: Merge "Add Mips memset speedup"

* commit '9c37960cd9169c160d9865a6d63e256e125b4aae':
Add Mips memset speedup
9c37960cd9169c160d9865a6d63e256e125b4aae 30-Mar-2013 Keun-young Park <keunyoung@google.com> am 9b32f87a: Merge "Add Mips memset speedup"

* commit '9b32f87a8c489a15baea535800b7c309014bd0ee':
Add Mips memset speedup
352004220a4ae6161d031a20380d862fe482b70d 29-Mar-2013 Colin Cross <ccross@android.com> Merge changes I0694ed72,I9f0622e0,Ib8c5196c

* changes:
Add BYD's USB Vendor ID
Add USB Vendor ID for Xiaomi
Add vendor IDs to adb
92eb5838336d52b415472a9a9df703a99328b194 15-Mar-2013 sunxiaoqi <sun.xiaoqi@byd.com> Add BYD's USB Vendor ID

Change-Id: I0694ed72d70638f0a4a252b1c802ae8f4e33385e
db/usb_vendors.c
d3b69404a1497cef235574a97e45867686f4c155 19-Mar-2013 Gary Hua <huachengping@xiaomi.com> Add USB Vendor ID for Xiaomi

Change-Id: I9f0622e05334a5074604bd88093172654b4c3e7d
Signed-off-by: Gary Hua <huachengping@xiaomi.com>
db/usb_vendors.c
df6d7666fd44e9903944202bcb4a8da6e8064a1d 12-Mar-2013 Sam Lin <samlin@google.com> Add vendor IDs to adb

Adding vendor IDs to adb for device partners:
AnyDATA, Harris & Oppo

Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
db/usb_vendors.c
ef854b62569014a0d43a089703538e4497ed965d 29-Mar-2013 Nick Kralevich <nnk@google.com> am a078c0e0: am d67bbab6: am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"

* commit 'a078c0e0e1ce4dd8aaad8704add4b2ad4040dc06':
run-as: Don't require CAP_DAC_READ_SEARCH
9b32f87a8c489a15baea535800b7c309014bd0ee 29-Mar-2013 Keun-young Park <keunyoung@google.com> Merge "Add Mips memset speedup"
a078c0e0e1ce4dd8aaad8704add4b2ad4040dc06 29-Mar-2013 Nick Kralevich <nnk@google.com> am d67bbab6: am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"

* commit 'd67bbab6d873c073fa5c3bdb93e8f32106898123':
run-as: Don't require CAP_DAC_READ_SEARCH
d67bbab6d873c073fa5c3bdb93e8f32106898123 29-Mar-2013 Nick Kralevich <nnk@google.com> am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"

* commit 'a56b0b97ddd64a9558975c470ea6d09b4f10575e':
run-as: Don't require CAP_DAC_READ_SEARCH
a56b0b97ddd64a9558975c470ea6d09b4f10575e 29-Mar-2013 Nick Kralevich <nnk@google.com> am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"

* commit '191fe44c972e7f45f4bac1cee27522ae244da498':
run-as: Don't require CAP_DAC_READ_SEARCH
a9ea0249a014884a60d08d7c669dff3366da8f2d 29-Mar-2013 The Android Open Source Project <initial-contribution@android.com> am e4e16d0c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e4e16d0cfbc8799f2c2ba6c500465668c192f23f':
e4e16d0cfbc8799f2c2ba6c500465668c192f23f 29-Mar-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: Ia1e9aa160247d491cc60c1dcc7a73c8545410d78
191fe44c972e7f45f4bac1cee27522ae244da498 29-Mar-2013 Nick Kralevich <nnk@google.com> Merge "run-as: Don't require CAP_DAC_READ_SEARCH"
b0f1540f2a1959120d1b083fa14d65f5c45335f8 29-Mar-2013 Nick Kralevich <nnk@google.com> run-as: Don't require CAP_DAC_READ_SEARCH

This is a partial AOSP port of Google internal change
080427e4e2b1b72718b660e16b6cf38b3a3c4e3f .

Change-Id: I23a7edc808d227caf3862b035dc2ca39639d9d59
un-as/package.c
5e61ab0d7779be5807dbcfdde2ad2de881c06634 29-Mar-2013 Benoit Goby <benoit@android.com> Merge "toolbox: Make reboot a separate command from toolbox"
9a84b553e89b399977252a2c8474bce4062e7bb6 28-Mar-2013 Geremy Condra <gcondra@google.com> am 83f9cdf0: am 46e89912: am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."

* commit '83f9cdf0c8a374f98593440b07d0688b2fb91997':
run-as: Get seinfo from packages.list and pass to libselinux.
83f9cdf0c8a374f98593440b07d0688b2fb91997 28-Mar-2013 Geremy Condra <gcondra@google.com> am 46e89912: am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."

* commit '46e8991209508a9f5d59bf97ed39b791444dbaf7':
run-as: Get seinfo from packages.list and pass to libselinux.
46e8991209508a9f5d59bf97ed39b791444dbaf7 28-Mar-2013 Geremy Condra <gcondra@google.com> am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."

* commit 'f19e045c58dafbdc46e848ec5a5c935f472dea34':
run-as: Get seinfo from packages.list and pass to libselinux.
f19e045c58dafbdc46e848ec5a5c935f472dea34 28-Mar-2013 Geremy Condra <gcondra@google.com> am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."

* commit 'c8df252fa16d328be197ecc5280a2f8c2aacb5ad':
run-as: Get seinfo from packages.list and pass to libselinux.
15311e083034c5f4b9e85d2ac3c4c99f86de98b5 28-Mar-2013 Jamie Gennis <jgennis@google.com> am 38e1bb86: am 774f9299: libcutils: add support for app tracing

* commit '38e1bb8617ee6b7913b9b7b7c40e43338ea5c947':
libcutils: add support for app tracing
38e1bb8617ee6b7913b9b7b7c40e43338ea5c947 28-Mar-2013 Jamie Gennis <jgennis@google.com> am 774f9299: libcutils: add support for app tracing

* commit '774f9299912cdf9f2a6b3805bb557e30bafbad05':
libcutils: add support for app tracing
774f9299912cdf9f2a6b3805bb557e30bafbad05 26-Feb-2013 Jamie Gennis <jgennis@google.com> libcutils: add support for app tracing

This change adds support for tracing using the ATRACE_TAG_APP tag. This tag is
enabled only for processes in which the /proc/<pid>/cmdline value appears in
the comma-separated list of such values in the debug.atrace.app_cmdlines system
property. It is also only enabled if either the ro.debuggable system property
is set to 1 or the application has declared itself debuggable in its manifest,
which gets reported to libcutils by the framework.

Change-Id: Ic94ba55f4e70a9cf994056acbf151e523428b65d
nclude/cutils/trace.h
ibcutils/trace.c
c8df252fa16d328be197ecc5280a2f8c2aacb5ad 28-Mar-2013 Geremy Condra <gcondra@google.com> Merge "run-as: Get seinfo from packages.list and pass to libselinux."
d982d29dc2ee02a8a2db3336e4490de253f4cc62 28-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
fced3ded831cb084121b10a78c12de99c89004aa 26-Mar-2013 Robert Craig <rpcraig@tycho.ncsc.mil> run-as: Get seinfo from packages.list and pass to libselinux.

Change allows the proper seinfo value to be passed
to libselinux to switch to the proper app security
context before running the shell.

Change-Id: I9d7ea47c920b1bc09a19008345ed7fd0aa426e87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
un-as/package.c
un-as/package.h
un-as/run-as.c
b9cbdbafda37997f6ae49b1334543dbe566ea221 28-Mar-2013 Geremy Condra <gcondra@google.com> am a9d7c529: am de97f798: am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"

* commit 'a9d7c5296fe31a9481fc3217066ae7fd1d850a06':
Drop /data/system as a policy file location
a9d7c5296fe31a9481fc3217066ae7fd1d850a06 28-Mar-2013 Geremy Condra <gcondra@google.com> am de97f798: am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"

* commit 'de97f798a1c24303de35ff44e2f47b590b46a815':
Drop /data/system as a policy file location
de97f798a1c24303de35ff44e2f47b590b46a815 28-Mar-2013 Geremy Condra <gcondra@google.com> am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"

* commit 'bed08333d921e97bc60b81c0f183816386709d79':
Drop /data/system as a policy file location
bed08333d921e97bc60b81c0f183816386709d79 28-Mar-2013 Geremy Condra <gcondra@google.com> am c0e1bc1c: Merge "Drop /data/system as a policy file location"

* commit 'c0e1bc1c755b165574c761e878b6fc26fb340ba0':
Drop /data/system as a policy file location
c0e1bc1c755b165574c761e878b6fc26fb340ba0 27-Mar-2013 Geremy Condra <gcondra@google.com> Merge "Drop /data/system as a policy file location"
04561b63474e25bf6a61fbf4179717bbdd5f32a2 21-Mar-2013 William Roberts <w.roberts@sta.samsung.com> Drop /data/system as a policy file location

/data/system is no longer used as a policy
file location. Use /data/security instead.

Change-Id: Ie77be9e25c67c8a2157c7b6c468f3215a49ead52
nit/init.c
c6d7e200eddd620d8ac55259ab3aa5f8bfa2aadb 23-Mar-2013 Benoit Goby <benoit@android.com> toolbox: Make reboot a separate command from toolbox

Set the CAP_SYS_BOOT filesystem capability on the new reboot
command and keep CAP_SYS_BOOT in adb bounding set so that the
shell user can run it.

Change-Id: I1dd6143445ee2a952254f0452ab6e544318431dd
leanSpec.mk
db/adb.c
nclude/private/android_filesystem_config.h
eboot/Android.mk
eboot/reboot.c
oolbox/Android.mk
oolbox/reboot.c
f798f300f39c9b45e06e18b610cf0f996eea0161 26-Mar-2013 The Android Open Source Project <initial-contribution@android.com> am 540c9fba: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '540c9fbaf58593e2d9046efd6a29caff6af0e77b':
82075a4044efe57ad9bad3d18982e311b4ef53ae 26-Mar-2013 Benoit Goby <benoit@android.com> Merge "toolbox: Fix rm -f with multiple files"
540c9fbaf58593e2d9046efd6a29caff6af0e77b 26-Mar-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I2a7a7aed31eaf87aac6359a320d4b8c3f3d6b034
584b3321341a8135e92d847639f9669577857c46 26-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
391f365c6d64d3223adc4cbd6b2fb558416ccceb 16-Jan-2013 Benoit Goby <benoit@android.com> toolbox: Fix rm -f with multiple files

Only check errno if unlink returns -1.
Continue instead of exiting if one file does not exist.

Change-Id: Iaf01b8523b84e87fcb0d732b89b7be6e24279c0b
oolbox/rm.c
df115f3386cb48493a8efa2d998f4cd9b38ec536 26-Mar-2013 Igor Murashkin <iam@google.com> am 858c8fe7: am d118394d: Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev

* commit '858c8fe7f98036a345a26dd710fbdad82357d201':
Properly handle cases of multiple inotify events
858c8fe7f98036a345a26dd710fbdad82357d201 26-Mar-2013 Igor Murashkin <iam@google.com> am d118394d: Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev

* commit 'd118394d444107dba4430723d248863ff412c444':
Properly handle cases of multiple inotify events
d118394d444107dba4430723d248863ff412c444 26-Mar-2013 Igor Murashkin <iam@google.com> Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev
d15715e5a085dc052ab462799950622f844b0059 25-Mar-2013 Todd Poynor <toddpoynor@google.com> am 40d313b4: am 6b5de1cd: init.rc: Set owner/perm for interactive governor io_is_busy

* commit '40d313b49341973f4a188647e0e923a683346ddf':
init.rc: Set owner/perm for interactive governor io_is_busy
40d313b49341973f4a188647e0e923a683346ddf 25-Mar-2013 Todd Poynor <toddpoynor@google.com> am 6b5de1cd: init.rc: Set owner/perm for interactive governor io_is_busy

* commit '6b5de1cda2e5c4946aa08a11a38ad0a7eee115ce':
init.rc: Set owner/perm for interactive governor io_is_busy
f75ea8d082ff39e316bd4d73979b610cc4b5e4bc 24-Mar-2013 Ziv Hendel <ziv@primesense.com> Properly handle cases of multiple inotify events

Bug: 8469799
Change-Id: Ie10242dd05becd142cc84651d5e5795e4c02270d
Signed-off-by: Igor Murashkin <iam@google.com>
Signed-off-by: Adam Hampson <ahampson@google.com>
ibusbhost/usbhost.c
6b5de1cda2e5c4946aa08a11a38ad0a7eee115ce 25-Mar-2013 Todd Poynor <toddpoynor@google.com> init.rc: Set owner/perm for interactive governor io_is_busy

Change-Id: I7537d56a23ca787daf92a9d91778056f987097bd
ootdir/init.rc
a797007bc134eeac7bf486a10d47b41322ace780 25-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
a4d79d68acb872169f2d2a1fa39032184692c6e4 23-Mar-2013 Geremy Condra <gcondra@google.com> am 746cde9a: am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."

* commit '746cde9a8c92a138f7a53b17728ecff5c48c9e4b':
Fix mode on /data/security.
746cde9a8c92a138f7a53b17728ecff5c48c9e4b 23-Mar-2013 Geremy Condra <gcondra@google.com> am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."

* commit 'fb39c0d19860fe48bc598d5d180a8cce9f59e33b':
Fix mode on /data/security.
fb39c0d19860fe48bc598d5d180a8cce9f59e33b 23-Mar-2013 Geremy Condra <gcondra@google.com> am 4d71493e: am e849970c: Merge "Fix mode on /data/security."

* commit '4d71493e74ed1ea39e554146351cc39e47cb5d02':
Fix mode on /data/security.
4d71493e74ed1ea39e554146351cc39e47cb5d02 23-Mar-2013 Geremy Condra <gcondra@google.com> am e849970c: Merge "Fix mode on /data/security."

* commit 'e849970c5423cae43da1f7e2ab117117db6e0a64':
Fix mode on /data/security.
e849970c5423cae43da1f7e2ab117117db6e0a64 23-Mar-2013 Geremy Condra <gcondra@google.com> Merge "Fix mode on /data/security."
504d2747bdc5f987159f707753c15137b8cae7ef 22-Mar-2013 Ying Wang <wangying@google.com> am 85da9313: am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-dev

* commit '85da931345fd420bc2959d79361058efa974f465':
android_filesystem_config: add /vendor
85da931345fd420bc2959d79361058efa974f465 22-Mar-2013 Ying Wang <wangying@google.com> am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-dev

* commit 'd0f3e8588a58e1687ca4336609e809351e94e2d8':
android_filesystem_config: add /vendor
d0f3e8588a58e1687ca4336609e809351e94e2d8 22-Mar-2013 Ying Wang <wangying@google.com> Merge "android_filesystem_config: add /vendor" into jb-mr2-dev
dcf8b21eef8ae70d76f2a375af0fcb70363c391b 22-Mar-2013 Rom Lemarchand <romlem@google.com> am 9cb78cc3: am af3a9cad: Merge "liblogwrap: use POLLHUP flag to check when a child dies" into jb-mr2-dev

* commit '9cb78cc3e1207544c6839ff3f78d266ae408a84b':
liblogwrap: use POLLHUP flag to check when a child dies
9cb78cc3e1207544c6839ff3f78d266ae408a84b 22-Mar-2013 Rom Lemarchand <romlem@google.com> am af3a9cad: Merge "liblogwrap: use POLLHUP flag to check when a child dies" into jb-mr2-dev

* commit 'af3a9cad81f35ca2a88be76e46cefb2882e531d2':
liblogwrap: use POLLHUP flag to check when a child dies
af3a9cad81f35ca2a88be76e46cefb2882e531d2 22-Mar-2013 Rom Lemarchand <romlem@google.com> Merge "liblogwrap: use POLLHUP flag to check when a child dies" into jb-mr2-dev
3676ea200716733c8959405c6b5e36bde9a388ba 21-Mar-2013 Geremy Condra <gcondra@google.com> am 9e5a4c56: am 9feea559: Merge "Create a new location for /data policy files" into jb-mr2-dev

* commit '9e5a4c56958fadc2f31dcf762dd647791eaa14e4':
Create a new location for /data policy files
9e5a4c56958fadc2f31dcf762dd647791eaa14e4 21-Mar-2013 Geremy Condra <gcondra@google.com> am 9feea559: Merge "Create a new location for /data policy files" into jb-mr2-dev

* commit '9feea559d68559dd74eaf325318014dee33ef9ea':
Create a new location for /data policy files
9feea559d68559dd74eaf325318014dee33ef9ea 21-Mar-2013 Geremy Condra <gcondra@google.com> Merge "Create a new location for /data policy files" into jb-mr2-dev
63c939aadcc22f99a44bf938597e294cd234d28a 21-Mar-2013 Ian Rogers <irogers@google.com> am da204c5c: am 62980e81: Inline ldrex/strex for thumb2, remove ARMv5 remnants.

* commit 'da204c5c4244ea67aacbd29c222d0a2d1c35b443':
Inline ldrex/strex for thumb2, remove ARMv5 remnants.
da204c5c4244ea67aacbd29c222d0a2d1c35b443 21-Mar-2013 Ian Rogers <irogers@google.com> am 62980e81: Inline ldrex/strex for thumb2, remove ARMv5 remnants.

* commit '62980e817c51c56208971ed5c3e98e0cb21e1685':
Inline ldrex/strex for thumb2, remove ARMv5 remnants.
bfd71b489b283fe54669dc5d1ccdc97b453d2fb4 23-Jan-2013 William Roberts <w.roberts@sta.samsung.com> Create a new location for /data policy files

Adding a new location for policy files under
/data, the new location is /data/security. The
new location is used before attempting to use
any other location.
This requires a new directory to be created by
the init script and an update to the location of
the property_contexts file for property service.

Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
nit/init.c
ootdir/init.rc
62980e817c51c56208971ed5c3e98e0cb21e1685 01-Feb-2013 Ian Rogers <irogers@google.com> Inline ldrex/strex for thumb2, remove ARMv5 remnants.

We assume ARMv7 which with thumb2 has ldrex/strex operations that may be
inlined if -mthumb is defined.
Remove remnants of ARMv5 support.

(cherry picked from commit 80c3b278fde7b92504614b7d47b9fecf6f736081)

Change-Id: I194a3d08e933c63f79d48288d9235b4e64099340
nclude/cutils/atomic-arm.h
c0317a75793ecbcd4a8e19f477458eb677024869 28-Jan-2013 Stephen Smalley <sds@tycho.nsa.gov> Fix mode on /data/security.

Change-Id: Id97d06a1c360c7871361db147f76b8a2eaceca42
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ootdir/init.rc
e94c4040150d084a8b3f0f98b76c2d5a02c955ed 21-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
a0524d0815baeed843936a50d8dd6a3c30403805 21-Mar-2013 Geremy Condra <gcondra@google.com> am 6ed65d5e: am 033b7f24: am a3c3709e: (-s ours) am 028e38f6: Merge "Create a new location for /data policy files"

* commit '6ed65d5e7f4d98de5bea34e71c33abd5a7be9b32':
Create a new location for /data policy files
6ed65d5e7f4d98de5bea34e71c33abd5a7be9b32 21-Mar-2013 Geremy Condra <gcondra@google.com> am 033b7f24: am a3c3709e: (-s ours) am 028e38f6: Merge "Create a new location for /data policy files"

* commit '033b7f244655af0e638aa608bb868237ec0282e4':
Create a new location for /data policy files
033b7f244655af0e638aa608bb868237ec0282e4 21-Mar-2013 Geremy Condra <gcondra@google.com> am a3c3709e: (-s ours) am 028e38f6: Merge "Create a new location for /data policy files"

* commit 'a3c3709ead0505f1c872bbf3a42999deb727e2ff':
Create a new location for /data policy files
a3c3709ead0505f1c872bbf3a42999deb727e2ff 21-Mar-2013 Geremy Condra <gcondra@google.com> am 028e38f6: Merge "Create a new location for /data policy files"

* commit '028e38f691c12c3f6f034dd192e5efcae8e767c7':
Create a new location for /data policy files
028e38f691c12c3f6f034dd192e5efcae8e767c7 21-Mar-2013 Geremy Condra <gcondra@google.com> Merge "Create a new location for /data policy files"
46e1bd89b457713bf91d2dc751795822cc202658 23-Jan-2013 William Roberts <w.roberts@sta.samsung.com> Create a new location for /data policy files

Adding a new location for policy files under
/data, the new location is /data/security. The
new location is used before attempting to use
any other location.
This requires a new directory to be created by
the init script and an update to the location of
the property_contexts file for property service.

Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
nit/init.c
ootdir/init.rc
6ad53df6335520befee74efafca41d625baa9023 20-Mar-2013 Rom Lemarchand <romlem@google.com> liblogwrap: use POLLHUP flag to check when a child dies

Replace the old signal handling mechanism with a check of POLLHUP
to check when the child has died.

See http://b/8333626

Change-Id: Ic9909b6660b1c3d1ed3015568b1a1ee1c25afe20
ogwrapper/logwrap.c
0b56fc769dc193e8714d6c1f304cfbc90d593dc5 20-Mar-2013 Colin Cross <ccross@android.com> android_filesystem_config: add /vendor

Make /vendor have the same permissions as /system/vendor for devices
that have a vendor partition.

Bug: 8341435
Change-Id: I077a2caf9da41fc072a4d3e334be28c24b70c7cd
nclude/private/android_filesystem_config.h
725b1d8cf88bc3af9d718b44e63df6ee9e5ea401 20-Mar-2013 Elliott Hughes <enh@google.com> am 127013c1: am 7bce39ca: am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"

* commit '127013c1627b75a24610b66dda01de9a91446789':
debuggerd: Fix minor memory leak
127013c1627b75a24610b66dda01de9a91446789 20-Mar-2013 Elliott Hughes <enh@google.com> am 7bce39ca: am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"

* commit '7bce39cac65166f39d0f26453da6e59e236d2ab5':
debuggerd: Fix minor memory leak
7bce39cac65166f39d0f26453da6e59e236d2ab5 20-Mar-2013 Elliott Hughes <enh@google.com> am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"

* commit '2690482a35562fc2f5c8a2164f10ffba1d27e599':
debuggerd: Fix minor memory leak
2690482a35562fc2f5c8a2164f10ffba1d27e599 20-Mar-2013 Elliott Hughes <enh@google.com> am 55e1df47: Merge "debuggerd: Fix minor memory leak"

* commit '55e1df471bb6e786c46a64d7ea99e224a6c46af2':
debuggerd: Fix minor memory leak
55e1df471bb6e786c46a64d7ea99e224a6c46af2 20-Mar-2013 Elliott Hughes <enh@google.com> Merge "debuggerd: Fix minor memory leak"
0632ad45776aa7651bdcef1cd5728ad29025ab31 20-Mar-2013 Liangtao Gao <gliangtao@gmail.com> debuggerd: Fix minor memory leak

free_ptrace_context(context) doesn't free(context),
which leaks the memory allocated to context.

Change-Id: Ic199b257aefc9a05ec2d902958efa8a57a601fb1
Signed-off-by: Liangtao Gao <gliangtao@gmail.com>
ibcorkscrew/ptrace.c
5c8cff772f65cd6befaf73dd2b6f179082818589 20-Mar-2013 The Android Open Source Project <initial-contribution@android.com> am 3c7eb2a2: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '3c7eb2a2ba1f97814d39c23e6dea0afa7ff92240':
3c7eb2a2ba1f97814d39c23e6dea0afa7ff92240 20-Mar-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I12e6984817c915f51a7297a950a47b79de036679
4cf20a1f7f0bd9395d8c2670b267056bdd4072d9 19-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
b178fbe67bc532519242cfec0a9f5190878daef0 19-Mar-2013 Alex Ray <aray@google.com> am ee2dccf2: am 66317770: cutils: trace: add asynchronous events

* commit 'ee2dccf21b61094a0fd782d32f221804b0a7d3fa':
cutils: trace: add asynchronous events
ee2dccf21b61094a0fd782d32f221804b0a7d3fa 19-Mar-2013 Alex Ray <aray@google.com> am 66317770: cutils: trace: add asynchronous events

* commit '66317770d37c012b12609defdc750304c97bd8d3':
cutils: trace: add asynchronous events
66317770d37c012b12609defdc750304c97bd8d3 18-Mar-2013 Alex Ray <aray@google.com> cutils: trace: add asynchronous events

Change-Id: Ia09d34cbc6c8c85fb3d0f1a7e95de53d1b79e998
nclude/cutils/trace.h
e695b8d6ec81cca8ffa5e7566184dbfa96b7d64d 18-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
c8d85a4b2415cce34f0b8f73870eb10b4ecb032c 15-Mar-2013 Nick Kralevich <nnk@google.com> am c99742b5: am db3eb684: am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"

* commit 'c99742b54e483ce0806ef1f1d3580b50d8e2d166':
liblog: fix fd leakage
c99742b54e483ce0806ef1f1d3580b50d8e2d166 15-Mar-2013 Nick Kralevich <nnk@google.com> am db3eb684: am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"

* commit 'db3eb6844c361acff2a0f78325d8227695bb40b5':
liblog: fix fd leakage
db3eb6844c361acff2a0f78325d8227695bb40b5 15-Mar-2013 Nick Kralevich <nnk@google.com> am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"

* commit 'e657e0c2a4a30104c650e7ad8827e8e887af0cb9':
liblog: fix fd leakage
e657e0c2a4a30104c650e7ad8827e8e887af0cb9 15-Mar-2013 Nick Kralevich <nnk@google.com> am 1a2bdd6f: Merge "liblog: fix fd leakage"

* commit '1a2bdd6fbef8119e05be703658ef7fa2017ecf6e':
liblog: fix fd leakage
1a2bdd6fbef8119e05be703658ef7fa2017ecf6e 15-Mar-2013 Nick Kralevich <nnk@google.com> Merge "liblog: fix fd leakage"
a1703220834ddeffde5d571cd776ca981e8a42f6 15-Mar-2013 Nick Kralevich <nnk@google.com> liblog: fix fd leakage

File descriptors remain open across an exec unless FD_CLOEXEC is
set. Add O_CLOEXEC to the open() call to prevent file descriptor
leakage.

In particular, the following program will eventually run out of
file descriptors:

int main(int argc, char **argv) {
printf("===== entering main =====\n");
ALOGW("entering main");
system("ls -l /proc/self/fd/");

execv(argv[0], argv);
printf("exec failed\n");
return -1;
}

Change-Id: I5be43ab3b9f82a05f242b1f586454c50568af388
iblog/logd_write.c
2bd8292091e93d0e891018a781e2fd687f46d994 15-Mar-2013 Rom Lemarchand <romlem@google.com> am c113311e: am 74a7b91c: liblogwrap: lock android_fork_execvp

* commit 'c113311e6c0458d2ac0901c921fc38ca09074516':
liblogwrap: lock android_fork_execvp
c113311e6c0458d2ac0901c921fc38ca09074516 15-Mar-2013 Rom Lemarchand <romlem@google.com> am 74a7b91c: liblogwrap: lock android_fork_execvp

* commit '74a7b91cbe29d3a9e6500fb90aae6d9a858dc1f7':
liblogwrap: lock android_fork_execvp
74a7b91cbe29d3a9e6500fb90aae6d9a858dc1f7 11-Mar-2013 Rom Lemarchand <romlem@google.com> liblogwrap: lock android_fork_execvp

Add a lock around android_fork_execvp to ensure no two threads can
execute it at the same time.

This is to help with http://b/8333626

Change-Id: I75d087a74b58f5b8e878675b301200f54d976fb2
ogwrapper/logwrap.c
7c2e195f67e4fc7f89db033c9e54692e6825922f 15-Mar-2013 Colin Cross <ccross@android.com> am 89f08da2: am 39b7fdea: am c8c95f86: am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"

* commit '89f08da256c468fc0147960ac3324856b9527e6e':
ueventd: allow platform devices to have just a /devices/ prefix
89f08da256c468fc0147960ac3324856b9527e6e 15-Mar-2013 Colin Cross <ccross@android.com> am 39b7fdea: am c8c95f86: am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"

* commit '39b7fdea315bf60c5d1e9ae1ddd4b81e2cf83b23':
ueventd: allow platform devices to have just a /devices/ prefix
39b7fdea315bf60c5d1e9ae1ddd4b81e2cf83b23 15-Mar-2013 Colin Cross <ccross@android.com> am c8c95f86: am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"

* commit 'c8c95f86712989003ddd9c55261942d0d83ca9f4':
ueventd: allow platform devices to have just a /devices/ prefix
c8c95f86712989003ddd9c55261942d0d83ca9f4 15-Mar-2013 Colin Cross <ccross@android.com> am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"

* commit '80dac35023bb7860b7382ca995e19710bd894e7e':
ueventd: allow platform devices to have just a /devices/ prefix
80dac35023bb7860b7382ca995e19710bd894e7e 15-Mar-2013 Colin Cross <ccross@android.com> Merge "ueventd: allow platform devices to have just a /devices/ prefix"
f395c9237da69f1cc15f26a2525a82a371d5816d 07-Mar-2013 Dima Zavin <dima@android.com> ueventd: allow platform devices to have just a /devices/ prefix

When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
nit/devices.c
e2cbb94f629a29aef6603153ee7686fb5c968dcd 15-Mar-2013 Elliott Hughes <enh@google.com> am e998ba61: am e05093b9: am 3e77b752: am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"

* commit 'e998ba615015df0e7356dc85586c7aa805fb8213':
Unwinding implementation via eh_frame sections for x86
e998ba615015df0e7356dc85586c7aa805fb8213 15-Mar-2013 Elliott Hughes <enh@google.com> am e05093b9: am 3e77b752: am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"

* commit 'e05093b924652acb76b4527a3c32807cfa68118c':
Unwinding implementation via eh_frame sections for x86
e05093b924652acb76b4527a3c32807cfa68118c 15-Mar-2013 Elliott Hughes <enh@google.com> am 3e77b752: am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"

* commit '3e77b7521ba96fd1ff6fed0e019aff5f46a31428':
Unwinding implementation via eh_frame sections for x86
3e77b7521ba96fd1ff6fed0e019aff5f46a31428 15-Mar-2013 Elliott Hughes <enh@google.com> am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"

* commit '0b5355589429cabac0e16f36c6e6541f8aafba08':
Unwinding implementation via eh_frame sections for x86
0b5355589429cabac0e16f36c6e6541f8aafba08 15-Mar-2013 Elliott Hughes <enh@google.com> Merge "Unwinding implementation via eh_frame sections for x86"
4ba6122fce5a709b3226b513b9b4922606709e58 15-Mar-2013 Nick Kralevich <nnk@google.com> am 5cd723fa: am eb6dd010: am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""

* commit '5cd723fa933ca10e479657d7604840b689fb00c9':
Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
5cd723fa933ca10e479657d7604840b689fb00c9 15-Mar-2013 Nick Kralevich <nnk@google.com> am eb6dd010: am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""

* commit 'eb6dd010b56bbca76f345967d55d0faab6c5fbf3':
Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
eb6dd010b56bbca76f345967d55d0faab6c5fbf3 15-Mar-2013 Nick Kralevich <nnk@google.com> am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""

* commit '9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4':
Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4 15-Mar-2013 Nick Kralevich <nnk@google.com> am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""

* commit 'dbf4937b5a1ef4ceed49e13527f50514c510ebd4':
Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
81543a5eb0e5f0edaac23c65e5ee932e1aa8251f 15-Mar-2013 Jeff Sharkey <jsharkey@android.com> am 64b31d36: am fb4f7ace: Add symlink to bugreport storage location.

* commit '64b31d369822f0dd963b90b694a4be330cabb024':
Add symlink to bugreport storage location.
64b31d369822f0dd963b90b694a4be330cabb024 15-Mar-2013 Jeff Sharkey <jsharkey@android.com> am fb4f7ace: Add symlink to bugreport storage location.

* commit 'fb4f7acefb31a51679cec194562c7aeb3922f728':
Add symlink to bugreport storage location.
dbf4937b5a1ef4ceed49e13527f50514c510ebd4 14-Mar-2013 Nick Kralevich <nnk@google.com> Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""
76ba83cce2c375c9e3edaaad52fdcb916ebdd3c1 14-Mar-2013 Nick Kralevich <nnk@google.com> Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."

This logic has been moved to platform/frameworks/base commit
8a0a929422682ba3eb6a205dc6c0638e68b909de and is no longer needed
here.

This reverts commit 01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70.
nit/init.c
fb4f7acefb31a51679cec194562c7aeb3922f728 14-Mar-2013 Jeff Sharkey <jsharkey@android.com> Add symlink to bugreport storage location.

Change-Id: I16f024c24767cfa1f5800d568d39fb098a408127
ootdir/init.rc
af2cb3667ba24d1ef3037aa5a7b3bc0a238cf040 08-Mar-2013 Pavel Chupin <pavel.v.chupin@intel.com> Unwinding implementation via eh_frame sections for x86

Backtracing through eh_frame section is more effective allowing to reuse
ebp register for other purposes within routine. GCC with turned on
optimizations (-O1 and above) implicitly defines -fomit-frame-pointer
anyway. eh_frame sections are generated by default with GCC on any
optimization level.

This change implements remote unwinding (separate process unwinding).
Local unwinding is already implemented through _Unwind_Backtrace call
which is implemented in libgcc.

Change-Id: I1aea1ecd19c21710f9cf5f05dc272fc51b67b7aa
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
ebuggerd/crasher.c
ibcorkscrew/arch-x86/backtrace-x86.c
ibcorkscrew/arch-x86/dwarf.h
ibcorkscrew/arch-x86/ptrace-x86.c
ibcorkscrew/ptrace-arch.h
52a17f52fa7fd8ae51a02552f192b905cd20d964 13-Mar-2013 Sam Lin <samlin@google.com> am 461ead42: am 91535cff: Merge "Add vendor IDs to adb" into jb-mr2-dev

* commit '461ead42fe8ab082c3ee5dd750a63ddbe45ea98a':
Add vendor IDs to adb
4e74882a805088cf75839bf0df7eb13485b8b27a 13-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
461ead42fe8ab082c3ee5dd750a63ddbe45ea98a 13-Mar-2013 Sam Lin <samlin@google.com> am 91535cff: Merge "Add vendor IDs to adb" into jb-mr2-dev

* commit '91535cff09af5b0181bffe64e97dcae9d24ba219':
Add vendor IDs to adb
91535cff09af5b0181bffe64e97dcae9d24ba219 13-Mar-2013 Sam Lin <samlin@google.com> Merge "Add vendor IDs to adb" into jb-mr2-dev
64caa2e247a067ec0e40a2554cf8759a24245b3e 13-Mar-2013 Colin Cross <ccross@android.com> am 8f17ea6b: am d4b360a2: am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"

* commit '8f17ea6b7884752fc02bc9a927cac680c5bd8691':
mkbootimg: support 8192/16384 pagesizes
8f17ea6b7884752fc02bc9a927cac680c5bd8691 13-Mar-2013 Colin Cross <ccross@android.com> am d4b360a2: am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"

* commit 'd4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf':
mkbootimg: support 8192/16384 pagesizes
d4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf 13-Mar-2013 Colin Cross <ccross@android.com> am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"

* commit '1d77e6e4e3d304f86d0cfa2cfcf5266192420cae':
mkbootimg: support 8192/16384 pagesizes
1d77e6e4e3d304f86d0cfa2cfcf5266192420cae 13-Mar-2013 Colin Cross <ccross@android.com> am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"

* commit '3960ec226d07c7327ac6967a2977c521fd4884b6':
mkbootimg: support 8192/16384 pagesizes
387742d924306156f5693f8e3ca749f474ece8cb 13-Mar-2013 Rom Lemarchand <romlem@google.com> am 914b65fc: am 451dd85f: liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY

* commit '914b65fcb9d445059a1b51ce5ecd7552e0ea8c8b':
liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY
914b65fcb9d445059a1b51ce5ecd7552e0ea8c8b 13-Mar-2013 Rom Lemarchand <romlem@google.com> am 451dd85f: liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY

* commit '451dd85fb204b5015c461eabc78722abd1c4252a':
liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY
3960ec226d07c7327ac6967a2977c521fd4884b6 12-Mar-2013 Colin Cross <ccross@android.com> Merge "mkbootimg: support 8192/16384 pagesizes"
451dd85fb204b5015c461eabc78722abd1c4252a 11-Mar-2013 Rom Lemarchand <romlem@google.com> liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY

Makes the code slightly more readable and avoids boilerplate.

Change-Id: I023d9a1e1de729deaec97c62a5ca7983b6918f94
ogwrapper/logwrap.c
fcd0987a4a047318377c6b77363ecbf645293951 12-Mar-2013 The Android Open Source Project <initial-contribution@android.com> am 81ab2eb2: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '81ab2eb2c85d084374abbcbfc2bf3f2383c28b7a':
81ab2eb2c85d084374abbcbfc2bf3f2383c28b7a 12-Mar-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: If556a8aade619e94ef8cf3bfa2f65d4efa2c4550
eba780c92396fd0b90e9ee481aae060ba8d18046 12-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
644b6afdacec5ae0724ca799b643a808b6d290c7 12-Mar-2013 Sam Lin <samlin@google.com> Add vendor IDs to adb

Adding vendor IDs to adb for device partners:
AnyDATA, Harris & Oppo

Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
db/usb_vendors.c
e673999ddc5d96e863ece8c51175c16dde50ad0b 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 758045fa: (-s ours) am 7398664d: am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '758045fad588da0dfa00c2148ce18dbbf0d26cae':
758045fad588da0dfa00c2148ce18dbbf0d26cae 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 7398664d: am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7398664de30cf953b791ab5aeeb37dfd57410698':
7398664de30cf953b791ab5aeeb37dfd57410698 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c8b3fee48ca53150b38d84c70e2679f91d293efb':
c8b3fee48ca53150b38d84c70e2679f91d293efb 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f9094401491ecee8e574b294a22e850bfc2b5043':
f9094401491ecee8e574b294a22e850bfc2b5043 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '75f29709af6d053168402dd12cdf8b0a58b0c35e':
charger: Do not suspend when disconnecting from charger
charger: suspend enable in charger mode
libsuspend: compile as a static library
75f29709af6d053168402dd12cdf8b0a58b0c35e 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '09b43645514669b3ff8181b0a111bc14576e3699':
charger: Do not suspend when disconnecting from charger
charger: suspend enable in charger mode
libsuspend: compile as a static library
09b43645514669b3ff8181b0a111bc14576e3699 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '92b2cd23f708c9aeed146e995807dce080b57d1a':
charger: Do not suspend when disconnecting from charger
charger: suspend enable in charger mode
libsuspend: compile as a static library
92b2cd23f708c9aeed146e995807dce080b57d1a 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> Reconcile with jb-mr1-release - do not merge
77e1af8386ec72fc90c0f8d4eaaaf3cafee00389 11-Mar-2013 Dima Zavin <dima@android.com> am ac19623f: (-s ours) am 53a02884: ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE

* commit 'ac19623f88203247cf4b710bdc70e3c26b18bdee':
ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
ac19623f88203247cf4b710bdc70e3c26b18bdee 11-Mar-2013 Dima Zavin <dima@android.com> am 53a02884: ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE

* commit '53a0288463c3fd88fb7f2cfa37c0e985eb1870f4':
ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
53a0288463c3fd88fb7f2cfa37c0e985eb1870f4 07-Mar-2013 Dima Zavin <dima@android.com> ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE

When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
nit/devices.c
c1c4ad5609834e5675452a22d8667610256817c1 11-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
81ce3a79ff0d828f8eafc1395851ae535dd151d4 10-Mar-2013 Ithamar R. Adema <ithamar@upgrade-android.com> mkbootimg: support 8192/16384 pagesizes

By now these sizes are very common, so make sure we support them.

Change-Id: Ib1963fbabc4ec0b4623f2045a3cbeedffbad7ee8
Signed-off-by: Ithamar R. Adema <ithamar@upgrade-android.com>
kbootimg/mkbootimg.c
7d312208a16a3d9bac01467369ae9b86fd0cf29b 10-Mar-2013 Young-Ho Cha <ganadist@gmail.com> rootdir: goldfish: mount debugfs on boot time

goldfish is ported to linux-3.4 and have capability to run atrace.
But can't run atrace yet because debugfs is not mounted on boot time.

Change-Id: I0ce23bde3b8d1b2a88d4238272123e3ab8cb6970
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
ootdir/etc/init.goldfish.rc
1b67a58f113f73c78534bb910c4f425aec6cc18e 09-Mar-2013 Elliott Hughes <enh@google.com> am f8c71067: am dd0d0e78: am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"

* commit 'f8c710670fe991d83cc24c51210d78d7eaf0b114':
Close adb_usb.ini after reading it
f8c710670fe991d83cc24c51210d78d7eaf0b114 09-Mar-2013 Elliott Hughes <enh@google.com> am dd0d0e78: am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"

* commit 'dd0d0e78afb5b809983fe9cebac8cc5d54a284b6':
Close adb_usb.ini after reading it
dd0d0e78afb5b809983fe9cebac8cc5d54a284b6 09-Mar-2013 Elliott Hughes <enh@google.com> am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"

* commit '822ea9b3d1cf240b16135e1b5c3bd926c02d17d6':
Close adb_usb.ini after reading it
822ea9b3d1cf240b16135e1b5c3bd926c02d17d6 09-Mar-2013 Elliott Hughes <enh@google.com> am fd5c6b9f: Merge "Close adb_usb.ini after reading it"

* commit 'fd5c6b9f137940ce2d762c85dfdb4d2f1104f2bd':
Close adb_usb.ini after reading it
fd5c6b9f137940ce2d762c85dfdb4d2f1104f2bd 09-Mar-2013 Elliott Hughes <enh@google.com> Merge "Close adb_usb.ini after reading it"
eb7af566d42f0d9862519161cadbcc7ec5f5de4a 09-Mar-2013 Christopher Tate <ctate@google.com> am 8a1eb12a: (-s ours) am 0c06eb50: DO NOT MERGE - Document new -obb flag for adb backup

* commit '8a1eb12a713694f2ae5ddac9ea3cab7518fc059b':
DO NOT MERGE - Document new -obb flag for adb backup
8a1eb12a713694f2ae5ddac9ea3cab7518fc059b 09-Mar-2013 Christopher Tate <ctate@google.com> am 0c06eb50: DO NOT MERGE - Document new -obb flag for adb backup

* commit '0c06eb5017e5888f0452da348d12fc92a767e45d':
DO NOT MERGE - Document new -obb flag for adb backup
0c06eb5017e5888f0452da348d12fc92a767e45d 07-Mar-2013 Christopher Tate <ctate@google.com> DO NOT MERGE - Document new -obb flag for adb backup

Now that adb backup handles OBB file backup/restore.

(Cherrypicked)

Change-Id: Ie92b546e3898b62d74f552ab577b7756ad176ee6
db/commandline.c
3b1022eb2b3c00ac44b71891d72230c6d05c1d83 08-Mar-2013 JP Abgrall <jpa@google.com> am 9efab70f: am 7b8970c5: fastboot: add support for some obscure args.

* commit '9efab70fc590933389b01b565f9e8d9c1c719e01':
fastboot: add support for some obscure args.
9efab70fc590933389b01b565f9e8d9c1c719e01 08-Mar-2013 JP Abgrall <jpa@google.com> am 7b8970c5: fastboot: add support for some obscure args.

* commit '7b8970c577c788c9af582dac797c63b3134b201e':
fastboot: add support for some obscure args.
4bad8faa21127ec986d10d5f50a5b3f1038a7392 08-Mar-2013 Christopher Tate <ctate@google.com> Merge "Document new -obb flag for adb backup"
7b8970c577c788c9af582dac797c63b3134b201e 08-Mar-2013 JP Abgrall <jpa@google.com> fastboot: add support for some obscure args.

Some devices use mkbootimg with weird args for which fastboot
only a hardcoded value.

Now fastboot recognizes those args.

Made handling of global vars more consistent.

Bug: 8341331
Change-Id: Ic09f148ccd0249f49935fdc63e517cf8ab2229bc
astboot/bootimg.c
astboot/fastboot.c
1b7392e27b45917cec28934220416bbb62dda689 07-Mar-2013 Colin Cross <ccross@android.com> am 03544b3f: am 2fa2dfd1: Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev

* commit '03544b3f18d99c5994a205e308cf96874f02de35':
init: prevent action being added to the action_queue twice
03544b3f18d99c5994a205e308cf96874f02de35 07-Mar-2013 Colin Cross <ccross@android.com> am 2fa2dfd1: Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev

* commit '2fa2dfd105204b84a7a32e8fe790793ba23c7f87':
init: prevent action being added to the action_queue twice
98f8c0943976597cfb9adef9e2a02a03b987f508 07-Mar-2013 Doug Zongker <dougz@android.com> am 6dd79c1e: am 598169e7: Merge "charger: accomodate minui change" into jb-mr2-dev

* commit '6dd79c1e5a138cb59f05fe7a7c2fd3c78a47e1d4':
charger: accomodate minui change
2fa2dfd105204b84a7a32e8fe790793ba23c7f87 07-Mar-2013 Colin Cross <ccross@android.com> Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev
6dd79c1e5a138cb59f05fe7a7c2fd3c78a47e1d4 07-Mar-2013 Doug Zongker <dougz@android.com> am 598169e7: Merge "charger: accomodate minui change" into jb-mr2-dev

* commit '598169e7687ea831a495f9fa7dd7677c740d64d3':
charger: accomodate minui change
598169e7687ea831a495f9fa7dd7677c740d64d3 07-Mar-2013 Doug Zongker <dougz@android.com> Merge "charger: accomodate minui change" into jb-mr2-dev
f3ae4a2c53c06cb117ed951abc58df042fe9289e 07-Mar-2013 Christopher Tate <ctate@google.com> Document new -obb flag for adb backup

Now that adb backup handles OBB file backup/restore.

Bug: 6718844
Change-Id: I5d0a1f95a52a6f15908691697ee29b077436b089
db/commandline.c
a5064626de3e46eed88534f728b01d17d2ae99b7 07-Mar-2013 Colin Cross <ccross@android.com> init: prevent action being added to the action_queue twice

Property triggers may cause an action to be queued twice, resulting
in a loop in the action queue. Keep actions that are not on the queue
in the list_empty state (act->qlist->next == act->qlist), and only
add them to the list if they are in that state.

Bug: 8335133
Change-Id: I3a3ec18176cf19cbaa3a45220a03c7560eacfe79
nit/init_parser.c
12c45fb9beba80c95c1a0db3ff5cd0efb21e82f3 07-Mar-2013 Doug Zongker <dougz@android.com> charger: accomodate minui change

gr_text() now takes an argument requesting bold text instead of
regular.

Change-Id: I18b54f05ae4a89cb753fa5977a870f1bc827b963
harger/charger.c
895c1b2c97a70ac6b9837354311e6c118c31172a 07-Mar-2013 Dima Zavin <dima@android.com> ueventd: allow platform devices to have just a /devices/ prefix

When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
nit/devices.c
ee3308dab9f37122f320ca3e3a493b5800627b22 06-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
9c4d9cdaf0ee0dbbf5d70d788f06f1086dde4f24 06-Mar-2013 Keun young Park <keunyoung@google.com> am 6a955d72: am 4c8c35d0: Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev

* commit '6a955d72ff8b5d4daafe9ce4df6d94d3effa99ea':
move goldfish stuffs to device/generic/goldfish
6a955d72ff8b5d4daafe9ce4df6d94d3effa99ea 06-Mar-2013 Keun young Park <keunyoung@google.com> am 4c8c35d0: Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev

* commit '4c8c35d06ce6a673c6e015b809f94da0083cd4cc':
move goldfish stuffs to device/generic/goldfish
4c8c35d06ce6a673c6e015b809f94da0083cd4cc 06-Mar-2013 Keun young Park <keunyoung@google.com> Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev
995ee3b6d5043a0d7d69d0fb7403be7c0120c482 06-Mar-2013 Alex Ray <aray@google.com> am 00977e58: am 81b5b5fb: sync: factor sw_sync functionality out of header

* commit '00977e5833a25bffd96d446ee39a25a6baf41a19':
sync: factor sw_sync functionality out of header
00977e5833a25bffd96d446ee39a25a6baf41a19 06-Mar-2013 Alex Ray <aray@google.com> am 81b5b5fb: sync: factor sw_sync functionality out of header

* commit '81b5b5fb02a59a443877363b1451328c7ad11fb2':
sync: factor sw_sync functionality out of header
81b5b5fb02a59a443877363b1451328c7ad11fb2 06-Mar-2013 Alex Ray <aray@google.com> sync: factor sw_sync functionality out of header

Change-Id: I13127abe1cd07cd52b35ff43902579478505ccf4
nclude/sync/sw_sync.h
nclude/sync/sync.h
9413db662f82a78a19e974393aa42efdee0b6cc2 05-Mar-2013 Colin Cross <ccross@android.com> am ed64c3ff: am 95b087fa: am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"

* commit 'ed64c3ff536ea122a430b4cd42aa6e7a56454ba7':
Fix issues where the filename is referred to as 'sideload'
949396f16b6ac85bc485386fb736043911dcfb4f 05-Mar-2013 Colin Cross <ccross@android.com> am bf6982ce: am 7c646cd3: am af4ececc: am 515bed0e: Merge "run-as: set the SELinux security context."

* commit 'bf6982cec4b258f3e87d70d1767d69ab30e72ad2':
run-as: set the SELinux security context.
ed64c3ff536ea122a430b4cd42aa6e7a56454ba7 05-Mar-2013 Colin Cross <ccross@android.com> am 95b087fa: am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"

* commit '95b087fa90c89b21d18268c84167d1407f9e7905':
Fix issues where the filename is referred to as 'sideload'
bf6982cec4b258f3e87d70d1767d69ab30e72ad2 05-Mar-2013 Colin Cross <ccross@android.com> am 7c646cd3: am af4ececc: am 515bed0e: Merge "run-as: set the SELinux security context."

* commit '7c646cd3594283bc4aaf53a0b10143a76281270f':
run-as: set the SELinux security context.
f5eb8035431a130f4666f5f067242df7392e8bc3 26-Feb-2013 Keun young Park <keunyoung@google.com> move goldfish stuffs to device/generic/goldfish

- each files will be pulled in emulator.mk as PRODUCT_COPY_FILES

Change-Id: I4772e2fd863e6d2663f477c3acd8a90cb95b498a
ootdir/Android.mk
ootdir/etc/init.goldfish.rc
ootdir/etc/init.goldfish.sh
ootdir/etc/ueventd.goldfish.rc
ootdir/etc/vold.fstab
95b087fa90c89b21d18268c84167d1407f9e7905 05-Mar-2013 Colin Cross <ccross@android.com> am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"

* commit '79d4381a8e838d7ddbeda5b7dc90e0c5bca5a8c6':
Fix issues where the filename is referred to as 'sideload'
7c646cd3594283bc4aaf53a0b10143a76281270f 05-Mar-2013 Colin Cross <ccross@android.com> am af4ececc: am 515bed0e: Merge "run-as: set the SELinux security context."

* commit 'af4ececc7bd10aec1240acfbfe7756ab8ee16883':
run-as: set the SELinux security context.
79d4381a8e838d7ddbeda5b7dc90e0c5bca5a8c6 05-Mar-2013 Colin Cross <ccross@android.com> am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"

* commit '69f3ec84cf4e9a1bf4c222b88b4413da407331b5':
Fix issues where the filename is referred to as 'sideload'
af4ececc7bd10aec1240acfbfe7756ab8ee16883 05-Mar-2013 Colin Cross <ccross@android.com> am 515bed0e: Merge "run-as: set the SELinux security context."

* commit '515bed0e6aae4a835ab4393499c7dd99941a8423':
run-as: set the SELinux security context.
69f3ec84cf4e9a1bf4c222b88b4413da407331b5 05-Mar-2013 Colin Cross <ccross@android.com> Merge "Fix issues where the filename is referred to as 'sideload'"
515bed0e6aae4a835ab4393499c7dd99941a8423 05-Mar-2013 Colin Cross <ccross@android.com> Merge "run-as: set the SELinux security context."
86ae6d587b740c70d46e0633a92457454dee79fb 05-Mar-2013 Magnus Eriksson <eriksson.mag@gmail.com> Fix issues where the filename is referred to as 'sideload'

The adb sideload utility referes to the filename as 'sideload' in some
places. This patch changes the printouts to display the filename instead.

Change-Id: I38ada01a08bed53a8d9697c03f55ce8cee2abe12
Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
db/commandline.c
1a3b024d2608a11260f49943cfde262396d6ddc1 04-Mar-2013 The Android Open Source Project <initial-contribution@android.com> am 68fa5114: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '68fa5114fe56297763a50a9090793eaae300aaa2':
Add directory for mediaserver
68fa5114fe56297763a50a9090793eaae300aaa2 04-Mar-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I20987b51211410332c427eb876334b0c6a9bcc32
6d89621266d222e6de585940058fb6d426dcb0e5 04-Mar-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
6f3622af944fc54c7d6add763584cd83bccd7ad9 01-Mar-2013 Nick Kralevich <nnk@google.com> am d1439a7f: am b3be89df: am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as"

* commit 'd1439a7f8eb228eb39dd74845a5e46d20c63b3b0':
android_filesystem_config.h: change ping and run-as
d1439a7f8eb228eb39dd74845a5e46d20c63b3b0 01-Mar-2013 Nick Kralevich <nnk@google.com> am b3be89df: am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as"

* commit 'b3be89dfe9e0eb1cb0fbf834d6fbcef976c03a1e':
android_filesystem_config.h: change ping and run-as
b3be89dfe9e0eb1cb0fbf834d6fbcef976c03a1e 01-Mar-2013 Nick Kralevich <nnk@google.com> am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as"

* commit '3fb63338e9faddeb50a582cfec114bd48f93f1c2':
android_filesystem_config.h: change ping and run-as
3fb63338e9faddeb50a582cfec114bd48f93f1c2 01-Mar-2013 Nick Kralevich <nnk@google.com> Merge "android_filesystem_config.h: change ping and run-as"
fe8135739c5a9195e74786205c077964ba4f9c44 12-Feb-2013 Nick Kralevich <nnk@google.com> android_filesystem_config.h: change ping and run-as

/system/bin/ping no longer requires CAP_NET_RAW, as we're now
using IPPROTO_ICMP. Please see the following for more details:

* http://lwn.net/Articles/443051/
* https://android-review.googlesource.com/52090
* https://android-review.googlesource.com/52072

We can now make ping a normal, unprivileged program.

/system/bin/run-as only requires CAP_SETUID and CAP_SETGID.
Explicitly set the capabilities of this file, and remove
the setuid bit.

This is equivalent to running the following commands:

* chmod 750 /system/bin/run-as
* chown root:shell /system/bin/run-as
* setcap cap_setgid,cap_setuid+ep /system/bin/run-as

Change-Id: I65df858b45e6de4e2190ac9d6d592c06ea9d28cf
nclude/private/android_filesystem_capability.h
nclude/private/android_filesystem_config.h
366f076366f7746e5159ff837b2407545940c955 01-Mar-2013 Nick Kralevich <nnk@google.com> am 277626e5: am 844306bd: am cc4499b6: Merge "adb: use correct header file."

* commit '277626e59dc0ccbf0337ec6615622f46e6f958fd':
adb: use correct header file.
277626e59dc0ccbf0337ec6615622f46e6f958fd 01-Mar-2013 Nick Kralevich <nnk@google.com> am 844306bd: am cc4499b6: Merge "adb: use correct header file."

* commit '844306bd9cb3c8b3e514e5d91e9514556e8f95f4':
adb: use correct header file.
844306bd9cb3c8b3e514e5d91e9514556e8f95f4 01-Mar-2013 Nick Kralevich <nnk@google.com> am cc4499b6: Merge "adb: use correct header file."

* commit 'cc4499b6fa9ad4cbe285d78754edcb6dd30ab893':
adb: use correct header file.
cc4499b6fa9ad4cbe285d78754edcb6dd30ab893 28-Feb-2013 Nick Kralevich <nnk@google.com> Merge "adb: use correct header file."
e2864bf727d6a404bd871f063c03e36cc8eedeec 28-Feb-2013 Nick Kralevich <nnk@google.com> adb: use correct header file.

Change-Id: I7a66ced762dc077247fd7c2714ae8850ffdcaeb9
db/adb.c
67f2efd21f2e426f2e9d223849b17f849c9d91fa 28-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to jb-mr2-dev
fe20a2ade0825a3f428d637e2b6ad3d8582bcd0e 28-Feb-2013 Nick Kralevich <nnk@google.com> am 4c609e96: Remove CAP_NET_RAW from adb

* commit '4c609e9683959193dafd7a32bb8393410cbddc74':
Remove CAP_NET_RAW from adb
4c609e9683959193dafd7a32bb8393410cbddc74 27-Feb-2013 Nick Kralevich <nnk@google.com> Remove CAP_NET_RAW from adb

ping no longer needs CAP_NET_RAW. See:

* http://lwn.net/Articles/443051/
* https://android-review.googlesource.com/52090
* https://android-review.googlesource.com/52072

Eliminate the CAP_NET_RAW special case in adb

Change-Id: If9d32c5254291b123b06bededc94b64113f6b8f2
db/adb.c
3954d778ababf71006ee00b0a8985fb46550d31d 26-Feb-2013 Alex Ray <aray@google.com> Merge "cutils: bitops: Add Hamming weight to bitmask"
4eb8edcec71d0cecbe3b1646202c0df9e8d6ca9d 25-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
09094e729b14e6b00a8ca25efae55a641d67826d 23-Feb-2013 Nick Kralevich <nnk@google.com> am 96f60a8c: am ff03bc30: Merge "fix mac sdk build."

* commit '96f60a8cf8a6e8e8c077339a27e417cd15645e1b':
fix mac sdk build.
96f60a8cf8a6e8e8c077339a27e417cd15645e1b 23-Feb-2013 Nick Kralevich <nnk@google.com> am ff03bc30: Merge "fix mac sdk build."

* commit 'ff03bc3024cb60d1840552f4e966f5b616fd861f':
fix mac sdk build.
ff03bc3024cb60d1840552f4e966f5b616fd861f 23-Feb-2013 Nick Kralevich <nnk@google.com> Merge "fix mac sdk build."
bb05a92cb11d18e7cbd412d8838bb1d0aef4cbfe 23-Feb-2013 Nick Kralevich <nnk@google.com> fix mac sdk build.

For now, remove linux/capability.h . We're haven't started using
capabilities yet, and this file doesn't exist on mac builds.

Change-Id: Id6ec7fdb408bcdfdd538dac65187194c8ee226ff
nclude/private/android_filesystem_config.h
89b530d215f9b346b0761ad4ca5db72a988cda72 23-Feb-2013 Nick Kralevich <nnk@google.com> am 0d060d56: am e3f247c0: Merge "Add support for filesystem capabilities."

* commit '0d060d56d25e41e61dd46e348bff3c875cbc85cd':
Add support for filesystem capabilities.
0d060d56d25e41e61dd46e348bff3c875cbc85cd 23-Feb-2013 Nick Kralevich <nnk@google.com> am e3f247c0: Merge "Add support for filesystem capabilities."

* commit 'e3f247c0e55d8bfd7df66532e807e38983c47761':
Add support for filesystem capabilities.
e3f247c0e55d8bfd7df66532e807e38983c47761 23-Feb-2013 Nick Kralevich <nnk@google.com> Merge "Add support for filesystem capabilities."
c325e569a457da1fdf938b8e19894a1abc925c5d 22-Feb-2013 Glenn Kasten <gkasten@google.com> Add directory for mediaserver

Bug: 8223560
Change-Id: Iccc6d439a848445cac0f5b30d1d663aed3f5344e
ootdir/init.rc
6c2c121386f5e19ed74dc8d706bcb1e6f65fc1ba 23-Feb-2013 Ken Sumrall <ksumrall@android.com> fs_mgr: add support for new recoveryonly flag

If a device has an ext4 partition that contains the radio
firmware, and that filesystem is not mounted in normal
operation, we need a flag to prevent mount_all from
mounting it, so the new flag recoveryonly was added.

Change-Id: I361800c494e751b04c4faf956870f15fd0d8fe20
s_mgr/fs_mgr.c
s_mgr/fs_mgr_priv.h
65e203070c0cb25f5401502d60e924ff2b5bdae5 23-Feb-2013 Glenn Kasten <gkasten@google.com> Merge "Add directory for mediaserver"
b0f908a95714fbbfd63ee498e5773c44712b30e2 22-Feb-2013 Glenn Kasten <gkasten@google.com> Add directory for mediaserver

Bug: 8223560
Change-Id: Iccc6d439a848445cac0f5b30d1d663aed3f5344e
ootdir/init.rc
f90fd9eeb32469e41c8f4207afa44929f9ec070e 20-Jan-2013 Alex Ray <aray@google.com> cutils: bitops: Add Hamming weight to bitmask

Change-Id: I5c6b7adf711007edfffcb4fdf8e05b04bcffef54
nclude/cutils/bitops.h
244814698203db9472ef69f13ba9a923aab0553f 22-Feb-2013 The Android Open Source Project <initial-contribution@android.com> am f6451116: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f6451116423c6195a464b69b6e07aa8ef743e6b1':
charger: Do not suspend when disconnecting from charger
charger: suspend enable in charger mode
libsuspend: compile as a static library
f6451116423c6195a464b69b6e07aa8ef743e6b1 22-Feb-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ie31a50f2edd4ef863f56f8939fcf8e806fb2ba0a
fe8425b5c5156c60691927a982672abd7927b777 22-Feb-2013 Nick Kralevich <nnk@google.com> am c5ce4108: am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"

* commit 'c5ce4108facc5a1b94fcf9469a189b2cbdfd5e76':
init.rc: allow IPPROTO_ICMP support
c5ce4108facc5a1b94fcf9469a189b2cbdfd5e76 22-Feb-2013 Nick Kralevich <nnk@google.com> am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"

* commit '1b64957a7952738b02d437ffe3d4de45127a160c':
init.rc: allow IPPROTO_ICMP support
1b64957a7952738b02d437ffe3d4de45127a160c 22-Feb-2013 Nick Kralevich <nnk@google.com> Merge "init.rc: allow IPPROTO_ICMP support"
320abd38875c6009e240cc4f50fd26d44a25efd9 22-Feb-2013 Ken Sumrall <ksumrall@android.com> Merge "fs_mgr: support a unified fstab format."
be341cc348257a07c68bcbfdc526835d49283329 22-Feb-2013 Nick Kralevich <nnk@google.com> init.rc: allow IPPROTO_ICMP support

Allow userspace programs to create IPPROTO_ICMP sockets.

This socket type allows an unprivileged program to safely
send ICMP_ECHO messages and receive the corresponding
ICMP_ECHOREPLY messages, without relying on raw sockets or
setuid programs.

Please see http://lwn.net/Articles/443051/ for details.

In particular, this allows us to use a version of ping
which doesn't have any capabilities
(https://android-review.googlesource.com/52072).
In addition, this allows us to safely implement an IPv4 ICMP
based version of InetAddress.isReachable()
(https://code.google.com/p/android/issues/detail?id=20106)

Change-Id: I876718151efa8219c4f34f573e35e21256fe2316
ootdir/init.rc
1531c966c11a8e3fe5099d8018715560923ffc9f 22-Feb-2013 Benoit Goby <benoit@android.com> Merge "adb: Fix secure adb when booting with usb attached"
747b0cf109eb67f38b0e854369a8282aca6e6b0c 20-Feb-2013 Ed Heyl <edheyl@google.com> Merge remote-tracking branch 'goog/jb-mr2-release'
e9e74f3c881bd73bd86be4db8b12200a61f143e1 07-Feb-2013 Nick Kralevich <nnk@google.com> Add support for filesystem capabilities.

Modify android_filesystem_config.h and add a capabilities
field. This field can be used to add filesystem capabilities
to a particular file.

Change-Id: If8953a322457ea7275aa6df75660b714e6dc678a
pio/mkbootfs.c
nclude/private/android_filesystem_config.h
70012fcd2f1afbd525a93a81d437deb830f7525c 20-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
d3297c2bab101c10e1e25ef6bbc0b4cb656a82da 20-Feb-2013 JP Abgrall <jpa@google.com> Merge "logwrap lib: make logwrapper less verbose when told to not log"
ab6b852235d99d752678312c155a3f1c140fb483 13-Feb-2013 Ken Sumrall <ksumrall@android.com> fs_mgr: support a unified fstab format.

Update fs_mgr to support more flags needed to unify the 3
fstabs currently in android into one.

Change-Id: Ie46cea61a5b19882c55098bdd70f39e78fb603be
s_mgr/fs_mgr.c
s_mgr/fs_mgr_main.c
s_mgr/fs_mgr_priv.h
s_mgr/include/fs_mgr.h
nit/builtins.c
c3215217a0176963dd2c671d7c7cb2516a10f6ab 19-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
080427e4e2b1b72718b660e16b6cf38b3a3c4e3f 15-Feb-2013 Nick Kralevich <nnk@google.com> adb: drop capability bounding set on user builds

run-as: don't require CAP_DAC_OVERRIDE.

Prevent an adb spawned application from acquiring capabilities
other than

* CAP_NET_RAW
* CAP_SETUID
* CAP_SETGID

The only privileged programs accessible on user builds are
* /system/bin/ping
* /system/bin/run-as

and the capabilities above are sufficient to cover those
two programs.

If the kernel doesn't support file capabilities, we ignore
a prctl(PR_CAPBSET_DROP) failure. In a future CL, this could
become a fatal error.

Change-Id: I45a56712bfda35b5ad9378dde9e04ab062fe691a
db/adb.c
un-as/package.c
bcfa910611b42018db580b3459101c564f802552 15-Feb-2013 Mathias Agopian <mathias@google.com> Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: Ie745d9adf5465834bb8bf751a2f88b19435fdf46
nclude/system/window.h
b9c087031b4f387fd2d1c6cb9f3ca1d43435c8d4 15-Feb-2013 Nick Kralevich <nnk@google.com> am e149855a: am 523a2090: Merge "adb: Use 64 bit capabilities."

* commit 'e149855a816c98149a95725139ae66f193049ddd':
adb: Use 64 bit capabilities.
e149855a816c98149a95725139ae66f193049ddd 15-Feb-2013 Nick Kralevich <nnk@google.com> am 523a2090: Merge "adb: Use 64 bit capabilities."

* commit '523a20901b2afce7ad02c0011d70ed57f8bbb997':
adb: Use 64 bit capabilities.
523a20901b2afce7ad02c0011d70ed57f8bbb997 15-Feb-2013 Nick Kralevich <nnk@google.com> Merge "adb: Use 64 bit capabilities."
109f4e16cb22e2ae915a4c16d8c8a5e46a749d27 15-Feb-2013 Nick Kralevich <nnk@google.com> adb: Use 64 bit capabilities.

Fix the following kernel warning:

$ adb shell dmesg | grep adb
<6>[ 7.813003] warning: `adbd' uses 32-bit capabilities (legacy support in use)

Change-Id: I3912302c5c577f1cb03f0c591834ab7b3a72ddf5
db/adb.c
3b7c584fe90a5ea1d14d3e45c4c117d7ce46d39b 15-Feb-2013 Elliott Hughes <enh@google.com> am 910b7a8b: am 17361134: Merge "Add a "smash-stack" option to crasher."

# Via Android Git Automerger (1) and others
* commit '910b7a8b88b29ee16c6014630b450dda56c5d578':
Add a "smash-stack" option to crasher.
910b7a8b88b29ee16c6014630b450dda56c5d578 15-Feb-2013 Elliott Hughes <enh@google.com> am 17361134: Merge "Add a "smash-stack" option to crasher."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '17361134180b178531979897f9c9867346a57f10':
Add a "smash-stack" option to crasher.
17361134180b178531979897f9c9867346a57f10 15-Feb-2013 Elliott Hughes <enh@google.com> Merge "Add a "smash-stack" option to crasher."
df4200e8c255fca1d03855b971b57036b9ccaa94 14-Feb-2013 Elliott Hughes <enh@google.com> Add a "smash-stack" option to crasher.

bionic's __stack_chk_fail was preventing debuggerd from dumping
stacks, which was not helpful.

Bug: 2487269
Change-Id: Idba2a274037b960dfb2ac1c21686323268c4b372
ebuggerd/Android.mk
ebuggerd/crasher.c
a689d13a19ca729eee1f9a79e181976eabbd79dc 14-Feb-2013 JP Abgrall <jpa@google.com> logwrap lib: make logwrapper less verbose when told to not log

We don't care about exit codes if logwrap output is not requested.

Change-Id: Ibae5fe53527554a1fe865c2058deb0a128a9dde2
ogwrapper/logwrap.c
6f5f53ca7649b84e758976c443215a615c3246f2 12-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
4869a68d56aaf3fefd2c1022bdab8571077e063c 12-Feb-2013 Igor Murashkin <iam@google.com> am 1b69da3e: am 6711f76d: Merge "graphics.h: Remove unnecessary comments for Y8/Y16 formats" into jb-mr1-aah-dev

# Via Android (Google) Code Review (1) and others
* commit '1b69da3ef0f505b885f8621ca2dad44d46aa824e':
graphics.h: Remove unnecessary comments for Y8/Y16 formats
51b78949b27d1c76d1979cac3aa61c04f820ff9f 12-Feb-2013 Igor Murashkin <iam@google.com> am fbb4a5ac: am fba6c12a: Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev

# Via Android (Google) Code Review (1) and others
* commit 'fbb4a5ac1b771b2df0786bb5587c7ed0d5f82089':
graphics.h: add new Y8, Y16 formats
9e76a29752ff9d047e98c34c1cb93e7e2a27ebcd 12-Feb-2013 Dave Burke <daveburke@google.com> Merge "Revert "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."""
79ebef0797370438674096ca02221ea7f5177ba6 12-Feb-2013 Ken Sumrall <ksumrall@android.com> Merge "Raise the max file open limit in sdcard"
2fd72cc22171cc23e67206db795fc5025d4f7ac6 09-Feb-2013 Ken Sumrall <ksumrall@android.com> Raise the max file open limit in sdcard

The default is 1024 files, and in some testing, the limit has been
hit. This raises the limit to 8192. Going higher starts to cause
performance issues (I started to notice that around 16K open files
in my testing) as sdcard does linear searches. If a higher max
is needed, then the sdcard daemon will need some optimizations.

Bug: 7442187

Change-Id: I7aba7f4556ed70651f36244294a6756f3d6b8963
dcard/sdcard.c
eb22e6a52b84f54756d069252858c7fb40c8a074 11-Feb-2013 Dave Burke <daveburke@google.com> Revert "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""

This reverts commit 87980b5c9fab12737196b8505e948186a210d96e

Getting more reports of app crashes (e.g. 7990090), so given timeline for MR2, want to revert.

Change-Id: Ic2d101d2d1156b3864d5c9b88aa8c94cd5aa345f
nit/init.c
1b69da3ef0f505b885f8621ca2dad44d46aa824e 11-Feb-2013 Igor Murashkin <iam@google.com> am 6711f76d: Merge "graphics.h: Remove unnecessary comments for Y8/Y16 formats" into jb-mr1-aah-dev

# Via Android (Google) Code Review (1) and Igor Murashkin (1)
* commit '6711f76d244b22d8c39c33963d2d81504816eaf4':
graphics.h: Remove unnecessary comments for Y8/Y16 formats
6711f76d244b22d8c39c33963d2d81504816eaf4 11-Feb-2013 Igor Murashkin <iam@google.com> Merge "graphics.h: Remove unnecessary comments for Y8/Y16 formats" into jb-mr1-aah-dev
d755b52b43913913e0915c50b5ff0d03c96eed49 11-Feb-2013 Igor Murashkin <iam@google.com> graphics.h: Remove unnecessary comments for Y8/Y16 formats

Change-Id: Ic80f6c4be7df9d9729334b97bb662eb2d0456c33
nclude/system/graphics.h
fbb4a5ac1b771b2df0786bb5587c7ed0d5f82089 11-Feb-2013 Igor Murashkin <iam@google.com> am fba6c12a: Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev

# Via Android (Google) Code Review (1) and Igor Murashkin (1)
* commit 'fba6c12a3e6ac5fabe91270293b1115f72fd48a1':
graphics.h: add new Y8, Y16 formats
fba6c12a3e6ac5fabe91270293b1115f72fd48a1 11-Feb-2013 Igor Murashkin <iam@google.com> Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev
d14283ffcfcd3d5a84a9648f5b02cae52c78b4dc 11-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
9e00e66ebcea150e75536e065419128efd4ee5b8 01-Feb-2013 Igor Murashkin <iam@google.com> graphics.h: add new Y8, Y16 formats

Change-Id: I0cb3786d91f442b5f3b665dd78bf5f0dd4ae4cf0
nclude/system/graphics.h
2f34c5033e21fed358a0e07b07c201dc943a1b5d 08-Feb-2013 Rom Lemarchand <romlem@google.com> logwrap: Change semantics of NULL status in android_fork_execvp

When passing a NULL status to android_fork_execvp the return
status will now be the return value of the child if it exited
properly, otherwise a non-0 value will be returned.

Change-Id: I13309c61b37b6b3f9d5507f7d6484e7b6baaf8d0
ogwrapper/include/logwrap/logwrap.h
ogwrapper/logwrap.c
ce2482413c5571fe8bca63d2a5ba6168dda28761 07-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
c5c410fe3d3dd2f3dce51ed25cdd0a7ac7d5bc8e 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> am 4b9bdd33: am 90dd1402: am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"

# By Duane Sand
# Via Android Git Automerger (2) and others
* commit '4b9bdd333362c1f58260c37306f1902fb215f7bf':
[MIPS] Benchmark test for MIPS memset16/memset32
caf9ae2db36b2d5bcb3b6cfde79d0409214c1078 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> am 32fb9fed: am 1b9a6057: am 44508515: Merge "Tidy up long lines"

# By Duane Sand
# Via Android Git Automerger (2) and others
* commit '32fb9fed1ed954beb8fcadff9d09e0e1374fb145':
Tidy up long lines
4b9bdd333362c1f58260c37306f1902fb215f7bf 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> am 90dd1402: am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"

# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '90dd14029414af26e64e3232f37c84feaa317ea8':
[MIPS] Benchmark test for MIPS memset16/memset32
32fb9fed1ed954beb8fcadff9d09e0e1374fb145 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> am 1b9a6057: am 44508515: Merge "Tidy up long lines"

# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '1b9a60574028fd1dd77d6c07efb369ecaaf91218':
Tidy up long lines
90dd14029414af26e64e3232f37c84feaa317ea8 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"

# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '241194cad4b27ffd1cb574cb10c4c6941ef3882f':
[MIPS] Benchmark test for MIPS memset16/memset32
1b9a60574028fd1dd77d6c07efb369ecaaf91218 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> am 44508515: Merge "Tidy up long lines"

# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '445085151cff012efefc329b9fa1a311d1d208be':
Tidy up long lines
241194cad4b27ffd1cb574cb10c4c6941ef3882f 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
445085151cff012efefc329b9fa1a311d1d208be 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> Merge "Tidy up long lines"
2ea3688b1bafb7b4ca4b5102907c39029a7ff74b 05-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
3d7790edf468a8b9669f30cca6863c4c0d31aa17 05-Feb-2013 Jean-Baptiste Queru <jbq@google.com> am 719df321: (-s ours) Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE.

# Via Jean-Baptiste Queru
* commit '719df3218b0e922935f2afa396596f6991b68139':
9e195d160f128b1cf9275ce9f802a9e8c0fcb3db 04-Feb-2013 Ian Rogers <irogers@google.com> am 2f228c39: am 271d6dfb: (-s ours) am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."

# Via Android Git Automerger (2) and others
* commit '2f228c395133db6d18a5d11b6103ea0f962b15f1':
Inline ldrex/strex for thumb2, remove ARMv5 remnants.
724dd072e52f340240b814f643bd514558e3e65b 04-Feb-2013 Jean-Baptiste Queru <jbq@google.com> am 024f97c6: am 825f29b1: Merge from jb-mr1.1-dev

# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit '024f97c67b179894d7333cd7c68d9787f2d9382f':
fd398accb4e98f6c60b8445930fb9bf36bdd7df9 04-Feb-2013 Devin Kim <dojip.kim@lge.com> am 2b0c471c: am 693a3d6c: am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger

# Via Android Git Automerger (3) and Iliyan Malchev (1)
* commit '2b0c471ce07b57449762cbfd4303a0855c022e45':
charger: Do not suspend when disconnecting from charger
e2a12435c65306e90dcdcde4dcba89160dc3e6e1 04-Feb-2013 choongryeol.lee <choongryeol.lee@lge.com> am 566cd8d1: am 83d16c9e: am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode

# Via Android Git Automerger (3) and Iliyan Malchev (1)
* commit '566cd8d165c25be55779d992c784890f51dce3b6':
charger: suspend enable in charger mode
5a0249e54930c369977be4ca1083d1e5d6db2fe1 04-Feb-2013 Ed Heyl <edheyl@google.com> am 823ce038: (-s ours) am 2507aed4: reset to 016806a7, but keep bad history for fast forward

# By Iliyan Malchev
# Via Android Git Automerger (3) and others
* commit '823ce03898c92336fe67276fe5e679ef382dfce0':
libsuspend: compile as a static library
719df3218b0e922935f2afa396596f6991b68139 04-Feb-2013 Jean-Baptiste Queru <jbq@google.com> Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE.
21291f1ac5a74aaa435c2b04e3334b7aed1286d5 04-Feb-2013 Nick Kralevich <nnk@google.com> Revert "property_get: do argument checking."

This reverts commit 75cc88546b893280add608becfd5887470573813.
nclude/cutils/properties.h
91e63efeef3c87748e3618f7b46af520e54da128 04-Feb-2013 Nick Kralevich <nnk@google.com> Revert "Fix win_sdk build."

This reverts commit 941daef629bd571032851edf7ae1dce24266640e.

Change-Id: I6b509492964baf535e0eeb1a731bf70c91715942
nclude/cutils/properties.h
bc66653e32cb9bd48c3301260495c39aa649ed7d 04-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
941daef629bd571032851edf7ae1dce24266640e 03-Feb-2013 Nick Kralevich <nnk@google.com> Fix win_sdk build.

Don't depend on sys/cdefs.h, which doesn't exist when building
for the host.Don't try to compile property_len() checking code
in mingw32, it doesn't work.

Change-Id: I6a56b759bd4e8d30d6ca136e43d6515bf7408cc6
nclude/cutils/properties.h
2f228c395133db6d18a5d11b6103ea0f962b15f1 02-Feb-2013 Ian Rogers <irogers@google.com> am 271d6dfb: (-s ours) am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."

# Via Android Git Automerger (1) and others
* commit '271d6dfb9cfd3fee321ae14d43b067c97aa3a846':
Inline ldrex/strex for thumb2, remove ARMv5 remnants.
045a4a9c3a317e60ab1078f5a689bf302ee2ab19 16-Jan-2013 Benoit Goby <benoit@android.com> adb: Fix secure adb when booting with usb attached

When booting with usb attached, the secure adb authentication happens
long before the framework is done booting, so adb can't notify the
framework to install the public key.

Change-Id: Id2af6cebece345022f56cb0c4b5af24e1d7a425c
db/adb.c
db/adb_auth.h
db/adb_auth_client.c
271d6dfb9cfd3fee321ae14d43b067c97aa3a846 02-Feb-2013 Ian Rogers <irogers@google.com> am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."

# Via Gerrit Code Review (1) and Ian Rogers (1)
* commit '78432ab1f42d59fed474365b95b7501dcccacebf':
Inline ldrex/strex for thumb2, remove ARMv5 remnants.
78432ab1f42d59fed474365b95b7501dcccacebf 02-Feb-2013 Ian Rogers <irogers@google.com> Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
024f97c67b179894d7333cd7c68d9787f2d9382f 02-Feb-2013 Jean-Baptiste Queru <jbq@google.com> am 825f29b1: Merge from jb-mr1.1-dev

# Via Jean-Baptiste Queru
* commit '825f29b1c8f0c420af5dc6b05f0dbbd5b1ec36bf':
825f29b1c8f0c420af5dc6b05f0dbbd5b1ec36bf 02-Feb-2013 Jean-Baptiste Queru <jbq@google.com> Merge from jb-mr1.1-dev
544d196e2269503136f73347e6d652b23bb87a0d 02-Feb-2013 Colin Cross <ccross@android.com> am 7480c007: am b2639f40: Merge "Label sockets consistently with the seclabel value if specified."

# By Stephen Smalley
# Via Android Git Automerger (1) and others
* commit '7480c0079d8c7fcfd5b3d9decfdabfebde162781':
Label sockets consistently with the seclabel value if specified.
cc62beebffc4f7df7073411fbba776e3a4bc27eb 02-Feb-2013 Nick Kralevich <nnk@google.com> Merge "property_get: do argument checking."
2b0c471ce07b57449762cbfd4303a0855c022e45 01-Feb-2013 Devin Kim <dojip.kim@lge.com> am 693a3d6c: am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger

# Via Android Git Automerger (2) and Iliyan Malchev (1)
* commit '693a3d6cd9658909f785d6dd179ba226fefec4a4':
charger: Do not suspend when disconnecting from charger
566cd8d165c25be55779d992c784890f51dce3b6 01-Feb-2013 choongryeol.lee <choongryeol.lee@lge.com> am 83d16c9e: am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode

# Via Android Git Automerger (2) and Iliyan Malchev (1)
* commit '83d16c9e47236aabac3cae05bde96c6fa2089cf8':
charger: suspend enable in charger mode
823ce03898c92336fe67276fe5e679ef382dfce0 01-Feb-2013 Ed Heyl <edheyl@google.com> am 2507aed4: reset to 016806a7, but keep bad history for fast forward

# By Rom Lemarchand (11) and others
# Via Android Git Automerger (194) and others
* commit '2507aed4300ffddfe0bd22843093ce66cf0a7b52': (48 commits)
cutils: remove dead code.
logwrap: add quiet flag to logwrap()
logwrap: Replace sigprocmask with pthread_sigmask
logwrap: wait for child process when receiving SIGINT or SIGQUIT
logwrap: ensure child exits with _exit
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
logwrap: remove unnecessary call to setuid/setgid
logwrap: fix off by 1 argument error
logwrapper: switch to signal handlers for SIGCHLD
property_service: make /dev/__properties__ readable
toolbox: renice: Add -t TYPE parameter and switch to getopt
libsuspend: compile as a static library
Revert "init: make system properties more secure."
init: make system properties more secure.
Revert "init.usb.rc: set sys.usb.config to none before changing it"
adb: Add "unauthorized" connection state
adb: Read secure adb keys on every auth request
logwrapper: prevent logwrap from hanging when child dies
logwrapper: split into liblogwrap and the executable itself
cutils: add simple reference counter
...
7480c0079d8c7fcfd5b3d9decfdabfebde162781 01-Feb-2013 Colin Cross <ccross@android.com> am b2639f40: Merge "Label sockets consistently with the seclabel value if specified."

# By Stephen Smalley
# Via Gerrit Code Review (1) and Stephen Smalley (1)
* commit 'b2639f4015c9fb2ff10c7bfae6074a8d968f5b7e':
Label sockets consistently with the seclabel value if specified.
80c3b278fde7b92504614b7d47b9fecf6f736081 01-Feb-2013 Ian Rogers <irogers@google.com> Inline ldrex/strex for thumb2, remove ARMv5 remnants.

We assume ARMv7 which with thumb2 has ldrex/strex operations that may be
inlined if -mthumb is defined.
Remove remnants of ARMv5 support.

Change-Id: I9bb9525ae6ff4816ba391115019d841f63c12348
nclude/cutils/atomic-arm.h
b2639f4015c9fb2ff10c7bfae6074a8d968f5b7e 01-Feb-2013 Colin Cross <ccross@android.com> Merge "Label sockets consistently with the seclabel value if specified."
693a3d6cd9658909f785d6dd179ba226fefec4a4 01-Feb-2013 Devin Kim <dojip.kim@lge.com> am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger

# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '6a7a324502e34e10830806751efbc514014815ee':
charger: Do not suspend when disconnecting from charger
83d16c9e47236aabac3cae05bde96c6fa2089cf8 01-Feb-2013 choongryeol.lee <choongryeol.lee@lge.com> am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode

# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '9190c0b3fdfdbcee98367c767dae0bd45f6ab08a':
charger: suspend enable in charger mode
6a7a324502e34e10830806751efbc514014815ee 01-Feb-2013 Devin Kim <dojip.kim@lge.com> am cf5c32c2: charger: Do not suspend when disconnecting from charger

# Via Iliyan Malchev
* commit 'cf5c32c26c3b458cd9f8d8f7ba07f1fbb8b496e5':
charger: Do not suspend when disconnecting from charger
9190c0b3fdfdbcee98367c767dae0bd45f6ab08a 01-Feb-2013 choongryeol.lee <choongryeol.lee@lge.com> am dec27f6e: (-s ours) charger: suspend enable in charger mode

# Via Iliyan Malchev
* commit 'dec27f6e11c2bdfe35791d0d25a3b1bb2204d194':
charger: suspend enable in charger mode
874f054b661fec3c6da45b1656f1cc46d3d367ee 01-Feb-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
75cc88546b893280add608becfd5887470573813 31-Jan-2013 Nick Kralevich <nnk@google.com> property_get: do argument checking.

Try to verify, at compile time, that the supplied
value buffer is large enough.

There's more we can do here, but this is a good first
pass.

Change-Id: Iac8153826c89114b2755735032423c6744f7a61b
nclude/cutils/properties.h
2507aed4300ffddfe0bd22843093ce66cf0a7b52 31-Jan-2013 Ed Heyl <edheyl@google.com> reset to 016806a7, but keep bad history for fast forward
ef89911ed69ebde624d661f22c01e5d243869fb1 31-Jan-2013 Eric Laurent <elaurent@google.com> Merge "audio: added input device for front + back mic"
7601b426e87b95477a1331062fe09257980c5616 31-Jan-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
749debe0ff12dd0ed0e763b51ec0c8d529d29076 30-Jan-2013 Iliyan Malchev <malchev@google.com> am 085943a1: am fdf2f337: libsuspend: compile as a static library

# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '085943a16cb3fdce91ff7345928afb1b259e2060':
libsuspend: compile as a static library
085943a16cb3fdce91ff7345928afb1b259e2060 30-Jan-2013 Iliyan Malchev <malchev@google.com> am fdf2f337: libsuspend: compile as a static library

# Via Iliyan Malchev
* commit 'fdf2f337805b0b9c6ebdf57540b2b70bb1eb64dd':
libsuspend: compile as a static library
2a46bfa6b9401b847a3c0609e247428564d91121 29-Jan-2013 Rom Lemarchand <romlem@google.com> logwrapper: rename logwrap() to android_fork_execvp()

Also change the quiet flag to a logwrap flag (inverses the meaning of
the boolean).

Change-Id: I76047a7b460f4c28d52f26bfe3f65889d96047f8
ogwrapper/include/logwrap/logwrap.h
ogwrapper/logwrap.c
ogwrapper/logwrapper.c
6832d73d0b3300f14edb25cff4a8d66feea75cc5 30-Jan-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
49f0f776932ec6120d41d8e144247f9d36a01fb5 30-Jan-2013 Kenny Root <kroot@android.com> am 282caf3b: am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"

# By Ray Donnelly
# Via Android Git Automerger (2) and others
* commit '282caf3bd0dfd81b92ac74e0b3ea970d195fee7b':
Windows adb: include stdint.h for uint8_t on MinGW-w64
53e5b242317a079a6a194e21e5e06a91ab6a23d8 30-Jan-2013 Kenny Root <kroot@android.com> am 6c3d3ccf: am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"

# By Ray Donnelly
# Via Android Git Automerger (2) and others
* commit '6c3d3ccfa5d1d77b80e5c7619909a48b976c69ec':
Windows adb: initialize on to 1 in disable_tcp_nagle
282caf3bd0dfd81b92ac74e0b3ea970d195fee7b 30-Jan-2013 Kenny Root <kroot@android.com> am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"

# By Ray Donnelly
# Via Android Git Automerger (1) and others
* commit '260f347197187c0e4ac9bf4afaf049bfa3655afc':
Windows adb: include stdint.h for uint8_t on MinGW-w64
6c3d3ccfa5d1d77b80e5c7619909a48b976c69ec 30-Jan-2013 Kenny Root <kroot@android.com> am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"

# By Ray Donnelly
# Via Android Git Automerger (1) and others
* commit 'd033739d176f8a2da99f80ef4a03bdca0649b644':
Windows adb: initialize on to 1 in disable_tcp_nagle
260f347197187c0e4ac9bf4afaf049bfa3655afc 30-Jan-2013 Kenny Root <kroot@android.com> am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"

# By Ray Donnelly
# Via Gerrit Code Review (1) and Ray Donnelly (1)
* commit 'f8afaebec3d10879f22406ac1bf06a246d448f93':
Windows adb: include stdint.h for uint8_t on MinGW-w64
d033739d176f8a2da99f80ef4a03bdca0649b644 30-Jan-2013 Kenny Root <kroot@android.com> am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"

# By Ray Donnelly
# Via Gerrit Code Review (1) and Ray Donnelly (1)
* commit 'd40fd86ec5bdf56e8cd5a702ffc5332b6de931e4':
Windows adb: initialize on to 1 in disable_tcp_nagle
f8afaebec3d10879f22406ac1bf06a246d448f93 30-Jan-2013 Kenny Root <kroot@android.com> Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"
d40fd86ec5bdf56e8cd5a702ffc5332b6de931e4 30-Jan-2013 Kenny Root <kroot@android.com> Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"
b94fd1abcbff1eacb8a2ad79c51de21ecf8f6d65 29-Jan-2013 Nick Kralevich <nnk@google.com> cutils: remove dead code.

The last caller of this code was removed in
dalvik commit eb1703442f3fc0577b3395b7eb4d55300b4125db
(https://android-review.googlesource.com/50689)

Change-Id: I3f4865c02092752a13369a3b2c3289fc9a4f6a62
nclude/cutils/zygote.h
ibcutils/zygote.c
3400ee257c23e33f81de71bd632fca361099e4cb 29-Jan-2013 Doug Zongker <dougz@google.com> am 76dd8e33: resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aosp

# Via Doug Zongker
* commit '76dd8e33689292e6255b090da7408fba76919424':
change AID_LOOP_RADIO uid assignment
76dd8e33689292e6255b090da7408fba76919424 29-Jan-2013 Doug Zongker <dougz@google.com> resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aosp

Change-Id: Ie513c90bcad779203a241a541945b0cf7c936664
0060935e1dc2fa7c5b629f845e3c031d7b2112c7 29-Jan-2013 Doug Zongker <dougz@google.com> am 8cc97302: resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp

# Via Doug Zongker
* commit '8cc97302b2cc42d70af3c6d84a6a46984a09fe24':
add AID_LOOP_RADIO for control of loop radio device
8cc97302b2cc42d70af3c6d84a6a46984a09fe24 29-Jan-2013 Doug Zongker <dougz@google.com> resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp

Change-Id: Ie7a8b642dec0f07d4c8bfd9d8f736fd66c4febe0
016806a71b911c8da0cffb7fa4dae0eab433a020 29-Jan-2013 Doug Zongker <dougz@android.com> change AID_LOOP_RADIO uid assignment

1029 was taken by an AOSP change; use 1030 instead.

Change-Id: Icfe19a5638a4c98a3e2694c0402d19b49b8face9
nclude/private/android_filesystem_config.h
0fe9742e385f7641a1f6272699349510ac57da9d 29-Jan-2013 Doug Zongker <dougz@android.com> add AID_LOOP_RADIO for control of loop radio device

Change-Id: I1e996dfbaa0f187ec87b5318a214ab0b852193cc
nclude/private/android_filesystem_config.h
f61fb576e60458251d36e44c702cabe9c0dbe1e2 29-Jan-2013 Elliott Hughes <enh@google.com> am db9697b3: am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."

# Via Android Git Automerger (1) and others
* commit 'db9697b3b059469153e81bf9e8844fb8e23149ea':
libcorkscrew will always HAVE_DLADDR.
db9697b3b059469153e81bf9e8844fb8e23149ea 29-Jan-2013 Elliott Hughes <enh@google.com> am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'b94b038df58cb13ae2073a28d5264bf9162d5be5':
libcorkscrew will always HAVE_DLADDR.
b94b038df58cb13ae2073a28d5264bf9162d5be5 29-Jan-2013 Elliott Hughes <enh@google.com> Merge "libcorkscrew will always HAVE_DLADDR."
a03e93adb2986c126b42b8c86f36cd7dd38a7a2c 29-Jan-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
38a260547ba65b495ddcb16ef32f219aff5e389e 29-Jan-2013 Wink Saville <wink@google.com> Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"
280760853f4ad1adde0b0ff42ef9dd561b4a9f92 29-Jan-2013 Benoit Goby <benoit@android.com> Merge "Revert "init.usb.rc: set sys.usb.config to none before changing it""
d0a21b2406f344a039005bf7b0d7b68d61660319 29-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "logwrap: add quiet flag to logwrap()"
8e85644aa139252acd5a13c99a1f6f7de22b23e7 29-Jan-2013 Benoit Goby <benoit@android.com> Merge "adb: Add "unauthorized" connection state"
f5200c075098a6fb6a69ac4e2baa2fdd3809cbbd 24-Jan-2013 Rom Lemarchand <romlem@google.com> logwrap: add quiet flag to logwrap()

Add a quiet flag to the logwrap function that prevents messages from
getting logged.

Change-Id: Ic56c011fb608babae32b03900b955833a6bdd070
ogwrapper/include/logwrap/logwrap.h
ogwrapper/logwrap.c
ogwrapper/logwrapper.c
2c3b2e12c15ac130bbfd806404dc735ed1ab8939 29-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "logwrap: Replace sigprocmask with pthread_sigmask"
665118f502baa3d3acaf6aa50c3dd14fdc14779d 29-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "logwrap: wait for child process when receiving SIGINT or SIGQUIT"
ed179d2f98c1628a593aec6d8408b621015f4de5 17-Jan-2013 Rom Lemarchand <romlem@google.com> logwrap: Replace sigprocmask with pthread_sigmask

sigprocmask has undefined behavior when called from a thread.
Replacing with pthread_sigmask to ensure correct behavior if
logwrap() gets called from a thread.

Change-Id: I77b6959d345eac8d7b90039ed8144ead8c19a00c
ogwrapper/logwrap.c
75c289aab9b81dc2235680cf141a4b183ee49391 09-Jan-2013 Rom Lemarchand <romlem@google.com> logwrap: wait for child process when receiving SIGINT or SIGQUIT

- Wait for the child to exit before propagating SIGINT and SIGQUIT
to the parent
- Add ignore_int_quit argument to logwrap() that gives the caller the
option to ignore SIGINT and SIGQUIT while logwrap is running

Change-Id: If5c96cf23094917211310f00aa6aed515f110f5b
ogwrapper/include/logwrap/logwrap.h
ogwrapper/logwrap.c
ogwrapper/logwrapper.c
99e1966400559f9fcc18174e37ccf8a0e5265ffc 08-Jan-2013 Rom Lemarchand <romlem@google.com> logwrap: ensure child exits with _exit

Always exit the child process with _exit() rather than exit() to ensure none
of the parent's atexit functions get called if the child needs to exit before
calling exec.

Change-Id: I6a75111ef1bb3468c114c98743565471cf82c9dd
ogwrapper/logwrap.c
83dee8e4e5346553f435626b46487d51b1e0ff2d 29-Jan-2013 Benoit Goby <benoit@android.com> Merge "adb: Read secure adb keys on every auth request"
c0d399df697850712432cb6092d63669ffa0fc23 29-Jan-2013 Wink Saville <wink@google.com> Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip

Add voip-common to BOOTCLASSPATH

Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
ootdir/init.rc
078ca5e30d04b10e2d6f6811a149643d255d4dc1 29-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "logwrap: remove unnecessary call to setuid/setgid"
e74313baf8c2df0525f8a9a72a511b294ef632be 29-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "logwrap: fix off by 1 argument error"
45509f9fdde8fafaf66f8583c3255aafcbeaf529 29-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "logwrapper: switch to signal handlers for SIGCHLD"
d11fb120191e01e156f607baf89be238a7f8960f 28-Jan-2013 Nick Kralevich <nnk@google.com> Merge "property_service: make /dev/__properties__ readable"
cfb5ec3c283bb0fd5a99d6ed282a508be309d291 11-Jan-2013 Rom Lemarchand <romlem@google.com> logwrap: remove unnecessary call to setuid/setgid

Android allows all users to write to log.
The setuid/setgid call is unneeded and could cause unintended
side effects when called from daemons or programs that need
to run as root.

Change-Id: I3bdb26eaa4363ef037615e45a1a5cb1ceb4088f3
ogwrapper/logwrap.c
611f5b4b938f2ffcf2a2e71a847e4fd12587ca4b 14-Jan-2013 Rom Lemarchand <romlem@google.com> logwrap: fix off by 1 argument error

Fix off by 1 argument parsing error in liblogwrap.

Change-Id: I79832ae338a71c445f9f616d780c577826874386
ogwrapper/logwrap.c
ogwrapper/logwrapper.c
0cc2cab6af2635e3293b3611a4c0982061dbb935 16-Jan-2013 Rom Lemarchand <romlem@google.com> logwrapper: switch to signal handlers for SIGCHLD

Switch to a signal handler to monitor SIGCHLD.
Also, clean up the exit path and log a warning when the
previous SIGCHLD sigaction is not default or ignore.

Change-Id: I7ef7daabee18d80e9e82fba3943cf1d03b504ae3
ogwrapper/logwrap.c
46d079dd8c974cb28d52b052158c2843d4125756 26-Jan-2013 Elliott Hughes <enh@google.com> libcorkscrew will always HAVE_DLADDR.

The only place we don't have dladdr(3) is Windows, and libcorkscrew
is for Unix.

Change-Id: If7633ee8398bccf9897add728facbe07592c0fcf
ibcorkscrew/backtrace.c
aaf89247dc164afd1173ac97a7ce577ac1b024c8 24-Jan-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
fa341f5b66088afc341a5ca4374e374a54d1afd5 24-Jan-2013 Colin Cross <ccross@android.com> Merge commit '35d5b7e6' into master
c86396eba20e550fe570a28d7cf5d2be8ac7efae 24-Jan-2013 Colin Cross <ccross@android.com> am 5fc4fdc6: am 2447afdb: Merge "fastboot: use better exported api from libext4_utils"

# Via Android Git Automerger (1) and others
* commit '5fc4fdc6a06cfa151d29f751d9d9beb8cb781a6a':
fastboot: use better exported api from libext4_utils
35d5b7e62456fa921d40d1ea5d91e6fcbbe8744d 24-Jan-2013 Colin Cross <ccross@android.com> am 61ae5dfd: Merge "fastboot: add errno.h to fix windows build"

# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '61ae5dfda0ddf74b5f05446aa1f76f3aa1917202':
fastboot: add errno.h to fix windows build
61ae5dfda0ddf74b5f05446aa1f76f3aa1917202 24-Jan-2013 Colin Cross <ccross@android.com> Merge "fastboot: add errno.h to fix windows build"
81c632e4dacb14c4afa8a1f166faa1bbacce4d8f 24-Jan-2013 Colin Cross <ccross@android.com> fastboot: add errno.h to fix windows build

The removal of extra headers from ext4_utils.h removed an indirect
include of errno.h that breaks building with USE_MINGW=1.

Change-Id: Ic8448db97b5c056a139dc836e1d6f3aaafb917c9
astboot/engine.c
5fc4fdc6a06cfa151d29f751d9d9beb8cb781a6a 24-Jan-2013 Colin Cross <ccross@android.com> am 2447afdb: Merge "fastboot: use better exported api from libext4_utils"

# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '2447afdb9ee2607b932805bd2efd8006242f4d62':
fastboot: use better exported api from libext4_utils
2447afdb9ee2607b932805bd2efd8006242f4d62 24-Jan-2013 Colin Cross <ccross@android.com> Merge "fastboot: use better exported api from libext4_utils"
2aaf5e84f004739858f5454e42cc88fd92e4f779 24-Jan-2013 Colin Cross <ccross@android.com> fastboot: use better exported api from libext4_utils

Switch fastboot to use an exported api from libext4_utils that
will change less often, and remove some of the implementation
details from fastboot.

Change-Id: I85a10c8f58abe8093d0c781e1a0e100c348ef0d9
astboot/engine.c
7ece0a862cf97e85bbe69458a32a2bd165456874 23-Jan-2013 Nick Kralevich <nnk@google.com> property_service: make /dev/__properties__ readable

Currently, system properties are passed via the environment
variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed
from parent to child. This is insecure for setuid executables,
as the environment variable can be changed by the caller.

Make the /dev/__properties__ file accessible, so an app can
get properties directly from the file, rather than relying on
environment variables.

Preserve the environment variable for compatibility with pre-existing
apps.

Bug: 8045561
Change-Id: If81e2b705eca43ddd8b491871aceff59c0e00387
nit/property_service.c
5929dee1412a8d509111105705a4920ed59ec411 23-Jan-2013 The Android Automerger <android-build@android.com> merge in jb-mr2-release history after reset to master
7d5f33ed55b9511a64d3e73b33366718972f74af 07-Dec-2012 Devin Kim <dojip.kim@lge.com> charger: Do not suspend when disconnecting from charger

The device should be power off when disconnecting from charger.
If the device enter to suspend, the device couldn't handle the power off
process. So the device shouldn't suspend to handle the power off at that time

Bug: 7429504
Change-Id: I9a0a60e53f315cd83550dc730a33bc7bd464ef67
harger/charger.c
3493f18985973e35f83b34b737c8fbcb179007c3 16-Nov-2012 choongryeol.lee <choongryeol.lee@lge.com> charger: suspend enable in charger mode

To reduce power consumption after charging completion, enable suspend when LCD
is turned off.

Bug: 7429504
Change-Id: I34731dc392661c9051a20cea74f70d94a8aaeb42
Signed-off-by: Iliyan Malchev <malchev@google.com>
harger/Android.mk
harger/charger.c
aae1ce43a45f38b3b4c0fac90e208253fa02ffe6 06-Dec-2012 Iliyan Malchev <malchev@google.com> libsuspend: compile as a static library

Compile libsuspend as a static library as well, currently needed by the charger
code in some cases.

Related-to-bug: 7429504
Change-Id: I113017c2c855f915b77c76d8934b6e57c0bb532c
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibsuspend/Android.mk
6c70ceeefe4cd2838b5788f6db8eb35751a5ce21 18-Jan-2013 Eric Laurent <elaurent@google.com> audio: added input device for front + back mic

Added a value to audio_channel_mask_t enum for front + back mic
combination to allow parsing of audio_policy.conf file by audio
policy manager.

Change-Id: I8412b4d3cfc03323eff867563a1a73322019c0f3
nclude/system/audio.h
4db7df71da5641dfa6c89543b9843dca1999d78e 23-Jan-2013 Dmitry Shmidt <dimitrysh@google.com> toolbox: renice: Add -t TYPE parameter and switch to getopt

Change-Id: Idaedabe1505a9c373629ef1fd31aa4b4beb068c2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
oolbox/renice.c
cf5c32c26c3b458cd9f8d8f7ba07f1fbb8b496e5 07-Dec-2012 Devin Kim <dojip.kim@lge.com> charger: Do not suspend when disconnecting from charger

The device should be power off when disconnecting from charger.
If the device enter to suspend, the device couldn't handle the power off
process. So the device shouldn't suspend to handle the power off at that time

Bug: 7429504
Change-Id: I9a0a60e53f315cd83550dc730a33bc7bd464ef67
harger/charger.c
dec27f6e11c2bdfe35791d0d25a3b1bb2204d194 16-Nov-2012 choongryeol.lee <choongryeol.lee@lge.com> charger: suspend enable in charger mode

To reduce power consumption after charging completion, enable suspend when LCD
is turned off.

Bug: 7429504
Change-Id: I34731dc392661c9051a20cea74f70d94a8aaeb42
Signed-off-by: Iliyan Malchev <malchev@google.com>
harger/Android.mk
harger/charger.c
fdf2f337805b0b9c6ebdf57540b2b70bb1eb64dd 06-Dec-2012 Iliyan Malchev <malchev@google.com> libsuspend: compile as a static library

Compile libsuspend as a static library as well, currently needed by the charger
code in some cases.

Related-to-bug: 7429504
Change-Id: I113017c2c855f915b77c76d8934b6e57c0bb532c
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibsuspend/Android.mk
3018f521df7fcef6edfa3910c2d3b4aa48dd6341 22-Jan-2013 Nick Kralevich <nnk@google.com> Revert "init: make system properties more secure."

This reverts commit 51e06618dbd87c4374c56d9193a5e567aa3d02ac.

Bug: 8045561
nit/init.c
nit/property_service.c
nit/property_service.h
2840647b15fe91069aee02ce0e203943346bf294 22-Jan-2013 Nick Kralevich <nnk@google.com> Revert "init: make system properties more secure."

This reverts commit 51e06618dbd87c4374c56d9193a5e567aa3d02ac.

Bug: 8045561
nit/init.c
nit/property_service.c
nit/property_service.h
5bf8a4200c5f1695b0210e59b6b6ef421cedee8f 21-Jan-2013 David Turner <digit@android.com> am 3dbcb6d6: am 98d07897: Merge "Windows adb: Make client stdout and stderr handles uninheritable"

* commit '3dbcb6d6c6befc406e4ce4e2b7aa9ad2635dfbb8':
Windows adb: Make client stdout and stderr handles uninheritable
3dbcb6d6c6befc406e4ce4e2b7aa9ad2635dfbb8 21-Jan-2013 David Turner <digit@android.com> am 98d07897: Merge "Windows adb: Make client stdout and stderr handles uninheritable"

* commit '98d0789772b94b9b0c2aecfab74dc1a9283a91b1':
Windows adb: Make client stdout and stderr handles uninheritable
98d0789772b94b9b0c2aecfab74dc1a9283a91b1 21-Jan-2013 David Turner <digit@android.com> Merge "Windows adb: Make client stdout and stderr handles uninheritable"
51e06618dbd87c4374c56d9193a5e567aa3d02ac 18-Jan-2013 Nick Kralevich <nnk@google.com> init: make system properties more secure.

Currently, system properties are passed via the environment
variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed
from parent to child. This is insecure for setuid executables,
as the environment variable can be changed by the caller.

Modify system property handling so that we get the properties
from a root owned properties file, rather than using an
environment variable.

Related to bug: 8029617

Change-Id: I18610128e11c4037ed6f4dec6eba20f69fa647eb
nit/init.c
nit/property_service.c
nit/property_service.h
31c8095cac4cd652c360feb85c47854363233a1c 16-Jan-2013 Benoit Goby <benoit@android.com> Revert "init.usb.rc: set sys.usb.config to none before changing it"

This can cause init to be stucked in a loop in very rare cases where
persist.sys.usb.config is set to "none" (because the "setprop
sys.usb.config none" action is added twice to the action list).
The original issue on encrypted devices has been fixed differently
by change # I350c5aab986f8ca86b95f316398d03012553e581

This reverts commit 80828af3def1f37eff1d483520df79ebe4238d55.

Change-Id: Id0a7af8dd861c8d10b80a13b540c8a339b432007
ootdir/init.usb.rc
77e8e5851d3b951b5382663bd50f1f83cb531eb2 15-Jan-2013 Benoit Goby <benoit@android.com> adb: Add "unauthorized" connection state

Add a new connection state, so that devices, that require confirmation
to allow adb, appear as "unauthorized" in the adb devices lists.

Change-Id: Ib4264bc5736dedecf05bcf8e31896f4d7a91fad8
db/adb.c
db/adb.h
db/transport.c
345cb066d2e0c774c877a85d3035f298df1daf16 15-Jan-2013 Benoit Goby <benoit@android.com> adb: Read secure adb keys on every auth request

The framework can now clear the user key list, so we need to reload the
key list on every auth request instead of loading it once when adbd
starts.
This also fixes issues with encrypted devices, where the user key file
is only readable after the user has unlocked the device.

Change-Id: I350c5aab986f8ca86b95f316398d03012553e581
db/adb_auth.h
db/adb_auth_client.c
d984497a8886251540a057f379e0f016ea72696b 15-Jan-2013 Elliott Hughes <enh@google.com> am 989c033b: am 026b3953: Merge "The localtime_tz and mktime_tz extensions are now in bionic."

* commit '989c033bf3de0e81fbb9f4aad2a52d6e17093d8c':
The localtime_tz and mktime_tz extensions are now in bionic.
989c033bf3de0e81fbb9f4aad2a52d6e17093d8c 15-Jan-2013 Elliott Hughes <enh@google.com> am 026b3953: Merge "The localtime_tz and mktime_tz extensions are now in bionic."

* commit '026b3953d4471cd43c850ee72bbca7cc77e87a34':
The localtime_tz and mktime_tz extensions are now in bionic.
026b3953d4471cd43c850ee72bbca7cc77e87a34 15-Jan-2013 Elliott Hughes <enh@google.com> Merge "The localtime_tz and mktime_tz extensions are now in bionic."
def8d6a706ee173de419000fccb3daf8b24117ec 11-Sep-2012 Elliott Hughes <enh@google.com> The localtime_tz and mktime_tz extensions are now in bionic.

(cherry-pick of d03072ffde3279fbb60591a0d07c820d8e792762. This change
was originally committed to AOSP, is in internal master, but was somehow
lost from AOSP.)

Bug: 7012465

Conflicts:

libcutils/Android.mk

Change-Id: I08ee8eb9b8ce5d3f9d8f2e67437d653e08697bc1
nclude/cutils/tztime.h
ibcutils/Android.mk
ibcutils/private.h
ibcutils/tzfile.h
ibcutils/tzstrftime.c
ibcutils/tztime.c
b58a82295529e775fbb900ecfb2d9104b2dafdc1 10-Jan-2013 Rom Lemarchand <romlem@google.com> logwrapper: prevent logwrap from hanging when child dies

Sometimes the read on the PTY can wait indefinitely if the child
dies. By using a poll statement that monitors both the output
of the child and its state we prevent this from happening.

Change-Id: I51d5556c66f039bca673145ca72db262977e1689
ogwrapper/include/logwrap/logwrap.h
ogwrapper/logwrap.c
1b325d196857d29fe5f022f2c574d3625e0adc08 12-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "logwrapper: split into liblogwrap and the executable itself"
c93d30f50d15ff0c5c2d2b364019743d6cdaa88f 12-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Support 4 dns servers, up from 2"
113bd47d619fa36eb5017cbf2c1b6fe677715ed0 11-Jan-2013 Rom Lemarchand <romlem@google.com> logwrapper: split into liblogwrap and the executable itself

Abstracting the functionality of logwrapper into a library and making
use of it for the logwrapper executable.

Change-Id: I2bcf722413f3a8454c6f52137dec86c4477fb8b5
ogwrapper/Android.mk
ogwrapper/include/logwrap/logwrap.h
ogwrapper/logwrap.c
ogwrapper/logwrapper.c
60efde774d96493483bd948805547680dfd7f41a 11-Jan-2013 Alex Ray <aray@google.com> Merge "cutils: add simple reference counter"
bbe26c1f79bf860dde9cfbe8cd4ad826cd1a8a53 11-Jan-2013 Ray Donnelly <mingw.android@gmail.com> Windows adb: initialize on to 1 in disable_tcp_nagle
db/sysdeps_win32.c
2c43b55814c9038f25425dd0a9b202e4fb9b5229 11-Jan-2013 Ying Wang <wangying@google.com> resolved conflicts for merge of f62f1e3a to master

Change-Id: I35c66859e2c454c20c8acc6b2b1f0833032205bb
d874cc8bb9ed0f836495b5eabea44def6cffe9a8 10-Jan-2013 Alex Ray <aray@google.com> cutils: add simple reference counter

Change-Id: Iefb34abc864cb4ca2da2f1c85c45f89af8c7fe8b
nclude/cutils/aref.h
fdd573188d08fbd3739aeda19ef0f2d03752db9f 10-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Support 4 dns servers, up from 2

bug:5958524
Change-Id: I61c25e23d21e92653ec9b874d3d456a330d8fe05
nclude/netutils/dhcp.h
ibnetutils/dhcp_utils.c
7f213f878dea1825dba7db80967ea996364043e4 10-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "Revert "Remove -d option from logwrapper""
571c1367682c83cb23481cc9c1028c8588a1fed0 07-Dec-2012 JP Abgrall <jpa@google.com> adb: HACK: (linux only) allow temp mitigation for multithreaded issues

There are serious multithreading issues between the fdevent and transport
subsystems which both manipulate struct asocket and struct fde concurrently.
The prevalent symptom being around multiple socket closures which stomp
on each other, typically causing:
"glibc detected *** adb: double free or corruption ..."

This HACK allows forcing CPU affinity via an env var. E.g.:
export ADB_CPU_AFFINITY_BUG6558362=0
which will cause ONLY the adb server and all its threads to be pegged
to CPU 0.

The result is visible in valgrind's helgrind: no *socket_close() related
data races. But tons of other races are still there.

Bug: 6558362
Change-Id: I0f112390a6a921c64b2a783297be9e99ce27fd56
db/Android.mk
db/adb.c
cbb9891049628a2a89d566cade88c80ba1ba4a7b 29-Nov-2012 Ray Donnelly <mingw.android@gmail.com> Windows adb: include stdint.h for uint8_t on MinGW-w64

Change-Id: I84b8284bc034feb0acd313b0aad9e2fa5868854f
db/adb.c
267aa8b00eadf273321e492026af74b7baad890e 29-Nov-2012 Ray Donnelly <mingw.android@gmail.com> Windows adb: Make client stdout and stderr handles uninheritable

Change-Id: Ib0519a199c9504aad1d0ecc3757f4d162984bf22
db/adb.c
f62f1e3a07d037bc50420575b028269cc7f7ede4 09-Jan-2013 Ying Wang <wangying@android.com> am ef2ea99b: Merge "Correct LOCAL_LDLIBS of adb"

* commit 'ef2ea99bfe1e19c451882c3c8eb19368d0087ff6':
Correct LOCAL_LDLIBS of adb
ef2ea99bfe1e19c451882c3c8eb19368d0087ff6 08-Jan-2013 Ying Wang <wangying@android.com> Merge "Correct LOCAL_LDLIBS of adb"
9067dd3aefaf64ded3d591eb7252d3f18db97597 08-Jan-2013 Alex Ray <aray@google.com> Merge "cutils: bitops: add include for bool"
81ec96df4f83df9781368c6f2b8160ee1b177f75 08-Jan-2013 Alex Ray <aray@google.com> cutils: bitops: add include for bool

Change-Id: I3eca5a7c1f5ec66ded1229ccb6ca1dbb5d608ffd
nclude/cutils/bitops.h
b65bea46ad81a46c0c9be277474b597cc75c2737 08-Jan-2013 Alex Ray <aray@google.com> Merge "cutils: Add bitmask utilities to bitops"
2111bc7b28af06757fa8108bab045188d4b337fd 03-Jan-2013 Alex Ray <aray@google.com> cutils: Add bitmask utilities to bitops

Bitmask utils handle resource tracking using a (multi-word) bitmask.

Change-Id: I2ae45df1ac8c665c29ea9cae32a757168686b96c
nclude/cutils/bitops.h
273f504c14ebbcead6c4adfa630135dd77bea8d1 07-Jan-2013 Elliott Hughes <enh@google.com> am bab2ba3e: am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set"

* commit 'bab2ba3e730d610883added31ff806da352cbb07':
Fix dhcpcd startup when net.hostname is not set
bab2ba3e730d610883added31ff806da352cbb07 07-Jan-2013 Elliott Hughes <enh@google.com> am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set"

* commit '6d9589c33517c024ab992d1e2c1b8efd1b51e366':
Fix dhcpcd startup when net.hostname is not set
6d9589c33517c024ab992d1e2c1b8efd1b51e366 07-Jan-2013 Elliott Hughes <enh@google.com> Merge "Fix dhcpcd startup when net.hostname is not set"
a44404154730e54615d44c389b11cec9dd86c001 05-Jan-2013 JP Abgrall <jpa@google.com> am ba900f2e: am fb69c2e2: Merge "init.rc: setup qtaguid group ownership of ctrl and stat files"

* commit 'ba900f2e708f0b654cdaa827804cbb21af4e4fb4':
init.rc: setup qtaguid group ownership of ctrl and stat files
ba900f2e708f0b654cdaa827804cbb21af4e4fb4 05-Jan-2013 JP Abgrall <jpa@google.com> am fb69c2e2: Merge "init.rc: setup qtaguid group ownership of ctrl and stat files"

* commit 'fb69c2e2577e056bb7a054343a9f6d781cedbf3d':
init.rc: setup qtaguid group ownership of ctrl and stat files
c2b19de2ec64dc8637bcb9afe9042e137eac1cc3 05-Jan-2013 jp abgrall <jpa@google.com> am 3f8d6cde: am d084ec96: Merge "ueventd: Increase uevent buffer size"

* commit '3f8d6cded84bd526f7e648905565a1d262ca9906':
ueventd: Increase uevent buffer size
fb69c2e2577e056bb7a054343a9f6d781cedbf3d 05-Jan-2013 JP Abgrall <jpa@google.com> Merge "init.rc: setup qtaguid group ownership of ctrl and stat files"
b10c7b4e3daadd0e8fccade8d8064f622b509eef 05-Jan-2013 Rom Lemarchand <romlem@google.com> Revert "Remove -d option from logwrapper"

This reverts commit 4d74bcf4458c4b2c902a3d4f45afbd51f5a3be1e

Change-Id: Ibcd19400cd2589b52df2b3acaba25f02676ba9e0
ogwrapper/logwrapper.c
3f8d6cded84bd526f7e648905565a1d262ca9906 05-Jan-2013 jp abgrall <jpa@google.com> am d084ec96: Merge "ueventd: Increase uevent buffer size"

* commit 'd084ec96b6b9cde311a4283a5f9121a1034de166':
ueventd: Increase uevent buffer size
3e54aabc63535572242477fadbf13ec42b06649e 04-Jan-2013 JP Abgrall <jpa@google.com> init.rc: setup qtaguid group ownership of ctrl and stat files

This will help get rid of android_aid.h in the kernel.
The group of the proc entries will be used in place of the default
values picked up by the xt_qtaguid netfilter module
(AID_NET_BW_STATS, AID_NET_BW_ACCT).
This change has no effect until the matching kernel changes are submitted.

Change-Id: I3c177e7b5caf9c59300eba6bd4a976634b333674
ootdir/init.rc
d084ec96b6b9cde311a4283a5f9121a1034de166 05-Jan-2013 jp abgrall <jpa@google.com> Merge "ueventd: Increase uevent buffer size"
132b7d750e6f3e835676dfc5edbb94978f9370f8 25-Jul-2012 Andrew Boie <andrew.p.boie@intel.com> fs_mgr_priv: Extend fs wait timeout to 20 seconds

In practice 5 seconds is too short to wait for a disk device node to
show up if the disk is USB; 20 seconds is a much more comfortable
window.

Change-Id: Iaf2c1f46b41a44fc1240d52d8498ca9cb639ea80
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
s_mgr/fs_mgr_priv.h
d7c52a458e1c93b539ebd94f341f842d32d36937 04-Jan-2013 jp abgrall <jpa@google.com> am 03873ce4: am 77eccafe: Merge "Support adb client connect to remote server"

* commit '03873ce495e8c4bdb1289cdfa2b97cb47bb15108':
Support adb client connect to remote server
03873ce495e8c4bdb1289cdfa2b97cb47bb15108 04-Jan-2013 jp abgrall <jpa@google.com> am 77eccafe: Merge "Support adb client connect to remote server"

* commit '77eccafe55e019089c18273c1062df262220ab83':
Support adb client connect to remote server
d562ca78aa713d186e83f05061c0aed88e200bcd 05-Dec-2012 Andrew Boie <andrew.p.boie@intel.com> ueventd: Increase uevent buffer size

As it turns out, no, 64K is not enough. A device provisioning
tool was generating many uevents as it manipulated the GPT,
causing events near the end of the process (including events
as a result of the final BLKRRPART ioctl()) to get lost.

It's not clear what the best value for this should be, but
increasing to 256K fixed the problem in this case.

Change-Id: I4883b34e96c89e8a6fa581bc9cd121bb021b5694
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
nit/devices.c
77eccafe55e019089c18273c1062df262220ab83 04-Jan-2013 jp abgrall <jpa@google.com> Merge "Support adb client connect to remote server"
d7b33085117ccbb908a883f624cb1fe5495ee92a 14-Nov-2012 Matt Gumbel <matthew.k.gumbel@intel.com> Support adb client connect to remote server

ADB client: allow user to specify hostname and port number of remote
adb server.
ADB server: bind server to all network interfaces instead of just
localhost when user gives -a flag.

Primary use-case for this change is to support remote testing of USB
devices. HostA is running some test automation software which invokes adb
client. HostB has USB-only device attached and is running adb server. adb
client on HostA makes connection to adb server on HostB to talk to the
USB device.

Change-Id: I845cc8c00350b400317f8c18f813e6fd79bd5470
Signed-off-by: Dean Kwon <daex.i.kwon@intel.com>
Signed-off-by: Jim Bride <jim.bride@intel.com>
Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>
db/adb.c
db/adb_client.c
db/adb_client.h
db/commandline.c
ba2ba5c011a3fb13cba538296b70888dd0fb129b 04-Jan-2013 Matt Gumbel <matthew.k.gumbel@intel.com> Fix dhcpcd startup when net.hostname is not set

Commit 62d6f74 swapped p2p_interface and DHCP_CONFIG_PATH
erroneously. This reverts them to their correct ordering and makes dhcpcd
startup work again.

Change-Id: Iea033a7e0dad98bb2a63fb39755330675cfbb0ab
Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>
ibnetutils/dhcp_utils.c
875adfafe781e040af4544956d688f2d5c35083c 04-Jan-2013 Rom Lemarchand <romlem@google.com> Merge "Remove -d option from logwrapper"
e8097be24e508f6ff6b6dfd9144bd4de1db8becc 04-Jan-2013 Elliott Hughes <enh@google.com> am a82985b6: am 7cd45071: Merge "Include page protections in the debuggerd map output."

* commit 'a82985b6686f8b47119193fee2f804376a90125b':
Include page protections in the debuggerd map output.
a82985b6686f8b47119193fee2f804376a90125b 04-Jan-2013 Elliott Hughes <enh@google.com> am 7cd45071: Merge "Include page protections in the debuggerd map output."

* commit '7cd450719a78b6079d30608473cb36d7e4be2cb9':
Include page protections in the debuggerd map output.
7cd450719a78b6079d30608473cb36d7e4be2cb9 03-Jan-2013 Elliott Hughes <enh@google.com> Merge "Include page protections in the debuggerd map output."
4d74bcf4458c4b2c902a3d4f45afbd51f5a3be1e 03-Jan-2013 Rom Lemarchand <romlem@google.com> Remove -d option from logwrapper

Removing the ability of logwrapper to die with a SIGSEGV at address
"return code from wait".

Change-Id: I563715db2b1e5e789af84190fc2ff78664d63572
ogwrapper/logwrapper.c
d1420be6133fc5ba71d59315936fb85239ea78b1 03-Jan-2013 Elliott Hughes <enh@google.com> Include page protections in the debuggerd map output.

Bug: 7941716
Change-Id: I3bf475425c628c06f7799340c8a6132aab741742
ebuggerd/tombstone.c
nclude/corkscrew/map_info.h
ibcorkscrew/map_info.c
2b5b3bb103f59d9d3bf25c0c1f8035db036917da 21-Dec-2012 Todd Poynor <toddpoynor@google.com> rootdir: init.rc: set perms for new interactive governor attrs

/sys/devices/system/cpu/cpufreq/interactive/timer_slack
/sys/devices/system/cpu/cpufreq/interactive/target_loads

Change-Id: Ia5d5c3d615ad64bab3a1317e5de2ac9a6d61679e
ootdir/init.rc
9c607552077321d9b6b2e29dab8a6e276bffb457 01-Jan-2013 Chih-Wei Huang <cwhuang@linux.org.tw> Correct LOCAL_LDLIBS of adb

adb doesn't really use ncurses-libs, remove it.

Add -ldl for the symbols dlclose, dlerror, dlopen...
introduced from dso_dlfcn.c of libcrypto_static.a.

Change-Id: If1cc23987a9b35ec535bbf8f4e7db141b9f10af7
db/Android.mk
2bf496378dbaabe3a49915574b11b1c74032b34a 28-Dec-2012 Elliott Hughes <enh@google.com> am e2aab2cc: am 38219ee6: Merge "Track the setsebool change in the emulator init.rc."

* commit 'e2aab2cce821149fcb807d4b67753c470a5f2028':
Track the setsebool change in the emulator init.rc.
8b9e9804f10102de80a14a01f9de5e23b2856b1d 28-Dec-2012 Colin Cross <ccross@android.com> am 4600545f: am b8e86c5a: Merge "android_filesystem_config: allow absolute paths"

* commit '4600545fbb5b496297a51e43818b8b3e750590c5':
android_filesystem_config: allow absolute paths
d4a80984fcf1066e244a8909354df03ba1e3f786 12-Oct-2012 Duane Sand <duanes@mips.com> [MIPS] Benchmark test for MIPS memset16/memset32

Author: Chris Dearman <chris@mips.com>
AuthorDate: 2011-07-26 19:24:40
Change-Id: I0a7b3360aaf45de8ee47744f7031b84f15f37611
ibcutils/Android.mk
ibcutils/tests/Android.mk
ibcutils/tests/memset_mips/Android.mk
ibcutils/tests/memset_mips/android_memset_dumb.S
ibcutils/tests/memset_mips/android_memset_test.S
ibcutils/tests/memset_mips/memset_cmips.S
ibcutils/tests/memset_mips/memset_omips.S
ibcutils/tests/memset_mips/test_memset.c
e2aab2cce821149fcb807d4b67753c470a5f2028 22-Dec-2012 Elliott Hughes <enh@google.com> am 38219ee6: Merge "Track the setsebool change in the emulator init.rc."

* commit '38219ee6116943269b0501a1a0210c76e2ba69c3':
Track the setsebool change in the emulator init.rc.
38219ee6116943269b0501a1a0210c76e2ba69c3 22-Dec-2012 Elliott Hughes <enh@google.com> Merge "Track the setsebool change in the emulator init.rc."
334ad0ed49356db93ef17c173cad19d098923ffe 21-Dec-2012 Elliott Hughes <enh@google.com> Track the setsebool change in the emulator init.rc.

setsebool's syntax changed in November. This is the sole
caller in AOSP.

Change-Id: I0da608ee974bc3a9060372ef68a71c52726a44a6
ootdir/etc/init.goldfish.rc
4600545fbb5b496297a51e43818b8b3e750590c5 21-Dec-2012 Colin Cross <ccross@android.com> am b8e86c5a: Merge "android_filesystem_config: allow absolute paths"

* commit 'b8e86c5aba4d160d1d356883a6a9a85056c5fa47':
android_filesystem_config: allow absolute paths
b8e86c5aba4d160d1d356883a6a9a85056c5fa47 21-Dec-2012 Colin Cross <ccross@android.com> Merge "android_filesystem_config: allow absolute paths"
04aaf5a424b1f88a481a17a6bc3518e2116250e2 21-Dec-2012 Colin Cross <ccross@android.com> android_filesystem_config: allow absolute paths

SELinux policies use absolute paths, allow absolute paths in fs_config
as well.

Change-Id: Ic97ee0b4eb4df9eac965a8e819fde01df473de7e
nclude/private/android_filesystem_config.h
17e9033f3339d252aa048f830f00515d94c41fe2 21-Dec-2012 Todd Poynor <toddpoynor@google.com> am 191af2f2: am 367f1e4b: am 4f247d75: rootdir: init.rc: set perms for cpufreq governor boostpulse_duration

* commit '191af2f2c3effc5a60f1643dd6283ecc5a521603':
rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
191af2f2c3effc5a60f1643dd6283ecc5a521603 21-Dec-2012 Todd Poynor <toddpoynor@google.com> am 367f1e4b: am 4f247d75: rootdir: init.rc: set perms for cpufreq governor boostpulse_duration

* commit '367f1e4b0aaaf7f725e686b5b40845cbb5c07a42':
rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
367f1e4b0aaaf7f725e686b5b40845cbb5c07a42 21-Dec-2012 Todd Poynor <toddpoynor@google.com> am 4f247d75: rootdir: init.rc: set perms for cpufreq governor boostpulse_duration

* commit '4f247d753a8865cd16292ff0b720b72c28049786':
rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
4f247d753a8865cd16292ff0b720b72c28049786 20-Dec-2012 Todd Poynor <toddpoynor@google.com> rootdir: init.rc: set perms for cpufreq governor boostpulse_duration

Change-Id: I09b9a1ed548e4ffe1232f583e8ff5f026760f616
ootdir/init.rc
487c4ea01274493b62e13530e955efdc115afc42 19-Dec-2012 Dima Zavin <dima@android.com> am 7ec62dbd: am 82ea44f8: Merge "Change setsebool syntax to be consistent with other init built-ins."

* commit '7ec62dbd9d2bd7369fa074bf002f642b03e6dd39':
Change setsebool syntax to be consistent with other init built-ins.
7ec62dbd9d2bd7369fa074bf002f642b03e6dd39 19-Dec-2012 Dima Zavin <dima@android.com> am 82ea44f8: Merge "Change setsebool syntax to be consistent with other init built-ins."

* commit '82ea44f88fed158fd807ef5b79100295b1163941':
Change setsebool syntax to be consistent with other init built-ins.
82ea44f88fed158fd807ef5b79100295b1163941 19-Dec-2012 Dima Zavin <dima@android.com> Merge "Change setsebool syntax to be consistent with other init built-ins."
9388033694a9f234954f26e51c93aa648912574f 19-Dec-2012 Jean-Baptiste Queru <jbq@google.com> am 22e91366: Merge from AOSP staging branch

* commit '22e9136661f55122d4ed4b081f61fd63e9ce3685':
libusbhost: generates a static library
libusbhost: permits client polling on inotify wd
22e9136661f55122d4ed4b081f61fd63e9ce3685 19-Dec-2012 Jean-Baptiste Queru <jbq@google.com> Merge from AOSP staging branch

Change-Id: I28f72f7c361eaa4a0fae671e988b52708cb9e3af
516943c0e919d77170622b8b5ed19412b4dbe5ef 17-Dec-2012 Mike Lockwood <lockwood@google.com> Merge "libusbhost: generates a static library"
dea9a93ddd66f8f40ae17d923e5ba0a4b109ac14 17-Dec-2012 Mike Lockwood <lockwood@google.com> Merge "libusbhost: permits client polling on inotify wd"
9bc6f20c618c45183af579e118dcf27b145b4e8c 14-Dec-2012 David 'Digit' Turner <digit@android.com> am abf7cc97: am 13306d95: Merge "adb: Improve ADB\'s forward redirection management."

* commit 'abf7cc977e41540c45836d2fafd81606117f0399':
adb: Improve ADB's forward redirection management.
abf7cc977e41540c45836d2fafd81606117f0399 14-Dec-2012 David 'Digit' Turner <digit@android.com> am 13306d95: Merge "adb: Improve ADB\'s forward redirection management."

* commit '13306d95f6b70b58bfdd3e1c6d9b1d2a49e6f175':
adb: Improve ADB's forward redirection management.
0e23fee505fda39de4286d20022a4b2119156e15 28-Nov-2012 Stephen Smalley <sds@tycho.nsa.gov> Change setsebool syntax to be consistent with other init built-ins.

Change setsebool syntax from name=value to name value.
This is to make it consistent with setprop and similar commands.
Update both the init built-in command and the toolbox command
for consistency.

Change-Id: I2c8e016ba26731c4a2ad4a49ae3b89362bf8f8a8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/builtins.c
nit/keywords.h
nit/readme.txt
oolbox/setsebool.c
13306d95f6b70b58bfdd3e1c6d9b1d2a49e6f175 13-Dec-2012 David 'Digit' Turner <digit@android.com> Merge "adb: Improve ADB's forward redirection management."
625a8ef433d371704f024ca6391c87677c433169 12-Dec-2012 Wink Saville <wink@google.com> am 0c47c682: am 81077e5f: Merge "Use Rlog instead of Log"

* commit '0c47c6825813e53007406daa0670ccaf1e20a543':
Use Rlog instead of Log
272236ecfabc796bb1486bf9c84da2ea3f34fc0f 12-Dec-2012 Wink Saville <wink@google.com> am 0c457c0f: am bf866aed: Merge "Add RLOGx"

* commit '0c457c0fff13908f22e9374a9cc5c267af1360fe':
Add RLOGx
0c47c6825813e53007406daa0670ccaf1e20a543 12-Dec-2012 Wink Saville <wink@google.com> am 81077e5f: Merge "Use Rlog instead of Log"

* commit '81077e5faeaa064478495ce0924e8249b04899fd':
Use Rlog instead of Log
0c457c0fff13908f22e9374a9cc5c267af1360fe 12-Dec-2012 Wink Saville <wink@google.com> am bf866aed: Merge "Add RLOGx"

* commit 'bf866aeda1d01a8adbcbf186f9ff08418e45b836':
Add RLOGx
81077e5faeaa064478495ce0924e8249b04899fd 12-Dec-2012 Wink Saville <wink@google.com> Merge "Use Rlog instead of Log"
bf866aeda1d01a8adbcbf186f9ff08418e45b836 12-Dec-2012 Wink Saville <wink@google.com> Merge "Add RLOGx"
4506426bfb15b85969cecd50532da710d94770c6 12-Dec-2012 Robert Greenwalt <rgreenwalt@google.com> am 8bc848d9: am abce9e85: Merge "libsysutils: Increase command buffersize and command args"

* commit '8bc848d9b2c5b3ed26441315d652ba043f636c17':
libsysutils: Increase command buffersize and command args
8bc848d9b2c5b3ed26441315d652ba043f636c17 12-Dec-2012 Robert Greenwalt <rgreenwalt@google.com> am abce9e85: Merge "libsysutils: Increase command buffersize and command args"

* commit 'abce9e85e406b7a6e4c8c36b8eaaac049a7e11a9':
libsysutils: Increase command buffersize and command args
abce9e85e406b7a6e4c8c36b8eaaac049a7e11a9 12-Dec-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "libsysutils: Increase command buffersize and command args"
cfa0de053aba30eb0773d1d8642012158cf423fe 11-Dec-2012 Ben Cheng <bccheng@google.com> am dc34f383: am 2353a44e: am becea6e0: Merge "Fix ELF header parser bug." into jb-mr1.1-dev

* commit 'dc34f3831289b69ee52751d43b68e560acb2eaf2':
Fix ELF header parser bug.
dc34f3831289b69ee52751d43b68e560acb2eaf2 11-Dec-2012 Ben Cheng <bccheng@google.com> am 2353a44e: am becea6e0: Merge "Fix ELF header parser bug." into jb-mr1.1-dev

* commit '2353a44eee2b97f9efca81103dac007db7129000':
Fix ELF header parser bug.
2353a44eee2b97f9efca81103dac007db7129000 11-Dec-2012 Ben Cheng <bccheng@google.com> am becea6e0: Merge "Fix ELF header parser bug." into jb-mr1.1-dev

* commit 'becea6e04e7f7cca3eaa514d5749d315c6213b25':
Fix ELF header parser bug.
becea6e04e7f7cca3eaa514d5749d315c6213b25 11-Dec-2012 Ben Cheng <bccheng@google.com> Merge "Fix ELF header parser bug." into jb-mr1.1-dev
efbe4bcb764fc5730993f1dd10f9bda0b2f24827 11-Dec-2012 Ben Cheng <bccheng@google.com> am 37af40c4: am b0f8c70a: Merge "Fix ELF header parser bug."

* commit '37af40c46ce463db3c136bb8c11f953eb2b68bd3':
Fix ELF header parser bug.
37af40c46ce463db3c136bb8c11f953eb2b68bd3 11-Dec-2012 Ben Cheng <bccheng@google.com> am b0f8c70a: Merge "Fix ELF header parser bug."

* commit 'b0f8c70aa3ae2851dabb6a73debd2011ddf95bcb':
Fix ELF header parser bug.
c076030eaa9f1c9215bf8bff8524c034b187ed77 10-Dec-2012 Ben Cheng <bccheng@google.com> Fix ELF header parser bug.

[cherry-picked from AOSP]
Program header size should be 32 instead of 40.

Bug: 7696928
Change-Id: I48e411837ff8a571544b55ccc37e20202dca424c
ibcorkscrew/arch-arm/ptrace-arm.c
b0f8c70aa3ae2851dabb6a73debd2011ddf95bcb 11-Dec-2012 Ben Cheng <bccheng@google.com> Merge "Fix ELF header parser bug."
c75cbf456e561ce18103a166a319c5829936e05c 11-Dec-2012 Elliott Hughes <enh@google.com> am 3de7fe9f: am 5fb042dd: Merge "Expand crasher with a "thread-" prefix to crash on another thread."

* commit '3de7fe9f40489db691407d6ebfd77cfde23d8049':
Expand crasher with a "thread-" prefix to crash on another thread.
3de7fe9f40489db691407d6ebfd77cfde23d8049 11-Dec-2012 Elliott Hughes <enh@google.com> am 5fb042dd: Merge "Expand crasher with a "thread-" prefix to crash on another thread."

* commit '5fb042dd3a04086c340801bc4fa0e3a0ed493e82':
Expand crasher with a "thread-" prefix to crash on another thread.
5fb042dd3a04086c340801bc4fa0e3a0ed493e82 11-Dec-2012 Elliott Hughes <enh@google.com> Merge "Expand crasher with a "thread-" prefix to crash on another thread."
0015a42942d246cc225034b9754bb6d926b16f10 10-Dec-2012 Ben Cheng <bccheng@google.com> Fix ELF header parser bug.

Program header size should be 32 instead of 40.

Bug: 7696928

Change-Id: I8298a030790e9c28e8e8a0d2ad4e9ef294708eb6
ibcorkscrew/arch-arm/ptrace-arm.c
aa4213057ba1723e4f164e54f80bb7621c3cb6b3 10-Dec-2012 Elliott Hughes <enh@google.com> Expand crasher with a "thread-" prefix to crash on another thread.

So "thread-nostack" runs the "nostack" code on a new thread, and
"thread-abort" runs the "abort" code on a new thread, and so on.

Bug: http://code.google.com/p/android/issues/detail?id=16672
Change-Id: I026a0e43eea147f1a7a74243846954599bcf4238
ebuggerd/crasher.c
229dc35f699f144e5e3ccd8062bba8f6e650cfdc 06-Dec-2012 Jon Medhurst <tixy@linaro.org> init: Fix get_hardware_name() to cope with long /proc/cpuinfo output

get_hardware_name() uses a fixed size buffer to slurp the contents of
/proc/cpuinfo into and with newer multicore systems this is not big
enough, leading to the inability to pick up the hardware name.

Fix this by using a dynamically allocated, exponentially growing buffer.

Change-Id: I51c6c276b6e110f462839e205a4428adc6656e75
Signed-off-by: Jon Medhurst <tixy@linaro.org>
nit/util.c
6dc5128a81ca57fad797e0385522238688a978df 10-Dec-2012 Elliott Hughes <enh@google.com> am 435c223d: am 5144fa28: Merge "Add missing signal codes to get_sigcode."

* commit '435c223d483c5e408fdbd7b6177e881ae445a24b':
Add missing signal codes to get_sigcode.
435c223d483c5e408fdbd7b6177e881ae445a24b 10-Dec-2012 Elliott Hughes <enh@google.com> am 5144fa28: Merge "Add missing signal codes to get_sigcode."

* commit '5144fa28c59825118c8f6e6bee832708f9748b89':
Add missing signal codes to get_sigcode.
5144fa28c59825118c8f6e6bee832708f9748b89 10-Dec-2012 Elliott Hughes <enh@google.com> Merge "Add missing signal codes to get_sigcode."
5b322b857d95d1367818dac79066460a4bd9077a 10-Dec-2012 Andy McFadden <fadden@android.com> Merge "Show pid+uid in certain failures"
b08084850dd1f3e1d0a69cca7095e4a68845f89a 10-Dec-2012 Andy McFadden <fadden@android.com> Show pid+uid in certain failures

If somebody sends debuggerd bad data, it logs a complaint
but doesn't give any indication of the source. Now we show
the pid and uid we get from SO_PEERCRED.

Bug 7704699

Change-Id: I2738eb972932cc868ad969b60e16dd0b623212a1
ebuggerd/debuggerd.c
8f7d4430f341c555533ef6effd883a5aae1ce160 10-Dec-2012 Elliott Hughes <enh@google.com> Add missing signal codes to get_sigcode.

The only common one we were missing is SI_TKILL, but we've had the full
set on the dalvik-dev branch for some time now.

Change-Id: I7cf52d352b8624e0adb17a2ed440e7a10f490dfd
ebuggerd/tombstone.c
970b4723d61b678647d1960c005da3ad2216aad3 10-Dec-2012 Irfan Sheriff <isheriff@google.com> Merge "Handle empty gateways"
08c119910aed26011a26eb95b1c4477eb16c22a0 07-Dec-2012 Guillaume Ranquet <guillaumex.ranquet@intel.com> libusbhost: generates a static library

due to limitations of the droidboot OS used for POS,
there's a need for a static libusbhost library.

this permits to include libusbhost in droidboot

Change-Id: I0f0c07817ad19b773b466b69fd6e997877d41b34
Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com>
ibusbhost/Android.mk
dea46b6657845a366d13f57c720eab28c9062ab7 23-Oct-2012 Guillaume Ranquet <guillaumex.ranquet@intel.com> libusbhost: permits client polling on inotify wd

Modify libusbhost to expose the inotify watch descriptor to clients

This modification permits clients to add the watch descriptor to
their polling loop so that they don't have to use a dedicated
thread only for libusbhost.

Change-Id: I615bfcd56beab978135034b228d4d93337351eab
Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com>
Signed-off-by: Luc Piguet-Lacroix <lucx.piguet-lacroix@intel.com>
nclude/usbhost/usbhost.h
ibusbhost/usbhost.c
26f447f5daa745d40ba76b902c5d15d28aaa873f 07-Dec-2012 Ben Cheng <bccheng@google.com> am 7f692fe6: am 523e21d3: Merge "Fail-proof the inline directives for SMP atomic operations."

* commit '7f692fe6448049dca2795d7d648615a2dc7a500c':
Fail-proof the inline directives for SMP atomic operations.
7f692fe6448049dca2795d7d648615a2dc7a500c 07-Dec-2012 Ben Cheng <bccheng@google.com> am 523e21d3: Merge "Fail-proof the inline directives for SMP atomic operations."

* commit '523e21d366523604576b85960d7aba6062fd5605':
Fail-proof the inline directives for SMP atomic operations.
523e21d366523604576b85960d7aba6062fd5605 07-Dec-2012 Ben Cheng <bccheng@google.com> Merge "Fail-proof the inline directives for SMP atomic operations."
20eaebeebea46a09957ece46fa0157a06481790f 07-Dec-2012 Devin Kim <dojip.kim@lge.com> am deb8e39e: am e1f0bd83: am fd8e6504: charger: Do not suspend when disconnecting from charger

* commit 'deb8e39ede561efa40e05e9ccd67c7704a75e8ce':
charger: Do not suspend when disconnecting from charger
deb8e39ede561efa40e05e9ccd67c7704a75e8ce 07-Dec-2012 Devin Kim <dojip.kim@lge.com> am e1f0bd83: am fd8e6504: charger: Do not suspend when disconnecting from charger

* commit 'e1f0bd83244e1ac96c6b023cfe12286cda8571c1':
charger: Do not suspend when disconnecting from charger
e1f0bd83244e1ac96c6b023cfe12286cda8571c1 07-Dec-2012 Devin Kim <dojip.kim@lge.com> am fd8e6504: charger: Do not suspend when disconnecting from charger

* commit 'fd8e6504e355d2c73a2aaad260475f72af0495bf':
charger: Do not suspend when disconnecting from charger
5206d5971208fab8208669dabc98bbb9f7e4a45a 07-Dec-2012 Ben Cheng <bccheng@google.com> Fail-proof the inline directives for SMP atomic operations.

The various atomic operations are declared as inline in the header files
to cut the function call overhead. However, the plain inline keyword is
just a suggestion to the compiler which makes its own decision on whether
to inline them or not. Worst, if they are not inlined, the
-fvisibility-inlines-hidden compiler flag will render them as hidden
symbols in the object file. If they are picked up by the linker over the
ones supplied in libcutils.so the following warning will be reported:

warning: hidden symbol 'android_atomic_inc' in foo.o is referenced by
DSO bar.so

One way is to add __attribute__((visibility("default"))) to those inline
functions to suppress the linker warnings. A better way is to force
inlining as with this patch.

Change-Id: Ie4fcfdfaaf06f42d351619a0d89671a9df15ca2f
nclude/cutils/atomic-arm.h
nclude/cutils/atomic-mips.h
nclude/cutils/atomic-x86.h
ibcutils/atomic.c
94cecfc4a00237cfd08e4327a836c67104ff2e20 07-Dec-2012 Irfan Sheriff <isheriff@google.com> Handle empty gateways

Change-Id: Icbc1859125bae0bc222685bfbc18af38273d6827
ibnetutils/dhcp_utils.c
fd8e6504e355d2c73a2aaad260475f72af0495bf 07-Dec-2012 Devin Kim <dojip.kim@lge.com> charger: Do not suspend when disconnecting from charger

The device should be power off when disconnecting from charger.
If the device enter to suspend, the device couldn't handle the power off
process. So the device shouldn't suspend to handle the power off at that time

Bug: 7429504
Change-Id: I9a0a60e53f315cd83550dc730a33bc7bd464ef67
harger/charger.c
6cd2d30a9f1a934ca8904d1f676cafba9c182ae4 07-Dec-2012 Iliyan Malchev <malchev@google.com> am 9c6385e1: am 94dd6794: am 40156b8a: charger: fix build

* commit '9c6385e1ca965bdfd7b86f16571be085db50e5b9':
charger: fix build
c37f51c0c48af575cc37120973f04c4b11a29ed7 07-Dec-2012 choongryeol.lee <choongryeol.lee@lge.com> am 86d08f0b: am 12b26649: am 9255713b: charger: suspend enable in charger mode

* commit '86d08f0b3f8d29c4789fdfc55f70747f0b35ff88':
charger: suspend enable in charger mode
4aaf198debed1d53114f17f2906997a5ec681e54 07-Dec-2012 Benoit Goby <benoit@android.com> am 9e2182ad: am 6d3e6099: am a2411eed: Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev

* commit '9e2182adc2f91ed3a5e7713ce214aafb537fab43':
init.usb.rc: set sys.usb.config to none before changing it
500ff199d2a015579338fd5e6fdd316a70725636 07-Dec-2012 Iliyan Malchev <malchev@google.com> am f3104fe5: am 76edb14f: am 2cc3527a: libsuspend: compile as a static library

* commit 'f3104fe5ce438edb652fbe3aa32f8be6359a4aad':
libsuspend: compile as a static library
9c6385e1ca965bdfd7b86f16571be085db50e5b9 07-Dec-2012 Iliyan Malchev <malchev@google.com> am 94dd6794: am 40156b8a: charger: fix build

* commit '94dd67946e56186caddbdead53f4e2e3824d8eaa':
charger: fix build
86d08f0b3f8d29c4789fdfc55f70747f0b35ff88 07-Dec-2012 choongryeol.lee <choongryeol.lee@lge.com> am 12b26649: am 9255713b: charger: suspend enable in charger mode

* commit '12b26649a20c9cee0c613cd5bdc0923536aec2e3':
charger: suspend enable in charger mode
9e2182adc2f91ed3a5e7713ce214aafb537fab43 07-Dec-2012 Benoit Goby <benoit@android.com> am 6d3e6099: am a2411eed: Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev

* commit '6d3e6099770c9f78264f573897a8b1923edbee63':
init.usb.rc: set sys.usb.config to none before changing it
f3104fe5ce438edb652fbe3aa32f8be6359a4aad 07-Dec-2012 Iliyan Malchev <malchev@google.com> am 76edb14f: am 2cc3527a: libsuspend: compile as a static library

* commit '76edb14f94069b11f36250390556d7c3c1853026':
libsuspend: compile as a static library
94dd67946e56186caddbdead53f4e2e3824d8eaa 07-Dec-2012 Iliyan Malchev <malchev@google.com> am 40156b8a: charger: fix build

* commit '40156b8a91363da69675e7e4cb7947c371871654':
charger: fix build
40156b8a91363da69675e7e4cb7947c371871654 07-Dec-2012 Iliyan Malchev <malchev@google.com> charger: fix build

Looks like libsuspend is not available on all platforms.

Change-Id: Ic32dc93221f3c488e846da35235f247f4ddb4c69
Signed-off-by: Iliyan Malchev <malchev@google.com>
harger/charger.c
12b26649a20c9cee0c613cd5bdc0923536aec2e3 07-Dec-2012 choongryeol.lee <choongryeol.lee@lge.com> am 9255713b: charger: suspend enable in charger mode

* commit '9255713bcf929e7cdd2817481f0dd08f838285c3':
charger: suspend enable in charger mode
9255713bcf929e7cdd2817481f0dd08f838285c3 16-Nov-2012 choongryeol.lee <choongryeol.lee@lge.com> charger: suspend enable in charger mode

To reduce power consumption after charging completion, enable suspend when LCD
is turned off.

Bug: 7429504
Change-Id: I34731dc392661c9051a20cea74f70d94a8aaeb42
Signed-off-by: Iliyan Malchev <malchev@google.com>
harger/Android.mk
harger/charger.c
629ba3795d885f96d12f9d6aad252c8722f6255a 06-Dec-2012 Irfan Sheriff <isheriff@google.com> Merge "Remove dead code"
35c625194bd1d2efb1a8230fd63c7febfbd98f31 06-Dec-2012 Irfan Sheriff <isheriff@google.com> Remove dead code

Remove unnecessary DHCP properties

Change-Id: I27b5d0a2d8fd67c911d04bb2d18dc1b3f10e7c2a
ibnetutils/dhcp_utils.c
6d3e6099770c9f78264f573897a8b1923edbee63 06-Dec-2012 Benoit Goby <benoit@android.com> am a2411eed: Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev

* commit 'a2411eedb2f005e344e7d920715727e136a806aa':
init.usb.rc: set sys.usb.config to none before changing it
a2411eedb2f005e344e7d920715727e136a806aa 06-Dec-2012 Benoit Goby <benoit@android.com> Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev
3761e963b30cfc0c2dbcbe69906d689c976b9f2e 28-Nov-2012 Wink Saville <wink@google.com> Use Rlog instead of Log

Changing __android_log_write so the tag warns users relying on the
tag to direct log output to the radio buffer to instead use Rlog or RLOG.

Change-Id: I04b7bb5e620c1ab22b9b495382a252b539947e28
iblog/logd_write.c
9d7ad45eff156d99759123b584a878c32ba08bb9 16-Nov-2012 Wink Saville <wink@google.com> Add RLOGx

This will eventually allow us to remove the code in
logd_write.c#__android_log_write which uses the tag
to direct logs to the radio buffer.

Change-Id: Ic992c0b8d1cf000b1814dc7786d2a40becf75eaf
nclude/cutils/log.h
76edb14f94069b11f36250390556d7c3c1853026 06-Dec-2012 Iliyan Malchev <malchev@google.com> am 2cc3527a: libsuspend: compile as a static library

* commit '2cc3527ae70138cc8a40d9ad6e92b98d81e44701':
libsuspend: compile as a static library
9bfecb0e3444306ec57d7fafe4a99a47d3848c17 06-Dec-2012 Scott Anderson <saa@android.com> Add old fastboot_protocol.txt

fastboot_protocol.txt used to live in bootable/bootloader/legacy
which was old, obsolete code. However, fastboot_protocol.txt is
a useful file and belongs with the fastboot code.

Change-Id: Iea50c3219f9ff9dd0c394fc6028c456fa948ffd9
Signed-off-by: Scott Anderson <saa@android.com>
astboot/fastboot_protocol.txt
80828af3def1f37eff1d483520df79ebe4238d55 06-Dec-2012 Benoit Goby <benoit@android.com> init.usb.rc: set sys.usb.config to none before changing it

On encrypted devices, persistent properties are loaded after the device
is decrypted. To properly change sys.usb.config to its persistent value,
it must first be set to "none" and then to ${persist.sys.usb.config}.

Bug: 7678835
Change-Id: I4f91245cedc04e3178ce9cee21390f5b657733c9
ootdir/init.usb.rc
2cc3527ae70138cc8a40d9ad6e92b98d81e44701 06-Dec-2012 Iliyan Malchev <malchev@google.com> libsuspend: compile as a static library

Compile libsuspend as a static library as well, currently needed by the charger
code in some cases.

Related-to-bug: 7429504
Change-Id: I113017c2c855f915b77c76d8934b6e57c0bb532c
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibsuspend/Android.mk
59836bd243bd5fc035b224d3e10abac41ee0ca85 04-Dec-2012 Alex Ray <aray@google.com> Merge "cutils: trace: use ANDROID_SMP to switch atomics"
229d2ace9de253e01a486a518301168ebb695b96 03-Dec-2012 Elliott Hughes <enh@google.com> am b8db1e09: am 777991d9: Merge "Fixed improper size displaying in \'df\' utility"

* commit 'b8db1e093d412f57263dc597dbac14c377945781':
Fixed improper size displaying in 'df' utility
b8db1e093d412f57263dc597dbac14c377945781 03-Dec-2012 Elliott Hughes <enh@google.com> am 777991d9: Merge "Fixed improper size displaying in \'df\' utility"

* commit '777991d9399f1268d27c72a03d56c1a36068a57f':
Fixed improper size displaying in 'df' utility
777991d9399f1268d27c72a03d56c1a36068a57f 03-Dec-2012 Elliott Hughes <enh@google.com> Merge "Fixed improper size displaying in 'df' utility"
376448c03249ff6c9f584b80c886fc616b95339a 02-Dec-2012 Colin Cross <ccross@android.com> am e4e1a065: am 2a2f6408: Merge "autosuspend_inited flag set even if initialization fails"

* commit 'e4e1a065d943db4f770d12ca5734b9b9257fe78a':
autosuspend_inited flag set even if initialization fails
e4e1a065d943db4f770d12ca5734b9b9257fe78a 02-Dec-2012 Colin Cross <ccross@android.com> am 2a2f6408: Merge "autosuspend_inited flag set even if initialization fails"

* commit '2a2f640886c9d356de1407b0888507823a7663b7':
autosuspend_inited flag set even if initialization fails
2a2f640886c9d356de1407b0888507823a7663b7 02-Dec-2012 Colin Cross <ccross@android.com> Merge "autosuspend_inited flag set even if initialization fails"
448f76a1c4eb78661b5ac68013e8a2348c92df63 01-Dec-2012 Alex Ray <aray@google.com> cutils: trace: use ANDROID_SMP to switch atomics

With inline atomics, trace functions have no non-inline function calls
in the fast (tracing off) path. To enable this, ANDROID_SMP must be
defined for the project. Otherwise, normal (non-inline) atomics are
used.

Change-Id: Id1f75bdf7db2f5d319a389ad411f55073d78c48c
nclude/cutils/trace.h
eb35fdff9260419defa2cfdfa54dde0ebd911854 30-Nov-2012 Wink Saville <wink@google.com> Merge "Use Rlog instead of Log"
3fc2b89abfbd9e439b66c99b6352e09d8c5d0987 28-Nov-2012 Alex Ray <aray@google.com> Merge "cutils: trace: add atrace_update_tags()"
3b5c9255999b520bc8f15243da442e2187acaa28 28-Nov-2012 Alex Ray <aray@google.com> Merge "cutils: Add tracing support"
e7bb7bca4f4036c213763673627e1eb6c2c2fdd6 20-Nov-2012 Alex Ray <aray@google.com> cutils: trace: add atrace_update_tags()

Adds a function to read the current trace system property value, and
sets the trace tags to it, do be used as a sysprop change callback.

Change-Id: Ia6336652173aa5b07188898736c2c795a69fe79a
nclude/cutils/trace.h
ibcutils/trace.c
0a34643160890eb50f7d8e016b4ec93d9db2aa27 15-Nov-2012 Alex Ray <aray@google.com> cutils: Add tracing support

Basic tracing functionality to cutils, which can be turned on at start,
or dynamically controlled by the frameworks. The goal is for hardware
modules to add tracing that will be controlled by their respective
services.

Change-Id: I84eeb7d6be0038f734e719074fa4a2fae4ffe9c0
nclude/cutils/trace.h
ibcutils/Android.mk
ibcutils/trace.c
91b114669f571c4b00f823d958934d3b5d64e534 28-Nov-2012 Wink Saville <wink@google.com> Use Rlog instead of Log

Changing __android_log_write so the tag warns users relying on the
tag to direct log output to the radio buffer to instead use Rlog or RLOG.

Change-Id: I04b7bb5e620c1ab22b9b495382a252b539947e28
iblog/logd_write.c
b2cf68fd57d50a4f8406144f408d4cfe8253c3d0 28-Nov-2012 Kenny Root <kroot@google.com> am 34ee8252: am a649fafb: Merge "Switch keystore to binder"

* commit '34ee8252caa1ede3b1ba41b49673c90e3a500459':
Switch keystore to binder
7af628233e49b717bad5dafdbf9e7c135ba4e787 28-Nov-2012 Kenny Root <kroot@android.com> am 27888a5d: am 9b82ce20: Merge "Document the SELinux extensions to the Android init language."

* commit '27888a5ded21182e1f15b19010fd2527fb7e1ef0':
Document the SELinux extensions to the Android init language.
34ee8252caa1ede3b1ba41b49673c90e3a500459 27-Nov-2012 Kenny Root <kroot@google.com> am a649fafb: Merge "Switch keystore to binder"

* commit 'a649fafbe8a83e9b86ea99f89b6554d93eb1937c':
Switch keystore to binder
27888a5ded21182e1f15b19010fd2527fb7e1ef0 27-Nov-2012 Kenny Root <kroot@android.com> am 9b82ce20: Merge "Document the SELinux extensions to the Android init language."

* commit '9b82ce20ebca3eb5bf782c38ca36d8acbb2ffae6':
Document the SELinux extensions to the Android init language.
a649fafbe8a83e9b86ea99f89b6554d93eb1937c 27-Nov-2012 Kenny Root <kroot@google.com> Merge "Switch keystore to binder"
9b82ce20ebca3eb5bf782c38ca36d8acbb2ffae6 27-Nov-2012 Kenny Root <kroot@android.com> Merge "Document the SELinux extensions to the Android init language."
0d82fbf04d6db847cf598f370aa6986af794bd72 14-Nov-2012 David 'Digit' Turner <digit@android.com> adb: Improve ADB's forward redirection management.

This adds a few new options/modes to 'adb forward':

adb forward --list
adb forward --remove <local>
adb forward --remove-all
adb forward --no-rebind <local> <remote>

For more context, see http://code.google.com/p/android/issues/detail?id=39631

Note that this only affects the host adb client and server programs,
i.e. it's compatible with devices running older adbd versions.

Change-Id: I9cda3ba12b5a8560a2061620bc7f948e5c1e70f7
db/SERVICES.TXT
db/adb.c
db/commandline.c
22f625529ec4364c7de9c5857221e2a3b2cda9f1 26-Nov-2012 Wink Saville <wink@google.com> Merge "Add RLOGx"
a26b4caf4cf5241e5c2145f53ec7170200ab4bb9 19-Nov-2012 Kyle Russell <bkylerussell@gmail.com> autosuspend_inited flag set even if initialization fails

Prevents possible SIGSEGV on second autosuspend_enable attempt when
first intialization attempt fails. autosuspend_inited should only
be set once autosuspend_ops has been assigned.

Consider the first call to autosuspend_enable().
autosuspend_init() sets its inited flag to true, and attempts to
set autosuspend_ops. If all the other autosuspend_*_init() attempts
fail, autosuspend_init() returns -1, which autosuspend_enable()
will return as a failure. A second call to autosuspend_enable()
will check autosuspend_init() and see that autosuspend has already
been initialized. It will attempt to access autosuspend_ops, which
were not set in the first initialization attempt, causing a SIGSEGV.

Change-Id: Ib2d3ee62fee4c3b6d0323e5b7f3709a23c6b923f
ibsuspend/autosuspend.c
60529e39bb5d5c1a797394fe78201c0454080ee4 15-Nov-2012 Chris Dearman <chris@mips.com> Close adb_usb.ini after reading it

Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I7d3ee8cbd54af206dac89225c438e6c7322c571f
db/usb_vendors.c
3e3a97dcf3d4e82fc0c0ccc120a2bc0d30867726 16-Nov-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Read domain name from dhcp system prop"
44a9abdd045b50f47c08430a38ddc4e94ce813c1 16-Nov-2012 Wink Saville <wink@google.com> Add RLOGx

This will eventually allow us to remove the code in
logd_write.c#__android_log_write which uses the tag
to direct logs to the radio buffer.

Change-Id: Ic992c0b8d1cf000b1814dc7786d2a40becf75eaf
nclude/cutils/log.h
30f30330420ca4d7913a49e6fd652b4768045ecb 16-Nov-2012 Stephen Smalley <sds@tycho.nsa.gov> Label sockets consistently with the seclabel value if specified.

This is necessary to ensure that the adbd socket is created in the
adbd domain rather than the init domain.

Change-Id: Id4997d7f074aeefea62b41c87b46a6609e03f527
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/init.c
92781808bab8f045752aa1824a57956ddd52fcbd 13-Nov-2012 Kenny Root <kroot@google.com> Switch keystore to binder

Change-Id: I1607bc1f14af5115cefd6727be3815cdcce670a8
ootdir/init.rc
6ecbdca4c19bc6f8eb371dd2c7a85fac06e1854d 13-Nov-2012 Robert Greenwalt <rgreenwalt@google.com> Read domain name from dhcp system prop

This property is set by the dhcpcd daemon.

bug:6799630
Change-Id: I21002e286819cff420ec72e3857764e5f58ecfe4
ibnetutils/dhcp_utils.c
4ead8beac8fe59b01ad1e5670713b99e7f841b9b 13-Nov-2012 Stephen Smalley <sds@tycho.nsa.gov> run-as: set the SELinux security context.

Before invoking the specified command or a shell, set the
SELinux security context.

Change-Id: Ifc7f91aed9d298290b95d771484b322ed7a4c594
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
un-as/Android.mk
un-as/run-as.c
3699bcfe8372d90966fb478de3fb99c4d00a7b01 13-Nov-2012 jp abgrall <jpa@google.com> am 0069b013: am 3ddc0059: am ee854b07: Merge "Allocate a UID for clatd"

* commit '0069b01354ab9a62acaf4547f78688429274f0ef':
Allocate a UID for clatd
0069b01354ab9a62acaf4547f78688429274f0ef 13-Nov-2012 jp abgrall <jpa@google.com> am 3ddc0059: am ee854b07: Merge "Allocate a UID for clatd"

* commit '3ddc0059bb897c4d7d2e0c6d9812d590388480d1':
Allocate a UID for clatd
3ddc0059bb897c4d7d2e0c6d9812d590388480d1 13-Nov-2012 jp abgrall <jpa@google.com> am ee854b07: Merge "Allocate a UID for clatd"

* commit 'ee854b077766a85279fa1849b537c50837d1a204':
Allocate a UID for clatd
ee854b077766a85279fa1849b537c50837d1a204 12-Nov-2012 jp abgrall <jpa@google.com> Merge "Allocate a UID for clatd"
2832525e70f8b8634d6b1f2695d63475ee5397a6 12-Nov-2012 Ken Sumrall <ksumrall@android.com> am 1626b98c: am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev

* commit '1626b98c5b1d4755f0f146698d487732dcc0a2cc':
Fix fs_mgr to properly invoke e2fsck on encrypted devices
1626b98c5b1d4755f0f146698d487732dcc0a2cc 12-Nov-2012 Ken Sumrall <ksumrall@android.com> am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev

* commit '7fd51b36dabedee4de159213237e71ba20865812':
Fix fs_mgr to properly invoke e2fsck on encrypted devices
7fd51b36dabedee4de159213237e71ba20865812 12-Nov-2012 Ken Sumrall <ksumrall@android.com> am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev

* commit 'b20fa762b515b5e96c158959d8c8d0c2ff1bf46b':
Fix fs_mgr to properly invoke e2fsck on encrypted devices
b20fa762b515b5e96c158959d8c8d0c2ff1bf46b 12-Nov-2012 Ken Sumrall <ksumrall@android.com> Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev
6d358ae44ccfbcd5b89511d142f334b2cc1b67b1 23-Feb-2011 Josef Kindberg <josef.kindberg@stericsson.com> libsysutils: Increase command buffersize and command args

Needed to support tethering of multiple remote Bluetooth devices.

Change-Id: I9f736affd83226e8b2fa4f0faacd3654175dd8c9
Signed-off-by: Patrik Ryd <patrik.ryd@stericsson.com>
nclude/sysutils/FrameworkListener.h
ibsysutils/src/FrameworkListener.cpp
258a0a5ac175fabff764d925a460e009e121a361 08-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 1ca4b7d2: (-s ours) am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge

* commit '1ca4b7d26a46d7b779a687f43f2c30ea779693de':
1ca4b7d26a46d7b779a687f43f2c30ea779693de 08-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge

* commit '270ee0c6c62e1bcf278892094653e7ab008b3685':
846c686b6663b15833e1827ff8f0232f9a959576 08-Nov-2012 Xavier Ducrohet <xav@android.com> am 493d04d2: am f621d62a: am c4244565: am d1e39491: Add usb vendor id for Teleepoch.

* commit '493d04d2fec59b273a067f5ef9d908dd0b441a08':
Add usb vendor id for Teleepoch.
493d04d2fec59b273a067f5ef9d908dd0b441a08 08-Nov-2012 Xavier Ducrohet <xav@android.com> am f621d62a: am c4244565: am d1e39491: Add usb vendor id for Teleepoch.

* commit 'f621d62adcbcd81d6479223d9afe47c1d966710d':
Add usb vendor id for Teleepoch.
270ee0c6c62e1bcf278892094653e7ab008b3685 07-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am ba70ed9a: Reconcile with jb-mr1-release - do not merge

* commit 'ba70ed9ae7dab75bde317a8dc8886da309831eca':
ba70ed9ae7dab75bde317a8dc8886da309831eca 07-Nov-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I70866c059c12fdba45761ecbbb6e2a4cf2aa8107
31da9db0d1bf3227e3c383aa6ac28bde3c6409e5 07-Nov-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d42d327c176d5819423f4bf9e211bb12bb5dde72 07-Nov-2012 Ken Sumrall <ksumrall@android.com> Fix fs_mgr to properly invoke e2fsck on encrypted devices

Change-Id: Ie220f5cb7b614a48ec8afe66f4721ede3a368166
s_mgr/fs_mgr.c
f621d62adcbcd81d6479223d9afe47c1d966710d 07-Nov-2012 Xavier Ducrohet <xav@android.com> am c4244565: am d1e39491: Add usb vendor id for Teleepoch.

* commit 'c424456542cacc7d776e1adc859ed1c0e784dee0':
Add usb vendor id for Teleepoch.
c424456542cacc7d776e1adc859ed1c0e784dee0 07-Nov-2012 Xavier Ducrohet <xav@android.com> am d1e39491: Add usb vendor id for Teleepoch.

* commit 'd1e39491f063626e026304ba8abe084cc43c94da':
Add usb vendor id for Teleepoch.
d1e39491f063626e026304ba8abe084cc43c94da 06-Nov-2012 Xavier Ducrohet <xav@android.com> Add usb vendor id for Teleepoch.

Change-Id: I82bbfed598fc3a886681c4139600cf487034c59c
db/usb_vendors.c
770dd86a758807fc656ff07c4696a273c2283d8f 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 63766a89: (-s ours) am b64246ae: am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '63766a89a18e8476f6e4cbac505a2a827d0490ab':
63766a89a18e8476f6e4cbac505a2a827d0490ab 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am b64246ae: am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'b64246ae1b00eacd5323f8a8db7249bd726c4f33':
b64246ae1b00eacd5323f8a8db7249bd726c4f33 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'c8e3a27b43407268b2bb76b1d4fceee4fa3b314a':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
Dump 256 bytes per chunk pointed by general-purpose registers.
Wrap system calls in TEMP_FAILURE_RETRY.
Bring back ADB_EXTERNAL_STORAGE.
Revert "Upgrade to dlmalloc 2.8.5."
bluetooth: bring up with bluedroid stack
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
c8e3a27b43407268b2bb76b1d4fceee4fa3b314a 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I89230f756ce6caee4d7fa4514f47b6b0fc44d1f3
3fb611083061535f8e32da1b7ea2d6c4687d114e 02-Nov-2012 Stephen Smalley <sds@tycho.nsa.gov> Document the SELinux extensions to the Android init language.

Change-Id: I9b066e0789c93e5147c28a60baeed91c44dd9359
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
nit/readme.txt
d249cddca6408c5fe2b02c1bbf094f050c5fda57 31-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 62edaa59: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '62edaa59a58b2d73c6a42a80fc4794f52d78c6e2':
62edaa59a58b2d73c6a42a80fc4794f52d78c6e2 31-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I74d83ad681e16b5e548eb2be6af985d6349ee83e
23964303b4b82fac3766f067d9f8e2dd1f56be96 31-Oct-2012 Elliott Hughes <enh@google.com> am 3427e80e: am a6fb0e05: Merge "Fix debuggerd\'s use of readdir_r(3)."

* commit '3427e80ef38bc7aae1278cfe78a65d9524f92c69':
Fix debuggerd's use of readdir_r(3).
3427e80ef38bc7aae1278cfe78a65d9524f92c69 31-Oct-2012 Elliott Hughes <enh@google.com> am a6fb0e05: Merge "Fix debuggerd\'s use of readdir_r(3)."

* commit 'a6fb0e05aa95995445c6f2b65f07db26bdbfd46c':
Fix debuggerd's use of readdir_r(3).
a6fb0e05aa95995445c6f2b65f07db26bdbfd46c 30-Oct-2012 Elliott Hughes <enh@google.com> Merge "Fix debuggerd's use of readdir_r(3)."
c463d2cf9c5717dcd37589deb01615b984266c8c 27-Oct-2012 Elliott Hughes <enh@google.com> Fix debuggerd's use of readdir_r(3).

Change-Id: I1b178af054cefebfb774320e4b4699d6dc8bbb01
ebuggerd/backtrace.c
ebuggerd/tombstone.c
7c85af005deb6c6c5fdd5740561a022bee715807 23-Oct-2012 Nick Kralevich <nnk@google.com> am 6575a162: am 8f98c4b5: Merge "Fix dirfd crash issue in property service"

* commit '6575a1625ac585b46f90c6f036db9231db50c969':
Fix dirfd crash issue in property service
6575a1625ac585b46f90c6f036db9231db50c969 23-Oct-2012 Nick Kralevich <nnk@google.com> am 8f98c4b5: Merge "Fix dirfd crash issue in property service"

* commit '8f98c4b5f011db8637ce1b9361e82d59b13434f4':
Fix dirfd crash issue in property service
8f98c4b5f011db8637ce1b9361e82d59b13434f4 23-Oct-2012 Nick Kralevich <nnk@google.com> Merge "Fix dirfd crash issue in property service"
e41bc3155588c2fdc23b512a959e20e896da5180 23-Oct-2012 Yi-wei Zhao <gbjc64@motorola.com> Fix dirfd crash issue in property service

In "init: harden property service" patch, dirfd() is invoked
without checking whether opendir() return successfully. It may
fail if load_persistent_properties() is invoked before userdata
partition is mounted; then dirfd(NULL) will make init crash.
This may happen if "is_charger" is true.

Change-Id: I216fb743a3c9fa050f92fcb31b62e766346d84bb
Signed-off-by: Yi-wei Zhao <gbjc64@motorola.com>
nit/property_service.c
ca96a793f33df2224ad9d5bfbd9f8b8c82259822 22-Oct-2012 Elliott Hughes <enh@google.com> am 066d3f9b: resolved conflicts for merge of 3e5e9e9e to jb-mr1-dev-plus-aosp

* commit '066d3f9b3bd77df71542b132adda8eb25bc013c0':
Add a directory for tzdata updates.
066d3f9b3bd77df71542b132adda8eb25bc013c0 22-Oct-2012 Elliott Hughes <enh@google.com> resolved conflicts for merge of 3e5e9e9e to jb-mr1-dev-plus-aosp

Change-Id: I621d0e984a266478b4297a25afd164c1275e30f9
3e5e9e9ee2ee24072b7b87a3e4eda2df0639a469 22-Oct-2012 Elliott Hughes <enh@google.com> Merge "Add a directory for tzdata updates."
f820e85164a1863e4384f5e1ca8b6f46902bd74e 20-Oct-2012 Elliott Hughes <enh@google.com> Add a directory for tzdata updates.

Bug: 7012465
Change-Id: I7e2c9965a4bcad125ca4fb788b842bd114b5619c
ootdir/init.rc
663005248dd5d62198feb2188bc9e841739b673e 11-Sep-2012 Elliott Hughes <enh@google.com> The localtime_tz and mktime_tz extensions are now in bionic.

Bug: 7012465

(cherry-pick of d03072ffde3279fbb60591a0d07c820d8e792762.)

Conflicts:

libcutils/Android.mk

Change-Id: I5e34edd4c8f59cc0a4d5dcc4740707ae063608a0
nclude/cutils/tztime.h
ibcutils/Android.mk
ibcutils/private.h
ibcutils/tzfile.h
ibcutils/tzstrftime.c
ibcutils/tztime.c
74365b18c1146a77ecd0938106fd53f38a7e5eda 18-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
f5f4e31f780c19987514afc57514246b700bcb88 17-Oct-2012 Zhihai Xu <zhihaixu@google.com> am a40f5e66: am 831f8cf9: am 9f239afc: second user doesnot pickup input operations from A2DP

* commit 'a40f5e662db68b297ff20c9ed418c726e0c001a1':
second user doesnot pickup input operations from A2DP
a40f5e662db68b297ff20c9ed418c726e0c001a1 17-Oct-2012 Zhihai Xu <zhihaixu@google.com> am 831f8cf9: am 9f239afc: second user doesnot pickup input operations from A2DP

* commit '831f8cf941fa1d298652fdf95fccb7bc693b4fc4':
second user doesnot pickup input operations from A2DP
831f8cf941fa1d298652fdf95fccb7bc693b4fc4 17-Oct-2012 Zhihai Xu <zhihaixu@google.com> am 9f239afc: second user doesnot pickup input operations from A2DP

* commit '9f239afc3565770f39ae94c2969addb520af3a40':
second user doesnot pickup input operations from A2DP
429bbfcafb9acae354228ea363c09982d20cc1e5 17-Oct-2012 Kenny Root <kroot@google.com> am 2a36ae56: am 7b88a90d: Merge "Remove HAVE_SELINUX guards"

* commit '2a36ae5608e9d655b2bb14ce538f6fbdb910cada':
Remove HAVE_SELINUX guards
2a36ae5608e9d655b2bb14ce538f6fbdb910cada 17-Oct-2012 Kenny Root <kroot@google.com> am 7b88a90d: Merge "Remove HAVE_SELINUX guards"

* commit '7b88a90da2a27e347fc16c14fa577f4ae1ef07fd':
Remove HAVE_SELINUX guards
7b88a90da2a27e347fc16c14fa577f4ae1ef07fd 17-Oct-2012 Kenny Root <kroot@google.com> Merge "Remove HAVE_SELINUX guards"
b5982bf7c65b30be981ecfe1847437b05e32b2bb 17-Oct-2012 Kenny Root <kroot@google.com> Remove HAVE_SELINUX guards

Change-Id: I8272c573b3c5dc663203bafab68fad5e94d89364
ebuggerd/Android.mk
ebuggerd/tombstone.c
nit/Android.mk
nit/builtins.c
nit/devices.c
nit/init.c
nit/init.h
nit/init_parser.c
nit/property_service.c
nit/util.c
efb5e3c709214cfc45beec5fcc66c93223ffc744 17-Oct-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 20f5daa8 to master

Change-Id: Ie3e67696d265a56dfa4d089c777506f27783a9a6
20f5daa8653eb2d81af8c161a2084e3b53ec3914 17-Oct-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aosp

Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba
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
44f4f8a4d2bef6e9fc37cd50076295102b38828a 17-Oct-2012 Kenny Root <kroot@google.com> Merge "Remove HAVE_SELINUX guards"
b83c09812f30d36285cacdf5cf824c56c267f8e5 10-Oct-2012 Kenny Root <kroot@google.com> Remove HAVE_SELINUX guards

Change-Id: Idef0a784a1d237257ff4135bb1df62ff8a67ded3
astboot/Android.mk
oolbox/Android.mk
oolbox/id.c
oolbox/ls.c
80a99e31a08d8280266feb9621580b59dc4315a3 16-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
55d039efb5d30377e2a66d931a7408b13ac24650 16-Oct-2012 Todd Poynor <toddpoynor@google.com> am d9430179: am c907ce77: am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev

* commit 'd94301799518a69f2b2b5a2b20bf9d4403658d7e':
init.trace.rc: Set perms for power/clock_set_rate events
d306a6aa28692b7f01f15a02acc885028d24d968 16-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> am 28b032c9: am 7908567b: am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev

* commit '28b032c9398a719aacb0ed15595d55416db5e430':
Remove force use definition for remote audio submix
d94301799518a69f2b2b5a2b20bf9d4403658d7e 16-Oct-2012 Todd Poynor <toddpoynor@google.com> am c907ce77: am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev

* commit 'c907ce77a099f28b07b754e9f69619adbe1e345f':
init.trace.rc: Set perms for power/clock_set_rate events
28b032c9398a719aacb0ed15595d55416db5e430 16-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> am 7908567b: am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev

* commit '7908567b642ec5a49b9d0baa7e0285cc742ced61':
Remove force use definition for remote audio submix
b49183f122956137b8eb3487a19ae980540842c8 16-Feb-2012 Daniel Drown <dan-android@drown.org> Allocate a UID for clatd

clatd(464xlat) runs as its own UID after it drops root privs

Change-Id: I2392f8127dcd90d16b0f20ff31bcc5aa096db464
Signed-off-by: Daniel Drown <dan-android@drown.org>
nclude/private/android_filesystem_config.h
c907ce77a099f28b07b754e9f69619adbe1e345f 16-Oct-2012 Todd Poynor <toddpoynor@google.com> am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev

* commit '7b4aa677b1860b9a83f9cde7d71ca0d5bc193422':
init.trace.rc: Set perms for power/clock_set_rate events
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
7908567b642ec5a49b9d0baa7e0285cc742ced61 16-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev

* commit '14075567de367bd109a256514119fc16e8d4cf67':
Remove force use definition for remote audio submix
14075567de367bd109a256514119fc16e8d4cf67 16-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Remove force use definition for remote audio submix" into jb-mr1-dev
69ce489fc3946b7b89ca837a01d3828f1af2e0a0 16-Oct-2012 Nick Kralevich <nnk@google.com> fs.c: Fix implicit declaration of function 'mkstemp'

system/core/libcutils/fs.c: In function 'fs_write_atomic_int':
system/core/libcutils/fs.c:109:5: warning: implicit declaration of function 'mkstemp' [-Wimplicit-function-declaration]

Change-Id: I337ecb818f85e20b058f782df45987acf2e9d6c1
ibcutils/fs.c
618a183c58f9baf8a5ce5f2de5d116c8377b1428 15-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 133155e3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '133155e3d825266900c9bf9464163f27faf69838':
133155e3d825266900c9bf9464163f27faf69838 15-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ie75896ec89b34fe067a2d1c6b34309629459228b
681666588660fc5f83c1d9c146e61190a0fa3fca 13-Oct-2012 Kenny Root <kroot@google.com> am 1dcaf9d0: am 51ccef27: Merge "Add TEMP_FAILURE_RETRY macro for darwin"

* commit '1dcaf9d054bf92a17d82160865bba5c6f7d15adb':
Add TEMP_FAILURE_RETRY macro for darwin
1dcaf9d054bf92a17d82160865bba5c6f7d15adb 13-Oct-2012 Kenny Root <kroot@google.com> am 51ccef27: Merge "Add TEMP_FAILURE_RETRY macro for darwin"

* commit '51ccef27cab58277775e62518a59666d2a059b62':
Add TEMP_FAILURE_RETRY macro for darwin
51ccef27cab58277775e62518a59666d2a059b62 13-Oct-2012 Kenny Root <kroot@google.com> Merge "Add TEMP_FAILURE_RETRY macro for darwin"
89c2812bd68ce81fb7a85bb1b946cc2f79f5dbfd 13-Oct-2012 Kenny Root <kroot@google.com> Add TEMP_FAILURE_RETRY macro for darwin

Darwin doesn't define the TEMP_FAILURE_RETRY macro in unistd.h so we
need to add it everywhere. Joy!

(cherry picked from commit ec90f1dc11488f0ab8a25a9159965b4ae3c4ca88)

Change-Id: Ida554fc65193672cc4616dec79e6282e06cc1b28
db/sysdeps.h
ec90f1dc11488f0ab8a25a9159965b4ae3c4ca88 13-Oct-2012 Kenny Root <kroot@google.com> Add TEMP_FAILURE_RETRY macro for darwin

Darwin doesn't define the TEMP_FAILURE_RETRY macro in unistd.h so we
need to add it everywhere. Joy!

Change-Id: Ida554fc65193672cc4616dec79e6282e06cc1b28
db/sysdeps.h
c5333e494d5a52261a9e0d595dc66e55e5dc6957 13-Oct-2012 Kenny Root <kroot@google.com> am 1dc92bac: am 207c17ff: Merge "Make adb robust against EINTR"

* commit '1dc92bacb8cbf052438e0b1af4030a57901d6e94':
Make adb robust against EINTR
1dc92bacb8cbf052438e0b1af4030a57901d6e94 13-Oct-2012 Kenny Root <kroot@google.com> am 207c17ff: Merge "Make adb robust against EINTR"

* commit '207c17ff1f48d0db3c69628bb036a14db40b5887':
Make adb robust against EINTR
207c17ff1f48d0db3c69628bb036a14db40b5887 13-Oct-2012 Kenny Root <kroot@google.com> Merge "Make adb robust against EINTR"
b151510bee9d81f164b13a4a2b460465285ea836 13-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-factory-release history after reset to 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
bb10d89a54c4a85e439093752d7e7a236d1ed892 13-Oct-2012 Dima Zavin <dima@android.com> am 657cd838: am 9b4a9312: am 209c7b0f: charger: allow devices to skip the initial display blank

* commit '657cd83899355c7f488dcd3294a523ec120f840f':
charger: allow devices to skip the initial display blank
657cd83899355c7f488dcd3294a523ec120f840f 13-Oct-2012 Dima Zavin <dima@android.com> am 9b4a9312: am 209c7b0f: charger: allow devices to skip the initial display blank

* commit '9b4a9312dc1c158ae28ce3f3a2f6ebf16fd94ff1':
charger: allow devices to skip the initial display blank
9b4a9312dc1c158ae28ce3f3a2f6ebf16fd94ff1 13-Oct-2012 Dima Zavin <dima@android.com> am 209c7b0f: charger: allow devices to skip the initial display blank

* commit '209c7b0fad9604d1dde1b74d9f9d577b923469fd':
charger: allow devices to skip the initial display blank
73167412bc52ee370761e418366ddac504666567 13-Oct-2012 Kenny Root <kroot@google.com> Make adb robust against EINTR

Change-Id: I39a8d9007ce2d5662a33a50e4d7e2e7f8f9fad63
db/services.c
db/sysdeps.h
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
c189f4a026bf5cf7190db732e02f5edcb5f6b0c0 12-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am e34e9e49: (-s ours) Reconcile with jb-mr1-factory-release - do not merge

* commit 'e34e9e498ac6910fc7c9a34aca010febcc750e7f':
e34e9e498ac6910fc7c9a34aca010febcc750e7f 12-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release - do not merge

Change-Id: I8c44904def148550022af390ceda87a2d4007c48
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
32429a93d418ae4be4b42be16d4b5eec03cbe479 11-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-factory-release history after reset to jb-mr1-dev
baca80b57b0d154d2c486e17c8efef04c6e8c67b 11-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 436faffe: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '436faffe3c99955eee2ccd9df3e0b2cd1510c01c':
436faffe3c99955eee2ccd9df3e0b2cd1510c01c 11-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I7ec0e7696f2f2004f75d5b83f86ea6d890e0cd3d
f3f1d016759019ec62f5873ddbae0b523199475b 11-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
f638b7e0a0fa8716e8a0844c8c02dcf4bc769fd7 11-Oct-2012 Kenny Root <kroot@google.com> am e47eb98a: am 674c0445: Merge "toolbox: silence some compiler warnings"

* commit 'e47eb98a337081d0d6c740eb7d8b990faf4090d7':
toolbox: silence some compiler warnings
e47eb98a337081d0d6c740eb7d8b990faf4090d7 11-Oct-2012 Kenny Root <kroot@google.com> am 674c0445: Merge "toolbox: silence some compiler warnings"

* commit '674c0445e25cdf9bcd7d32a84103bd3b7e24a4a0':
toolbox: silence some compiler warnings
674c0445e25cdf9bcd7d32a84103bd3b7e24a4a0 11-Oct-2012 Kenny Root <kroot@google.com> Merge "toolbox: silence some compiler warnings"
3253f42c69629fc45636b7e9a2ea347ad4a80a5c 11-Oct-2012 Matthew Xie <mattx@google.com> am 41f0e1a7: am f1bb0a95: am bdec5ead: Change dev/uhid group id from bluetooth to net_bt_stack

* commit '41f0e1a725994fe458f6859e8c72df17af84b3fd':
Change dev/uhid group id from bluetooth to net_bt_stack
41f0e1a725994fe458f6859e8c72df17af84b3fd 11-Oct-2012 Matthew Xie <mattx@google.com> am f1bb0a95: am bdec5ead: Change dev/uhid group id from bluetooth to net_bt_stack

* commit 'f1bb0a95b91a8a75c7ca653a40bb56f1122afbba':
Change dev/uhid group id from bluetooth to net_bt_stack
f1bb0a95b91a8a75c7ca653a40bb56f1122afbba 11-Oct-2012 Matthew Xie <mattx@google.com> am bdec5ead: Change dev/uhid group id from bluetooth to net_bt_stack

* commit 'bdec5ead7417769ba9fc75b6ca86d191b49f2be8':
Change dev/uhid group id from bluetooth to net_bt_stack
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
ef5d0340e4ff3fe11b7668ebaf2f4f0c4c06134d 10-Oct-2012 Kenny Root <kroot@google.com> toolbox: silence some compiler warnings

Comparison of signed and unsigned integers. Use parenthesis around a
group of bitwise OR operations.

Change-Id: Ia404380593ce2c2a291133c07c0fc7a016a3ad3f
oolbox/ls.c
d81cf9e7463ff7fc2d0c7c6ccaa9b17e216bc5c6 10-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 1595c5a8: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '1595c5a8b8b6dc2dddcc79c2fa8239914125b124':
1595c5a8b8b6dc2dddcc79c2fa8239914125b124 10-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I3f20206be34b065992e47210bf5a10b3c4bfcfb9
7f9349da1f882fa8caf0ae4a0db1d6623affdf6e 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-factory-release history after reset to jb-mr1-dev
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
1311d48b0d159df56d85dd24fd8ee6c68332480f 09-Oct-2012 Eric Laurent <elaurent@google.com> am 90b53007: am 074f11c2: am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev

* commit '90b530070ad49d49844fe82ab674b5f1093b80a6':
audio policy: add forced uses for system
90b530070ad49d49844fe82ab674b5f1093b80a6 09-Oct-2012 Eric Laurent <elaurent@google.com> am 074f11c2: am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev

* commit '074f11c21da1f6897a750125e87cc478c0e983ee':
audio policy: add forced uses for system
074f11c21da1f6897a750125e87cc478c0e983ee 09-Oct-2012 Eric Laurent <elaurent@google.com> am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev

* commit 'd22b2a1f35153058bbc5ce664fc9740adda8bcb7':
audio policy: add forced uses for system
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
1fcda03919213d7752d02c21c704b01f6302ba34 09-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 6c631f7a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6c631f7a4d5b26d21059ae9ec58f84be1421f27e':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
6c631f7a4d5b26d21059ae9ec58f84be1421f27e 09-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I71bc832ed089ae690aecfc96672986fc09712a58
fb2f28271b79b1725cc52e6620bf17c4e94d38cd 09-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
a675e560400f609fa2391020f8fd35df8358e3e0 08-Oct-2012 Dima Zavin <dima@android.com> am 9b40be2a: am a6b429d4: am c6f8bd39: Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev

* commit '9b40be2a6e04ec82e9e3c24880a8bced446ecfda':
rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
9b40be2a6e04ec82e9e3c24880a8bced446ecfda 08-Oct-2012 Dima Zavin <dima@android.com> am a6b429d4: am c6f8bd39: Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev

* commit 'a6b429d4f19aead36a04f0103a2bd687f5ccaeb8':
rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
a6b429d4f19aead36a04f0103a2bd687f5ccaeb8 08-Oct-2012 Dima Zavin <dima@android.com> am c6f8bd39: Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev

* commit 'c6f8bd396614d422d80ac9f24c91fa44a713894a':
rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
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
87980b5c9fab12737196b8505e948186a210d96e 05-Oct-2012 Nick Kralevich <nnk@google.com> Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."

This reverts commit 01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70.

Bug: 7188322
Change-Id: Ia159eab36e9e7373f470d20a3796b63868ea5689
nit/init.c
00b7cefaf63042041ba7c82a3ebcbeec6f8ce3d7 05-Oct-2012 Nick Kralevich <nnk@google.com> am 569182a2: am 7f3de6a4: am d282dfc4: Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev

* commit '569182a2ab059c41524f4ba3798e18fd9165c2b6':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
569182a2ab059c41524f4ba3798e18fd9165c2b6 05-Oct-2012 Nick Kralevich <nnk@google.com> am 7f3de6a4: am d282dfc4: Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev

* commit '7f3de6a450f025245bb27fdc13f5bbc1dc22624d':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
7f3de6a450f025245bb27fdc13f5bbc1dc22624d 05-Oct-2012 Nick Kralevich <nnk@google.com> am d282dfc4: Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev

* commit 'd282dfc4e9bd5b5479511eb4ffdf64407606dc40':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
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
f39be6b58a30c2260fcaad9de0edd16a5720a41d 05-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am e21cbe0d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e21cbe0db2b3afa39be9f65ec0bc7aea7ed2d0dc':
e21cbe0db2b3afa39be9f65ec0bc7aea7ed2d0dc 05-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I01fd1df9c6d8814ac0a8a92da1f04ca21c6779cb
6fe9240d8c5ecc65ae06426e174cba17d3b9918d 05-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
243ba6eed755085236493b75da7267eeaf1a1e1e 05-Oct-2012 Matthew Xie <mattx@google.com> am 4e49ca46: am 124bbe39: am 9eca69b0: Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev

* commit '4e49ca4692a94b0c333bfb882dc508e3840a1c9f':
Create bluetooth stack aid for sharing gid between all bluetooth processes
4e49ca4692a94b0c333bfb882dc508e3840a1c9f 05-Oct-2012 Matthew Xie <mattx@google.com> am 124bbe39: am 9eca69b0: Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev

* commit '124bbe39ed9de8880be2dfee6d78dbc504348f59':
Create bluetooth stack aid for sharing gid between all bluetooth processes
124bbe39ed9de8880be2dfee6d78dbc504348f59 05-Oct-2012 Matthew Xie <mattx@google.com> am 9eca69b0: Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev

* commit '9eca69b08334701d3ec64029087691054c59729f':
Create bluetooth stack aid for sharing gid between all bluetooth processes
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
23b3a05d681c24662dac6a6d91ff68582bdb9f9a 04-Oct-2012 Nick Kralevich <nnk@google.com> am 474cb0e3: am 33045b3d: am f9c05970: Merge "init: harden property service."

* commit '474cb0e33aa12f7ba11170ad1a6b564bde244151':
init: harden property service.
474cb0e33aa12f7ba11170ad1a6b564bde244151 04-Oct-2012 Nick Kralevich <nnk@google.com> am 33045b3d: am f9c05970: Merge "init: harden property service."

* commit '33045b3d7bd965f67e2e0b175976cf9934fb924f':
init: harden property service.
33045b3d7bd965f67e2e0b175976cf9934fb924f 04-Oct-2012 Nick Kralevich <nnk@google.com> am f9c05970: Merge "init: harden property service."

* commit 'f9c059700ce91dfca05d44ec67938209a69bbd39':
init: harden property service.
f9c059700ce91dfca05d44ec67938209a69bbd39 04-Oct-2012 Nick Kralevich <nnk@google.com> Merge "init: harden property service."
7ecfe6a94baf9f5d883e32a870e282c5b349a954 02-Oct-2012 Nick Kralevich <nnk@google.com> init: harden property service.

Don't create temporary files in a well-known location. Rather,
use mkstemp().

Don't read persistent property files from insecure files.

Change-Id: I81e2aca674a2a7ca54869f088737fb228d3af6d2
nit/property_service.c
7786467725c0fea4aa3aa823849ec95acb3de202 04-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am b78ced24: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b78ced24c6da9d80a4d94017bdf8493dcb3f1f4b':
b78ced24c6da9d80a4d94017bdf8493dcb3f1f4b 04-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ic30692b569b80fb34ed2d2960007f76b01e0c398
6800ae9fd3b4b2470e061725c66e2bab3c54d62f 04-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
656a24cae7c49e7bbbc1ad5e8f4cdfcc7f65f6e7 03-Oct-2012 Ken Sumrall <ksumrall@android.com> am e17c821e: am 608634a1: am 48f3b576: Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev

* commit 'e17c821e36163695f6d5024a71f8e706bda65fd6':
Update fastboot to wipe ext4 partitions before flashing
e17c821e36163695f6d5024a71f8e706bda65fd6 03-Oct-2012 Ken Sumrall <ksumrall@android.com> am 608634a1: am 48f3b576: Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev

* commit '608634a1cb68ca89bb033d476d43b58b2e487cf7':
Update fastboot to wipe ext4 partitions before flashing
608634a1cb68ca89bb033d476d43b58b2e487cf7 03-Oct-2012 Ken Sumrall <ksumrall@android.com> am 48f3b576: Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev

* commit '48f3b576846734b76db849f17c3ba2a2cc3f1265':
Update fastboot to wipe ext4 partitions before flashing
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
e72aca6d93e498b0f403672127774e1cce8d0768 02-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 449a7d0d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '449a7d0d78ceb71e478e77ac4d339272dee78c1b':
449a7d0d78ceb71e478e77ac4d339272dee78c1b 02-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ib099b57a16a13bb5d7b4785b547146130e67109d
8183fc4e45968d8aa6383d5fd40186d64bd2ba95 02-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
1f90dcd0c022182220c37b300690cf73674d03b8 14-Jul-2011 Michal Frynas <michal.frynas@sonyericsson.com> Fixed improper size displaying in 'df' utility

'df' command used to display filesystem usage statistics as integer
values, in most cases rounding the actual value down. Because of
that 'df' tended to display faulty size values.
This fix to 'df' utility calculates the fractional part of the size,
then it rounds it when needed to the nearest one-digit integer value
and displays after decimal dot.

Change-Id: I9bc52635d45d3e55ce61b3b1c6b80d1267516e75
oolbox/df.c
4b40143385bf3f1fbbeff0c355664e9c4da34c75 02-Oct-2012 Jesse Hall <jessehall@google.com> am f8672864: am 069f5dad: am bc930eda: Move dequeue-buffer-and-wait out-of-line

* commit 'f86728647afd20e371c3bf3176b3a3d9984ab5ef':
Move dequeue-buffer-and-wait out-of-line
f86728647afd20e371c3bf3176b3a3d9984ab5ef 02-Oct-2012 Jesse Hall <jessehall@google.com> am 069f5dad: am bc930eda: Move dequeue-buffer-and-wait out-of-line

* commit '069f5dadbef13947229ea9ea189ebcb493594198':
Move dequeue-buffer-and-wait out-of-line
069f5dadbef13947229ea9ea189ebcb493594198 02-Oct-2012 Jesse Hall <jessehall@google.com> am bc930eda: Move dequeue-buffer-and-wait out-of-line

* commit 'bc930eda3985cf50bb568aeb098cd0585d0c0ce0':
Move dequeue-buffer-and-wait out-of-line
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
1dc819b37f861bec3324c301a3de1a0534369baa 29-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am aea4b79d: Merge from jb-mr1-aah-dev

* commit 'aea4b79de103729df9b7aa7f4975dd6470cde0ac':
aea4b79de103729df9b7aa7f4975dd6470cde0ac 29-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge from jb-mr1-aah-dev

Change-Id: I585cfc00fe77d26c9b9c407d4c4994a340e8c234
4760f98936a73bf989b6f447e370ce2014a31cef 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am 717a35b5: am d6d47805: Add writable data space for radio.

* commit '717a35b57bd66fb34caa2c150f04a19a79a6c03d':
Add writable data space for radio.
cc5aec013dd6a58fbb182bc9ff9d03d19bf317b1 29-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am fe6b1db1: Merge from jb-mr1-aah-dev

* commit 'fe6b1db1084812a5041756cee360bcaaab79d754':
717a35b57bd66fb34caa2c150f04a19a79a6c03d 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am d6d47805: Add writable data space for radio.

* commit 'd6d478058fc201bfc70f353019477e17c71a29d4':
Add writable data space for radio.
65700be6afd1f83b9ad5e1e2785507b520a4fef7 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am d6d47805: Add writable data space for radio.

* commit 'd6d478058fc201bfc70f353019477e17c71a29d4':
Add writable data space for radio.
fe6b1db1084812a5041756cee360bcaaab79d754 28-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge from jb-mr1-aah-dev

Change-Id: Icbe58041fdf59c583b15f3d0266f1e0b1e211c9e
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
e6eee6a6a835ce809e9449a797422b6090b641c3 27-Sep-2012 Elliott Hughes <enh@google.com> am 07266528: am cfd7c2a0: am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"

* commit '07266528740d860ed42ea881214e44cd0411bd6a':
Rename getline to fs_getline for fs_mgr
07266528740d860ed42ea881214e44cd0411bd6a 27-Sep-2012 Elliott Hughes <enh@google.com> am cfd7c2a0: am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"

* commit 'cfd7c2a05166a3ff27b2145b007834408d95a2e0':
Rename getline to fs_getline for fs_mgr
cfd7c2a05166a3ff27b2145b007834408d95a2e0 27-Sep-2012 Elliott Hughes <enh@google.com> am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"

* commit '1c0c52503dcedff1a75775bf8bfffe7ec77b722b':
Rename getline to fs_getline for fs_mgr
1c0c52503dcedff1a75775bf8bfffe7ec77b722b 26-Sep-2012 Elliott Hughes <enh@google.com> Merge "Rename getline to fs_getline for fs_mgr"
2bc654bbef7e4d79530aa78593bef5e4a3a6b952 26-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am cbc2136c: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cbc2136c28191b943d5ad8a272d6ba39c078946f':
Dump 256 bytes per chunk pointed by general-purpose registers.
d5d6d97defa8999784a15003ed41449954bc7178 26-Sep-2012 Kenny Root <kroot@google.com> Host builds: add fastboot and adb

Add fastboot and adb host utilities to debug builds for debugging
and development purposes.

Change-Id: If77699a27497b8641998930f14d4ee418b856080
db/Android.mk
astboot/Android.mk
cbc2136c28191b943d5ad8a272d6ba39c078946f 26-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I20f10801bb78a9086a381aa1238e7cc693dd8d07
67952e61ad1d9cf7fe8a15da1fcec74241d018e9 26-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
2e1e29e1a972f131ffc40dfae1067a84d66fa687 26-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 5581c1e3: am 00615f01: Merge "Allow mkdir() race to succeed." into jb-mr1-dev

* commit '5581c1e3e2d359f71b14c20f44c6a58c18e27248':
Allow mkdir() race to succeed.
10f35e876a0ef320735c4b04518e953b8861d95b 26-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 00615f01: Merge "Allow mkdir() race to succeed." into jb-mr1-dev

* commit '00615f017bcc4be5a6ce02f1eeeebe59dbd381df':
Allow mkdir() race to succeed.
5581c1e3e2d359f71b14c20f44c6a58c18e27248 26-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 00615f01: Merge "Allow mkdir() race to succeed." into jb-mr1-dev

* commit '00615f017bcc4be5a6ce02f1eeeebe59dbd381df':
Allow mkdir() race to succeed.
00615f017bcc4be5a6ce02f1eeeebe59dbd381df 26-Sep-2012 Jeff Sharkey <jsharkey@android.com> Merge "Allow mkdir() race to succeed." into jb-mr1-dev
7c3bbcd5db4b60abb1dc34e81023785986fcb94c 26-Sep-2012 Dima Zavin <dima@android.com> am 507a855c: am 9481266e: init.rc: chmod slabinfo to 440 to capture slabinfo in BRs

* commit '507a855cc34848f0d24a9803ee1e7d2c6b00b79e':
init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
4c37ff3f715ffd982d55995910bbe431c57328a5 26-Sep-2012 Dima Zavin <dima@android.com> am 9481266e: init.rc: chmod slabinfo to 440 to capture slabinfo in BRs

* commit '9481266ea360e0a8f326fec1106ea445f2ef883c':
init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
507a855cc34848f0d24a9803ee1e7d2c6b00b79e 26-Sep-2012 Dima Zavin <dima@android.com> am 9481266e: init.rc: chmod slabinfo to 440 to capture slabinfo in BRs

* commit '9481266ea360e0a8f326fec1106ea445f2ef883c':
init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
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
1edfe0ebe6bb89b6e8f71f69c80f35878f7c74f1 24-Sep-2012 Ben Cheng <bccheng@google.com> am 2745e3cf: am 0b76d020: Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev

* commit '2745e3cf6d9cacb27fd276d18000284976460f24':
Dump 256 bytes per chunk pointed by general-purpose registers.
d4d64e0cfcbc0f414ef3d9b0efd5287d07c4f2a7 24-Sep-2012 Todd Poynor <toddpoynor@google.com> am b31cc865: am f1c50bf6: init: import init.trace.rc after h/w-specific rc

* commit 'b31cc865f168c9e0aacd449f05f06780932db28f':
init: import init.trace.rc after h/w-specific rc
44dbf623a879d875737f056d2e35676798272d26 24-Sep-2012 Ben Cheng <bccheng@google.com> am 0b76d020: Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev

* commit '0b76d0209981fb79350ff6b7ce25d010dddf42fa':
Dump 256 bytes per chunk pointed by general-purpose registers.
2745e3cf6d9cacb27fd276d18000284976460f24 24-Sep-2012 Ben Cheng <bccheng@google.com> am 0b76d020: Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev

* commit '0b76d0209981fb79350ff6b7ce25d010dddf42fa':
Dump 256 bytes per chunk pointed by general-purpose registers.
0b76d0209981fb79350ff6b7ce25d010dddf42fa 24-Sep-2012 Ben Cheng <bccheng@google.com> Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev
7fad6f669a8c060a3a136185a86882b8ae1c9bc1 24-Sep-2012 Todd Poynor <toddpoynor@google.com> am f1c50bf6: init: import init.trace.rc after h/w-specific rc

* commit 'f1c50bf63857b9cdabcf930363c372defc6383a8':
init: import init.trace.rc after h/w-specific rc
b31cc865f168c9e0aacd449f05f06780932db28f 24-Sep-2012 Todd Poynor <toddpoynor@google.com> am f1c50bf6: init: import init.trace.rc after h/w-specific rc

* commit 'f1c50bf63857b9cdabcf930363c372defc6383a8':
init: import init.trace.rc after h/w-specific rc
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
bf1cb98b61c08724adf50038723fb5be52e3cd2c 24-Sep-2012 Elliott Hughes <enh@google.com> am d43c9b98: am c611911e: am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."

* commit 'd43c9b989695562c5c1730a5aa63ac90d77ef8d7':
The localtime_tz and mktime_tz extensions are now in bionic.
95cc64b23ca01d6e54619a2be5095893f8a94e63 24-Sep-2012 Elliott Hughes <enh@google.com> am c611911e: am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."

* commit 'c611911e11fbb40c5d4d2904c316e4fe2321df6e':
The localtime_tz and mktime_tz extensions are now in bionic.
d43c9b989695562c5c1730a5aa63ac90d77ef8d7 24-Sep-2012 Elliott Hughes <enh@google.com> am c611911e: am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."

* commit 'c611911e11fbb40c5d4d2904c316e4fe2321df6e':
The localtime_tz and mktime_tz extensions are now in bionic.
f03d602850a95888c10df99e594ada7b537388f9 24-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 9b87fd64: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9b87fd644574d94d962baf5671d7dc4641dda492':
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.
9b87fd644574d94d962baf5671d7dc4641dda492 24-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I1589df137a31448329a8904b6ea3a7e3442bf1ca
af3dd88a36489f00b6a24ecf2831df0e6214bbda 24-Sep-2012 Duane Sand <duanes@mips.com> Tidy up long lines

Change-Id: I22d90a343c351b90f460b8810bfb4bd28dc0792d
ibcorkscrew/arch-mips/backtrace-mips.c
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.
3568a617465cc33e6d9e3dbab84a233c72b20e71 24-Sep-2012 Colin Cross <ccross@android.com> am f3b3fcb9: am b9886558: libsuspend: force autosleep off during init

* commit 'f3b3fcb99588bd939fd703c784e971651f829230':
libsuspend: force autosleep off during init
2dbef6ae08eec8815863b89046653a1a73443a7c 24-Sep-2012 Elliott Hughes <enh@google.com> Merge "The localtime_tz and mktime_tz extensions are now in bionic."
db97f75c355a6f20e6886b093f7a9329dc95cc51 24-Sep-2012 Colin Cross <ccross@android.com> am b9886558: libsuspend: force autosleep off during init

* commit 'b98865586bcf7779150c461b64e4fe49972f6351':
libsuspend: force autosleep off during init
f3b3fcb99588bd939fd703c784e971651f829230 24-Sep-2012 Colin Cross <ccross@android.com> am b9886558: libsuspend: force autosleep off during init

* commit 'b98865586bcf7779150c461b64e4fe49972f6351':
libsuspend: force autosleep off during init
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
4f5cec049d38911db3aae240a70e088e9bec309a 21-Sep-2012 Jamie Gennis <jgennis@google.com> am 96094ae2: ANW: fix my fix for a file descriptor leak

* commit '96094ae27c4deac8b0dde8e3c6a479b249cecb72':
ANW: fix my fix for a file descriptor leak
c4e8a69d70336cb6ab4cc0a5498dceec265cbf04 21-Sep-2012 Doug Zongker <dougz@google.com> am 45b0385a: Merge "remove unneeded import" into jb-mr1-dev

* commit '45b0385ac4f192a4a211872dee4a2a5dbd2a56fd':
remove unneeded import
e9659d4a0ca54bef0728db11c07c5d01664f8ad1 21-Sep-2012 Zhihai Xu <zhihaixu@google.com> am e16534f8: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev

* commit 'e16534f8f7492755aebe4c54089b5298f4b064be':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
61e6bc5b7165408ff271b708a1196c4d6868a7c1 21-Sep-2012 Mathias Agopian <mathias@google.com> am 37bd30bf: Merge "ANW: fix an fd leak" into jb-mr1-dev

* commit '37bd30bfd59a352452aea474ece764a6a14f71a9':
ANW: fix an fd leak
fdecfc876e868ffcebc5d1eab0519bc7cb10e520 21-Sep-2012 Ying Wang <wangying@google.com> am 81360178: Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev

* commit '813601785f9ef37f892034a7722d176deea41eec':
Move AndroidConfig.hs to the build project.
ff0156ec2bab8dce71d8edeac57486e7bf740a64 21-Sep-2012 Rebecca Schultz Zavin <rebecca@android.com> am 0d699de0: Merge "Add explicit sync call to ion library" into jb-mr1-dev

* commit '0d699de0fca487328e6dfc86847f33a0214ca253':
Add explicit sync call to ion library
2a17b52cfe82e62e4d2bde92467fd6ee3e74648a 21-Sep-2012 Ben Cheng <bccheng@google.com> am fbafa63b: Merge "Print the revision number in the tombstone file." into jb-mr1-dev

* commit 'fbafa63b339808bf8082b705c5121e529e8be29f':
Print the revision number in the tombstone file.
638d8053e5f05e541d1bf9c0da379711e800bd6d 21-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d4091b7812e4e05c1dabb57b549779c10814aebc 21-Sep-2012 Jamie Gennis <jgennis@google.com> am 160f0c9e: am 96094ae2: ANW: fix my fix for a file descriptor leak

* commit '160f0c9edb250e4e70120bbe1e6c916755825498':
ANW: fix my fix for a file descriptor leak
3834b83f8acf878d2d3e1351a23267a9f8197f07 21-Sep-2012 Doug Zongker <dougz@google.com> am 1474915b: am 45b0385a: Merge "remove unneeded import" into jb-mr1-dev

* commit '1474915ba325bf1de9655e1669dc62c06a399c7b':
remove unneeded import
27fbff0adebe755b9d82652d4d6284804840bb1f 21-Sep-2012 Zhihai Xu <zhihaixu@google.com> am 77b90829: am e16534f8: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev

* commit '77b90829b1148125625b66a06e18f84e2818703a':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
160f0c9edb250e4e70120bbe1e6c916755825498 21-Sep-2012 Jamie Gennis <jgennis@google.com> am 96094ae2: ANW: fix my fix for a file descriptor leak

* commit '96094ae27c4deac8b0dde8e3c6a479b249cecb72':
ANW: fix my fix for a file descriptor leak
1474915ba325bf1de9655e1669dc62c06a399c7b 21-Sep-2012 Doug Zongker <dougz@google.com> am 45b0385a: Merge "remove unneeded import" into jb-mr1-dev

* commit '45b0385ac4f192a4a211872dee4a2a5dbd2a56fd':
remove unneeded import
77b90829b1148125625b66a06e18f84e2818703a 21-Sep-2012 Zhihai Xu <zhihaixu@google.com> am e16534f8: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev

* commit 'e16534f8f7492755aebe4c54089b5298f4b064be':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
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
861d68fdf0a800cffbaa95603c4f2945655a7587 21-Sep-2012 Mathias Agopian <mathias@google.com> am 51d53ca5: am 37bd30bf: Merge "ANW: fix an fd leak" into jb-mr1-dev

* commit '51d53ca5afa3e8b5a2c262723550393a49b19292':
ANW: fix an fd leak
29dfe83bf05807ce0b4068a8267632b7ceadbda5 21-Sep-2012 Ying Wang <wangying@google.com> am bf7f3684: am 81360178: Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev

* commit 'bf7f368459fc2413ae45d1a06421ebc8bec5098d':
Move AndroidConfig.hs to the build project.
f23b922b18e9e2573f7bc5f68e037ca3035e40cc 21-Sep-2012 Rebecca Schultz Zavin <rebecca@android.com> am 95163626: am 0d699de0: Merge "Add explicit sync call to ion library" into jb-mr1-dev

* commit '951636260af95a1ae3b1e8c32eadc62a2f09ac94':
Add explicit sync call to ion library
51d53ca5afa3e8b5a2c262723550393a49b19292 20-Sep-2012 Mathias Agopian <mathias@google.com> am 37bd30bf: Merge "ANW: fix an fd leak" into jb-mr1-dev

* commit '37bd30bfd59a352452aea474ece764a6a14f71a9':
ANW: fix an fd leak
bf7f368459fc2413ae45d1a06421ebc8bec5098d 20-Sep-2012 Ying Wang <wangying@google.com> am 81360178: Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev

* commit '813601785f9ef37f892034a7722d176deea41eec':
Move AndroidConfig.hs to the build project.
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
951636260af95a1ae3b1e8c32eadc62a2f09ac94 20-Sep-2012 Rebecca Schultz Zavin <rebecca@android.com> am 0d699de0: Merge "Add explicit sync call to ion library" into jb-mr1-dev

* commit '0d699de0fca487328e6dfc86847f33a0214ca253':
Add explicit sync call to ion library
0d699de0fca487328e6dfc86847f33a0214ca253 20-Sep-2012 Rebecca Schultz Zavin <rebecca@android.com> Merge "Add explicit sync call to ion library" into jb-mr1-dev
258949553aa232ff7a87a0e48218a353c768580d 20-Sep-2012 Ben Cheng <bccheng@google.com> am 34205c63: am fbafa63b: Merge "Print the revision number in the tombstone file." into jb-mr1-dev

* commit '34205c634930288c3852438b0bd40604003cf232':
Print the revision number in the tombstone file.
34205c634930288c3852438b0bd40604003cf232 20-Sep-2012 Ben Cheng <bccheng@google.com> am fbafa63b: Merge "Print the revision number in the tombstone file." into jb-mr1-dev

* commit 'fbafa63b339808bf8082b705c5121e529e8be29f':
Print the revision number in the tombstone file.
fbafa63b339808bf8082b705c5121e529e8be29f 20-Sep-2012 Ben Cheng <bccheng@google.com> Merge "Print the revision number in the tombstone file." into jb-mr1-dev
6dd8683396937f456005924b32e4f4e007e467e6 20-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 171336be: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '171336be126743cf9042971fd076b955ad596ffa':
Wrap system calls in TEMP_FAILURE_RETRY.
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
171336be126743cf9042971fd076b955ad596ffa 20-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: If24ab92e844fb1a6e6cdec7bb9cdfba887df812a
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
400b89b218dd616b8e08b4fea040a42748892dc1 20-Sep-2012 Nick Kralevich <nnk@google.com> am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev

* commit 'e1df9ad215af6e51a2d8fb1d0306e00c7b510b62':
init: Don't read local properties if ro.debuggable=0
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
32f594a5b4b1a592a9cc18dc6e62bcd6cc24c9ee 20-Sep-2012 Nick Kralevich <nnk@google.com> am a8b91609: am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev

* commit 'a8b916093772627f55fa1bfb624fdebf38af171b':
init: Don't read local properties if ro.debuggable=0
a8b916093772627f55fa1bfb624fdebf38af171b 19-Sep-2012 Nick Kralevich <nnk@google.com> am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev

* commit 'e1df9ad215af6e51a2d8fb1d0306e00c7b510b62':
init: Don't read local properties if ro.debuggable=0
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
581c484d2eac5b50e6e08eac42e6c9a4b69579bf 19-Sep-2012 Geremy Condra <gcondra@google.com> am 1683413f: (-s ours) Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev

* commit '1683413f413eb1b77f527247db2df31eae93ee3a':
DO NOT MERGE Add event log tag for cert pin failures.
3ce056d7cb8656e42d2ac0f413138117a6d64e5d 19-Sep-2012 Geremy Condra <gcondra@google.com> am 1e3cab0b: (-s ours) am 1683413f: Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev

* commit '1e3cab0b88a15670345fc9e89d649de9e028e640':
DO NOT MERGE Add event log tag for cert pin failures.
1e3cab0b88a15670345fc9e89d649de9e028e640 19-Sep-2012 Geremy Condra <gcondra@google.com> am 1683413f: Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev

* commit '1683413f413eb1b77f527247db2df31eae93ee3a':
DO NOT MERGE Add event log tag for cert pin failures.
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
e7b153b84571fec77d769ad386f089c24e14199f 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 0a4a4bbb: am a6cf7746: Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev

* commit '0a4a4bbb21919a2730cb6f6ba207c10cef52535a':
Wrap more system calls in TEMP_FAILURE_RETRY.
77b1cba18c65263215276edacf77a0a6287160bb 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 67c01dfe: am 7918d816: Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev

* commit '67c01dfe6db2bbe386eb98114c2a89f7dbf7bd2d':
Wrap system calls in TEMP_FAILURE_RETRY.
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
5e310605a53f0dbfe160d1128c753802422b3b4a 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> am a6cf7746: Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev

* commit 'a6cf7746cb8732897c3bbafffd52667c7e02d579':
Wrap more system calls in TEMP_FAILURE_RETRY.
0a4a4bbb21919a2730cb6f6ba207c10cef52535a 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> am a6cf7746: Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev

* commit 'a6cf7746cb8732897c3bbafffd52667c7e02d579':
Wrap more system calls in TEMP_FAILURE_RETRY.
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
01718515c9498d2e58f8f1fe8b88b03d2ff2cd41 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 7918d816: Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev

* commit '7918d816401a92456709ba64ccbe60b8e5ffb14c':
Wrap system calls in TEMP_FAILURE_RETRY.
67c01dfe6db2bbe386eb98114c2a89f7dbf7bd2d 14-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 7918d816: Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev

* commit '7918d816401a92456709ba64ccbe60b8e5ffb14c':
Wrap system calls in TEMP_FAILURE_RETRY.
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
f0a0c3ce5e35e2bac8632e1ebccc42315fb43f2c 13-Sep-2012 Kenny Root <kroot@google.com> am d2b2f89f: am ad59e0a9: am c92961dc: am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"

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

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

* commit 'ad59e0a90ec414ddc59cbe73319039981f433c53':
Add shared app gid to fs config
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
4deee74ef09395105be7edd8fd47aa16091abdeb 13-Sep-2012 Elliott Hughes <enh@google.com> am f135a447: am 7e014ce6: am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."

* commit 'f135a4470ded733f2a10b893449242d2e2110565':
Always include <sys/socket.h> before <linux/netlink.h>.
2aebf3d47d18be409d161b96819b62d131246ce9 13-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am b6f137c7: (-s ours) Reconcile with jb-mr1-release - do not merge

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

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

* commit '7e014ce6defdfe596d83ff549a13f7215151069e':
Always include <sys/socket.h> before <linux/netlink.h>.
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
295b82bd691d413c07665c7e7607fe0e5d3485f5 27-Aug-2012 Irina Tirdea <irina.tirdea@intel.com> Rename getline to fs_getline for fs_mgr

fs_mgr defines its own version of getline and uses it
internally. This leads to a build error if getline is
also defined in bionic, since fs_mgr will see readline
as defined internally.

Rename getline in fs_mgr to a local name (fs_getline)
so that there will no longer be any conflicts.

This is needed it we want to add getline in bionic.

Change-Id: I3a32be71a645e122629802d98ff8f9ab9c419e86
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
s_mgr/fs_mgr.c
b6f137c7d8539dd0cf837a25acb097b33d306c87 12-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I3935a689501afea5ad92ff559aa433b03d78bd65
d832567908a9967d1aa35a24b43e541356728d07 12-Sep-2012 Geremy Condra <gcondra@google.com> Add event log tag for cert pin failures.

Change-Id: Ib93f4eeec35b5754498464ada94faeb2bdb0b896
ogcat/event.logtags
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
2a048fe827f447315b4f96ff71f67c7eb9f2f52b 11-Sep-2012 Kenny Root <kroot@google.com> am 12dc7c8e: am 0f5e303c: Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev

* commit '12dc7c8e4ba43d6dbca28ccb78de40a816ca162f':
Add /data/app-lib for native library sharing
c2cb1086477909f21161691fb08e34c010b24f6d 11-Sep-2012 Colin Cross <ccross@android.com> am 8ada7b0e: am fb4a4c35: am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"

* commit '8ada7b0e6a023e036de20158b293e2c301602433':
fastboot: move help command before usb connect
910bbfa9b77c8195dc317e3dd55891a7542eb5d3 11-Sep-2012 Colin Cross <ccross@android.com> am 85605900: am ae807aaa: Merge "fastboot: move help command before usb connect" into jb-mr1-dev

* commit '856059003bde3b235ea907c66cc1742e665ae4a2':
fastboot: move help command before usb connect
011cae80f58ce6fc7936079a004e0d0223f5e495 11-Sep-2012 Ian Rogers <irogers@google.com> am 1fe8e62c: am 64604840: am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."

* commit '1fe8e62ca20fccc0aabd7e39bc34d399bc499ef9':
Remove unnecessary compiler pragma.
53c8e8acccef045c2c704b9b732d9aac6088c5d7 11-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 9f02737d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9f02737df73cc773e5b1cf62939b2752a6eb9a19':
Bring back ADB_EXTERNAL_STORAGE.
72144278f35f181c7bd71af86b40a133ff785d50 11-Sep-2012 Eric Laurent <elaurent@google.com> am 6276069f: am eeeee802: audio: new audio devices enum values

* commit '6276069f396fb52fe9626a340f56b6e7513da5fc':
audio: new audio devices enum values
a668fceca4c1a64b91e4ea8b28f8efa73a325341 11-Sep-2012 Kenny Root <kroot@google.com> am 0f5e303c: Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev

* commit '0f5e303c6a88c63fc5a4d325ab675af7ed57b777':
Add /data/app-lib for native library sharing
12dc7c8e4ba43d6dbca28ccb78de40a816ca162f 11-Sep-2012 Kenny Root <kroot@google.com> am 0f5e303c: Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev

* commit '0f5e303c6a88c63fc5a4d325ab675af7ed57b777':
Add /data/app-lib for native library sharing
0f5e303c6a88c63fc5a4d325ab675af7ed57b777 11-Sep-2012 Kenny Root <kroot@google.com> Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev
bb0c72587cfd4041c3a50320de8c7eee8cede2e2 11-Sep-2012 Jean-Michel Trivi <jmtrivi@google.com> am a86364e5: am 38f10f86: Merge "Device and mode definitions for remote submix" into jb-mr1-dev

* commit 'a86364e503c3f353dafd7f6f902083fa70964663':
Device and mode definitions for remote submix
686a445f1ee05b2a113834717d72ea35ab6a540c 10-Sep-2012 Colin Cross <ccross@android.com> am fb4a4c35: am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"

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

* commit 'fb4a4c35856ce9c9c6199d26d27bcbc9451f365a':
fastboot: move help command before usb connect
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"
856059003bde3b235ea907c66cc1742e665ae4a2 10-Sep-2012 Colin Cross <ccross@android.com> am ae807aaa: Merge "fastboot: move help command before usb connect" into jb-mr1-dev

* commit 'ae807aaa022196b2f08f64f303b380c1903b77e0':
fastboot: move help command before usb connect
a65d62bce3f25d988e86a3af421b6aefc5638a22 10-Sep-2012 Colin Cross <ccross@android.com> am ae807aaa: Merge "fastboot: move help command before usb connect" into jb-mr1-dev

* commit 'ae807aaa022196b2f08f64f303b380c1903b77e0':
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
33d1cc72d1fc655654a075818191ed320093d985 08-Sep-2012 Ian Rogers <irogers@google.com> am 64604840: am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."

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

* commit '64604840debad8f9f24c22b6b90fb572a5dc2d6b':
Remove unnecessary compiler pragma.
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."
e7a4cbc0e796388a9464dc7b5247a2c6c98c98d3 08-Sep-2012 Eric Laurent <elaurent@google.com> am eeeee802: audio: new audio devices enum values

* commit 'eeeee802e9837c592b0f0f9fd183bcaa9e77732e':
audio: new audio devices enum values
3bfb8ec6b3115a20a0c4ea8ad7d1edd3db152c39 08-Sep-2012 Jean-Michel Trivi <jmtrivi@google.com> am 38f10f86: Merge "Device and mode definitions for remote submix" into jb-mr1-dev

* commit '38f10f8649940eda42b2336a4757a9dd07e721cf':
Device and mode definitions for remote submix
9f02737df73cc773e5b1cf62939b2752a6eb9a19 08-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I77e76ba09125bdbd371933808a6399ab62372d8c
6276069f396fb52fe9626a340f56b6e7513da5fc 07-Sep-2012 Eric Laurent <elaurent@google.com> am eeeee802: audio: new audio devices enum values

* commit 'eeeee802e9837c592b0f0f9fd183bcaa9e77732e':
audio: new audio devices enum values
98159b6940a0f51156dc1497b62448616950976a 07-Sep-2012 Jeff Sharkey <jsharkey@android.com> am d2f9bf3a: Merge "Keep /mnt/secure private to default namespace." into jb-mr1-dev

* commit 'd2f9bf3addaa586c0dbc303508caf02c66dc03b9':
Keep /mnt/secure private to default namespace.
b6033147900dadfe7c0b925be81fbc4ea9ab16a6 07-Sep-2012 Jeff Sharkey <jsharkey@android.com> am d8a8979b: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev

* commit 'd8a8979bd932a73378286ecea6a03c7fa8e1b2a6':
Bring back ADB_EXTERNAL_STORAGE.
6af812c174abacf1001b8d8e604af095bf88f0fb 07-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 83e3842f: (-s ours) am 7908a68e: (-s ours) Reconcile with jb-release - do not merge

* commit '83e3842f4efc2647752d85af81869034dda985f6':
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
a86364e503c3f353dafd7f6f902083fa70964663 07-Sep-2012 Jean-Michel Trivi <jmtrivi@google.com> am 38f10f86: Merge "Device and mode definitions for remote submix" into jb-mr1-dev

* commit '38f10f8649940eda42b2336a4757a9dd07e721cf':
Device and mode definitions for remote submix
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
e884af1410d35375899854b1ed433933255898fe 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 7617b28f: am d2f9bf3a: Merge "Keep /mnt/secure private to default namespace." into jb-mr1-dev

* commit '7617b28fd3549b5e9c1e6980088ff09fa9a02053':
Keep /mnt/secure private to default namespace.
7617b28fd3549b5e9c1e6980088ff09fa9a02053 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> am d2f9bf3a: Merge "Keep /mnt/secure private to default namespace." into jb-mr1-dev

* commit 'd2f9bf3addaa586c0dbc303508caf02c66dc03b9':
Keep /mnt/secure private to default namespace.
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
f0118c72c66302c8805ef51117b153b3aa950949 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 2121219c: am d8a8979b: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev

* commit '2121219cfd5cc288d6ad1f42d5d37d62e476c7b0':
Bring back ADB_EXTERNAL_STORAGE.
2121219cfd5cc288d6ad1f42d5d37d62e476c7b0 06-Sep-2012 Jeff Sharkey <jsharkey@android.com> am d8a8979b: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev

* commit 'd8a8979bd932a73378286ecea6a03c7fa8e1b2a6':
Bring back ADB_EXTERNAL_STORAGE.
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
fa15d3acb0861b682d07dd9bb81d6a44a19cc23b 06-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 446cc5b6: (-s ours) am 83e3842f: am 7908a68e: (-s ours) Reconcile with jb-release - do not merge

* commit '446cc5b6d887a3ea902f0e883158bec5c8c09462':
446cc5b6d887a3ea902f0e883158bec5c8c09462 06-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 83e3842f: am 7908a68e: (-s ours) Reconcile with jb-release - do not merge

* commit '83e3842f4efc2647752d85af81869034dda985f6':
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':
a6eba6c86dedcd6134a54efa8f6761b336383f31 06-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 75ad3432: (-s ours) Reconcile with jb-mr1-release - do not merge

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

Change-Id: I74a36d0a79723c656b50f36c1d96042e50a0c943
75ad34327739a02f76ecfae06d9026de3834e6b2 06-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

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

* commit '1098fa7d49ebf1a637cfab0c799fdaa1f310f2b9':
Dist fastboot and adb for the sdk build.
1098fa7d49ebf1a637cfab0c799fdaa1f310f2b9 05-Sep-2012 Ying Wang <wangying@google.com> am 96535ba6: Dist fastboot and adb for the sdk build.

* commit '96535ba62044c712f8b017fe569f598a7a2934c2':
Dist fastboot and adb for the sdk build.
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
f87e12165a3f34f62db676b745217b96ae452841 04-Sep-2012 Benoit Goby <benoit@android.com> am 5548fed1: am 345ca131: adb: Link statically with libcrypto

* commit '5548fed13baccf43819d85aade8407573a189fc0':
adb: Link statically with libcrypto
5548fed13baccf43819d85aade8407573a189fc0 04-Sep-2012 Benoit Goby <benoit@android.com> am 345ca131: adb: Link statically with libcrypto

* commit '345ca131bbc17b1ae1073db04f37f6610ccb4c71':
adb: Link statically with libcrypto
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
fbe3641606f0f5ecff34033e4e039cd229b4a837 31-Aug-2012 Benoit Goby <benoit@android.com> am 07f65645: am 59680145: Merge "adb: Create private key with 0600 mode" into jb-mr1-dev

* commit '07f65645516220a5d169e5b73eae3bd1f77de8c2':
adb: Create private key with 0600 mode
07f65645516220a5d169e5b73eae3bd1f77de8c2 31-Aug-2012 Benoit Goby <benoit@android.com> am 59680145: Merge "adb: Create private key with 0600 mode" into jb-mr1-dev

* commit '59680145c85522e8b4b8cc928a48e105d966a44b':
adb: Create private key with 0600 mode
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
6bc248c7abbe47bbc1f6c4c084c07b6b4374655a 30-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 028791fc: am 9685194f: File-system utilities for installd and zygote.

* commit '028791fcb2512fa2a29ca4d4ba891407b3d981a0':
File-system utilities for installd and zygote.
028791fcb2512fa2a29ca4d4ba891407b3d981a0 30-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 9685194f: File-system utilities for installd and zygote.

* commit '9685194fc94510a33201aee9b80c23f206ccfe67':
File-system utilities for installd and zygote.
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
1ca120588a58236da93fb441d98e36dc913fe561 25-May-2012 Duane Sand <duanes@mips.com> Add Mips memset speedup

Change-Id: I157aa8b500e271c213bf615dd4ceb25b3aedd7c2
ibcutils/Android.mk
ibcutils/arch-mips/android_memset.c
b8ea47a7016519f8846fed1f17f2de4694f16ee3 29-Aug-2012 Ian Rogers <irogers@google.com> am 117af5f2: am 84ac402f: Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev

* commit '117af5f2067c740471f76821934b99d6c5726c3d':
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
117af5f2067c740471f76821934b99d6c5726c3d 29-Aug-2012 Ian Rogers <irogers@google.com> am 84ac402f: Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev

* commit '84ac402fa1860817ed100d189b0613f8c4b0ef2a':
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
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
d3a2e24b0798810b4e3a34744ceb216ab6d7b9c4 29-Aug-2012 Wink Saville <wink@google.com> am 1c9991d8: am 5c9da7b6: am e3524293: am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils"

* commit '1c9991d894c275661085fa211eba35575dcc7080':
import init.${ro.hardware}.rc last to allow overriding default USB configuration
Export flags needed for ifc_reset_connections API in netutils
1c9991d894c275661085fa211eba35575dcc7080 29-Aug-2012 Wink Saville <wink@google.com> am 5c9da7b6: am e3524293: am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils"

* commit '5c9da7b65ca32f4268cafeef198f173abb33ec46':
import init.${ro.hardware}.rc last to allow overriding default USB configuration
Export flags needed for ifc_reset_connections API in netutils
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
109338da05c4156c5d9788db6b4a67d3aa278372 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 3969115d: am 8bbc8a28: am 7995b841: am c3c5358b: Merge "Add MIPS support to pixelflinger."

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

* commit '8bbc8a2884b11ff4693be72756a90f86b122058d':
Add MIPS support to pixelflinger.
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
fc40815e5e850b248ea50402139a6e8230830491 25-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 7ec13655: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7ec136557b82a01d2f280653cf9aa8cdd1a4fab2':
7ec136557b82a01d2f280653cf9aa8cdd1a4fab2 25-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ib703906e995f252a62d61912627b584f4ad24e63
6e3f0232066554db1a71a4902b902ba2315882ce 24-Aug-2012 Jamie Gennis <jgennis@google.com> am 1781c1ee: am d7c8fe6a: Merge "Add an IMPL_DEFINED pixel format." into jb-mr1-dev

* commit '1781c1eec98a9d48157a49ba629405313d4850a0':
Add an IMPL_DEFINED pixel format.
1781c1eec98a9d48157a49ba629405313d4850a0 24-Aug-2012 Jamie Gennis <jgennis@google.com> am d7c8fe6a: Merge "Add an IMPL_DEFINED pixel format." into jb-mr1-dev

* commit 'd7c8fe6abbf03157242ae104a7aedabf15791da0':
Add an IMPL_DEFINED pixel format.
d7c8fe6abbf03157242ae104a7aedabf15791da0 24-Aug-2012 Jamie Gennis <jgennis@google.com> Merge "Add an IMPL_DEFINED pixel format." into jb-mr1-dev
0d9f74571c69a9f59f01a4e4b08b190b5b8dbf38 24-Aug-2012 Stephen Hines <srhines@google.com> am c445e6e9: am 1182e61f: Merge "Link directly with libm due to libpng dependency." into jb-mr1-dev

* commit 'c445e6e90b6a343e83a77a82befd4b2ddda905a7':
Link directly with libm due to libpng dependency.
c445e6e90b6a343e83a77a82befd4b2ddda905a7 24-Aug-2012 Stephen Hines <srhines@google.com> am 1182e61f: Merge "Link directly with libm due to libpng dependency." into jb-mr1-dev

* commit '1182e61f76f3adf79d82622697ba07a267f4cf71':
Link directly with libm due to libpng dependency.
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
53b6ca7e6947f36159ddf7a294b1a64030b236f8 23-Aug-2012 Wink Saville <wink@google.com> am 258114b4: am f824ad7b: am 582b1152: am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"

* commit '258114b489207b5cce2728d1ada8e02f96b02ca3':
Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
258114b489207b5cce2728d1ada8e02f96b02ca3 23-Aug-2012 Wink Saville <wink@google.com> am f824ad7b: am 582b1152: am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"

* commit 'f824ad7b35c3bf866d60662404be0d55fe753e3d':
Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
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
547390053e9f52d2162c23acf7ef734d0756368d 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 13d71d33: am 2bf953a9: Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev

* commit '13d71d332cbfe9f91f5b91d105f594c07c94ef26':
libcorkscrew: avoid future name collisions.
13d71d332cbfe9f91f5b91d105f594c07c94ef26 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 2bf953a9: Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev

* commit '2bf953a9ba1949815f5022ae831e81061cb5c7e5':
libcorkscrew: avoid future name collisions.
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
75e65e0679307ebdba727d20d64cb66eba81f012 23-Aug-2012 Benoit Goby <benoit@android.com> am 63325c91: am d5fcafaf: adb: Add public key authentification

* commit '63325c910906c2b00d5eb1ebbce538dfe61c4b10':
adb: Add public key authentification
63325c910906c2b00d5eb1ebbce538dfe61c4b10 23-Aug-2012 Benoit Goby <benoit@android.com> am d5fcafaf: adb: Add public key authentification

* commit 'd5fcafaf41f8ec90986c813f75ec78402096af2d':
adb: Add public key authentification
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
ad8663e970e218bf2f8c202e425d25dffe95b588 23-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 08f748a2: am 42a1e6c9: Merge "Iteration on multi-user external storage." into jb-mr1-dev

* commit '08f748a2f8e6933fdd96290de049c1aa1f3f8479':
Iteration on multi-user external storage.
08f748a2f8e6933fdd96290de049c1aa1f3f8479 23-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 42a1e6c9: Merge "Iteration on multi-user external storage." into jb-mr1-dev

* commit '42a1e6c9d827fc3d64ad3b0750b87de1f4c436e7':
Iteration on multi-user external storage.
42a1e6c9d827fc3d64ad3b0750b87de1f4c436e7 23-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Iteration on multi-user external storage." into jb-mr1-dev
35aa3642e1d4c6206750d5b51519d7de352a80e2 23-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am bd82e329: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'bd82e3293c03f27d69af8c554fbcf4dcd2399b32':
Revert "Upgrade to dlmalloc 2.8.5."
bd82e3293c03f27d69af8c554fbcf4dcd2399b32 23-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ia5d484b16bf45e3a8481bf5c81864474749f964e
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
548a5257e56d41e7332fcc116316b84c3fb7499d 23-Aug-2012 Jeff Sharkey <jsharkey@android.com> am ecee9934: am f70c6da4: Merge "Remove sdcard groups from services." into jb-mr1-dev

* commit 'ecee9934afa24f95f4351d1f41b1f0e7869b7b64':
Remove sdcard groups from services.
ecee9934afa24f95f4351d1f41b1f0e7869b7b64 23-Aug-2012 Jeff Sharkey <jsharkey@android.com> am f70c6da4: Merge "Remove sdcard groups from services." into jb-mr1-dev

* commit 'f70c6da41ef13146b85e1101d1e708cd35f81b78':
Remove sdcard groups from services.
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
ff49d1112cf6c777b0bd38b40c3b831aa6789fa7 22-Aug-2012 James Dong <jdong@google.com> am 86e21a1d: am 8ccaed6a: Merge "Don\'t give drmserver read permission to local storage" into jb-mr1-dev

* commit '86e21a1d24154890fa8e48a9eb2b541eb13fc079':
Don't give drmserver read permission to local storage
86e21a1d24154890fa8e48a9eb2b541eb13fc079 22-Aug-2012 James Dong <jdong@google.com> am 8ccaed6a: Merge "Don\'t give drmserver read permission to local storage" into jb-mr1-dev

* commit '8ccaed6a29d7371f614e94f28b68e476064fc959':
Don't give drmserver read permission to local storage
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
fa9146b2b431ee917ea9205382b533fb0a55ed97 22-Aug-2012 Brian Carlstrom <bdc@google.com> am 23f4ead8: am 42b83c6d: Revert "Upgrade to dlmalloc 2.8.5."

* commit '23f4ead81cd487fb12413182694f887dcaa77150':
Revert "Upgrade to dlmalloc 2.8.5."
23f4ead81cd487fb12413182694f887dcaa77150 22-Aug-2012 Brian Carlstrom <bdc@google.com> am 42b83c6d: Revert "Upgrade to dlmalloc 2.8.5."

* commit '42b83c6df7e4f65461a32a711d5dd4f46b9b85e0':
Revert "Upgrade to dlmalloc 2.8.5."
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
2b77f30307aeff27736f4ca44354e5fbdf11a8a8 22-Aug-2012 Erik Gilling <konkers@android.com> am d5f149b3: am 984d3570: update libsync to support new timeout semantics

* commit 'd5f149b3f55b91e84633c11d4af4679748c022ec':
update libsync to support new timeout semantics
d5f149b3f55b91e84633c11d4af4679748c022ec 22-Aug-2012 Erik Gilling <konkers@android.com> am 984d3570: update libsync to support new timeout semantics

* commit '984d35703d5c6738253193bd53da9dedb3b58243':
update libsync to support new timeout semantics
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
225732a425d28f63866f1c5d44d09cba7021f2ce 22-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 161c1cc8: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '161c1cc8ef87c11e7fcb8a32f8bdf2f3fd627e90':
161c1cc8ef87c11e7fcb8a32f8bdf2f3fd627e90 22-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ie51b5f85342674d507d7db2e7fb681f0f4088693
309cdb4e5353dcc0e18e16d30fb806d16fcb2e9b 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8fde167b: am 6302b420: am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile"

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

* commit 'ba6d63e09369b44f32bedfa70ed50fbf01b0f3ee':
Fixing unused param warnings in sync_test
8fde167ba27de7f4e302c8fb23380ddca7655989 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 6302b420: am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile"

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

* commit 'a4ad73480896c6bc7960331dcfca87a358cc5782':
Fixing unused param warnings in sync_test
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
8b19786feaa58728e5aa27d6e6944e1c3ad7c8d5 21-Aug-2012 Benoit Goby <benoit@android.com> am 38289942: am 3fc95a99: Revert "adb: Add public key authentification"

* commit '3828994216da9323fa34177603b4e9ac77e3951d':
Revert "adb: Add public key authentification"
3828994216da9323fa34177603b4e9ac77e3951d 21-Aug-2012 Benoit Goby <benoit@android.com> am 3fc95a99: Revert "adb: Add public key authentification"

* commit '3fc95a991805feba257a396c13548776fd36f34f':
Revert "adb: Add public key authentification"
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
06020588b71fd01cedb76323e4f92d5fbe1671ab 21-Aug-2012 Benoit Goby <benoit@android.com> am 271add57: am 300d6d65: Merge "adb: Add public key authentification" into jb-mr1-dev

* commit '271add57aed5dac63fee9e1d6cbc6ab2fdaec89e':
adb: Add public key authentification
271add57aed5dac63fee9e1d6cbc6ab2fdaec89e 21-Aug-2012 Benoit Goby <benoit@android.com> am 300d6d65: Merge "adb: Add public key authentification" into jb-mr1-dev

* commit '300d6d65d022c4a4663d097e5271eac745be6278':
adb: Add public key authentification
300d6d65d022c4a4663d097e5271eac745be6278 21-Aug-2012 Benoit Goby <benoit@android.com> Merge "adb: Add public key authentification" into jb-mr1-dev
3bfb6a4e44ecca97a47dcd7ac21047025ffd6a4e 21-Aug-2012 Brian Carlstrom <bdc@google.com> am bc773686: am 17687079: am e05ac541: am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."

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

* commit '17687079519c9014ee6c5ad2d13c3163d40a02ce':
Upgrade to dlmalloc 2.8.5.
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.
be3ead49421093955df0e59fc70498b0fd89d7f5 21-Aug-2012 John Grossman <johngro@google.com> am a0a46170: am 9dd0029a: Merge "Replace a segfault with a warning." into jb-mr1-dev

* commit 'a0a46170f1e570e6aa0818bbb2da7a15c1013563':
Replace a segfault with a warning.
a0a46170f1e570e6aa0818bbb2da7a15c1013563 21-Aug-2012 John Grossman <johngro@google.com> am 9dd0029a: Merge "Replace a segfault with a warning." into jb-mr1-dev

* commit '9dd0029a05511d5e15c7fdb453b93f50d5b37d04':
Replace a segfault with a warning.
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
b59ac124deb8f5bf6d1427df38ff53018a1eb3a6 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 95ddeb0e: am a8b832a8: am 42900c30: am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p"

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

* commit '81eecb1eb8c23e603c78d60a7278a3afd1798962':
vmstat: Fix -n flag
24a5a97b718b66ebdbe37a1b1a510d4005e67138 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 66cb61c8: am 93058924: am 1bcced2b: am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."

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

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

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

* commit '9305892464fc353702345eedcb2180f5e6fb27c0':
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
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
9e0d6ba5b5a0e8d219742f03751cf034367546db 20-Aug-2012 Jeff Brown <jeffbrown@google.com> am 8fb50b4a: am a8c2112b: Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-dev

* commit '8fb50b4abe7038be258c8736c52cea3f6ab8b928':
Migrate sdcard0 to shell-accessible location.
8fb50b4abe7038be258c8736c52cea3f6ab8b928 20-Aug-2012 Jeff Brown <jeffbrown@google.com> am a8c2112b: Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-dev

* commit 'a8c2112be672409a81f200c110f901fda4907bde':
Migrate sdcard0 to shell-accessible location.
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
71fb3274f802a8d462f45a0803726513be95d627 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am a7962832: am bb0d0721: am 94938c9d: am ed2e672f: Merge "Print strerror for file read errors during flashing"

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

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

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

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

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

* commit '80da83ac31925326b3a76f10564c05f2043c70f0':
diskconfig: Add missing include for loff_t
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
42d622df5873baf8fcc10b1f2d7519dd90f9c2c8 17-Aug-2012 Joe Onorato <joeo@android.com> am c14b5683: am ab163a9a: am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367

* commit 'c14b56831d74d3d871cac8beb3024cedba7e7fa8':
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
c14b56831d74d3d871cac8beb3024cedba7e7fa8 17-Aug-2012 Joe Onorato <joeo@android.com> am ab163a9a: am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367

* commit 'ab163a9a1784594b46217576d0fa991496f3d14e':
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
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
20258b501e1d2b15b4587d42c83db848b8fae188 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
4d9571145abbf5ca15bf42f90a2f81439bcfbbd4 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
1cd5bcf591690adfc671731bb2d50308b3f6fe35 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
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
2da12877ca5bfbfbabb4bae7bc946f9f899e3a43 17-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 2f86a384: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2f86a384743fd3f608e8e65e4d5f5328a0aedfcb':
bluetooth: bring up with bluedroid stack
2f86a384743fd3f608e8e65e4d5f5328a0aedfcb 17-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I5602173e60967c0b027f926df862747b2cf1edde
7c87aaa38ccc26813b3ea42ae0abf9990b278889 17-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 807a2f54: am de980f27: Omit multiuser.c from Windows builds.

* commit '807a2f54f313caa5d7cba85a924de0ab6b830b66':
Omit multiuser.c from Windows builds.
807a2f54f313caa5d7cba85a924de0ab6b830b66 17-Aug-2012 Jeff Sharkey <jsharkey@android.com> am de980f27: Omit multiuser.c from Windows builds.

* commit 'de980f27a701eb8f7130218f9bac768fe7155d30':
Omit multiuser.c from Windows builds.
de980f27a701eb8f7130218f9bac768fe7155d30 17-Aug-2012 Jeff Sharkey <jsharkey@android.com> Omit multiuser.c from Windows builds.

Change-Id: I0cee35373e33084e4fc65a1d5c0b611c6fa82346
ibcutils/Android.mk
19542d2425ef5c00b31ef283a1dd3b26e2bfe340 16-Aug-2012 Jeff Sharkey <jsharkey@android.com> am b0d56eef: am 2be5338a: Merge "Multi-user external storage support." into jb-mr1-dev

* commit 'b0d56eef7b073461678751f56e24623f2e1ab581':
Multi-user external storage support.
b0d56eef7b073461678751f56e24623f2e1ab581 16-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 2be5338a: Merge "Multi-user external storage support." into jb-mr1-dev

* commit '2be5338a84f19b24b6515c0bfcf2f3f7b55262c1':
Multi-user external storage support.
2be5338a84f19b24b6515c0bfcf2f3f7b55262c1 16-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Multi-user external storage support." into jb-mr1-dev
0b7a10a15f7cacd139d40ee79229b344c0951b04 16-Aug-2012 Scott Anderson <saa@android.com> am 59094a52: am edb2d634: Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev

* commit '59094a52ff47e107d749d6094cf577019906e691':
ueventd.rc: Add /dev/uhid for bluedroid
59094a52ff47e107d749d6094cf577019906e691 16-Aug-2012 Scott Anderson <saa@android.com> am edb2d634: Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev

* commit 'edb2d634b35ec1b0268ac7d9ddab8c8fc082a14e':
ueventd.rc: Add /dev/uhid for bluedroid
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
d7514a0781a8226781f6946bdd20361d8bc6567f 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 9342d910: am e92372ba: resolved conflicts for merge of 2237ca4c to jb-mr1-dev

* commit '9342d9101896d006a398de159409f08619fec004':
Fixing signed/unsigned comparison warnings
9342d9101896d006a398de159409f08619fec004 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am e92372ba: resolved conflicts for merge of 2237ca4c to jb-mr1-dev

* commit 'e92372ba9eaa04eb4ed7eb9417ee2be3515bd972':
Fixing signed/unsigned comparison warnings
e92372ba9eaa04eb4ed7eb9417ee2be3515bd972 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 2237ca4c to jb-mr1-dev

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

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

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

* commit 'cd67383d7966328d04b0e339a7c9f423ba40f99f':
[MIPS] debuggerd and libcorkscrew support
7b0ea4262b2ec5781faeca67762f03af3fb1c71f 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am d7f78e88: am e3bdaeb6: am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"

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

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

* commit '5731de9620a632e1b70e19dd816f9807ba84082e':
[MIPS] debuggerd and libcorkscrew support
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
4546a4cf98aca8d8bae58ddfff40f92219bcb489 15-Aug-2012 Iliyan Malchev <malchev@google.com> am b2e31e45: am a8f1e11b: Merge "bluetooth: bring up with bluedroid stack" into jb-mr1-dev

* commit 'b2e31e4566220eca2a1704f21f10740198b8a566':
bluetooth: bring up with bluedroid stack
b2e31e4566220eca2a1704f21f10740198b8a566 15-Aug-2012 Iliyan Malchev <malchev@google.com> am a8f1e11b: Merge "bluetooth: bring up with bluedroid stack" into jb-mr1-dev

* commit 'a8f1e11bcc8144548a5dd0e004f54679d4d66396':
bluetooth: bring up with bluedroid stack
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"
159bf04c5bcb688ba08890d8d70151b5e73bb9b0 15-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 964cd9e7: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '964cd9e7f0a4c70dbc31d25e648eb3963c565be9':
964cd9e7f0a4c70dbc31d25e648eb3963c565be9 15-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I91469c571a771a8531dfe3071b739a5d8e18c724
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
9d763f850a76a7d17c0c809810f902c636fb78f6 15-Aug-2012 Keun-young Park <keunyoung@google.com> am f588cf97: am 847cb4d1: am 8f19b11a: am c4c731e7: Merge "[MIPS] Enable SD-card functionality to work"

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

* commit '847cb4d125fa9eeb4272a0676e1dac847d4b8a96':
[MIPS] Enable SD-card functionality to work
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
b057fe93391f604a9843e4989f51986822235d59 15-Aug-2012 Benoit Goby <benoit@android.com> am db58849a: am 5c8574b5: init: Fix mkdir command when using ISUID or ISGID bit

* commit 'db58849a95b43b164506604c81b685c5050b8a63':
init: Fix mkdir command when using ISUID or ISGID bit
db58849a95b43b164506604c81b685c5050b8a63 15-Aug-2012 Benoit Goby <benoit@android.com> am 5c8574b5: init: Fix mkdir command when using ISUID or ISGID bit

* commit '5c8574b51210be53efbb488965db0b8591c8d1cf':
init: Fix mkdir command when using ISUID or ISGID bit
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
a52b0192070b5c1c2f926a03797f5f1c77f33349 14-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 3fe22e6b: am 90b80de5: Merge "Support shared-subtree and bind mount flags." into jb-mr1-dev

* commit '3fe22e6b26b88a07b391ba6a11807610251128af':
Support shared-subtree and bind mount flags.
3fe22e6b26b88a07b391ba6a11807610251128af 14-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 90b80de5: Merge "Support shared-subtree and bind mount flags." into jb-mr1-dev

* commit '90b80de5a7b9b4557985eb2ec21d2d82b44eb83b':
Support shared-subtree and bind mount flags.
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
78f7aefae28bae0f88380f04269842e388c7fe1c 14-Aug-2012 Jon Larimer <jlarimer@google.com> Merge "Make usage() static in du.c to avoid conflicts"
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
c01ad6945371b824afc424ba8f889801a3e3ed31 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 001061d1: am 96539e81: am ee0d281a: am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup."

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

* commit '96539e8153dadeccb8b7d334cda8b2acaaa68f06':
Char device /dev/dri/card0 was not created during startup.
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
50ecb7a1dc931339844cb5c8fb5f444d4ea3d47d 14-Aug-2012 Jeff Sharkey <jsharkey@android.com> am b4d82506: am 70e995fb: Merge "Source and destination paths for sdcard." into jb-mr1-dev

* commit 'b4d8250600f28c18fb712ab2ee3835083faf0587':
Source and destination paths for sdcard.
b4d8250600f28c18fb712ab2ee3835083faf0587 14-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 70e995fb: Merge "Source and destination paths for sdcard." into jb-mr1-dev

* commit '70e995fb8c5f51e91766cd8765a6733d19b1d37a':
Source and destination paths for sdcard.
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
0816c9308fccea8480649050f5f3cefc5538335c 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c365306d: am 93be76f5: am e8e73b01: am 311a4758: Merge "Remove system/core\'s remnants of SH support."

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

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

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

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

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

* commit '2a1067d144be5437df98ddb0f2d3680f03dafa5f':
Fixed an unused param warning in logcat
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
f286dd75f6e715f900a2b2a230c8e8fb68a418a3 13-Aug-2012 Jon Larimer <jlarimer@google.com> Make usage() static in du.c to avoid conflicts

Change-Id: Ic6b036d050943fb5f0af8553c081ca75362167e8
oolbox/du.c
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
fcfa5e641f94c042d192f8a11a13c2b3d88aa04b 13-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 937458f7: am 84dcf091: Collapse IMS tags into a prefix check.

* commit '937458f7c21f7732acb48da2e96b98f887c69bce':
Collapse IMS tags into a prefix check.
937458f7c21f7732acb48da2e96b98f887c69bce 13-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 84dcf091: Collapse IMS tags into a prefix check.

* commit '84dcf091482b8d0f484e665915d354069a8c879b':
Collapse IMS tags into a prefix check.
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
36a3b2f61bfc1c4170a5f43bc0b6d99095b4e9c0 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 3424b4fd: am 9a7b9aab: am 79e30b6c: am ae8927aa: Merge "Fix a print format warning"

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

* commit '9a7b9aab08e5640a08b312807dc57fcd469a77f2':
Fix a print format warning
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"
e18eb556c8980842a1c352e8f54324bf2575b029 13-Aug-2012 Kenny Root <kroot@android.com> am 4f04c51d: am 2fec4de5: am 11c783f1: am 9494f297: Merge "Implement SELinux/MAC checks for property service."

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

* commit 'a0347971dec3dc34c6ccebad5170ced255fdf35f':
Add support for reloading policy from /data/system.
4f04c51da98ee13464082bee961dc3f095f10aa7 13-Aug-2012 Kenny Root <kroot@android.com> am 2fec4de5: am 11c783f1: am 9494f297: Merge "Implement SELinux/MAC checks for property service."

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

* commit '605103fb553a8b872aa8dd0aef76ae8b3bfe47fa':
Add support for reloading policy from /data/system.
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
732eb2746fbdf2468a848b4a01482bbd23a39a60 11-Aug-2012 Elliott Hughes <enh@google.com> am 9eeca544: am 98ebf197: am 2ff60998: am 605f8706: Merge "Add Mips architecture to system/core/include"

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

* commit '98ebf1975f68ffeaa43d5c53964c3dabe8655562':
Add Mips architecture to system/core/include
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
db56e95ebd806728c479d8b880618137a3716ee5 11-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am d6fd7606: am 3016e34b: am 697b6379: am 7b682c47: Merge "Add Mips support to libpixelflinger"

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

* commit '3016e34beba2b977ec1dc1897f4a311ceb7cee2d':
Add Mips support to libpixelflinger
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"
54175823267be3f77adde8e082a5c219102a868c 10-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 8928b092: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8928b092b6f4158d77627d3faa6ebce3ca13f412':
8928b092b6f4158d77627d3faa6ebce3ca13f412 10-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I595f70b0e854d3a42bf2c5121bc6f175a83ab9a2
7255104266f65a3049a5ad4cf4436b171529fcf5 09-Aug-2012 Jouni Malinen <j@w1.fi> am e9cdf550: am 831cbc9d: libnl: Add nla_put_u8/u16/u32/u64() wrapper

* commit 'e9cdf55088d99003f6100392335d481190e92d70':
libnl: Add nla_put_u8/u16/u32/u64() wrapper
e9cdf55088d99003f6100392335d481190e92d70 09-Aug-2012 Jouni Malinen <j@w1.fi> am 831cbc9d: libnl: Add nla_put_u8/u16/u32/u64() wrapper

* commit '831cbc9d2958d1553acd4f58e52569fab4fd64c5':
libnl: Add nla_put_u8/u16/u32/u64() wrapper
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
d208f8353dd2960c78fc9f5b9fb9aef8afacde31 09-Aug-2012 Jason Simmons <jsimmons@google.com> am cdde4524: am 845999d2: Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev

* commit 'cdde45242edbe5bd931233304aa7e71a811a0638':
Allow adb to listen both on usb and tcp.
cdde45242edbe5bd931233304aa7e71a811a0638 09-Aug-2012 Jason Simmons <jsimmons@google.com> am 845999d2: Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev

* commit '845999d232298043c899820c3e9f56e3c00a5845':
Allow adb to listen both on usb and tcp.
845999d232298043c899820c3e9f56e3c00a5845 09-Aug-2012 Jason Simmons <jsimmons@google.com> Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev
8f8f94015d5024027d36612822339967957bcde6 09-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am e0fb9bf2: am 7c7c1b0d: am 5f6d2529: am 8076b212: Merge "Decode DHCP netmask option correctly"

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

* commit '7c7c1b0d8a09645826e0ee4d8ab30a543c246114':
Decode DHCP netmask option correctly
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
38ca80d09797a19b52eecd81e72fc4a492594dfa 09-Aug-2012 Stephen Hines <srhines@google.com> am b9450210: am 30f52fea: am 67bdfa98: am d25b8502: Merge "Fix unused param warning"

* commit 'b94502101f6b738dd7e7aab8da664d8fd162de8a':
Fix unused param warning
7b5475d3f29b100d4f83c59f83ad59b517d8f404 09-Aug-2012 Stephen Hines <srhines@google.com> am 944ada30: am 278cded6: am d2e826b5: am 65c37c81: Merge "Fixed an unused param warning"

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

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

* commit '56c014beb58cdd53d0a00cda06caa6df2019886c':
Trivial signed/unsigned warning fix for adbd
329c99464899ccd5b64fcf4f635f53663de788f2 09-Aug-2012 Stephen Hines <srhines@google.com> am 491547ed: am 5d3cf721: am e7b2a436: (-s ours) am e551055e: Merge "Fix signed/unsigned comparison warning"

* commit '491547edf39b4552c2010df68d5bd57bbcbb911c':
Fix signed/unsigned comparison warning
b94502101f6b738dd7e7aab8da664d8fd162de8a 09-Aug-2012 Stephen Hines <srhines@google.com> am 30f52fea: am 67bdfa98: am d25b8502: Merge "Fix unused param warning"

* commit '30f52fea05fb91394b50793c5cb14ef05e5c94d6':
Fix unused param warning
944ada30cf18d57e301f7d62e79f51f979f6037d 09-Aug-2012 Stephen Hines <srhines@google.com> am 278cded6: am d2e826b5: am 65c37c81: Merge "Fixed an unused param warning"

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

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

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

* commit '5d3cf721f438a12de6eec0a2af0bf8041feb14d8':
Fix signed/unsigned comparison warning
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
4e8735f8e8098ec9cc29fb8091d3b83750705b99 09-Aug-2012 Stephen Hines <srhines@google.com> am f6714b02: am 58b6a130: am 02adb534: am 80bcb489: Merge "Fixed un-initialized variable warnings"

* commit 'f6714b027a4940218b88773bccd939fc0d52ae38':
Fixed un-initialized variable warnings
f6714b027a4940218b88773bccd939fc0d52ae38 09-Aug-2012 Stephen Hines <srhines@google.com> am 58b6a130: am 02adb534: am 80bcb489: Merge "Fixed un-initialized variable warnings"

* commit '58b6a130c59d757b290f30773c68380514cb89b7':
Fixed un-initialized variable warnings
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
9303398b05010ed1c281907e0b01a70fa30a2baa 09-Aug-2012 Chris Dearman <chris@mips.com> am 49666005: am 6ee3ecc0: Decode DHCP netmask option correctly

* commit '49666005b22519ddd628d7bd262b778d130d6e8b':
Decode DHCP netmask option correctly
49666005b22519ddd628d7bd262b778d130d6e8b 09-Aug-2012 Chris Dearman <chris@mips.com> am 6ee3ecc0: Decode DHCP netmask option correctly

* commit '6ee3ecc03a7cf9118e6a0b2577f15c76244bc408':
Decode DHCP netmask option correctly
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"
34af36085949b84410d6b34f228e2c08460eac76 09-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am bdf4fd7a: am ff5c802e: am faad67fa: am ef3f7fa3: Merge "Set the SELinux security label on new directories."

* commit 'bdf4fd7a8c629eb7bef9f713ba7eb9cd4bd5ad32':
Set the SELinux security label on new directories.
fa17037c0d063e2feecd79ef2d441a6edfd12c4b 09-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 211f9fb1: am 21c2c849: am b9994d22: am 8261d271: Merge "restorecon tombstone directory."

* commit '211f9fb14bb204044ce657c71a1d870b7ddcc0a0':
restorecon tombstone directory.
7acf56f8f740d63be3b7492b2d56349dda33b134 09-Aug-2012 Elliott Hughes <enh@google.com> am 79737802: am 8268a75e: am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT"

* commit '79737802421d7b32707f1c248b5ecb239965234a':
Conditionally use SIGSTKFLT
cd5d7bff651983d2081184509d5297945de6860a 09-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 2fa85910: am e0346fa7: am b2a32cb9: am 8fb0caa7: Merge "config_mbr: Fix integer overflow"

* commit '2fa859101f9d5f568c2562b064e233b14973e6fc':
config_mbr: Fix integer overflow
c6b95299a625d9c34d047a00a9c8c630f71d4eb9 09-Aug-2012 Jeff Sharkey <jsharkey@android.com> am b9c37922: am 1d421490: Merge "Include to define uid_t." into jb-mr1-dev

* commit 'b9c37922b7b445dc86c2c5eb3266c83bd88c5cb2':
Include to define uid_t.
bdf4fd7a8c629eb7bef9f713ba7eb9cd4bd5ad32 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am ff5c802e: am faad67fa: am ef3f7fa3: Merge "Set the SELinux security label on new directories."

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

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

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

* commit 'e0346fa7fa715f785ea60966f38a474f337278ca':
config_mbr: Fix integer overflow
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
b9c37922b7b445dc86c2c5eb3266c83bd88c5cb2 08-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 1d421490: Merge "Include to define uid_t." into jb-mr1-dev

* commit '1d4214900cc5c07eceb3a98618fcfecdfa8dc903':
Include to define uid_t.
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"
691414f2678b89c965404e1836b5ccfd92c4cb0e 08-Aug-2012 Jeff Sharkey <jsharkey@google.com> Merge "Added clear command to toolbox"
aa29e08027b93cadb5c947cfebebd2d3f1af2f46 08-Aug-2012 Jeff Sharkey <jsharkey@android.com> am 2f096c3a: am f2e4d7ff: Merge "Native utils for working with user and app IDs." into jb-mr1-dev

* commit '2f096c3a96a715caaeb0746c8041e9dc9e62d6aa':
Native utils for working with user and app IDs.
2f096c3a96a715caaeb0746c8041e9dc9e62d6aa 08-Aug-2012 Jeff Sharkey <jsharkey@android.com> am f2e4d7ff: Merge "Native utils for working with user and app IDs." into jb-mr1-dev

* commit 'f2e4d7ff0308171d63e4c133e8769b0dba304ece':
Native utils for working with user and app IDs.
f2e4d7ff0308171d63e4c133e8769b0dba304ece 08-Aug-2012 Jeff Sharkey <jsharkey@android.com> Merge "Native utils for working with user and app IDs." into jb-mr1-dev
52abb4b1ef5f0a0939f1485433cf817523caf779 16-Jul-2012 Michael Wright <michaelwr@google.com> Added clear command to toolbox

Change-Id: Ifb1b7693727997b94614f7da73081f0894ee88ad
oolbox/Android.mk
oolbox/clear.c
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
3b592db88efca95d6ca995a645df963c08dd3ef2 07-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 7391e7a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7391e7a4e24c116a9aab66506f86757a2f7e74da':
7391e7a4e24c116a9aab66506f86757a2f7e74da 07-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ib9d575cce6450d7d9b4df6fb731f7618192c2858
eb58dafef5dc6bc74cde95914b37fa9b98cd4c1f 07-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
c76fca1f02c6b7e70809723d0d6880149ca5329a 07-Aug-2012 Ravi Nagarajan <nravi@broadcom.com> am 1c237977: am a8afd723: Allow AID_BLUETOOTH to update persist.service.bdroid

* commit '1c237977e8f1b73bfd9bb873a0ba1ce61b75fcce':
Allow AID_BLUETOOTH to update persist.service.bdroid
1c237977e8f1b73bfd9bb873a0ba1ce61b75fcce 07-Aug-2012 Ravi Nagarajan <nravi@broadcom.com> am a8afd723: Allow AID_BLUETOOTH to update persist.service.bdroid

* commit 'a8afd723a4bdd68eda34a552a472a6adc0c26369':
Allow AID_BLUETOOTH to update persist.service.bdroid
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
de24d83f0e4aeb0f9cf2517c3705078053ec1a4d 06-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 447e392b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '447e392b6036aa9fcb9427782ab249921def8fc2':
447e392b6036aa9fcb9427782ab249921def8fc2 06-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: If02ab00e12b60a3852ec58a1f7eba47e2675da1a
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
3df086824c79cdc52e1e68269c1c7b21ced3d82c 03-Aug-2012 Colin Cross <ccross@google.com> am 91368bb1: am 60479afa: Merge changes I943b04dd,I645b6a2d into jb-mr1-dev

* commit '91368bb1c352dd00b8751b92cb1d6971e0143505':
init: fix return value for android uid/gid check
init.rc: make last_kmsg readable only by user system and group log
00443711cc337574f32aa36e01cfc44c2bc6861a 03-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 358641ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '358641ec1af9aa2b4f87e688f04e4836eccf2f20':
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
91368bb1c352dd00b8751b92cb1d6971e0143505 03-Aug-2012 Colin Cross <ccross@google.com> am 60479afa: Merge changes I943b04dd,I645b6a2d into jb-mr1-dev

* commit '60479afa182330b42c5be04759b0340d8fd9e7c8':
init: fix return value for android uid/gid check
init.rc: make last_kmsg readable only by user system and group log
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
358641ec1af9aa2b4f87e688f04e4836eccf2f20 03-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I67e44ab1acd80a961b813639d41737ac187bbd99
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
fafef5aea2163a528866ba5590eeabf71d9fac01 03-Aug-2012 James Dong <jdong@google.com> am 7cc2be47: am b2b46dc4: Merge "Added a cmd for configuring number of video buffers for camera, if supported" into jb-mr1-dev

* commit '7cc2be476812bf3b4f3e4d51e6fc2a27bf4add6a':
Added a cmd for configuring number of video buffers for camera, if supported
7cc2be476812bf3b4f3e4d51e6fc2a27bf4add6a 03-Aug-2012 James Dong <jdong@google.com> am b2b46dc4: Merge "Added a cmd for configuring number of video buffers for camera, if supported" into jb-mr1-dev

* commit 'b2b46dc48c01c03e824ef49a88fc947ab2a65b28':
Added a cmd for configuring number of video buffers for camera, if supported
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
7b88e38a1c3e0f1d808f804cf579d5848bd7f502 03-Aug-2012 Doug Zongker <dougz@google.com> am aaa1dfb5: am cba158a6: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." into jb-mr1-dev

* commit 'aaa1dfb5d9bc1c9cd24abe00051e075ed6cd625d':
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
aaa1dfb5d9bc1c9cd24abe00051e075ed6cd625d 03-Aug-2012 Doug Zongker <dougz@google.com> am cba158a6: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." into jb-mr1-dev

* commit 'cba158a6f69dc0eb942a3fa8e5b42c6e5e51c2ae':
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
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
c24cd7a15f2aeec597e329364cd71711633a915b 03-Aug-2012 Benoit Goby <benoit@android.com> am 85895980: am f4de0783: libusbhost: Fix USB device discovery on boot

* commit '85895980da0c2444f50779a45ec23b6bccc410f7':
libusbhost: Fix USB device discovery on boot
51e2478227af7337911ede5e77bc95d66888f3be 03-Aug-2012 Benoit Goby <benoit@android.com> am 9d0e3dc8: am 6cc883ca: libusbhost: Fix possible missed "device added" notification

* commit '9d0e3dc89dc3f28a6d64daf996840c900010dcdc':
libusbhost: Fix possible missed "device added" notification
f8a098631c0f1bd79e06e8de52f9545128d49d21 03-Aug-2012 The Android Open Source Project <initial-contribution@android.com> am 4e28e5b8: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4e28e5b871e7a4d67297ece485c87680ba0f6021':
85895980da0c2444f50779a45ec23b6bccc410f7 02-Aug-2012 Benoit Goby <benoit@android.com> am f4de0783: libusbhost: Fix USB device discovery on boot

* commit 'f4de078388242fff9b68c04b122e8a095cab9b0e':
libusbhost: Fix USB device discovery on boot
9d0e3dc89dc3f28a6d64daf996840c900010dcdc 02-Aug-2012 Benoit Goby <benoit@android.com> am 6cc883ca: libusbhost: Fix possible missed "device added" notification

* commit '6cc883ca098f34bd126478a6aa19d5cce48d71a9':
libusbhost: Fix possible missed "device added" notification
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
4e28e5b871e7a4d67297ece485c87680ba0f6021 02-Aug-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ic967f2cc0110dd1ceca4f30c552430bb57c03bb6
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
7c51aad4fee8acd0cf835782da764b26f888e454 01-Aug-2012 Dima Zavin <dima@android.com> am 35fc46d8: am 018227f5: am ce76e2d0: Merge "Modify init.rc and init.goldfish.rc for SE Android."

* commit '35fc46d8e338181ee3caedc30f3627bad2ffe35e':
Modify init.rc and init.goldfish.rc for SE Android.
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."
cac6b48ac014eccf06a0ec3b340925e86355832f 31-Jul-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release

Change-Id: Ibc7b4524bee9979836a9c7610fb69cc64bf9624b
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
b54f39fdd97c50e0e8dfa439722be0786f5e6f52 26-Jan-2012 Mike Kasick <mike@kasick.org> init: Retain traditional restart behavior for critical and oneshot services.

Adds an SVC_RESTART state that's used for an explicit "restart" of a
running service. This retains the traditional restart behavior for
critical and oneshot services (previously altered by 7e36edd8), whereby
these services are "simply restarted" instead of counting as a crash (for a
critical serivce) or going into the disabled state (for a oneshot service).
nit/builtins.c
nit/init.c
nit/init.h
nit/signal_handler.c
7e36edd80f23a5d34ce7b5b0fbe8ecfea061a826 06-Feb-2012 Mike Kasick <mike@kasick.org> init: Safely restart services to avoid race conditions.

Previously, service restarts (either an explicit "restart", or a "stop,
start" pair) exhibited a race condition whereby the new (restarting)
service process was often spawned before the old (stopping) process had
terminated. This may have resulted in the new service process failing to
acquire a limited resource (file lock, socket bind, etc.) that the old
process had not yet released.

Now, a stopping service remains in the SVC_RUNNING state until its exiting
process has been reaped by waitpid. This prevents a "stop, start" sequence
from spawning a second service process before resources held by the first
are released. This enables safe service restarts by stopping the service,
waiting for the old service process to terminate, and (only then) starting
the new service process. In the event of "restarting" an already stopped
service, the previous behavior is maintained whereby the service is simply
started.

This scenario could be special-cased by the restart command, however, we
have observed instances where services are, unintentionally, stopped and
started "too quickly," and so simultaneous processes for the same service
should never be allowed.

Note that this commit alters the behaviors for explicit restarts of
critical and oneshot services. Previously these serivces would simply be
restarted, whereas now, an explicit restart of a critical service counts as
a crash (which may result in a recovery reboot) and oneshot services go
into the disabled state.
nit/init.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