Commit Graph

21982 Commits

Author SHA1 Message Date
Elliott Hughes 9ce327200c Remove a test for an API I'm removing.
Change-Id: I44ee84b92fdbf561551e5cf90e0c44df535de83f
2016-02-26 16:57:54 -08:00
Jorge Lucangeli Obes 7e070eb29f Merge "Add notice for adding users in AOSP." am: acf69772ff
am: da6b7ef1e9

* commit 'da6b7ef1e9585a2a2cc62d3e64f537e477b226d5':
  Add notice for adding users in AOSP.
2016-02-27 00:53:26 +00:00
Jorge Lucangeli Obes da6b7ef1e9 Merge "Add notice for adding users in AOSP."
am: acf69772ff

* commit 'acf69772ffbf2b4684f9bb44f5b9ed9ae3b8ddbd':
  Add notice for adding users in AOSP.
2016-02-27 00:51:12 +00:00
Jorge Lucangeli Obes acf69772ff Merge "Add notice for adding users in AOSP." 2016-02-27 00:49:49 +00:00
James Hawkins b2de40a4fc crash_reporter: Mark the euid parameter as __unused.
This fixes an unused parameter warning.

Bug: 27378717
Change-Id: Ieb50dfd60a565e0cd77e8179c21cbe8e65ebdd9d
2016-02-26 15:44:46 -08:00
Dan Willemsen 40d9046e4e Merge "Fix windows 64-bit builds" into nyc-dev
am: 242393fec1  -s ours

* commit '242393fec13d6703e1d2ef27873fc222cb1d3db3':
  Fix windows 64-bit builds
2016-02-26 23:42:08 +00:00
James Hawkins 47f9ba02ae Merge "crash_reporter: Fix a -Wmissing-field-initializers warning." am: 2913fa1908
am: df5ac40d6d

* commit 'df5ac40d6da1b82a3e0b2dd4b4300be9fac65ddf':
  crash_reporter: Fix a -Wmissing-field-initializers warning.
2016-02-26 23:41:15 +00:00
James Hawkins df5ac40d6d Merge "crash_reporter: Fix a -Wmissing-field-initializers warning."
am: 2913fa1908

* commit '2913fa190831ff224e7a0ef1311c345fe67c758f':
  crash_reporter: Fix a -Wmissing-field-initializers warning.
2016-02-26 23:38:42 +00:00
James Hawkins 2913fa1908 Merge "crash_reporter: Fix a -Wmissing-field-initializers warning." 2016-02-26 23:35:26 +00:00
Stephen Hines 242393fec1 Merge "Fix windows 64-bit builds" into nyc-dev 2016-02-26 23:34:39 +00:00
James Hawkins 69bd21f695 crash_reporter: Fix a -Wmissing-field-initializers warning.
The fix is to use the C++ empty struct initialization {} instead of the
C-style {0}.

Bug: 27378717
Change-Id: I36896d1202bf30b5db5689ac13acaff3b3f1b30b
2016-02-26 15:15:06 -08:00
Jorge Lucangeli Obes 5596cf04ff Add notice for adding users in AOSP.
Sometimes new users/groups get added in internal branches, and the list
gets out of sync. Add a comment to prompt developers to add users in
AOSP.

Bug: None
Change-Id: I5b2df391902b842f1af8a377c8eac4cdb36a0518
2016-02-26 15:03:44 -08:00
Josh Gao 71728ca300 adb: fix directory creation logic.
Previously, for `adb pull $remote $local`, we would do the equivalent of
mkdir -p on `dirname $local`. This patch changes the behavior to only
creating directories that are being pulled, like scp.

Bug: http://b/27362811
Change-Id: I79f975ee9f2d9bc9e8be6a7c4f2de6d7ae2d2d23
2016-02-26 14:50:24 -08:00
James Hawkins 906368968a Merge "crash_report: Fix several signed-unsigned comparison warnings in tests." am: ac06dcd29f
am: 48458219d5

* commit '48458219d5a107d8ea208239bed240a7be6d911d':
  crash_report: Fix several signed-unsigned comparison warnings in tests.
2016-02-26 22:38:27 +00:00
James Hawkins 48458219d5 Merge "crash_report: Fix several signed-unsigned comparison warnings in tests."
am: ac06dcd29f

* commit 'ac06dcd29fbc551ebc77abdee2557db98930058e':
  crash_report: Fix several signed-unsigned comparison warnings in tests.
2016-02-26 22:35:22 +00:00
James Hawkins ac06dcd29f Merge "crash_report: Fix several signed-unsigned comparison warnings in tests." 2016-02-26 22:32:32 +00:00
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
James Hawkins a28317d137 crash_report: Fix several signed-unsigned comparison warnings in tests.
The two types of fixes are:
* Assign expected non-negative values to unsigned int variables.
* Annotate constant expected integer values as unsigned.

Bug: 27378717
Change-Id: Ifc13beedd61a28ed685e1a06a7cefe99072e3345
2016-02-26 11:24:38 -08: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
Mattias Nissler 474ef2484e Remove libmincrypt/tools after move to bootable/recovery
Bug: 27326256
Change-Id: Ife119db4cda9905b66a1ab5b6f018de85547c0f3
2016-02-26 11:03:15 +01: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
Dan Willemsen 9dddd137c7 Fix windows 64-bit builds
pid_t is 64-bit in 64-bit mingw, but the windows process/thread
functions return a DWORD(uint32_t). Instead of promoting to a pid_t and
fixing the format strings, just use a uint32_t to store the values.

android_thread_id also cannot be a 64-bit pointer, so for windows just
force it to be a uint32_t.

libutils/ProcessCallStack only works under Linux, since it makes heavy
use of /proc. Don't compile it under Windows or Darwin.

Bug: 26957718

(cherry picked from commit 86cf941c48)

Change-Id: I8d39d1951fea1b3011caf585c983e1da7959f7c0
2016-02-25 18:43:55 -08: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