Chia-I Wu
9bae89be3a
graphics: include graphics-sw.h from graphics.h
...
This reverts commit 94f641c33
in effect. The way for framework to
avoid including graphics-sw.h is
- include graphics-base.h directly
- do not include HAL headers
Bug: 70526789
Test: builds
Change-Id: I3cd0fbdce2605a59c24f83c680bede95693abfcf
2018-03-13 10:13:51 -07:00
Chia-I Wu
ecbb3324e0
Merge "graphics: move some flex pixel formats to graphcis-sw.h" into pi-dev
2018-03-12 22:41:08 +00:00
TreeHugger Robot
23d45d1cc7
Merge "Base: Add default tag manipulation" into pi-dev
2018-03-10 03:09:52 +00:00
Andreas Gampe
3aa893647c
Base: Add default tag manipulation
...
Allow the default tag (the program name) to be overwritten.
(cherry picked from commit 1923e768ef
)
Bug: 34867873
Test: m
Test: logging_test
Test: manual
Merged-In: I4ef32bad413a7cc82e46ce16a2f26212925964b1
Change-Id: I4ef32bad413a7cc82e46ce16a2f26212925964b1
2018-03-09 13:20:05 -08:00
Chia-I Wu
94f641c333
graphics: move some flex pixel formats to graphcis-sw.h
...
Some of the flex pixel formats are software-only. Move them to
graphics-sw.h to identify files that use them.
Bug: 70526789
Test: builds
Change-Id: I42757af810028f53bb6389c637a00c493041a4fb
2018-03-09 12:26:45 -08:00
Steven Moreland
432cdb6391
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
am: f546acd3fa
-s ours am: 9ce034ce8a
-s ours
...
am: 4e13bf0e73
-s ours
Change-Id: Ib936ca8e664938dce3c4f6f12e0d26f165c6e2d1
2018-03-09 03:10:02 +00:00
Steven Moreland
4e13bf0e73
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
am: f546acd3fa
-s ours
...
am: 9ce034ce8a
-s ours
Change-Id: I6dc6d1628deb2992d292672a20e1b7209ca8fcb5
2018-03-09 03:04:48 +00:00
Steven Moreland
9ce034ce8a
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
...
am: f546acd3fa
-s ours
Change-Id: I00bb77d99b2e4548215a64a80d89c214b0759c10
2018-03-09 02:57:24 +00:00
Android Build Merger (Role)
f546acd3fa
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
...
Change-Id: Ic2cae6509c07e60fe66494b4b37fc5f0d29f068e
2018-03-09 01:49:02 +00:00
Android Build Merger (Role)
dd95a7f10d
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
...
Change-Id: Ifab7435d2c707247b64b6debccbdd00224bdc6af
2018-03-09 01:49:01 +00:00
Android Build Merger (Role)
e9df4d52f7
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
...
Change-Id: Ib19d60a2933bf9ca6aa7eaeb285055d0f2c01452
2018-03-09 01:49:00 +00:00
Android Build Merger (Role)
f479f90679
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
...
Change-Id: Ia9d1a2f4387bdd11085163ffea0e99d22d43757f
2018-03-09 01:48:58 +00:00
Android Build Merger (Role)
dc2153c913
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
...
Change-Id: I1f668592187eef0bb882372f42529d147ce49786
2018-03-09 01:48:57 +00:00
Android Build Merger (Role)
35629db6fe
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
...
Change-Id: Ifc14cf3778241da9ba4d06e3e8913c08dec085ce
2018-03-09 01:48:55 +00:00
Android Build Merger (Role)
4ca82d1d14
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
...
Change-Id: I61308a749e84d4a909d22e4365bbd403fcf67dd4
2018-03-09 01:48:54 +00:00
Android Build Merger (Role)
726007edf0
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
...
Change-Id: Iaf27e11e7beb60499e8c44c8659a13a02c923cbd
2018-03-09 01:48:53 +00:00
Android Build Merger (Role)
9de539d0dd
[automerger] String16: remove integer overflows am: d0648d8dc6
...
Change-Id: Ib1bb7df40aac5be2ff7a704038279e4768b18f88
2018-03-09 01:48:52 +00:00
Steven Moreland
f50ca832cd
String16: remove integer overflows am: 0e5fbea01c
am: b02e0ab211
...
am: 1549baa415
Change-Id: I3d528c5445b6cb0cd58f24743e6442a2aea2344a
2018-03-08 22:24:22 +00:00
Steven Moreland
1549baa415
String16: remove integer overflows am: 0e5fbea01c
...
am: b02e0ab211
Change-Id: I618aaf491fb6309a3e313f4eeed62f68822f574d
2018-03-08 22:20:15 +00:00
Steven Moreland
b02e0ab211
String16: remove integer overflows
...
am: 0e5fbea01c
Change-Id: I60af627000e8c8d4ad44dfafcfdea772afad3838
2018-03-08 22:13:10 +00:00
Mark Salyzyn
df7a622c12
liblog: save errno through log writing
...
(cherry picked from commit 72d3724ee5
)
Test: compile
Bug: 74258013
Change-Id: I5163527826855bc506ed324aaba47f8695aaf668
2018-03-07 22:30:16 +00:00
Christopher Ferris
fc8febc888
Remove leftover commented out code.
...
Test: Compiles.
Change-Id: Icf1cf1640e76450d5327395eb94dbd87d2faac36
(cherry picked from commit 81744ac69f
)
2018-03-06 17:14:41 -08:00
Suren Baghdasaryan
8aaf581b4d
Merge changes I394a7920,Ia847118c,Ic8396eee,I79a85c33,Id015e6a7, ... am: 1d5b102671
am: 27bae4cf7c
...
am: 2cdfb3f23a
-s ours
Change-Id: I5d41303f07c25c06cf89d78b181f7c6d97902756
2018-03-03 00:50:09 +00:00
Steven Moreland
bd352fdc92
Merge "fastboot: only require Linux modules on Linux" am: 24efdff2c5
am: 96eea9a773
...
am: 1c4150ee4c
Change-Id: I5372f2adeea27242e8caf37015453809ec6df524
2018-03-03 00:49:30 +00:00
Yi Kong
979ace46ed
Merge "healthd: Fix negativity check after cast to unsigned enum" am: 3dad67af05
am: 4734981245
...
am: eb066ae098
Change-Id: I2327adfd50fceb232ef2a52e535914743c25cf3a
2018-03-03 00:46:57 +00:00
Suren Baghdasaryan
2cdfb3f23a
Merge changes I394a7920,Ia847118c,Ic8396eee,I79a85c33,Id015e6a7, ... am: 1d5b102671
...
am: 27bae4cf7c
Change-Id: Ie508e8890b66c2baa334e4bbee1e46384b7f44c7
2018-03-03 00:37:13 +00:00
Steven Moreland
1c4150ee4c
Merge "fastboot: only require Linux modules on Linux" am: 24efdff2c5
...
am: 96eea9a773
Change-Id: I20da9920086c2334309bc82e57a97432d5186f23
2018-03-03 00:36:20 +00:00
Yi Kong
eb066ae098
Merge "healthd: Fix negativity check after cast to unsigned enum" am: 3dad67af05
...
am: 4734981245
Change-Id: I77ec8aae517e4bd647a7dd6c87cb53152410e7c9
2018-03-03 00:34:29 +00:00
Suren Baghdasaryan
27bae4cf7c
Merge changes I394a7920,Ia847118c,Ic8396eee,I79a85c33,Id015e6a7, ...
...
am: 1d5b102671
Change-Id: Iec6ef1c08a1aed08e9376c367a6e69f8705a8518
2018-03-03 00:15:49 +00:00
Steven Moreland
96eea9a773
Merge "fastboot: only require Linux modules on Linux"
...
am: 24efdff2c5
Change-Id: Ic3b7aeee813ab0ef55e7a2ad0d71db6fdb3889c9
2018-03-03 00:14:29 +00:00
Yi Kong
4734981245
Merge "healthd: Fix negativity check after cast to unsigned enum"
...
am: 3dad67af05
Change-Id: If35b22e1a2e56a0a424aedc8d8e36d23c1ed5ea8
2018-03-03 00:09:34 +00:00
Suren Baghdasaryan
1d5b102671
Merge changes I394a7920,Ia847118c,Ic8396eee,I79a85c33,Id015e6a7, ...
...
* changes:
lmkd: Select in-kernel vs userspace lmk based on kernel driver presence
lmkd: Implement kill timeout
lmkd: Allow killing multiple processes to downgrade memory pressure
lmkd: Detect the highest level of vmpressure when event is detected
lmkd: Close cgroup.event_control file when done writing
lmkd: Remove stale dependency on libprocessgroup
lmkd: Add ability to trace lmkd kills
lmkd: add logic to kill the heaviest of the eligible processes
lmkd: change defaults to disable event upgrade/downgrade logic
lmkd: add ability to monitor all vmpressure events
2018-03-02 21:32:18 +00:00
Treehugger Robot
24efdff2c5
Merge "fastboot: only require Linux modules on Linux"
2018-03-02 20:44:29 +00:00
Steven Moreland
d0648d8dc6
String16: remove integer overflows
...
Bug: 73826242
Test: manual
Change-Id: I32e13d61b944c1a527cf2d95473552d246e322be
Merged-In: I32e13d61b944c1a527cf2d95473552d246e322be
2018-03-02 20:26:45 +00:00
Steven Moreland
0e5fbea01c
String16: remove integer overflows
...
Bug: 73826242
Test: manual
Change-Id: I32e13d61b944c1a527cf2d95473552d246e322be
2018-03-02 20:16:28 +00:00
TreeHugger Robot
6027705f46
Merge "String16: remove integer overflows"
2018-03-02 20:15:32 +00:00
Treehugger Robot
3dad67af05
Merge "healthd: Fix negativity check after cast to unsigned enum"
2018-03-02 19:49:18 +00:00
Yi Kong
808e57e3f3
healthd: Fix negativity check after cast to unsigned enum
...
mapSysfsString return code is checked for negativity after being casted
to unsigned enum type, which will always be false. This is obviously
unintended behaviour.
Fixes tautological-unsigned-enum-zero-compare warning.
Bug: 72331526
Test: m
Change-Id: Icec76d7a1121cb56fd9d05feb70cede69954c322
2018-03-02 18:42:03 +00:00
Adam Lesinski
9937840eb0
Merge "Remove empty zip warning on host builds" am: fd42c09813
am: c9c0460e99
...
am: fbd68ec85e
Change-Id: Iba5ecc1ed7f059c4deb5bde2a3c0521cc8ca9e83
2018-03-02 02:39:27 +00:00
Adam Lesinski
fbd68ec85e
Merge "Remove empty zip warning on host builds" am: fd42c09813
...
am: c9c0460e99
Change-Id: Ie22226ad9a9c0dc5f3fbc4a841936cdecabf3cc4
2018-03-02 02:32:13 +00:00
Adam Lesinski
c9c0460e99
Merge "Remove empty zip warning on host builds"
...
am: fd42c09813
Change-Id: Ic3d788dd7da989da048bfb410ca51bea716e3d08
2018-03-02 02:21:02 +00:00
Treehugger Robot
fd42c09813
Merge "Remove empty zip warning on host builds"
2018-03-02 02:07:00 +00:00
Paul Crowley
f023e51742
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: b9ee9abebe
am: c30557f2bf
...
am: 492ff5bf09
Change-Id: I4218d302b0924e162c64929f6b69d0a28f6fac4f
2018-03-02 01:54:26 +00:00
Paul Crowley
492ff5bf09
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: b9ee9abebe
...
am: c30557f2bf
Change-Id: If87f2af0a0babe02d45353c57d08fd7335cfc2f6
2018-03-02 01:49:18 +00:00
Paul Crowley
c30557f2bf
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery.""
...
am: b9ee9abebe
Change-Id: I46fd5105be75661eb74ab17528e03ac420e022dc
2018-03-02 01:43:48 +00:00
Tom Cherry
b428407041
Merge "Restrict setting platform properties from vendor .prop files" am: c3892c045f
am: 550ebdf9fb
...
am: 54dd80337d
Change-Id: I6ffb8a2ff839ae4b82b5ccfdfb6011800413dfe4
2018-03-02 01:27:48 +00:00
Treehugger Robot
b9ee9abebe
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery.""
2018-03-02 01:26:32 +00:00
Tom Cherry
54dd80337d
Merge "Restrict setting platform properties from vendor .prop files" am: c3892c045f
...
am: 550ebdf9fb
Change-Id: Ie9d551ff1bede431ab562f3fb127254a726e79d3
2018-03-02 01:22:40 +00:00
Tom Cherry
550ebdf9fb
Merge "Restrict setting platform properties from vendor .prop files"
...
am: c3892c045f
Change-Id: I8d5cbc8addf03785d9effdde97c170d60b7c1255
2018-03-02 01:17:07 +00:00
Suren Baghdasaryan
2088f6ad03
lmkd: Select in-kernel vs userspace lmk based on kernel driver presence
...
(cherry pick from commit 979591b627
)
Currently selection criteria for in-kernel vs userspace lmk is kernel
driver presence and device not being a Go device. This change removes
Go device check leaving kernel driver presence to be the only selection
criteria.
Bug: 71502948
Change-Id: I394a7920433a8d090e207ea86296356413a63fe7
Merged-In: I394a7920433a8d090e207ea86296356413a63fe7
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2018-03-02 01:16:05 +00:00