Commit Graph

22883 Commits

Author SHA1 Message Date
Paul Lawrence 131aabdf0e Merge "Revert "HACK: Run e2fsck with -f"" into nyc-dev
am: dc6893c

* commit 'dc6893ce9fda33740e7c59b6a49433e03da9a66b':
  Revert "HACK: Run e2fsck with -f"

Change-Id: I8943c573dea631e4324b3b6a621dc791c55f667b
2016-03-30 20:55:19 +00:00
James Hawkins e5531ad6c5 bootstat: Two changes to aid in debugging TimeSinceFactoryReset. am: 4b71388
am: 17dc473

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

Change-Id: I3e086b31db98ef5a74fd9286d99eed496cda8ce4
2016-03-30 20:52:43 +00:00
James Hawkins 17dc4732e8 bootstat: Two changes to aid in debugging TimeSinceFactoryReset.
am: 4b71388

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

Change-Id: Id7b47b7b1889eec950f2bd18a20e192bd8c93425
2016-03-30 20:48:33 +00:00
Paul Lawrence dc6893ce9f Merge "Revert "HACK: Run e2fsck with -f"" into nyc-dev 2016-03-30 20:46:00 +00:00
James Hawkins 4b71388896 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
(cherry picked from commit fff95ba5dd)
2016-03-30 13:32:22 -07:00
Yabin Cui 75da574d6f Merge "base: Avoid compilation error when compiled with -Wdangling-else." into nyc-dev am: dceb7fc -s ours
am: 89a10d1

* commit '89a10d1c79b0363dba5acf84306211406a5dd12c':
  base: Avoid compilation error when compiled with -Wdangling-else.

Change-Id: Ia40e09690a5c9a3ddd23bce7d56963567e804f7e
2016-03-30 19:45:22 +00:00
Yabin Cui 89a10d1c79 Merge "base: Avoid compilation error when compiled with -Wdangling-else." into nyc-dev
am: dceb7fc  -s ours

* commit 'dceb7fc87ac95d7f7db0d3bf5247fc6f138e3763':
  base: Avoid compilation error when compiled with -Wdangling-else.

Change-Id: I34afae48363ffedbf25537c82e03052281f10536
2016-03-30 19:40:55 +00:00
Yabin Cui dceb7fc87a Merge "base: Avoid compilation error when compiled with -Wdangling-else." into nyc-dev 2016-03-30 19:29:11 +00:00
Josh Gao 21404a9a5b Merge "debuggerd: set the name of the signal sender." am: 3d0a87b am: 437911e
am: 470df1b

* commit '470df1b9045da29ec93e08b985c4c4c36f4bf53c':
  debuggerd: set the name of the signal sender.

Change-Id: Id8bd485f53160f86976d316e96812a661a95e10b
2016-03-30 19:26:29 +00:00
Dan Austin 92c34f7f7b Merge "Address const issues in preparation for libcxx rebase." am: b2cb35e am: 4e39764
am: 7b2125d

* commit '7b2125d2b1e55836d9c4381de23303dda3a72bfa':
  Address const issues in preparation for libcxx rebase.

Change-Id: I694ccb7de01cd37e84cd03d912381a39b7a42b01
2016-03-30 19:26:27 +00:00
Dan Austin ca7ef0f31a Merge "Address const issue in preparation for libcxx rebase." am: a2a13e3 am: 61e5a66
am: 0bab7c3

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

Change-Id: Idaffc014595c1e29feac958fb008473b3c346f28
2016-03-30 19:26:25 +00:00
James Hawkins e9bf0cbcc5 Merge "bootstat: Two changes to aid in debugging TimeSinceFactoryReset." am: a348dfc am: 6da6ad9
am: 4eb63f3

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

Change-Id: Ibe29773316cef0ccc15585d67eae1646b240325f
2016-03-30 19:26:21 +00:00
Josh Gao 470df1b904 Merge "debuggerd: set the name of the signal sender." am: 3d0a87b
am: 437911e

* commit '437911ec87fe471a4cbe7e3dfa722e11d3187805':
  debuggerd: set the name of the signal sender.

Change-Id: I23723649fcc33a624f4aba80cde81f1bbb71fc3b
2016-03-30 19:15:39 +00:00
Dan Austin 7b2125d2b1 Merge "Address const issues in preparation for libcxx rebase." am: b2cb35e
am: 4e39764

