Commit graph

38290 commits

Author SHA1 Message Date
Yifan Hong
b7cd45f877 charger: add charger_test
Test: charger_test
Bug: 63702641
Change-Id: Id50d024c015916cb8007742e3c17eaf1161b909f
2017-11-21 15:05:17 -08:00
Yifan Hong
43142c4286 Merge changes from topic "health2_passthru"
* changes:
  healthd: charger use health 2.0 HAL
  healthd: move healthd_board_init call to Health::Health() c-tor
2017-11-20 22:52:06 +00:00
Yifan Hong
10c2b4013a healthd: charger use health 2.0 HAL
Test: charger_test
Test: off-mode charging, charger runs correctly
Bug: 63702641
Bug: 69268160
Change-Id: I7dfc83ae4020ada7e9d11ab955f648abb74f435b
2017-11-20 10:28:11 -08:00
Dmitry Dementyev
d8791e9d12 Merge "Get rid of manually created IKeystoreService in gatekeeper.cpp" 2017-11-17 22:32:19 +00:00
TreeHugger Robot
5ef59f6e7a Merge "Revert "Add functions for testability to the EventLog APIs"" 2017-11-17 22:17:04 +00:00
Christopher Ferris
767c1ce3c7 Merge "Force call the fallback handler." am: b7969272a3 am: ce31cff9af
am: e1de2086c7

Change-Id: I5e3336c3f2c9de5a746c668893ddaefa5e5e57fc
2017-11-17 18:44:06 +00:00
Christopher Ferris
e1de2086c7 Merge "Force call the fallback handler." am: b7969272a3
am: ce31cff9af

Change-Id: Ieacde0260faed5d072608df907600205d46a51a3
2017-11-17 18:40:34 +00:00
Christopher Ferris
ce31cff9af Merge "Force call the fallback handler."
am: b7969272a3

Change-Id: I0c2893acb1f1aba246a1346775ed6d83f9b45e44
2017-11-17 18:38:29 +00:00
Christopher Ferris
b7969272a3 Merge "Force call the fallback handler." 2017-11-17 18:33:20 +00:00
Jaegeuk Kim
2decf61b2d fs_mgr: support quota format for f2fs
This patch adds -O quota for make_f2fs to activate disk quotas, and add -d1 to
show debug messages which was set in all the other make_f2fs calls.

Change-Id: I33ab0f585b1081ff88f298286378f9ff70579b3f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-16 22:10:02 -08:00
Christopher Ferris
664d2a9093 Force call the fallback handler.
Always check to see if the fallback handler has been called and is
not trying to dump a specific thread.

Bug: 69110957

Test: Verified on a system where the prctl value changes, that before the
Test: change it dumps multiple tombstones, and after the change it
Test: works as expected.
Test: Ran debuggerd unit tests.
Test: Dumped process using debuggerd -b <PID> and debuggerd <PID>.
Change-Id: Id98bbe96cced9335f7c3e17088bb4ab2ad2e7a64
2017-11-16 20:07:13 -08:00
Steven Moreland
c79baea4d5 Merge changes from topic "b69050941" am: 37eb97d911 am: 864a1baa0f
am: a8fcd9060d

Change-Id: I61bd9960c9e240f427a84190d195c1cb59befaae
2017-11-15 21:57:03 +00:00
Steven Moreland
a8fcd9060d Merge changes from topic "b69050941" am: 37eb97d911
am: 864a1baa0f

Change-Id: I676cce806836ef6a9204e7b482e94b8cb1d7163f
2017-11-15 21:52:21 +00:00
Steven Moreland
864a1baa0f Merge changes from topic "b69050941"
am: 37eb97d911

Change-Id: Icdfc3e160b2ae1d2dc63c1d86c1a75a199fdf1c0
2017-11-15 21:49:19 +00:00
Treehugger Robot
37eb97d911 Merge changes from topic "b69050941"
* changes:
  Allow a service to override another.
  Move service name duplication lookup to EndSection
  EndSection returns Result<Success>
  Fix out of date SectionParser comment.
2017-11-15 21:30:56 +00:00
yaochen
00129eb694 Merge changes from topic "stats_log" am: 68f2c85354 am: 11bb6bbf41
am: 9ecaaf44f9

Change-Id: I17e28078354548b375d60a44a32cc7bd39d895be
2017-11-15 19:30:13 +00:00
yaochen
9ecaaf44f9 Merge changes from topic "stats_log" am: 68f2c85354
am: 11bb6bbf41

