GitLab

* commit '66b6eb94':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer

See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 7987b835)

Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df

* commit 'e0dce90b':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b

Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7

* commit '5b85b1d4':
  libutils: fix overflow in String8::allocFromUTF8

Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908

Bug: 23290056

(cherry picked from commit 4eeacbee)

Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
(cherry picked from commit ebabef27)

* commit '9bd7afc0':
  Prevent integer overflow when allocating native_handle_t

User specified values of numInts and numFds can overflow
and cause malloc to allocate less than we expect, causing
heap corruption in subsequent operations on the allocation.

Bug: 19334482
Change-Id: I43c75f536ea4c08f14ca12ca6288660fd2d1ec55

Bug: 15701117
Change-Id: I1d2164726b8f421d8e6741b84749fddb86b60809

Bug: 14498701

(cherry picked from commit c5bb49a1)

Conflicts:
	debuggerd/tombstone.cpp

Change-Id: I888b3d683c3b880357b0b24f9204a9cca3e8f3be

Change-Id: Ife0da42c22e4408dc5c07ac0f20e0ecbbde20832

Remove world-readable, reduce group permissions to readable by system
daemons

Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>

Change-Id: Idf3e21dfaa9f90f4dcb1b4d41eed3891dda99561

* commit 'efbf36f2':
  init.rc: prep tcp_default_init_rwnd, set the default to 60

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

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 7c862c8b)

* commit '726beb6c':
  don't load property_contexts from /data

* commit '6941a83c':
  don't load property_contexts from /data

Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
(cherry picked from commit dc3a42bb)

Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file." into klp-modular-dev

* commit '3530b9cd':
  Remove obsolete vdc call.

* commit '02916aa2':
  Remove obsolete vdc call.

Since ca8e66a8, init has
been handling reboots and filesystem unmounts. Remove obsolete
call to vdc.

Bug: 12504045
Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
(cherry picked from commit 225459a5)

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>

* commit '773c9ab7':
  Fix global pointing to local variable.

* commit 'c96c2954':
  Fix global pointing to local variable.

* commit 'a152ed73':
  Fix global pointing to local variable.

Change-Id: I933cbb680ca6310c13634f09a9827077c8dbd568

* commit 'a40636f3':
  Fix code style, put unused in the end

* commit '5abe06bf':
  Fix code style, put unused in the end

* commit '6e34793b':
  Fix code style, put unused in the end

* commit 'aaf89887':
  Re-enable libunwind for arm.

* commit '6fe31b2f':
  Re-enable libunwind for arm.

* commit 'd391c9b4':
  Re-enable libunwind for arm.

am 7b9bb36a: am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...

* commit '7b9bb36a': (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
  ...

Change-Id: I7315b35049924d5067203a432584b8f29e5a1391

* commit '0256e1f6': (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
  ...