Commit Graph

21859 Commits

Author SHA1 Message Date
Ruchi Kandoi 39510201a3 Merge "healthd: Correct the scaling factor for maxVoltage and maxCurrent." into nyc-dev
am: 1d043484d4

* commit '1d043484d409d4d18eaf13aa1086f51fcee73587':
  healthd: Correct the scaling factor for maxVoltage and maxCurrent.
2016-02-26 21:29:48 +00:00
Ruchi Kandoi 1d043484d4 Merge "healthd: Correct the scaling factor for maxVoltage and maxCurrent." into nyc-dev 2016-02-26 21:27:47 +00:00
Dimitry Ivanov 246589ac4d Merge "Added function to explicitly initialize a namespace" into nyc-dev
am: 94da34a8fa

* commit '94da34a8fa20ea6717089d0fe5777bf9c55b76bb':
  Added function to explicitly initialize a namespace
2016-02-26 18:11:20 +00:00
Ruchi Kandoi 5c09ec1726 healthd: Correct the scaling factor for maxVoltage and maxCurrent.
Change-Id: I93a4c916d0c742710c00c0b15d8d1de6b8f8d1c2
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-02-26 10:09:28 -08:00
Dimitry Ivanov 94da34a8fa Merge "Added function to explicitly initialize a namespace" into nyc-dev 2016-02-26 18:03:56 +00:00
Todd Kjos 973f224d31 Merge "Mount schedTune cgroup as /dev/stune" into nyc-dev
am: d125f6e8a9

* commit 'd125f6e8a95a998d74175df49d54251489723933':
  Mount schedTune cgroup as /dev/stune
2016-02-26 17:43:47 +00:00
Todd Kjos d125f6e8a9 Merge "Mount schedTune cgroup as /dev/stune" into nyc-dev 2016-02-26 17:35:50 +00:00
Lajos Molnar 0b4cc2f3e1 Merge "keep legacy HAL_DATASPACE enums unchanged" into nyc-dev
am: 1e86e1ba1a

* commit '1e86e1ba1acfec7a16cdad8ab87f262e7bfc3e52':
  keep legacy HAL_DATASPACE enums unchanged
2016-02-26 05:08:36 +00:00
Lajos Molnar 1e86e1ba1a Merge "keep legacy HAL_DATASPACE enums unchanged" into nyc-dev 2016-02-26 05:06:13 +00:00
Steve Fung b20f071615 Merge "crash_reporter: Clean up symlinks in unit test" am: 36016e2742
am: 96df20f628

* commit '96df20f6280562654d8a96cebcab6d2d97245e06':
  crash_reporter: Clean up symlinks in unit test
2016-02-26 02:10:53 +00:00
Steve Fung 96df20f628 Merge "crash_reporter: Clean up symlinks in unit test"
am: 36016e2742

* commit '36016e2742597ea4e5350ba89a5188ef4937ce7a':
  crash_reporter: Clean up symlinks in unit test
2016-02-26 02:07:56 +00:00
Steve Fung 36016e2742 Merge "crash_reporter: Clean up symlinks in unit test" 2016-02-26 02:06:12 +00:00
Casey Dahlin c3cc8fb283 Introduce unique_fd
am: 97b3e66d3e

* commit '97b3e66d3ef598ccf8cad42bbb723273d8d61f7c':
  Introduce unique_fd
2016-02-26 01:50:54 +00:00
Casey Dahlin 97b3e66d3e Introduce unique_fd
unique_fds are wrappers for integer file descriptors that automatically
close when they go out of scope. They are movable but not copyable and
generally mimic the semantics of std::unique_ptr

(cherry-pick from 918b9e8dc6)

Change-Id: I0657b848b6536d5ad9fc06686e240ea5c387b0ac
Test: Considerable exercise in new AIDL integration tests
Bug: None
Signed-off-by: Casey Dahlin <sadmac@google.com>
2016-02-25 17:02:17 -08:00
Steve Fung 7ee2f36e67 crash_reporter: Clean up symlinks in unit test
The user collector test creates several symlinks to the temporary
directory that it doesn't unlink.  Fix it.

