Commit graph

33040 commits

Author SHA1 Message Date
Janis Danisevskis
c5bb8c74d1 libkeymaster1 split
libkeymaster1 was split into libkeymaster_portable and libkeymaster.

Change-Id: Iacdcef8631b4903fef4a79d146a9f59e37f31c3f
2017-05-01 12:32:37 -07:00
Erik Staats
66b0716d5d Merge "Change set_sched_policy to set slack for current thread." am: d6f8b5f2d4 am: fc6d71707a am: 4696b4110b
am: 192c707bcc

Change-Id: Ib178e35a0467ff83204b9e1eee3d1f7ddcc92e5a
2017-05-01 19:07:33 +00:00
Erik Staats
192c707bcc Merge "Change set_sched_policy to set slack for current thread." am: d6f8b5f2d4 am: fc6d71707a
am: 4696b4110b

Change-Id: Ibf5a664e1232cefceeceb9a31c90ea47fe686b77
2017-05-01 18:57:10 +00:00
Erik Staats
4696b4110b Merge "Change set_sched_policy to set slack for current thread." am: d6f8b5f2d4
am: fc6d71707a

Change-Id: I72c9b3afd6458852158ce96b7ef46b1b1e2e97c4
2017-05-01 18:50:49 +00:00
Erik Staats
fc6d71707a Merge "Change set_sched_policy to set slack for current thread."
am: d6f8b5f2d4

Change-Id: Ie4f9953e7ef30f144f9871a9710c2cc13065a332
2017-05-01 18:45:50 +00:00
Erik Staats
d6f8b5f2d4 Merge "Change set_sched_policy to set slack for current thread." 2017-05-01 18:35:30 +00:00
Mark Salyzyn
7099d8699d Merge "logd: CTS test" am: 16214f2955 am: fddaec1e2c am: d492d04c45
am: b9f9b7c500

Change-Id: I94308d996bb244a1c8c417e98062272b2ea82420
2017-05-01 17:10:10 +00:00
Mark Salyzyn
b9f9b7c500 Merge "logd: CTS test" am: 16214f2955 am: fddaec1e2c
am: d492d04c45

Change-Id: I6a62d36aba23dd4c7ba8a9a3b9b6894df2d95a08
2017-05-01 17:01:59 +00:00
Mark Salyzyn
d492d04c45 Merge "logd: CTS test" am: 16214f2955
am: fddaec1e2c

Change-Id: I49b9f615f15af2fb52d3d39b50f47a1aae326429
2017-05-01 17:00:29 +00:00
Mark Salyzyn
fddaec1e2c Merge "logd: CTS test"
am: 16214f2955

Change-Id: I77ca1c3fa6a5fa7569cc433bc419bebf5c5334ff
2017-05-01 16:58:28 +00:00
Treehugger Robot
16214f2955 Merge "logd: CTS test" 2017-05-01 16:50:50 +00:00
Steven Moreland
6a2d05a993 Merge "liblog: __android_log_error_write in vndk" am: ae10af6050 am: 685b39d53b am: d525216946
am: 166f74db70

Change-Id: I92eda1e2c99dcf84ee199e0c59280ed5416405f6
2017-05-01 16:34:27 +00:00
Steven Moreland
166f74db70 Merge "liblog: __android_log_error_write in vndk" am: ae10af6050 am: 685b39d53b
am: d525216946

Change-Id: Ifac2be38ce88a174d9b75a58aa716ed276153403
2017-05-01 16:32:27 +00:00
Steven Moreland
d525216946 Merge "liblog: __android_log_error_write in vndk" am: ae10af6050
am: 685b39d53b

Change-Id: I5051c6fefd3dfa391a84e938c918edb5a6b16f37
2017-05-01 16:30:58 +00:00
Steven Moreland
685b39d53b Merge "liblog: __android_log_error_write in vndk"
am: ae10af6050

Change-Id: If60bc2c69d62b3336a841e882d0e088cdd869ea9
2017-05-01 16:28:56 +00:00
Treehugger Robot
ae10af6050 Merge "liblog: __android_log_error_write in vndk" 2017-05-01 16:23:39 +00:00
Bowgo Tsai
f8ca1ba145 Merge changes I017c8bd9,I262e75b8,I6584bdf7 into oc-dev am: e2e0d9cae2 -s ours
am: 9da4f07b99  -s ours

Change-Id: I41473c66c564c41ade775311ebde41b3c253a467
2017-05-01 16:02:12 +00:00
Bowgo Tsai
9da4f07b99 Merge changes I017c8bd9,I262e75b8,I6584bdf7 into oc-dev
am: e2e0d9cae2  -s ours

