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
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
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
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
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
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
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
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
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
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
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
baaeddfa23
Merge "init.rc: restorecon_recursive /sys/kernel/debug" am: 6d85c06aa1
...
am: 070288241d
* commit '070288241d5c3d1a169e21ba4439a5943ce476d8':
init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:50:55 +00:00
Nick Kralevich
070288241d
Merge "init.rc: restorecon_recursive /sys/kernel/debug"
...
am: 6d85c06aa1
* commit '6d85c06aa1600e905cf3e0b093e939fa3866ee59':
init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:48:06 +00:00
Nick Kralevich
6d85c06aa1
Merge "init.rc: restorecon_recursive /sys/kernel/debug"
2015-12-08 04:44:08 +00:00
Yabin Cui
6405bb3aee
Fix libbacktrace host build.
...
On host build, libbacktrace relies on libcutils to provide gettid()
function.
Change-Id: Iad83384ea699ca024b71b73cef26755287c9e6fe
2015-12-07 20:09:24 -08:00
Tom Cherry
1563d6546c
Remove property_area_initialized
...
This is deadcode as property_init() will only ever be called once and
the only remaining caller of properties_initialized() is
Service::NotifyStateChange() which can only be called after properties
have been initialized.
Change-Id: Ie071af84fcdbead72d259890fc8fb8db624282e7
2015-12-07 17:53:39 -08:00
Erik Kline
cbc6f68e32
Merge "Switch from using sockaddr to sockaddr_storage." am: 46b0b1c694
...
am: 4c1b3840f0
* commit '4c1b3840f092e63b0b8db8998b3bbc3465ff7c91':
Switch from using sockaddr to sockaddr_storage.
2015-12-08 01:48:58 +00:00
Erik Kline
4c1b3840f0
Merge "Switch from using sockaddr to sockaddr_storage."
...
am: 46b0b1c694
* commit '46b0b1c694bd873bd8130440d9ec1367dbe6da6e':
Switch from using sockaddr to sockaddr_storage.
2015-12-07 17:45:17 -08:00
Erik Kline
46b0b1c694
Merge "Switch from using sockaddr to sockaddr_storage."
2015-12-08 01:41:38 +00:00
Tom Cherry
876c9c803e
Merge "Remove ANDROID_PROPERTY_WORKSPACE" am: c68998441c
...
am: c64de373c1
* commit 'c64de373c13183c424a2a27c34f45311328374d5':
Remove ANDROID_PROPERTY_WORKSPACE
2015-12-08 01:36:24 +00:00
Tom Cherry
c64de373c1
Merge "Remove ANDROID_PROPERTY_WORKSPACE"
...
am: c68998441c
* commit 'c68998441cdf32159912704fdd264b4750390012':
Remove ANDROID_PROPERTY_WORKSPACE
2015-12-08 01:33:10 +00:00
Tom Cherry
c68998441c
Merge "Remove ANDROID_PROPERTY_WORKSPACE"
2015-12-08 01:29:53 +00:00
Nick Kralevich
715c4dc3f9
init.rc: restorecon_recursive /sys/kernel/debug
...
If /sys/kernel/debug is present, make sure it has all the appropriate
SELinux labels.
Labeling of /sys/kernel/debug depends on kernel support
added in commit https://android-review.googlesource.com/122130
This patch depends on an external/sepolicy change with the
same Change-Id as this patch.
Change-Id: Id1d6a9ad6d0759d6de839458890e8cb24685db6d
2015-12-07 17:00:40 -08:00
Nick Kralevich
173eb396c7
adb: Make HOME=/data/local/tmp
...
Make the home directory for adb shell be /data/local/tmp and
automatically change into that directory.
Change-Id: Ib5cc6e1ecdd31a37e986cf03836f7589ebd40868
2015-12-07 16:56:12 -08:00
Mark Salyzyn
1f6a9473a7
Merge "liblog: print message payload of zero length" am: 50413c7626
...
am: e13efa6112
* commit 'e13efa61122cbad99dc10b9a89d1a06a6b6dc418':
liblog: print message payload of zero length
2015-12-08 00:39:06 +00:00
Mark Salyzyn
e13efa6112
Merge "liblog: print message payload of zero length"
...
am: 50413c7626
* commit '50413c7626c7598ccb062d7d1156e5cfa1b2cb8e':
liblog: print message payload of zero length
2015-12-08 00:31:59 +00:00
Mark Salyzyn
50413c7626
Merge "liblog: print message payload of zero length"
2015-12-08 00:27:30 +00:00
Mark Salyzyn
d7bcf40ee6
liblog: print message payload of zero length
...
logcat will crash if the log message payload is of zero length. Side
effect of possible log messages from LogKlog in eng and userdebug
builds, or lower level logging calls.
NB: The referenced bug cited an example of this native crash, this
does not fix the problem cited in the bug about the
com.android.music shutdown.
Bug: 25774695
Change-Id: I5c7a6ad8db640ba9bc8d34fab04ba7cc2a9a426a
2015-12-07 16:14:40 -08:00