BUG=27365098
TEST=run `crash_reporter_tests`, tests pass, no symlinks are left behind

Change-Id: I7ad24c528dc842e17fa3569ea010f43d34e0bd75
2016-02-25 16:16:13 -08:00
Mark Salyzyn c2f3eea195 Merge changes Ic15a87f4,I8a53ad3a,I6a03d405 into nyc-dev
am: dad8361a0e

* commit 'dad8361a0ecc194128ad46676b65a81463d5b1b4':
  liblog: __android_log_error_write use event list library
  liblog: test: __android_log_error_write accuracy
  liblog: add android_log_write_string8_len
2016-02-25 23:56:39 +00:00
Tim Murray 46f8276968 Fix build break with uninitialized boost_fd.
am: b43225eefb

* commit 'b43225eefb0e60858755d72103f9f9b53785b5d9':
  Fix build break with uninitialized boost_fd.
2016-02-25 23:56:25 +00:00
Mark Salyzyn dad8361a0e Merge changes Ic15a87f4,I8a53ad3a,I6a03d405 into nyc-dev
* changes:
  liblog: __android_log_error_write use event list library
  liblog: test: __android_log_error_write accuracy
  liblog: add android_log_write_string8_len
2016-02-25 23:55:59 +00:00
Mark Salyzyn a4f2ef1b05 liblog: __android_log_error_write use event list library
(cherry pick from commit 81f407be36)

Switch to the event list library to compose the associated event.

SideEffects: Instead of composing event on a stack buffer of 512
             bytes in size, a PAGE is allocated temporarily.

Bug: 27356456
Change-Id: Ic15a87f49385834c2287ed82c26439b2c5eb4f77
2016-02-25 15:54:28 -08:00
Mark Salyzyn d9aee653d1 liblog: test: __android_log_error_write accuracy
(cherry pick from commit 5cecedc6e8)

Add a test to confirm exact expected content using the testframe
setup for the events log handler. Remove dependency on 512 truncation
in liblog->
android_errorWriteWithInfoLog__android_logger_list_read__data_too_large
to something more liberal.

Bug: 27356456
Change-Id: I8a53ad3a16cf16b14856efe5b95417e857c7e09b
2016-02-25 15:53:44 -08:00
Tim Murray b43225eefb Fix build break with uninitialized boost_fd.
Change-Id: Icf209e2e0f4835db01f61dbf83b4715db9ef03a9
(cherry picked from commit def6c151f4)
2016-02-25 23:53:08 +00:00
Mark Salyzyn 1d5afc9e08 liblog: add android_log_write_string8_len
(cherry pick from commit 67d7eafd56)

android_log_write_string8_len(android_log_context ctx,
                              const char *value, size_t maxlen)

Caps the supplied string to a maxlen length. Alter API to handle
a NULL pointer for the value string for this and
android_log_write_string8() and instead of returning -EINVAL,
act like a null string "" was supplied to preserve the list
location. API is also changed to report the number of characters
actually placed into the android_log_context.

Bug: 27356456
Bug: 19235719
Change-Id: I6a03d405eac1d741555dd05555513ec691e7a46e
2016-02-25 15:53:00 -08:00
Josh Gao d3ff759988 Merge "adb: fix mistaken use of PLOG." am: a692f431d6
am: 95891e5a70

* commit '95891e5a70f9b0aed6332e92f9a3204b3e5b3d58':
  adb: fix mistaken use of PLOG.
2016-02-25 22:34:32 +00:00
Josh Gao 95891e5a70 Merge "adb: fix mistaken use of PLOG."
am: a692f431d6

* commit 'a692f431d64c394ae620d9e7554075538e41e3c9':
  adb: fix mistaken use of PLOG.
2016-02-25 22:32:32 +00:00
Josh Gao a692f431d6 Merge "adb: fix mistaken use of PLOG." 2016-02-25 22:29:53 +00:00
Josh Gao 443a52c298 adb: fix mistaken use of PLOG.
Change-Id: I60bfa3d8cf1572a877d6f0c9369d8f72f10e5aef
2016-02-25 14:14:02 -08:00
James Hawkins 714a090536 Merge "libpixelflinger: Fix -Woverloaded-virtual warnings." am: aace5df403
am: bd493a7927