Change-Id: I59dc67b32d19570357b69d82c7ce771000ffa64f
2017-11-15 19:28:35 +00:00
yaochen
11bb6bbf41 Merge changes from topic "stats_log"
am: 68f2c85354

Change-Id: I2dce867c04ea61a05b32063f321414f459cbe26c
2017-11-15 19:26:12 +00:00
yaochen
68f2c85354 Merge changes from topic "stats_log"
* changes:
  Register an event logtag for stats logs.
  Create stats buffer in logd.
2017-11-15 19:16:12 +00:00
Steven Moreland
6f5333a4a9 Allow a service to override another.
For instance, on vendor.img:
service foo /vendor/bin/nfc
    ...

And then on odm.img:
service foo /odm/bin/super-nfc
    override

Allows a service on ODM to override a HAL on vendor.

Bug: 69050941
Test: boot, init_tests
Change-Id: I4e908fb66e89fc6e021799fe1fa6603d3072d62a
2017-11-15 10:39:29 -08:00
Steven Moreland
5e1bea30b9 Move service name duplication lookup to EndSection
This is paving the way to allow an "override" tag
in init services. This also means that errors for
part of a service definition in its section will
be shown in addition to the fact that the service
is duplicated.

Bug: 69050941
Test: boot, init_tests
Change-Id: Ic1ea8597789f45ead1083451b3e933db1524bdc9
2017-11-15 10:39:29 -08:00
Steven Moreland
7d0a5c3656 EndSection returns Result<Success>
Allow it to fail. When there is an error for a section ending,
print the error pointing to the line where the section starts.

Bug: 69050941
Test: boot, init_tests
Change-Id: I1d8ed25f4b74cc9ac24d38b8075751c7d606aea8
2017-11-15 10:39:29 -08:00
Xin Li
954cb53eec Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: f3397a3ca4

Change-Id: I84410ec89dd106e9b9c6be94dbe3ad3dda28f039
2017-11-15 00:53:11 +00:00
Xin Li
f3397a3ca4 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I2da7085b5c1f235c7d50949b1abd26ae2aea6888
2017-11-14 16:47:59 -08:00
Yao Chen
91794ca275 Revert "Add functions for testability to the EventLog APIs"
This reverts commit a346544124.

Change-Id: I779a1fa9595f5fc7274e358de1f61c35922fe70c
2017-11-15 00:46:47 +00:00
Yao Chen
c6eafeb5bf Register an event logtag for stats logs.
Bug: 69323063
Test: manual
Change-Id: I244aa15c74ad70ba228c2128a3cdc829537ce5e2
2017-11-14 16:24:13 -08:00
Stefan Lafon
701a0658e6 Create stats buffer in logd.
Bug: 69323063
Test: ran unit tests.
Change-Id: Icfb827ab4674172c26b4bbfe1a9b3bffc03dc24b
(cherry picked from commit 1b1b6f50c7)
2017-11-14 16:20:00 -08:00
Dmitry Dementyev
0dd259cf78 Get rid of manually created IKeystoreService in gatekeeper.cpp
Bug:68389643
Test: manual
Change-Id: I2c1404f4c6597e63bc0a360a7bf598e35585b30e
2017-11-14 16:15:44 -08:00
Steven Moreland
b480d441ac Fix out of date SectionParser comment.
It has since been refactored with different
return types.

Bug: 69050941
Test: boot, init_tests
Change-Id: I54c0e6745640136f060ba1876b2f26d95bddc9d6
2017-11-14 13:47:59 -08:00
Xin Li
23e27db576 Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40
Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
2017-11-14 13:19:45 -08:00
Yifan Hong
3bc12ce7df healthd: move healthd_board_init call to Health::Health() c-tor
The invocation is wrapped so that clients of -impl doesn't
have to call healthd_board_init directly.

Test: health VTS test
Test: charger_test
Bug: 69268160

Change-Id: I61f820b80ce6b03fe51ca05d07ed7e09ca369d2d
2017-11-14 12:59:54 -08:00
Jeff Sharkey
a8066ead1d Merge "Better, consistent definition of AID_SHARED_GID." am: b77ecd04d8 am: ea41bcf7a3
am: 90ec70adfa