Change-Id: I3df5cbaa7e8aa0941b7c8d700a75829fa15adbb7
2017-05-01 15:55:54 +00:00
Bowgo Tsai
e2e0d9cae2 Merge changes I017c8bd9,I262e75b8,I6584bdf7 into oc-dev
* changes:
  init: fix first stage mount failure when two fstab entries have verity_loc
  init: set ro.boot.avb_version in recovery mode
  init: moving early mount logic into init_first_stage.cpp
2017-05-01 15:49:54 +00:00
Steven Moreland
64328403b5 liblog: __android_log_error_write in vndk
Also added log_safetynet.h header. This contains a memory sensitive logging
function which is used to detect attack attempts.

Fixes: 37442967
Test: liblog-unit-tests on internal marlin
Test: build liblog with BOARD_VNDK_VERSION := current on aosp_arm
Test: libbinder vendor variant links with BOARD_VNDK_VERSION := current

Change-Id: Icfcc2b1acbb3712bf4c84403870dc93401eafb15
2017-05-01 14:40:55 +00:00
Elliott Hughes
2afde4eb45 Merge "Remove unused cruft from <cutils/bitops.h>." am: 4c8acafa25 am: 024a51bdc8 am: e19f4abd7b
am: 09e55b9155

Change-Id: I344dadf955dcd5d8acb0b792b5837f1e3cf5bc4c
2017-04-30 02:56:01 +00:00
Elliott Hughes
09e55b9155 Merge "Remove unused cruft from <cutils/bitops.h>." am: 4c8acafa25 am: 024a51bdc8
am: e19f4abd7b

Change-Id: Ic3b3f6f99c3dfbad02ff59789d9aac717eb3da0f
2017-04-30 02:53:31 +00:00
Elliott Hughes
e19f4abd7b Merge "Remove unused cruft from <cutils/bitops.h>." am: 4c8acafa25
am: 024a51bdc8

Change-Id: Id7f65ecfcd8a660e722740a15fd5280ae86371eb
2017-04-30 02:51:01 +00:00
Elliott Hughes
024a51bdc8 Merge "Remove unused cruft from <cutils/bitops.h>."
am: 4c8acafa25

Change-Id: I3c40f329d682da8c2ec89018add35b0a64076f43
2017-04-30 02:48:29 +00:00
Elliott Hughes
4c8acafa25 Merge "Remove unused cruft from <cutils/bitops.h>." 2017-04-30 02:45:46 +00:00
Elliott Hughes
0e8810ccbe Remove unused cruft from <cutils/bitops.h>.
Bug: N/A
Test: builds
Change-Id: I5931f2b91b2d64d8e26f9ba092879c14d0ed3622
2017-04-29 10:22:40 -07:00
Steven Moreland
7ae18c8eb0 Merge "lmkd: Android.mk -> Android.bp" am: 6de56724a2 am: 4cceba71fd am: e17ebe12ca
am: 989a10e9b0

Change-Id: I277892b7157cccd532e53488b097802d5f17fd82
2017-04-29 08:26:19 +00:00
Steven Moreland
989a10e9b0 Merge "lmkd: Android.mk -> Android.bp" am: 6de56724a2 am: 4cceba71fd
am: e17ebe12ca

Change-Id: Ie71bd9904b58a4b3a5214aa5ff08a49fa3ec93c3
2017-04-29 08:24:18 +00:00
Steven Moreland
e17ebe12ca Merge "lmkd: Android.mk -> Android.bp" am: 6de56724a2
am: 4cceba71fd

Change-Id: I1145a182b5b3907bd4f4c6751c4d2c79f021543c
2017-04-29 08:21:48 +00:00
Steven Moreland
4cceba71fd Merge "lmkd: Android.mk -> Android.bp"
am: 6de56724a2

Change-Id: I495889f50101bb0eac1fc3435d50bd2b667799a0
2017-04-29 08:19:48 +00:00
Treehugger Robot
6de56724a2 Merge "lmkd: Android.mk -> Android.bp" 2017-04-29 08:14:21 +00:00
Bowgo Tsai
7fe58ba5b6 Merge "fs_mgr: code clean up" am: 0914d2bdff am: 0bb2ebbe74 am: f7cc23bf3a
am: 1bd2d1c3a5

Change-Id: Id37b33ccb4f5127bd0e5b16bff2c79a1819623ed
2017-04-29 03:37:02 +00:00
Bowgo Tsai
1bd2d1c3a5 Merge "fs_mgr: code clean up" am: 0914d2bdff am: 0bb2ebbe74
am: f7cc23bf3a

