ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
43432 commits 1 branch 0 tags 217 MiB
Commit graph

43432 commits

This branch
This branch
All branches
Author SHA1 Message Date
Minchan Kim
cd38ee36a4 Merge "export dumpstatez into stable_properties" 
am: d37dd4a6f0

Change-Id: I4ddf4a5bc6a6df8ea416c242c4eb0b170d627c13
 2018-10-12 00:30:28 -07:00
Minchan Kim
d37dd4a6f0 Merge "export dumpstatez into stable_properties" 2018-10-12 07:23:23 +00:00
Josh Gao
8dce3157e6 Merge "Revert "adb: don't close sockets before hitting EOF."" 
am: 58d5906be3

Change-Id: If3b7d76a9f70a3e16e57d3042effbad5f4a3edb3
 2018-10-11 23:51:38 -07:00
Josh Gao
58d5906be3 Merge "Revert "adb: don't close sockets before hitting EOF."" 2018-10-12 06:38:55 +00:00
Josh Gao
faf1328a64 Revert "adb: don't close sockets before hitting EOF." 
This reverts commit ffc11d3cf3.

Reason for revert: DeviceIdleFreqCheckTest failing

Bug: http://b/117630047
Change-Id: Ia51a4a30e785bc5b2526695de3f442aac298198f
 2018-10-12 05:08:45 +00:00
Mark Salyzyn
2c162bb89f Merge "adb: add reboot-fastboot command" 
am: 11cbf7d711

Change-Id: Ia7104dbbdd09f42491c46784818f615f2c589b67
 2018-10-11 20:52:17 -07:00
Treehugger Robot
11cbf7d711 Merge "adb: add reboot-fastboot command" 2018-10-12 03:38:05 +00:00
Tom Cherry
50166e3571 Merge "init: add [[nodiscard]] to Result" 
am: 4c67290da6

Change-Id: Icf1ef509db9a43305ddf66592847cf34b4773d62
 2018-10-11 13:44:22 -07:00
Tom Cherry
4c67290da6 Merge "init: add [[nodiscard]] to Result" 2018-10-11 20:34:04 +00:00
Mark Salyzyn
d8e94bd3f2 adb: add reboot-fastboot command 
Alias reboot-fastboot to reboot fastboot

Test: manual
Bug: 117604012
Change-Id: I5f7842e420fbc0b1d9ae8e1231887fb8644b29e9
 2018-10-11 13:21:16 -07:00
Tom Cherry
d987264625 init: add [[nodiscard]] to Result 
It's better to either check these results or explicitly ignore them.
Only a few callers weren't already doing this, so it's relatively
trivial to enforce.

Test: build
Change-Id: I44cdc342e46128f66cac914aaa0b9b4559cacd8c
 2018-10-11 10:39:33 -07:00
Pirama Arumuga Nainar
9c9d8bb965 Merge changes from topic "windows-libcxx" 
am: a2ccce870c

Change-Id: I7c0082c9e7e7d9ffa2fa990d029217c261512d93
 2018-10-11 10:25:42 -07:00
Pirama Arumuga Nainar
bdc2b5fa30 Add sys/types.h in utf8.h 
am: 18a1606a88

Change-Id: I1be3c77db48c92f3e8d0b4a1b567e136c9aee5e6
 2018-10-11 10:24:49 -07:00
Pirama Arumuga Nainar
ff229321fd Adapt to switch to libc++ for Windows 
am: 29e3dd8548

Change-Id: Ia4f13c6542334601273dea5a35b47a2df17b3ba0
 2018-10-11 10:23:55 -07:00
Pirama Arumuga Nainar
a2ccce870c Merge changes from topic "windows-libcxx" 
* changes:
  Do not enable -Wold-style-cast for Windows
  Add sys/types.h in utf8.h
  Adapt to switch to libc++ for Windows
 2018-10-11 17:00:53 +00:00
Mark Salyzyn
6ed9536bf4 Merge "fs_mgr: deprecate check for ro.build.system_root_image" 
am: 8ef3fe14bb

Change-Id: I2adaa88a70ac66f7704bceec06af06fc0f14c245
 2018-10-11 08:17:46 -07:00
Treehugger Robot
8ef3fe14bb Merge "fs_mgr: deprecate check for ro.build.system_root_image" 2018-10-11 14:56:49 +00:00
Minchan Kim
b7f6c5a1cd export dumpstatez into stable_properties 
Vendor might want to pause/resume some operations while a bugreport is captured
so that we need to export dumpstatez into stable_properties.h for vendor to get
property event when dumpstatez launch.

