Commit Graph

22380 Commits

Author SHA1 Message Date
Dimitry Ivanov 8239061a22 Merge changes from topic \'fix-nativeloader-todo\' into nyc-dev am: c8bc211
am: 0583bc6

* commit '0583bc610b56dfba646d16e5ee88131b6b918cdd':
  Move list of public libraries to a config file
  Revert "libnativeloader: Make webviewchromium so file optional"
2016-03-17 19:34:28 +00:00
Josh Gao 74a4b954ad debuggerd: kill crashing processes with the signal they died with. am: bcb58e6
am: 9749056

* commit '97490560ceb2f77958aad712b78c5740843bceae':
  debuggerd: kill crashing processes with the signal they died with.
2016-03-17 19:34:28 +00:00
Dimitry Ivanov 0583bc610b Merge changes from topic \'fix-nativeloader-todo\' into nyc-dev
am: c8bc211

* commit 'c8bc211e6658cf56c5ac8ff5217a1d9a3a64143b':
  Move list of public libraries to a config file
  Revert "libnativeloader: Make webviewchromium so file optional"
2016-03-17 18:21:15 +00:00
Josh Gao 97490560ce debuggerd: kill crashing processes with the signal they died with.
am: bcb58e6

* commit 'bcb58e6d64caef0506eb1d711ec3adbd7e9fb58e':
  debuggerd: kill crashing processes with the signal they died with.
2016-03-17 18:21:15 +00:00
Dimitry Ivanov c8bc211e66 Merge changes from topic 'fix-nativeloader-todo' into nyc-dev
* changes:
  Move list of public libraries to a config file
  Revert "libnativeloader: Make webviewchromium so file optional"
2016-03-17 17:47:09 +00:00
Dimitry Ivanov 4b0e963872 Move list of public libraries to a config file
This list contains libraries that should directly or indirectly
be accessible to apps for the platform. Note that this list is
not device specific but rather device class specific.

For now we have 2 separate lists; one for Android Phones and Tablets,
and another one for Android Wear devices.

Bug: http://b/27546414
Bug: http://b/22548808
Change-Id: I83de5e3cf67392d0e9af66f70123898bd5997146
2016-03-17 09:45:52 -07:00
Josh Gao d3dd97eba1 Merge "debuggerd: kill crashing processes with the signal they died with." am: 371e7ea
am: 02becd4

* commit '02becd47e473f98185e10e3a60c088aa7c2a7cc6':
  debuggerd: kill crashing processes with the signal they died with.
2016-03-16 23:30:12 +00:00
Josh Gao 02becd47e4 Merge "debuggerd: kill crashing processes with the signal they died with."
am: 371e7ea

* commit '371e7ea170d749489a0eb7085347f58b7be63734':
  debuggerd: kill crashing processes with the signal they died with.
2016-03-16 23:27:58 +00:00
Josh Gao bcb58e6d64 debuggerd: kill crashing processes with the signal they died with.
Bug: http://b/27675306
Change-Id: I951c5d7e54c35d88c65c5dc856e0b9d5a93d47b2
(cherry picked from commit 561497c0a8)
2016-03-16 16:16:41 -07:00
Josh Gao 371e7ea170 Merge "debuggerd: kill crashing processes with the signal they died with." 2016-03-16 23:15:51 +00:00
Josh Gao 561497c0a8 debuggerd: kill crashing processes with the signal they died with.
Bug: http://b/27675306
Change-Id: I951c5d7e54c35d88c65c5dc856e0b9d5a93d47b2
2016-03-16 16:10:48 -07:00
Dimitry Ivanov 9c0a202977 Revert "libnativeloader: Make webviewchromium so file optional"
This reverts commit 75dda7551f.

Bug: http://b/27546414
2016-03-16 13:54:33 -07:00
Prashant Malani e75df854c7 libnativeloader: Make webviewchromium so file optional am: 75dda75
am: 93a762a