* commit 'bd493a7927c31c37692234a581746525b40e5c34':
  libpixelflinger: Fix -Woverloaded-virtual warnings.
2016-02-25 22:04:20 +00:00
Christopher Ferris 2f485c3743 Fix incorrect handling of snprintf return value.
am: 82d84897b1

* commit '82d84897b1f17ccda1e32098af11a25bd9f6127a':
  Fix incorrect handling of snprintf return value.
2016-02-25 22:03:07 +00:00
Christopher Ferris 82d84897b1 Fix incorrect handling of snprintf return value.
The code assumed that snprintf would never return a value less than
the passed in size of the buffer. This is not accurate, so fix all
of the places this assumptions is made. Also, if the name is too large,
then truncate just the name to make everything fit.

Added a new set of tests for this code. Verified that the old code passes
on the _normal and _exact version of the tests, but fails with the
FORTIFY error on the _truncated version of the tests. All tests pass
on the new code.

Bug: 27324359

(cherry picked from commit 626efb78a6)

Change-Id: Iba60a926cf5a1d6b517a6bfd8c797d724f093010
2016-02-25 14:02:00 -08:00
Christopher Ferris 126485e6c1 Merge "Fix incorrect handling of snprintf return value." am: 63f7a67c6e
am: 19f704ba66

* commit '19f704ba66ac1880ed5e26d80a1abe3922b5a4dc':
  Fix incorrect handling of snprintf return value.
2016-02-25 22:01:42 +00:00
James Hawkins bd493a7927 Merge "libpixelflinger: Fix -Woverloaded-virtual warnings."
am: aace5df403

* commit 'aace5df403a8d95429f13daf037a9def46bf7cd5':
  libpixelflinger: Fix -Woverloaded-virtual warnings.
2016-02-25 22:01:41 +00:00
James Hawkins aace5df403 Merge "libpixelflinger: Fix -Woverloaded-virtual warnings." 2016-02-25 21:59:40 +00:00
Christopher Ferris 19f704ba66 Merge "Fix incorrect handling of snprintf return value."
am: 63f7a67c6e

* commit '63f7a67c6e39109b402aae9b121c117b8bb7bd7b':
  Fix incorrect handling of snprintf return value.
2016-02-25 21:59:38 +00:00
Mark Salyzyn 79e0c9eeca Merge changes Ic15a87f4,I8a53ad3a,I6a03d405 am: 9377fa863a
am: acc6ca3eb8

* commit 'acc6ca3eb83606478123efd3fe5c2f22f16279e5':
  liblog: __android_log_error_write use event list library
  liblog: test: __android_log_error_write accuracy
  liblog: add android_log_write_string8_len
2016-02-25 21:59:37 +00:00
Christopher Ferris 63f7a67c6e Merge "Fix incorrect handling of snprintf return value." 2016-02-25 21:58:44 +00:00
Mark Salyzyn acc6ca3eb8 Merge changes Ic15a87f4,I8a53ad3a,I6a03d405
am: 9377fa863a

* commit '9377fa863af78623d93698f045264c067e275dc3':
  liblog: __android_log_error_write use event list library
  liblog: test: __android_log_error_write accuracy
  liblog: add android_log_write_string8_len
2016-02-25 21:58:00 +00:00
Mark Salyzyn 9377fa863a Merge changes Ic15a87f4,I8a53ad3a,I6a03d405
* changes:
  liblog: __android_log_error_write use event list library
  liblog: test: __android_log_error_write accuracy
  liblog: add android_log_write_string8_len
2016-02-25 21:57:30 +00:00
Dimitry Ivanov 24d75df93c Merge "Make libutils symbols protected" am: 70e75d9287
am: 9d8d6f0a7a

* commit '9d8d6f0a7a53a56daaa4bb3fe77382436c219726':
  Make libutils symbols protected
2016-02-25 21:14:45 +00:00
Dimitry Ivanov 9d8d6f0a7a Merge "Make libutils symbols protected"
am: 70e75d9287

