Commit Graph

22469 Commits

Author SHA1 Message Date
Dan Austin 0bab7c3dbd Merge "Address const issue in preparation for libcxx rebase." am: a2a13e3
am: 61e5a66

* commit '61e5a6625dfdb586abb9f83b20bc1d727a783225':
  Address const issue in preparation for libcxx rebase.

Change-Id: I883b8210df7c8ddd1f82914ba448af0175f53437
2016-03-30 19:15:38 +00:00
James Hawkins 4eb63f3f4a Merge "bootstat: Two changes to aid in debugging TimeSinceFactoryReset." am: a348dfc
am: 6da6ad9

* commit '6da6ad9ffa98b548b61fcee344b7174f270befd6':
  bootstat: Two changes to aid in debugging TimeSinceFactoryReset.

Change-Id: I2d56fd25e817a63962ea4855432fc023914c244b
2016-03-30 19:15:38 +00:00
Dan Austin 61e5a6625d Merge "Address const issue in preparation for libcxx rebase."
am: a2a13e3

* commit 'a2a13e3267850b4eaf2689b0e02cc499228b7bf5':
  Address const issue in preparation for libcxx rebase.

Change-Id: Ia54835c35695ae76b3c093adfb256bab2446ff65
2016-03-30 17:48:20 +00:00
James Hawkins 6da6ad9ffa Merge "bootstat: Two changes to aid in debugging TimeSinceFactoryReset."
am: a348dfc

* commit 'a348dfcd651d8410bba41cde63c45e3c4d760d5a':
  bootstat: Two changes to aid in debugging TimeSinceFactoryReset.

Change-Id: I4f91e3ac286ce02885089ac63cd0201f996b53c9
2016-03-30 17:48:19 +00:00
Dan Austin a2a13e3267 Merge "Address const issue in preparation for libcxx rebase." 2016-03-30 17:40:01 +00:00
James Hawkins a348dfcd65 Merge "bootstat: Two changes to aid in debugging TimeSinceFactoryReset." 2016-03-30 17:13:42 +00:00
Pierre Imai dc53f5bfd5 Merge "Add C++ thread annotations support to core." into nyc-dev
am: 77746f2  -s ours

* commit '77746f2eabc1ca00c68015b6018495aba87c023d':
  Add C++ thread annotations support to core.

Change-Id: I157dd2190f5b804e0af74f9dba89e29c83aa48a6
2016-03-30 08:48:06 +00:00
Pierre Imai 77746f2eab Merge "Add C++ thread annotations support to core." into nyc-dev 2016-03-30 07:40:06 +00:00
Sami Tolvanen c1c761b5fd Merge "mkbootimg: use int for os_version and os_patch_level" into nyc-dev
am: bebd381

* commit 'bebd38114c47965ab475c7736d689b564dc54890':
  mkbootimg: use int for os_version and os_patch_level

Change-Id: I56cee9e16544a0603544f143a204cb1bf3d53275
2016-03-30 03:29:34 +00:00
Sami Tolvanen bebd38114c Merge "mkbootimg: use int for os_version and os_patch_level" into nyc-dev 2016-03-30 03:25:21 +00:00
Nick Kralevich d87a1747aa Merge "init/builtins.cpp: Switch to finit_module" am: b3cf2e0
am: 699b115

* commit '699b115be3c79547e9cc6d8bca771d77eb384915':
  init/builtins.cpp: Switch to finit_module

Change-Id: Iab21b9e058fe9435847ba9bca4cb2d1c0f50c88f
2016-03-30 02:17:56 +00:00
Nick Kralevich 699b115be3 Merge "init/builtins.cpp: Switch to finit_module"
am: b3cf2e0

* commit 'b3cf2e0f3d3b9ba328921cd1c9c3839ea70a1ab1':
  init/builtins.cpp: Switch to finit_module

Change-Id: I23d53bb70856016968c58a417b9299be572392a7
2016-03-30 02:14:09 +00:00
Nick Kralevich b3cf2e0f3d Merge "init/builtins.cpp: Switch to finit_module" 2016-03-30 02:07:09 +00:00
Dimitry Ivanov 8ea5eb16f8 Merge "Adjust check for target_sdk_version for workarounds" into nyc-dev
am: f2c2c07