* commit '93a762a58da67a80870add8c0772e857347c1df5':
  libnativeloader: Make webviewchromium so file optional
2016-03-16 20:34:37 +00:00
Prashant Malani 93a762a58d libnativeloader: Make webviewchromium so file optional
am: 75dda75

* commit '75dda7551f6a3499c0c45ed0f9530353c7616357':
  libnativeloader: Make webviewchromium so file optional
2016-03-16 20:27:51 +00:00
Prashant Malani 75dda7551f libnativeloader: Make webviewchromium so file optional
Not all android devices ship with Webview. The requirement of
libwebviewchromium_plat_support.so to be loaded while initializing the
android namespace is therefore liable to cause a crash on devices that
don't support or use Webview. Therefore, this patch makes this
requirement conditional, but enabled by default.

To remove the dependency, device make files should add the following:

TARGET_IGNORE_WEBVIEW_CHROMIUM := true

Bug: 27336841
Bug: 27546414
Change-Id: Iaec1b58236356d981504ea8f716413ea334ca4f4
2016-03-16 13:03:12 -07:00
Mark Salyzyn 5d67fd8f2c Merge changes I7cbc8fda,Ibb7cf4b1 am: c040600
am: 5aad341

* commit '5aad3417d5cafdf90c2591bb963c800fde5ab928':
  liblog: test: security buffer is allowed to be denied
  liblog: test: do not LOG in signal handler
2016-03-16 19:04:09 +00:00
Mark Salyzyn 5aad3417d5 Merge changes I7cbc8fda,Ibb7cf4b1
am: c040600

* commit 'c040600baf984c64e48c3340dc1f9b175f975a61':
  liblog: test: security buffer is allowed to be denied
  liblog: test: do not LOG in signal handler
2016-03-16 18:59:42 +00:00
Mark Salyzyn c3ec801da2 liblog: test: security buffer is allowed to be denied am: 53263ff
am: 2581a3e

* commit '2581a3e762695dd4c7630377f3fee35b30098759':
  liblog: test: security buffer is allowed to be denied
2016-03-16 16:57:39 +00:00
Mark Salyzyn 3734a8063c liblog: test: do not LOG in signal handler am: a6f2f81
am: 04f5acd

* commit '04f5acd3a8804772ec3c27229af788514012c648':
  liblog: test: do not LOG in signal handler
2016-03-16 16:57:39 +00:00
Mark Salyzyn 2581a3e762 liblog: test: security buffer is allowed to be denied
am: 53263ff

* commit '53263ffa00b291de92dd4cb399b1cb5218d363f6':
  liblog: test: security buffer is allowed to be denied
2016-03-16 16:50:08 +00:00
Mark Salyzyn 04f5acd3a8 liblog: test: do not LOG in signal handler
am: a6f2f81

* commit 'a6f2f81d1ec81315f7b8395c17282b5f9d02bf0a':
  liblog: test: do not LOG in signal handler
2016-03-16 16:50:08 +00:00
Mark Salyzyn 53263ffa00 liblog: test: security buffer is allowed to be denied
(cherry pick from commit 29e70a98fe)

Bug: 27405083
Change-Id: I7cbc8fda326a2aea3bef5dabee9d3290cc818b24
2016-03-16 09:05:15 -07:00
Mark Salyzyn a6f2f81d1e liblog: test: do not LOG in signal handler
(cherry pick from commit 50af7f8b1d)

- We actually are logging in a signal handler, the title is bluster
  to remind developers. It is not a reliable path though as it can
  lock up. Our goal is to minimize the chances of a lockup regardless
  in the name of stability only. The test remains to catch regression
  in the name of code quality and reliability. Expected to be
  >99.999% reliable.
- Add a new _correct_ duplicate test that uses signal to release a
  semaphore to a thread that performs the task. This path is expected
  to be 100% reliable.