* commit '70e75d92872076f3f89cedf3b3a7b9ca4e9aafc1':
  Make libutils symbols protected
2016-02-25 21:12:37 +00:00
Dimitry Ivanov ca0c8ce614 Merge "Make libutils symbols protected" into nyc-dev
am: aa2cf3facf

* commit 'aa2cf3facf8d26a3642c90cbf5b83e18934da48c':
  Make libutils symbols protected
2016-02-25 21:10:24 +00:00
Dimitry Ivanov 70e75d9287 Merge "Make libutils symbols protected" 2016-02-25 21:10:20 +00:00
Dimitry Ivanov 96ccb85fa2 Make libutils symbols protected
This change is a workaround for apps linking
libutils statically and dynamically which causes
them to crash for newer version of Android.

Bug: http://b/27313399
Change-Id: I47ac4146041b6eeef03cb605ea436719d552ec8f
(cherry picked from commit 2c7960c8d9)
2016-02-25 13:09:40 -08:00
Dimitry Ivanov aa2cf3facf Merge "Make libutils symbols protected" into nyc-dev 2016-02-25 21:08:48 +00:00
Mark Salyzyn c58bc1717f logd: sock_alloc_send_pskb starves pruning
am: d26b2cacad

* commit 'd26b2cacadc3f0cc143b3afd392f6a0135dc16bd':
  logd: sock_alloc_send_pskb starves pruning
2016-02-25 21:03:05 +00:00
Mark Salyzyn f50ed8138c logd: Allow (some) headers to be individually importable
am: 317bfb923c  -s ours

* commit '317bfb923c12af688d18fc9a3580dff201b2482b':
  logd: Allow (some) headers to be individually importable
2016-02-25 21:02:56 +00:00
Christopher Ferris 626efb78a6 Fix incorrect handling of snprintf return value.
The code assumed that snprintf would never return a value less than
the passed in size of the buffer. This is not accurate, so fix all
of the places this assumptions is made. Also, if the name is too large,
then truncate just the name to make everything fit.

Added a new set of tests for this code. Verified that the old code passes
on the _normal and _exact version of the tests, but fails with the
FORTIFY error on the _truncated version of the tests. All tests pass
on the new code.

Bug: 27324359
Change-Id: I1b64ddde6f5ff2ec7f6428b998d21d41a1236b14
2016-02-25 12:46:44 -08:00
Mark Salyzyn 9873e265c6 Merge changes Idaa6699d,Ic7759ef9 am: faf7946bd7
am: 7c72c0f28d

* commit '7c72c0f28d55d528162ad8ad652a311a41d1f3be':
  logd: sock_alloc_send_pskb starves pruning
  logd: Allow (some) headers to be individually importable
2016-02-25 20:44:48 +00:00
Mark Salyzyn d26b2cacad logd: sock_alloc_send_pskb starves pruning
(cherry pick from commit 5c77ad55d0)

Allow socket send syscall to terminate after 32 seconds if reader
stalled because of memory pressure allocating new network buffers

Add a gTest to catch regressions, add security buffer to log_dump

Bug: 27242723
Change-Id: Idaa6699d9d284e7f5f723ae0e76b3d6aa3371489
2016-02-25 12:43:12 -08:00
Mark Salyzyn 7c72c0f28d Merge changes Idaa6699d,Ic7759ef9
am: faf7946bd7

* commit 'faf7946bd79622a6fc564bc2487c21c950c896b1':
  logd: sock_alloc_send_pskb starves pruning
  logd: Allow (some) headers to be individually importable
2016-02-25 20:42:32 +00:00
Mark Salyzyn 317bfb923c logd: Allow (some) headers to be individually importable
(cherry pick from commit 2ad0bd0a9b)

LogReader.h needs to be individually importable.

Fix a few others, drop includes of local includes, let them be
included in source instead and allow headers to be included
alphabetically. Was not a complete audit since goal was to
separate LogReader.h out from the pack.

Bug: 27242723
Change-Id: Ic7759ef90995e5bd285810706af33550c73cf5b5
2016-02-25 12:42:31 -08:00