* commit '4e3976417b4e43c2a3969fb3305d9f069ec8c8f8':
  Address const issues in preparation for libcxx rebase.

Change-Id: I7b25949ccdae45398f47c43f79fa532d66d4d3a2
2016-03-30 19:15:39 +00:00
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
Yabin Cui dd4c75e6e3 base: Avoid compilation error when compiled with -Wdangling-else.
As logging macros uses `if xxx else yyy` style, it is reported as an
error when DCHECK() is compiled with -Wdangling-else option. Because
after preprocess, DCHECK(x) becomes:
if (EnableDChecks)
  if (x)
    ;
  else
    LogMessage(FATAL) << yyy;

This CL avoids compilation error by replacing `if xxx else yyy`
with `xxx && yyy` or `!(xxx) || yyy`.

Bug: 26962895

Change-Id: Ib0bf242cc04a238ec31a1ab66b53fc8a5b5ed28f
(cherry picked from commit 2527628eda)
2016-03-30 11:13:40 -07:00
Josh Gao 437911ec87 Merge "debuggerd: set the name of the signal sender."
am: 3d0a87b

* commit '3d0a87bd5bfe8b1c66d5cbaec5685a9e5ec80938':
  debuggerd: set the name of the signal sender.

Change-Id: I8b4134dfaaeeab8f7b83f28d9dde758d8b372d9e
2016-03-30 18:01:33 +00:00
Josh Gao 3d0a87bd5b Merge "debuggerd: set the name of the signal sender." 2016-03-30 17:52:05 +00:00
Dan Austin 4e3976417b Merge "Address const issues in preparation for libcxx rebase."
am: b2cb35e

* commit 'b2cb35ef96b6d1cc03c6c39a57a4eb9b6484e100':
  Address const issues in preparation for libcxx rebase.

Change-Id: I1c2236db56c9fee2d1c9e9dcff8a61dca2cac303
2016-03-30 17:48:22 +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 b2cb35ef96 Merge "Address const issues in preparation for libcxx rebase." 2016-03-30 17:40:15 +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 419489ff56 Merge "Add C++ thread annotations support to core." into nyc-dev am: 77746f2 -s ours
am: dc53f5b

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

Change-Id: I9373d833673a46320565780d4dd16d84fee5a3ea
2016-03-30 16:26:06 +00:00
Erik Kline 06cb8e9203 Set IFA_BROADCAST during IPv4 RTM_NEWADDRs
Bug: 27194345
Bug: 27732412
Bug: 27786864
Change-Id: I5a5b41422bbaab4582c268c213b788f61cb0e169
2016-03-30 20:06:36 +09: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 24cd64f18d Merge "mkbootimg: use int for os_version and os_patch_level" into nyc-dev am: bebd381
am: c1c761b

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

Change-Id: I83c80725f82f080c09e2846b8c51647b9081d8ef
2016-03-30 03:33:17 +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 36b96b0c5c Merge "init/builtins.cpp: Switch to finit_module" am: b3cf2e0 am: 699b115
am: d87a174

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

Change-Id: Ia1665193f8e0e5d11dbdda70b6b8b48119d60358
2016-03-30 02:21:59 +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
Dimitry Ivanov 26b31c92be Merge "Adjust check for target_sdk_version for workarounds" into nyc-dev am: f2c2c07
am: 8ea5eb1

* commit '8ea5eb16f8a2505331aff5c79ed49a392abc441c':
  Adjust check for target_sdk_version for workarounds

Change-Id: Id52b7297b078541365719ef05172d681e4dd3127
2016-03-30 02:10:20 +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 ba73b2587c Merge "mkbootimg: use int for os_version and os_patch_level" am: adbe06d am: e4052d2
am: 835b974

* commit '835b974e26e819190ee2f254530a39fe50481bae':
  mkbootimg: use int for os_version and os_patch_level

Change-Id: Ifb8af34a6f3a3f5c74ecdd7b2675e0255052c004
2016-03-30 02:03:07 +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 b824e88a2f Merge "libbacktrace_offline: support unwinding of shared libraries in apk file." into nyc-dev am: 901be39
am: e697597

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

Change-Id: Ic0fabcbf451ad125c9b32621c389dfd038641d9e
2016-03-30 01:11:57 +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
Josh Gao f3dde2f869 debuggerd: set the name of the signal sender.
Change-Id: I6bff938e229d2368250d4b5c268fa24bd4badea0
2016-03-29 17:56:47 -07: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