Bug: 27405083
Change-Id: Ibb7cf4b13e34ebfac2db2af8724b7db7a27f81a8
2016-03-16 09:04:30 -07:00
Mark Salyzyn c040600baf Merge changes I7cbc8fda,Ibb7cf4b1
* changes:
  liblog: test: security buffer is allowed to be denied
  liblog: test: do not LOG in signal handler
2016-03-16 16:02:48 +00:00
Sami Tolvanen ed316884de mkbootimg: add os_version am: 05d2a9002e
am: 3a56df14b6

* commit '3a56df14b6de522459ade7914c306e0a908950ec':
  mkbootimg: add os_version
2016-03-15 19:39:22 +00:00
Sami Tolvanen 3a56df14b6 mkbootimg: add os_version
am: 05d2a9002e

* commit '05d2a9002ef3509efd1a1ab2ebf0a86561e61607':
  mkbootimg: add os_version
2016-03-15 19:36:02 +00:00
Sami Tolvanen 05d2a9002e mkbootimg: add os_version
Adds operating system version and security patch level to the boot
image header. This change take into use one of the existing unused
fields to preserve compatibility.

Note: All information is packed into a single field, because there
are a lot of existing devices that break if the first unused field
is set to a non-zero value.

Bug: 27498078
Bug: 22914603
Change-Id: I24953129e06019b95014a050e916fe4f5c199286
(cherry picked from commit d162828814)
2016-03-15 10:37:52 -07:00
Sami Tolvanen b243bbe6e7 Merge "mkbootimg: add os_version" am: 9fc2cd20a6
am: 8b69be8fdc

* commit '8b69be8fdce48c5f1558f27dbdfc12343821123e':
  mkbootimg: add os_version
2016-03-15 17:04:05 +00:00
Sami Tolvanen 8b69be8fdc Merge "mkbootimg: add os_version"
am: 9fc2cd20a6

* commit '9fc2cd20a615a03b0375769939ba0dc1a946f4ac':
  mkbootimg: add os_version
2016-03-15 17:01:25 +00:00
Sami Tolvanen 9fc2cd20a6 Merge "mkbootimg: add os_version" 2016-03-15 16:46:31 +00:00
Sami Tolvanen d162828814 mkbootimg: add os_version
Adds operating system version and security patch level to the boot
image header. This change take into use one of the existing unused
fields to preserve compatibility.

Note: All information is packed into a single field, because there
are a lot of existing devices that break if the first unused field
is set to a non-zero value.

Bug: 27498078
Bug: 22914603
Change-Id: I24953129e06019b95014a050e916fe4f5c199286
2016-03-15 09:38:36 -07:00
James Hawkins f933663ad7 bootstat: Disambiguate boot time on encrypted devices. am: eef069acc5
am: 314b3f1364

* commit '314b3f1364d3da9cc39abc9330877c48ce2f9cdc':
  bootstat: Disambiguate boot time on encrypted devices.
2016-03-15 15:34:14 +00:00
James Hawkins 314b3f1364 bootstat: Disambiguate boot time on encrypted devices.
am: eef069acc5

* commit 'eef069acc58a55f8f9c028b6d9a737d7b1851354':
  bootstat: Disambiguate boot time on encrypted devices.
2016-03-15 15:31:57 +00:00
Mattias Nissler 2fcef17aa2 Merge "[core][trusty] Implement Trusty NVRAM HAL module." am: ff03857437
am: 3212df1c5f

* commit '3212df1c5f895f64e4fcca947be35fe2286855f4':
  [core][trusty] Implement Trusty NVRAM HAL module.
2016-03-15 14:54:29 +00:00
Mattias Nissler 3212df1c5f Merge "[core][trusty] Implement Trusty NVRAM HAL module."
am: ff03857437

* commit 'ff038574377f183f503362ed03468581ebfc2486':
  [core][trusty] Implement Trusty NVRAM HAL module.
2016-03-15 14:52:14 +00:00
Mattias Nissler ff03857437 Merge "[core][trusty] Implement Trusty NVRAM HAL module." 2016-03-15 14:43:29 +00:00
James Hawkins eef069acc5 bootstat: Disambiguate boot time on encrypted devices.
This change introduces new metrics to discern boot time on encrypted devices:
* post_decrypt_time_elapsed
* boot_decryption_complete
* boot_complete_post_decrypt
* boot_complete_no_encryption