Change-Id: I553d18ef489e067eca013d460efc842daa8a50f2
2017-04-29 03:35:31 +00:00
Bowgo Tsai
f7cc23bf3a Merge "fs_mgr: code clean up" am: 0914d2bdff
am: 0bb2ebbe74

Change-Id: Ib0d4012bd1bf3165dbd14675b5a5974be2ad8b53
2017-04-29 03:32:31 +00:00
Bowgo Tsai
0bb2ebbe74 Merge "fs_mgr: code clean up"
am: 0914d2bdff

Change-Id: Iebda2fb1cf9aa4e70d4c8160ff42ff45300c8c40
2017-04-29 03:29:29 +00:00
Treehugger Robot
0914d2bdff Merge "fs_mgr: code clean up" 2017-04-29 03:21:33 +00:00
Guang Zhu
82ab44ce09 Merge "Revert "Enable metadata encryption"" 2017-04-29 00:01:35 +00:00
Guang Zhu
9709c5a7ff Revert "Enable metadata encryption"
Bug: 37792477

This reverts commit 2bf87eebe4.

Change-Id: I1a43793beda24c01f0fe9e25a7c183af1200fa76
2017-04-28 23:58:55 +00:00
Keun-young Park
d6febeff80 combine wait for exec log with service exit log am: 6e53199191
am: 5ade5e2989

Change-Id: I10afed0926ee29335bfe70eb42c4d9520b30f1a8
2017-04-28 23:44:15 +00:00
Keun-young Park
5ade5e2989 combine wait for exec log with service exit log
am: 6e53199191

Change-Id: I8ec71493683b5ddea2995e719a4bc2de84ba4828
2017-04-28 23:37:13 +00:00
Steven Moreland
1457c9290d lmkd: Android.mk -> Android.bp
Test: links
Change-Id: I19aa62270488af02d64830ca90faf80b35423009
2017-04-28 15:20:18 -07:00
Nick Desaulniers
4f4a2baa21 Merge "Enable metadata encryption" 2017-04-28 21:29:29 +00:00
Keun-young Park
6e53199191 combine wait for exec log with service exit log
- allows easier tracking of wait time from monitoring tools
- this change also reduces unnecessary log spam
- service exit log looks like this:
  init: Service 'exec 4 (/system/bin/otapreopt_slot)' (pid 611) exited with status 0 waiting took 0.060771 seconds

bug: 37752410
Test: reboot and check log

(cherry picked from commit 4de31e1481)

Change-Id: Icb83a6a23b45ebd9b4c9d86ee37df8ee3d6e790a
2017-04-28 14:15:32 -07:00
Keun-young Park
9483be8a00 Merge "combine wait for exec log with service exit log" am: 483d2f9a59 am: 010efc6a1c am: b85523e64e
am: 58689cb421

Change-Id: If8e7055ef4f98c256a30d0719bcb157af0010e85
2017-04-28 20:55:13 +00:00
Mark Salyzyn
2bd06f2895 logd: CTS test
Utilize logd-unit-tests as a CTS test

Goal is to check if the kernel logger is enabled.

Test: run cts tests
Bug: 31772697
Change-Id: I6d80350f3e40aff095f81b6600c40dd7d376bd74
2017-04-28 13:50:56 -07:00
Keun-young Park
58689cb421 Merge "combine wait for exec log with service exit log" am: 483d2f9a59 am: 010efc6a1c
am: b85523e64e

Change-Id: If4e052913653de1feebde4799d19c282255f5ede
2017-04-28 20:40:13 +00:00
Keun-young Park
b85523e64e Merge "combine wait for exec log with service exit log" am: 483d2f9a59
am: 010efc6a1c

Change-Id: Ia3f892e87ee0d08607a472db36b788da81987107
2017-04-28 20:30:02 +00:00
Keun-young Park
010efc6a1c Merge "combine wait for exec log with service exit log"
am: 483d2f9a59

Change-Id: I58622d8a76f6f9ecc5df5bb421a4c6af6b72b41a
2017-04-28 20:25:31 +00:00
Keun-young Park
483d2f9a59 Merge "combine wait for exec log with service exit log" 2017-04-28 20:12:00 +00:00
Jocelyn Bohr
c9a8f9fb98 Merge changes I5b1a1ce0,I483a18f9 am: 9349b72a67 am: 4cd2da28ff am: 1bd50f6a98
am: db1accde79

Change-Id: Iaf1746ae2e35373b9fb04b8d8699690aa7be62b6
2017-04-28 19:21:27 +00:00