Test: confirmed manually with "adb bugreport"
Bug: 117536084
Change-Id: Ib743c5e59ca20cc44470110c814d85e4cbb90c0c
Signed-off-by: Minchan Kim <minchan@google.com>
 2018-10-11 18:02:58 +09:00
Idries Hamadi
fe6e279aeb Merge "Reverted aapt dependency to be a dependency on libandroidfw" 
am: 86554e949b

Change-Id: Ie11997e510592dff6528d78615e1d0fb3d86c9dc
 2018-10-10 23:33:39 -07:00
Idries Hamadi
86554e949b Merge "Reverted aapt dependency to be a dependency on libandroidfw" 2018-10-11 06:15:04 +00:00
Chih-Hung Hsieh
310ff45982 Merge "Suppress implicit-fallthrough warning." 
am: 3f50316ea1

Change-Id: I827e9521aad9f1ab7fc0156c31dd4cb463d8b905
 2018-10-10 18:27:01 -07:00
Treehugger Robot
3f50316ea1 Merge "Suppress implicit-fallthrough warning." 2018-10-11 01:01:13 +00:00
Rajeev Kumar
e10165769e [automerger skipped] Merge "Read memory stats from /proc/pid/stat file." 
am: d936e628a3  -s ours

Change-Id: Ifcc16f31ad7dc9b9a6f7071dbbb5741fc96c064d
 2018-10-10 17:50:52 -07:00
Rajeev Kumar
d936e628a3 Merge "Read memory stats from /proc/pid/stat file." 2018-10-10 23:24:05 +00:00
Hridya Valsaraju
c0cea25d59 Merge "Do not calculate CRC for sparse images during fastboot flash" 
am: a605668edd

Change-Id: Ib6c77991c908421bd2a38afe12012ac4e2fc059c
 2018-10-10 16:16:56 -07:00
Hridya Valsaraju
e69d00e80c Merge "set_active command should update current slot information." 
am: cd72cbb5d8

Change-Id: Id736371e2ada05e171f941f26d57bddf0ab7b6eb
 2018-10-10 16:16:22 -07:00
Rajeev Kumar
4dbc24d393 Read memory stats from /proc/pid/stat file. 
(cherry pick from commit 0301683e49)
Bug: 117333340
Test: Manual testing using alloc-stress tool
Merged-In: Ie555933aafa6a6b7aa1dbf5518ebe804376e0afd
Change-Id: Ie555933aafa6a6b7aa1dbf5518ebe804376e0afd
 2018-10-10 22:23:25 +00:00
Treehugger Robot
a605668edd Merge "Do not calculate CRC for sparse images during fastboot flash" 2018-10-10 22:22:30 +00:00
Treehugger Robot
cd72cbb5d8 Merge "set_active command should update current slot information." 2018-10-10 22:13:15 +00:00
Mark Salyzyn
d556c41a48 fs_mgr: deprecate check for ro.build.system_root_image 
If there is a "/" in the fstab, can only be there on system as root.

This drops the troubling and annoying log message:

    [libfs_mgr]Could not find verity device for mount point: /: No such device or address

Test: manual
Bug: 109821005
Change-Id: I6bbfc0af63e1526e52a1c6365241dbc1d5ee7c6a
 2018-10-10 14:42:29 -07:00
Mark Salyzyn
d5045947e7 Merge changes I5e3f6677,I94665a41 
am: ce2a8e5b9e

Change-Id: I979971b5da241c6c247fad005744d72b2931b0a8
 2018-10-10 14:42:16 -07:00
Chih-Hung Hsieh
e6e2b3cda4 Suppress implicit-fallthrough warning. 
Bug: 112564944
Test: make checkbuild
Change-Id: I2bcfd08ec62f6d5953a9e25dbeaa42ffefda6d1c
 2018-10-10 14:39:02 -07:00
Treehugger Robot
ce2a8e5b9e Merge changes I5e3f6677,I94665a41 
* changes:
  fs_mgr: overlayfs create scratch using a Dynamic Logical Partition
  fs_mgr.h cleanup
 2018-10-10 21:12:34 +00:00
Hridya Valsaraju
aec0de5d96 Do not calculate CRC for sparse images during fastboot flash 
Bug: 78793464
Test: fastboot flashall