Bug: 27497357
Change-Id: I8d3a411029bd6a45f80589ff67c408593e133a87
(cherry picked from commit c08e996ac8)
2016-03-14 14:27:35 -07:00
James Hawkins 60aae0e8b9 Merge "bootstat: Disambiguate boot time on encrypted devices." am: 42aab0a789
am: f767a8eb15

* commit 'f767a8eb1579af462551ee246bcc5fddf31e6c55':
  bootstat: Disambiguate boot time on encrypted devices.
2016-03-14 19:13:50 +00:00
James Hawkins f767a8eb15 Merge "bootstat: Disambiguate boot time on encrypted devices."
am: 42aab0a789

* commit '42aab0a789d6d2d602165e641ddc86a0bc2458c6':
  bootstat: Disambiguate boot time on encrypted devices.
2016-03-14 19:11:49 +00:00
James Hawkins 42aab0a789 Merge "bootstat: Disambiguate boot time on encrypted devices." 2016-03-14 18:59:55 +00:00
Mihai Serban e45d59b05b Merge "init-debug.rc: mount debugfs" am: bf6c67f234
am: 8bf6e6908b

* commit '8bf6e6908b97f785b5d7036e616438f839e9da1d':
  init-debug.rc: mount debugfs
2016-03-14 18:08:23 +00:00
Mihai Serban 8bf6e6908b Merge "init-debug.rc: mount debugfs"
am: bf6c67f234

* commit 'bf6c67f234b591afd3cf936632ca00730b89eb73':
  init-debug.rc: mount debugfs
2016-03-14 18:06:27 +00:00
Elliott Hughes bf6c67f234 Merge "init-debug.rc: mount debugfs" 2016-03-14 17:57:16 +00:00
Mark Salyzyn 459958c695 liblog: truncate logtags that overflow prefixBuf am: 73207ce139
am: fb56f042ca

* commit 'fb56f042ca3518f0cd9f7f14084f953bf5f1c258':
  liblog: truncate logtags that overflow prefixBuf
2016-03-14 17:40:34 +00:00
Mark Salyzyn fb56f042ca liblog: truncate logtags that overflow prefixBuf
am: 73207ce139

* commit '73207ce139eaf1ac3fe3b96e2e0b254bf268b896':
  liblog: truncate logtags that overflow prefixBuf
2016-03-14 17:38:39 +00:00
Mark Salyzyn 73207ce139 liblog: truncate logtags that overflow prefixBuf
(cherry pick from commit 2f83d679dd)

Bug: 27585978
Change-Id: If2f45e8787b05b46491a771702746cfc248b9ccd
2016-03-14 10:08:06 -07:00
Mark Salyzyn 5c69be7296 Merge "liblog: truncate logtags that overflow prefixBuf" am: 00c8dd8e6f
am: 9212456a27

* commit '9212456a279f63b6f83c98bb72d5119fa9341e90':
  liblog: truncate logtags that overflow prefixBuf
2016-03-14 16:50:17 +00:00
Mark Salyzyn 9212456a27 Merge "liblog: truncate logtags that overflow prefixBuf"
am: 00c8dd8e6f

* commit '00c8dd8e6f135c520bfa9c4f2b09f74c1c931913':
  liblog: truncate logtags that overflow prefixBuf
2016-03-14 16:45:58 +00:00
Mark Salyzyn 00c8dd8e6f Merge "liblog: truncate logtags that overflow prefixBuf" 2016-03-14 16:40:37 +00:00
Mark Salyzyn 29e70a98fe liblog: test: security buffer is allowed to be denied
Bug: 27405083
Change-Id: I7cbc8fda326a2aea3bef5dabee9d3290cc818b24
2016-03-14 09:18:55 -07:00