Commit graph

20393 commits

Author SHA1 Message Date
Sami Tolvanen
af968b82f2 Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate" am: 85abb0860e
am: 226914be6a

* commit '226914be6ad06f1ccbdcd2ea584e748a02665e2d':
  init: set ro.boot.flash.locked from ro.boot.verifiedbootstate
2015-12-09 16:08:06 +00:00
Sami Tolvanen
226914be6a Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate"
am: 85abb0860e

* commit '85abb0860e4e8b74d8f4498b2b1b3cea44614aff':
  init: set ro.boot.flash.locked from ro.boot.verifiedbootstate
2015-12-09 08:05:46 -08:00
Sami Tolvanen
85abb0860e Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate" 2015-12-09 16:00:00 +00:00
Sami Tolvanen
9e9efcadc5 init: set ro.boot.flash.locked from ro.boot.verifiedbootstate
If ro.oem_unlock_supported is specified for the device and it supports
verified boot, export lock status in ro.boot.flash.locked.

Bug: 26039090
Change-Id: Ie7844aeb458c97944c72d46ea962b9cfb0a7875d
2015-12-09 10:09:11 +00:00
Alex Vakulenko
12f726cee9 Merge "metricsd: Remove unused type declarations" am: 9729392ffa
am: be3f400c8c

* commit 'be3f400c8c3e721bc1fe543d7a086ec89fe43453':
  metricsd: Remove unused type declarations
2015-12-09 01:41:20 +00:00
Alex Vakulenko
be3f400c8c Merge "metricsd: Remove unused type declarations"
am: 9729392ffa

* commit '9729392ffa40ed37aab7fd535c6644d20279bbf0':
  metricsd: Remove unused type declarations
2015-12-09 01:38:50 +00:00
Alex Vakulenko
9729392ffa Merge "metricsd: Remove unused type declarations" 2015-12-09 01:32:43 +00:00
Alex Vakulenko
4840ab74b5 metricsd: Remove unused type declarations
BUG: 26092352
Change-Id: If0dda4c171a2b62291693db49c1e16499fc10f5a
2015-12-08 17:13:32 -08:00
Mark Salyzyn
64f5059e95 Merge "liblog: Build Problem, BOOLEAN" am: cb3e6ef154
am: 2625a74585

* commit '2625a745853c5c1324c662234a4d11ca73e34d22':
  liblog: Build Problem, BOOLEAN
2015-12-09 00:12:40 +00:00
Mark Salyzyn
2625a74585 Merge "liblog: Build Problem, BOOLEAN"
am: cb3e6ef154

* commit 'cb3e6ef15459388fc8fee2b4a3157ff0eac0714a':
  liblog: Build Problem, BOOLEAN
2015-12-09 00:10:04 +00:00
Mark Salyzyn
cb3e6ef154 Merge "liblog: Build Problem, BOOLEAN" 2015-12-09 00:04:53 +00:00
Mark Salyzyn
b004a7fe6f liblog: Build Problem, BOOLEAN
Checks with BOOLEAN_FALSE and BOOLEAN_TRUE should be made
against an unsigned char.

Bug: 26029733
Change-Id: I405f45a4d6ddae1b060b0e8da9c1585298abe8bd
2015-12-08 15:24:44 -08:00
Mark Salyzyn
ee6b51f210 Merge "liblog: Add __android_log_security()" am: 1631d36d95
am: e52a6d60cd

* commit 'e52a6d60cdb2233bd3d03723c73ce8f9bf33c929':
  liblog: Add __android_log_security()
2015-12-08 14:04:42 -08:00
Mark Salyzyn
e52a6d60cd Merge "liblog: Add __android_log_security()"
am: 1631d36d95

* commit '1631d36d95f03cc4c3f0a9c00effdc4a918ce324':
  liblog: Add __android_log_security()
2015-12-08 22:02:07 +00:00
Mark Salyzyn
1631d36d95 Merge "liblog: Add __android_log_security()" 2015-12-08 21:55:56 +00:00
Steve Fung
47749725fe Merge "crash_reporter: Fix unit tests" am: ec5b7d4b6c
am: 502f2c957d

* commit '502f2c957d42f89f678282c0f3fb3574aa9466fd':
  crash_reporter: Fix unit tests
2015-12-08 21:55:13 +00:00
Steve Fung
502f2c957d Merge "crash_reporter: Fix unit tests"
am: ec5b7d4b6c