* commit 'f2c2c073541c42abf72d6d23583c217d7437797d':
  Adjust check for target_sdk_version for workarounds

Change-Id: Ie9bb20386fb612db61a21e36c3e9bf831e0eeb1c
2016-03-30 02:06:34 +00:00
Sami Tolvanen 835b974e26 Merge "mkbootimg: use int for os_version and os_patch_level" am: adbe06d
am: e4052d2

* commit 'e4052d2ca544d47e104f4ff842a013429463420d':
  mkbootimg: use int for os_version and os_patch_level

Change-Id: I61c57e45900da7dbdb303565ed5219f19b1e10b1
2016-03-30 01:59:20 +00:00
Dimitry Ivanov f2c2c07354 Merge "Adjust check for target_sdk_version for workarounds" into nyc-dev 2016-03-30 01:59:07 +00:00
Sami Tolvanen e4052d2ca5 Merge "mkbootimg: use int for os_version and os_patch_level"
am: adbe06d

* commit 'adbe06db4870e9829ddc8c702f8789df6f2401b1':
  mkbootimg: use int for os_version and os_patch_level

Change-Id: I23125c4f1842491effa903b2e30aee07664a6b98
2016-03-30 01:36:59 +00:00
Sami Tolvanen fa0b90aa79 mkbootimg: use int for os_version and os_patch_level
The parse_int function attempts to interpret the string to detect
base, which leads to it assuming strings starting with 0 are base
8. This obviously fails for certain dates, so use int instead.

Bug: 27498078
Bug: 22914603
Change-Id: I50b1fb3d7876f2ec17d00649cc9a2d23af2aec2b
(cherry picked from commit 294eb9dac3)
2016-03-29 18:27:13 -07:00
Sami Tolvanen adbe06db48 Merge "mkbootimg: use int for os_version and os_patch_level" 2016-03-30 01:25:28 +00:00
Yabin Cui e697597650 Merge "libbacktrace_offline: support unwinding of shared libraries in apk file." into nyc-dev
am: 901be39

* commit '901be39dc4337313109b6aca362fc70950e66f9a':
  libbacktrace_offline: support unwinding of shared libraries in apk file.

Change-Id: Iadb421325b352a6c49c38ad09c992e743f2f7b0a
2016-03-30 01:08:25 +00:00
Pierre Imai 3c94aeef53 Add C++ thread annotations support to core.
Change-Id: I7b8940c12e0f3121d8c09d86d2d4077b0a0ce376
(cherry picked from commit 021ea2d176)
2016-03-30 10:06:33 +09:00
Yabin Cui 901be39dc4 Merge "libbacktrace_offline: support unwinding of shared libraries in apk file." into nyc-dev 2016-03-30 00:59:27 +00:00
Nick Kralevich 124a9c97e9 init/builtins.cpp: Switch to finit_module
Switch insmod from using init_module to finit_module. From
"man finit_module":

  The finit_module() system call is like init_module(), but reads the
  module to be loaded from the file descriptor fd. It is useful when the
  authenticity of a kernel module can be determined from its location in
  the file system; in cases where that is possible, the overhead of
  using cryptographically signed modules to determine the authenticity
  of a module can be avoided.

finit_module is preferred over init_module because it allows LSMs, such
as SELinux, to perform a permission check on kernel module loads based on
the file from which the module is loaded. This functionality is not yet
implemented in the Linux kernel, but is on the SEAndroid TODO list.
See https://bitbucket.org/seandroid/wiki/wiki/ToDo

Bug: 27824855
Change-Id: Id0ea88cd1930393c8c73ce38e63d5b2eeadf946a
2016-03-29 16:53:08 -07:00
James Hawkins fff95ba5dd bootstat: Two changes to aid in debugging TimeSinceFactoryReset.
* Also log to the BootEventRecordStore to check lossiness.
* Log factory_reset_current_time_failure separately.