Sparse images with CRC are not supported by the Android build
system and hence the calculated CRC is unused.

Change-Id: Ia48b2f7e29f2adea26d185c5a8f2337c4cbe6dcb
 2018-10-10 13:18:35 -07:00
Mark Salyzyn
69ebd440fe fs_mgr: overlayfs create scratch using a Dynamic Logical Partition 
The default is a valid /mnt/scratch/overlay/ or /cache/overlay/
directory, with .../<mount_point>/upper and .../<mount_point>/work,
associated with each system partition <mount_point>.  Add support
for Dynamically Resized Partitions to create /mnt/scratch.

Test: manual
Bug: 109821005
Change-Id: I5e3f66778ea9e937c839e25541fedb6fbf34ab50
 2018-10-10 12:26:51 -07:00
Mark Salyzyn
b5ca72811c fs_mgr.h cleanup 
Drop struct from specifications, fix style.

Test: compile
Change-Id: I94665a41d514501d2f4cd6888361316e08813431
 2018-10-10 12:26:49 -07:00
Hridya Valsaraju
20bdf899b2 set_active command should update current slot information. 
Boot control HAL implementations will return the current boot
slot as the active slot. If a set_active command is issued on another
slot, it should be considered as the new active slot and subsequent
flashes should flash the same.

Test: fastboot set_active "b", fastboot getvar current-slot
Bug: 78793464
Change-Id: Ida3817670de8e74a7d7ae2a905e7ac1756c6bdf1
 2018-10-10 12:25:11 -07:00
Josh Gao
36d5c2ae9c Merge "adb: don't close sockets before hitting EOF." 
am: 2185d8ceef

Change-Id: Id7e398b5e2058a591492d7f053700e5129e63349
 2018-10-10 11:44:04 -07:00
Josh Gao
2185d8ceef Merge "adb: don't close sockets before hitting EOF." 2018-10-10 18:13:01 +00:00
Mark Salyzyn
3a78f9775d Merge "fs_mgr: overlayfs deal with verity detection issues" 
am: 042f2da1f3

Change-Id: I1dbc4fa1d41943f4833151c24ecc98cb2bf494e4
 2018-10-10 10:00:38 -07:00
Treehugger Robot
042f2da1f3 Merge "fs_mgr: overlayfs deal with verity detection issues" 2018-10-10 16:51:57 +00:00
Mark Salyzyn
54e47908c3 fs_mgr: overlayfs deal with verity detection issues 
Stop checking verity on each entry in the fstab, collect the verity
list whole and use in the loop.  Open code verity detection for
"system" for cases where device table is incompletely specified, does
not specify a "/" or a "/system" entry.

Test: manual, /system on system-as-root overlays correctly.
Bug: 109821005
Change-Id: I7bc5fbef6577bb0823cb5deb26c370219e4e597b
 2018-10-10 07:26:50 -07:00
Christopher Ferris
1bbd5a44f0 Merge "Fix handling of globals for new linker." 
am: 8ddded2f96

Change-Id: I3b9acbd1a75daacc5e861937b6ad5a212d34a783
 2018-10-09 19:24:25 -07:00
Christopher Ferris
8ddded2f96 Merge "Fix handling of globals for new linker." 2018-10-10 01:25:31 +00:00
Paul Lawrence
06834e3094 Merge "Handle retry count correctly" 
am: a1bb191541

Change-Id: I68d6e150cd05b26ecdaf7e5869e17f0222bb8607
 2018-10-09 18:01:18 -07:00
Treehugger Robot
a1bb191541 Merge "Handle retry count correctly" 2018-10-10 00:44:49 +00:00
Hridya Valsaraju
de809e0122 Merge "Check validity of partition for getvar:partition-type" 
am: 9810709d91

Change-Id: If60e2ace22f215464757ce97b181d0a59f104a1a
 2018-10-09 16:33:42 -07:00
Treehugger Robot
9810709d91 Merge "Check validity of partition for getvar:partition-type" 2018-10-09 23:21:54 +00:00
Hridya Valsaraju
9e7c924155 Merge "Return partition size in hex format." 
am: b2263b4a07

Change-Id: I24e48dcb9b7e42b5069ebda9424db0e3cdc89cf5
 2018-10-09 14:48:50 -07:00
Treehugger Robot
b2263b4a07 Merge "Return partition size in hex format." 2018-10-09 21:38:48 +00:00