* commit 'ec5b7d4b6c0d41d90f3d4046bdc13a201f5a023f':
  crash_reporter: Fix unit tests
2015-12-08 21:52:22 +00:00
Steve Fung
ec5b7d4b6c Merge "crash_reporter: Fix unit tests" 2015-12-08 21:46:53 +00:00
Tom Cherry
cbc7c91edc Merge "Remove property_area_initialized" am: 93f82d0897
am: c70fe0073e

* commit 'c70fe0073e93a3175f3c07778ce81bf9b03f566b':
  Remove property_area_initialized
2015-12-08 21:12:02 +00:00
Tom Cherry
c70fe0073e Merge "Remove property_area_initialized"
am: 93f82d0897

* commit '93f82d08978772498fa61cafc955f3487dff5515':
  Remove property_area_initialized
2015-12-08 21:09:16 +00:00
Tom Cherry
93f82d0897 Merge "Remove property_area_initialized" 2015-12-08 21:03:05 +00:00
Mark Salyzyn
ffbd86ff25 liblog: Add __android_log_security()
Return non-zero if ro.device_owner is set and not false
and persist.logd.security is true.

Bug: 26029733
Change-Id: Ie82ae11ae35e9c79017b6e873fefb39d79a1d4fe
2015-12-08 11:28:27 -08:00
Elliott Hughes
c40e941d2c Merge "Track rename of base/ to android-base/." am: 4ab13d0256
am: 145ba91284

* commit '145ba91284257184f06e31d58b49af68075fe283':
  Track rename of base/ to android-base/.
2015-12-08 10:57:56 -08:00
Yabin Cui
b49b09a4b6 Merge "Fix libbacktrace host build." am: bfdc099650
am: 97790cfd37

* commit '97790cfd37a7cc866cb83c429f772d8edf21daee':
  Fix libbacktrace host build.
2015-12-08 10:57:49 -08:00
Elliott Hughes
145ba91284 Merge "Track rename of base/ to android-base/."
am: 4ab13d0256

* commit '4ab13d025657c9d33abce428a8b00fbca83d7731':
  Track rename of base/ to android-base/.
2015-12-08 10:54:29 -08:00
Yabin Cui
97790cfd37 Merge "Fix libbacktrace host build."
am: bfdc099650

* commit 'bfdc099650b2adcb51d9b0c3a74dae5987b77ed1':
  Fix libbacktrace host build.
2015-12-08 10:54:22 -08:00
Elliott Hughes
4ab13d0256 Merge "Track rename of base/ to android-base/." 2015-12-08 18:45:15 +00:00
Elliott Hughes
8b0471462e Track rename of base/ to android-base/.
Change-Id: I974d67b6568e913bfb7700d952be55b4073388ee
2015-12-08 10:38:59 -08:00
Yabin Cui
bfdc099650 Merge "Fix libbacktrace host build." 2015-12-08 18:26:18 +00:00
David Pursell
9046c23ed6 Merge "adb: add help text for USB permission errors." am: 663e949b2b am: e37325defc
am: 4542b62cca

* commit '4542b62ccafb749542bddaf0b442db554e7210e3':
  adb: add help text for USB permission errors.
2015-12-08 16:22:44 +00:00
David Pursell
4542b62cca Merge "adb: add help text for USB permission errors." am: 663e949b2b
am: e37325defc

* commit 'e37325defce9078a566b070c595d5c4dd933e35d':
  adb: add help text for USB permission errors.
2015-12-08 16:19:19 +00:00
David Pursell
e37325defc Merge "adb: add help text for USB permission errors."
am: 663e949b2b

* commit '663e949b2bbda5dcc2b92e4d1936555019cdd66b':
  adb: add help text for USB permission errors.
2015-12-08 16:16:16 +00:00
Elliott Hughes
89d7caa5a7 Merge "Rename base/ to android-base/." am: 5986d9f263 am: a77731e14d
am: fbdec4f643

* commit 'fbdec4f6434e7040f410b99fb9a8e7d1f809e151':
  Rename base/ to android-base/.
2015-12-08 16:12:24 +00:00
David Pursell
663e949b2b Merge "adb: add help text for USB permission errors." 2015-12-08 16:12:22 +00:00
Elliott Hughes
fbdec4f643 Merge "Rename base/ to android-base/." am: 5986d9f263
am: a77731e14d

