Commit Graph

19979 Commits

Author SHA1 Message Date
Sami Tolvanen 9218477ae7 Merge "logd: stop log spam when integrity enforcement is suppressed" 2016-02-29 20:28:54 +00:00
Sami Tolvanen abda9340e6 logd: stop log spam when integrity enforcement is suppressed
Bug: 27389331
Change-Id: I9f3bc21eb1b85b9fda4fa0a5c5b4da94e5e7cc1c
2016-02-29 12:08:39 -08:00
Bernhard Rosenkränzer e487732935 Merge "Allow building with Python 3.x"
am: a335367bb0

* commit 'a335367bb02b759e5fa5aab535989f61ba691323':
  Allow building with Python 3.x
2016-02-29 19:18:27 +00:00
Dan Albert a335367bb0 Merge "Allow building with Python 3.x" 2016-02-29 19:16:52 +00:00
Dan Willemsen ea29d56873 Merge "liblog: Update Android.bp for Android.mk changes"
am: d480a99b0c

* commit 'd480a99b0cefd17a120919c662bfc6d303cffddd':
  liblog: Update Android.bp for Android.mk changes
2016-02-29 19:06:32 +00:00
Dan Willemsen d480a99b0c Merge "liblog: Update Android.bp for Android.mk changes" 2016-02-29 19:05:39 +00:00
Dan Willemsen 7d5457e150 liblog: Update Android.bp for Android.mk changes
Change-Id: I5062583a45efa2774f01339e7601767b817f54ee
2016-02-29 10:46:18 -08:00
David Pursell 89d749dbfc Merge "adb: use TCP keepalive."
am: e663c163ac

* commit 'e663c163ac5f1931c2f9ebb091bf09a8a588432b':
  adb: use TCP keepalive.
2016-02-29 17:44:56 +00:00
David Pursell e663c163ac Merge "adb: use TCP keepalive." 2016-02-29 17:43:35 +00:00
Mattias Nissler e84f68ad5d Merge "Remove libmincrypt/tools after move to bootable/recovery"
am: 50eb9b29db

* commit '50eb9b29db783b6bda724da0f021489e7ec7f25a':
  Remove libmincrypt/tools after move to bootable/recovery
2016-02-29 08:30:27 +00:00
Mattias Nissler 50eb9b29db Merge "Remove libmincrypt/tools after move to bootable/recovery" 2016-02-29 08:28:11 +00:00
Elliott Hughes b57e7786d6 Merge "Remove another test for a private API I\'m about to remove."
am: f71553cbe7

* commit 'f71553cbe7465f6094ad54fcdacc79cf9ce08d72':
  Remove another test for a private API I'm about to remove.
2016-02-27 17:12:05 +00:00
Elliott Hughes f71553cbe7 Merge "Remove another test for a private API I'm about to remove." 2016-02-27 17:11:26 +00:00
Elliott Hughes 74c9052fe4 Remove another test for a private API I'm about to remove.
Change-Id: I541d1de549aa62d43867889f41bd0757ed414636
2016-02-26 22:04:26 -08:00
Dimitry Ivanov 4cd0768115 Added function to explicitly initialize a namespace
This change replaces lazy get-or-create logic for
linker namespaces with the explicit one.

ApplicationLoaders.getClassLoader(..) is now resposible for
the namespace initialization for PathClassLoaders.

Bug: http://b/27189432
Bug: http://b/22548808
Change-Id: Ife987c3ca1db33a47c20f363a5ed61512be8b5a7
(cherry picked from commit d047c925af)
2016-02-26 18:38:58 -08:00
Josh Gao 8564dc9085 Merge "adb: fix directory creation logic."
am: a887c4faca

* commit 'a887c4faca223765956200a86316eee196a49b43':
  adb: fix directory creation logic.
2016-02-27 01:55:38 +00:00
Josh Gao a887c4faca Merge "adb: fix directory creation logic." 2016-02-27 01:54:16 +00:00
Elliott Hughes e3473f3a4c Merge "Remove a test for an API I\'m removing."
am: 0962ecd4e3

* commit '0962ecd4e38b39331088081ab26fb182140bbb3d':
  Remove a test for an API I'm removing.
2016-02-27 01:27:07 +00:00
Elliott Hughes 0962ecd4e3 Merge "Remove a test for an API I'm removing." 2016-02-27 01:26:30 +00:00
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 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
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
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 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
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
Mattias Nissler 474ef2484e Remove libmincrypt/tools after move to bootable/recovery
Bug: 27326256
Change-Id: Ife119db4cda9905b66a1ab5b6f018de85547c0f3
2016-02-26 11:03:15 +01: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
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
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 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
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 9d8d6f0a7a Merge "Make libutils symbols protected"
am: 70e75d9287

* commit '70e75d92872076f3f89cedf3b3a7b9ca4e9aafc1':
  Make libutils symbols protected
2016-02-25 21:12:37 +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
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 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 faf7946bd7 Merge changes Idaa6699d,Ic7759ef9
* changes:
  logd: sock_alloc_send_pskb starves pruning
  logd: Allow (some) headers to be individually importable
2016-02-25 20:40:58 +00:00