Bug: 27550578
Change-Id: Id3d579a74a59ac28290cb7d6048765519f9ba59b
2016-03-29 16:13:49 -07:00
Dimitry Ivanov 4f8bb2577a Adjust check for target_sdk_version for workarounds
target_sdk_version=0 is a valid version, it basically
means 1 (the very first version of android) not current one.

Bug: http://b/27702070
Change-Id: Ib7843718f364b975e1d09a05377bf8580b407d9d
2016-03-29 16:12:40 -07:00
Sami Tolvanen 294eb9dac3 mkbootimg: use int for os_version and os_patch_level
The parse_int function attempts to interpret the string to detect
base, which leads to it assuming strings starting with 0 are base
8. This obviously fails for certain dates, so use int instead.

Bug: 27498078
Bug: 22914603
Change-Id: I50b1fb3d7876f2ec17d00649cc9a2d23af2aec2b
2016-03-29 16:06:37 -07:00
Yabin Cui 02092b36da libbacktrace_offline: support unwinding of shared libraries in apk file.
Bug: 26962895
Change-Id: I009080f26e7323247c3ab24eea614eec4432ca6a
(cherry picked from commit b791a76ed7)
2016-03-29 14:04:34 -07:00
Mark Salyzyn d5dcc5a1d8 liblog: gate write on log id available
am: 5e635f7

* commit '5e635f7c06a01ec635a9774d4cf942e058dddb11':
  liblog: gate write on log id available

Change-Id: I011c845762d9899f4f01361e13b7ce040447cb5a
2016-03-29 20:03:32 +00:00
Mark Salyzyn 47cce8c410 Merge "liblog: gate write on log id available" am: fbdbf10
am: f44cb4c

* commit 'f44cb4c6cb11a4a2cd6af8f72d84a092bcfcf513':
  liblog: gate write on log id available

Change-Id: Ida839dd23ea2b3b1b860c6e8e2b32af61b2fea29
2016-03-29 20:00:52 +00:00
Mark Salyzyn f44cb4c6cb Merge "liblog: gate write on log id available"
am: fbdbf10

* commit 'fbdbf100cb48f18d308c96f1959945cf7d1909ec':
  liblog: gate write on log id available

Change-Id: Ia715fa8f520a9f7893c07a06eca4cacd2962e9cb
2016-03-29 19:57:53 +00:00
Mark Salyzyn 5e635f7c06 liblog: gate write on log id available
(cherry pick from commit c33103c440)

- Secure LOG_ID_KERNEL in writer
- Secure LOG_ID_SECURITY in reader and writer
- if writer transport says not available, do not write to that log id

Bug: 27566046
Bug: 27896341
Change-Id: If63a78a56fb94adfbf9979454c4cadb81af45c19
2016-03-29 12:53:44 -07:00
Mark Salyzyn fbdbf100cb Merge "liblog: gate write on log id available" 2016-03-29 19:52:32 +00:00
Dimitry Ivanov 17f2a1e550 A workaround for apps using custom classloaders
am: 7f9a1aa

* commit '7f9a1aaf05dda20904f08a667dadcf555a41477e':
  A workaround for apps using custom classloaders

Change-Id: I0e0c8325f2b1403bd6534f9f97434f0ce2b3c64d
2016-03-29 19:32:14 +00:00
Mark Salyzyn c33103c440 liblog: gate write on log id available
- Secure LOG_ID_KERNEL in writer
- Secure LOG_ID_SECURITY in reader and writer
- if writer transport says not available, do not write to that log id

Bug: 27566046
Bug: 27896341
Change-Id: If63a78a56fb94adfbf9979454c4cadb81af45c19
2016-03-29 12:29:04 -07:00
Yabin Cui 566692fa11 Merge "libbacktrace_offline: support unwinding of shared libraries in apk file." am: d8c88fc
am: f63704e

* commit 'f63704ed5a9daa40b9e471c7020ae4e4541dee79':
  libbacktrace_offline: support unwinding of shared libraries in apk file.

Change-Id: If880c04da5ab6b4faa232b80fbfceca37f63d41d
2016-03-29 18:30:19 +00:00
Yabin Cui f63704ed5a Merge "libbacktrace_offline: support unwinding of shared libraries in apk file."
am: d8c88fc