* commit 'a77731e14de614e26ddbf21daadba217c647be68':
  Rename base/ to android-base/.
2015-12-08 16:09:26 +00:00
Elliott Hughes
a77731e14d Merge "Rename base/ to android-base/."
am: 5986d9f263

* commit '5986d9f263d08ef8876656098cbe95b59d310f21':
  Rename base/ to android-base/.
2015-12-08 16:06:06 +00:00
Elliott Hughes
5986d9f263 Merge "Rename base/ to android-base/." 2015-12-08 16:02:53 +00:00
Erik Kline
f3501658af Merge "Listen on dualstack sockets." am: 1f7bcf3e93 am: f6df8fce6d
am: 4cb2c1fbb6

* commit '4cb2c1fbb60b5b4684bdd01c140eb82e1c397e3c':
  Listen on dualstack sockets.
2015-12-08 06:38:12 +00:00
Erik Kline
4cb2c1fbb6 Merge "Listen on dualstack sockets." am: 1f7bcf3e93
am: f6df8fce6d

* commit 'f6df8fce6d0bea7da34e2e16edc691881b92105a':
  Listen on dualstack sockets.
2015-12-07 22:35:10 -08:00
Erik Kline
f6df8fce6d Merge "Listen on dualstack sockets."
am: 1f7bcf3e93

* commit '1f7bcf3e93349bbb067f12296c0e17cf64d30e89':
  Listen on dualstack sockets.
2015-12-07 22:31:40 -08:00
Erik Kline
1f7bcf3e93 Merge "Listen on dualstack sockets." 2015-12-08 06:28:29 +00:00
Nick Kralevich
e042ff867c Merge "adb: Make HOME=/data/local/tmp" am: 5358093225 am: 65ab87dd9b
am: b87df11678

* commit 'b87df11678c22d56d02c776f8f91031bf81a963d':
  adb: Make HOME=/data/local/tmp
2015-12-08 05:06:19 +00:00
Nick Kralevich
b87df11678 Merge "adb: Make HOME=/data/local/tmp" am: 5358093225
am: 65ab87dd9b

* commit '65ab87dd9bc840e7bb187505824d2217ff1d8401':
  adb: Make HOME=/data/local/tmp
2015-12-08 05:03:24 +00:00
Nick Kralevich
65ab87dd9b Merge "adb: Make HOME=/data/local/tmp"
am: 5358093225

* commit '53580932250c9f3ba4a052c9fe31aa1de7bf411d':
  adb: Make HOME=/data/local/tmp
2015-12-08 05:00:16 +00:00
Nick Kralevich
5358093225 Merge "adb: Make HOME=/data/local/tmp" 2015-12-08 04:56:05 +00:00
Nick Kralevich
c94d92f5ad Merge "init.rc: restorecon_recursive /sys/kernel/debug" am: 6d85c06aa1 am: 070288241d
am: baaeddfa23

* commit 'baaeddfa239625a9d54091c628242d84a9191514':
  init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:54:15 +00:00
Erik Kline
79a3210eda Merge "Switch from using sockaddr to sockaddr_storage." am: 46b0b1c694 am: 4c1b3840f0
am: cbc6f68e32

* commit 'cbc6f68e320bd30d0cd7fbe73847deacbd54e073':
  Switch from using sockaddr to sockaddr_storage.
2015-12-08 04:54:05 +00:00
Tom Cherry
b6058e4489 Merge "Remove ANDROID_PROPERTY_WORKSPACE" am: c68998441c am: c64de373c1
am: 876c9c803e

* commit '876c9c803e399877bf7b0adc52e7a6e18d055d73':
  Remove ANDROID_PROPERTY_WORKSPACE
2015-12-08 04:53:59 +00:00
Mark Salyzyn
eb0137eeca Merge "liblog: print message payload of zero length" am: 50413c7626 am: e13efa6112
am: 1f6a9473a7

* commit '1f6a9473a73371c2e7d8e28e1692c64e5a2efd0a':
  liblog: print message payload of zero length
2015-12-08 04:53:54 +00:00
Dimitry Ivanov
d686fb3474 Merge "Native loader as a separate library" am: beceb6ef53 am: 17f119eade
am: d6c9995d99

* commit 'd6c9995d992b4fdffe176acff207f1f066e2a920':
  Native loader as a separate library
2015-12-08 04:53:45 +00:00