Change-Id: I6538ad0396fdfa6058a1c5bb6fd9ed74e2382f5b
2017-11-14 17:33:23 +00:00
Jeff Sharkey
90ec70adfa Merge "Better, consistent definition of AID_SHARED_GID." am: b77ecd04d8
am: ea41bcf7a3

Change-Id: I7a75c46a1d40db8d2ef1b91234db38b5e1cfe994
2017-11-14 17:20:17 +00:00
Jeff Sharkey
ea41bcf7a3 Merge "Better, consistent definition of AID_SHARED_GID."
am: b77ecd04d8

Change-Id: I9459a24dafc9a11c401a0fef4f9a8e2864ed22c8
2017-11-14 17:04:21 +00:00
Jeff Sharkey
b77ecd04d8 Merge "Better, consistent definition of AID_SHARED_GID." 2017-11-14 16:49:30 +00:00
TreeHugger Robot
1f73aedee2 Merge "sdcard: Use AID_ROOT constant" 2017-11-14 00:16:52 +00:00
TreeHugger Robot
64adc7ca6a Merge "healthd: move global gHealth service pointer" 2017-11-13 23:57:19 +00:00
Jeff Sharkey
53d37ba23f Better, consistent definition of AID_SHARED_GID.
AID_SHARED_GID is a GID shared by a specific app across all users on
the same device.  Bring the UserHandle and multiuser.c implementations
into agreement, and copy/paste the unit tests that verify that both
behave identically.

This fixes a regression where multiuser_get_shared_gid() was applying
per-user isolation when it shouldn't have.

Test: adb shell /data/nativetest64/libcutils_test/libcutils_test64
Bug: 34151068, 64548938
Change-Id: I491dd79d23a214425a68865d1d0f8269916aad4c
2017-11-13 16:49:26 -07:00
Jaegeuk Kim
9680cbab65 Merge "fastboot: support f2fs format" am: 21d3840eb3 am: 6c2bfb95ee
am: 1fa1fdb8f9

Change-Id: Iff6751d9b826838496eede0ab6cec8a384e67b48
2017-11-13 23:00:28 +00:00
Jaegeuk Kim
1fa1fdb8f9 Merge "fastboot: support f2fs format" am: 21d3840eb3
am: 6c2bfb95ee

Change-Id: I9204686aa7afd835d6b1f8852b7a082a4b3e13be
2017-11-13 22:55:54 +00:00
Jaegeuk Kim
6c2bfb95ee Merge "fastboot: support f2fs format"
am: 21d3840eb3

Change-Id: I348a523a7822a73a9905a747789571457d2f193e
2017-11-13 22:48:15 +00:00
Jaegeuk Kim
21d3840eb3 Merge "fastboot: support f2fs format" 2017-11-13 22:37:34 +00:00
Calvin On
5b61509339 Merge "Fix logcatd dependency in logpersist." am: d0406316fe am: 8b03fd8441
am: 808c8ca352

Change-Id: Ie2cf5ba632d7a30e98f47b45bc11116660ed80d2
2017-11-13 22:23:53 +00:00
Calvin On
808c8ca352 Merge "Fix logcatd dependency in logpersist." am: d0406316fe
am: 8b03fd8441

Change-Id: I23b13d708cffe44f5016b85dd0820c27097daa44
2017-11-13 22:21:48 +00:00
Calvin On
8b03fd8441 Merge "Fix logcatd dependency in logpersist."
am: d0406316fe

Change-Id: I7bf6bf5afaa453ea553d8e1776f148162b273530
2017-11-13 22:19:44 +00:00
Treehugger Robot
d0406316fe Merge "Fix logcatd dependency in logpersist." 2017-11-13 22:15:24 +00:00
Steven Moreland
2eaa098bfe Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c17 am: 5bd7b32c15
am: 2c531b007e

Change-Id: Iee1ac7081e7954099e9ee77c07480e8db30adb67
2017-11-13 21:19:21 +00:00
Steven Moreland
2c531b007e Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c17
am: 5bd7b32c15

Change-Id: I0958fea7b320025bb329defe2d26a922e7f236bb
2017-11-13 21:13:50 +00:00
Steven Moreland
5bd7b32c15 Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt"
am: c437e14c17

Change-Id: I7fbdb7ad974663beef8f4a985bbd281228f3230c
2017-11-13 21:11:17 +00:00
Treehugger Robot
c437e14c17 Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" 2017-11-13 21:06:34 +00:00