* commit 'd8c88fc5e339105cca3d207826675fdf95bfadc9':
  libbacktrace_offline: support unwinding of shared libraries in apk file.

Change-Id: I7228b3a902ebd1128fbae4cd754eb7f8945eedbd
2016-03-29 18:24:10 +00:00
Yabin Cui d8c88fc5e3 Merge "libbacktrace_offline: support unwinding of shared libraries in apk file." 2016-03-29 18:18:47 +00:00
Dimitry Ivanov 7f9a1aaf05 A workaround for apps using custom classloaders
Allow custom classloaders to load native libraries
from anywhere under /data

Bug: http://b/27588281
Change-Id: Idb87b33361903f52b734ddd0ceaabe1ff9c281eb
2016-03-29 11:12:18 -07:00
Elliott Hughes 7f96883852 Merge "Add operator int() to unique_fd." am: c8e179c
am: fabe534

* commit 'fabe534ecf48d395a0d30aa3a2d281a77673c535':
  Add operator int() to unique_fd.

Change-Id: Icb38f55ff17439d1c9be6f38d3af8d9940da00d7
2016-03-29 15:26:20 +00:00
Elliott Hughes fabe534ecf Merge "Add operator int() to unique_fd."
am: c8e179c

* commit 'c8e179c09466d392a52b6276e6dd62b4334a9a0f':
  Add operator int() to unique_fd.

Change-Id: I4fd9abc29990fa5ba27de62b96237fa7c6b6b49f
2016-03-29 15:23:23 +00:00
Elliott Hughes c8e179c094 Merge "Add operator int() to unique_fd." 2016-03-29 15:15:35 +00:00
Dan Austin 80fd4549e3 Address const issue in preparation for libcxx rebase.
Change-Id: I80c3349ee93d2b3f16c6fadc7f34b2bf4f2cc0d3
2016-03-28 23:28:48 +00:00
James Hawkins 93d83a55d4 Merge "Revert "Revert "bootstat: Handle v1 record files which do not contain file contents.""" into nyc-dev
am: c1b10a9

* commit 'c1b10a9e84d675a3611e8bb5ee93001e8a286932':
  Revert "Revert "bootstat: Handle v1 record files which do not contain file contents.""
2016-03-28 23:05:39 +00:00
Dan Austin d219b4eff4 Merge "Address const issues in preparation for libcxx rebase."
am: 7f84a07

* commit '7f84a0700ca49cfdf650d46b383d6e5aaae05fdc':
  Address const issues in preparation for libcxx rebase.
2016-03-28 22:43:26 +00:00
Dan Austin 7f84a0700c Merge "Address const issues in preparation for libcxx rebase." 2016-03-28 22:35:51 +00:00
Dan Austin 427fb7216d Merge "Fix const issues in preparation for libcxx rebase."
am: dce9b61

* commit 'dce9b61d253675fc5067b76eb166de66dc8fd367':
  Fix const issues in preparation for libcxx rebase.
2016-03-28 21:48:38 +00:00
Dan Austin dce9b61d25 Merge "Fix const issues in preparation for libcxx rebase." 2016-03-28 21:41:10 +00:00
Dan Austin 60b976db85 Address const issues in preparation for libcxx rebase.
Change-Id: If9bf6c3ee57c3476a5661401853506551e2150cb
2016-03-28 14:22:12 -07:00
Pablo Ceballos 0daf872712 Merge "Rename single buffer mode to shared buffer mode" into nyc-dev
am: 0e28c1f

* commit '0e28c1fa4a759755f21bf8a10d9e645ae64d1f78':
  Rename single buffer mode to shared buffer mode
2016-03-28 21:01:03 +00:00
James Hawkins ecda1ed1d3 Merge "Revert "bootstat: Handle v1 record files which do not contain file contents."" into nyc-dev
am: 197b628  -s ours

* commit '197b62852b27021f2a388be7b6a49329a082c665':
  Revert "bootstat: Handle v1 record files which do not contain file contents."
2016-03-28 21:01:03 +00:00