Commit graph

56417 commits

Author SHA1 Message Date
Jeffrey Huang
97b4d62ed4 Merge "Add apex available to liblog" am: fd73daa049
Change-Id: Ieeef95dbe8339d3d343c9bf21724cfaa1859be1f
2020-02-14 00:57:49 +00:00
Jeffrey Huang
fd73daa049 Merge "Add apex available to liblog" 2020-02-14 00:45:22 +00:00
Treehugger Robot
1632564c64 Merge "Preserving /avb/* keys to /metadata" am: 05aff5b211
Change-Id: Ibf1c8b6cf4d692ca6b87532d8b5bb83f9c6d7f18
2020-02-14 00:15:09 +00:00
Treehugger Robot
05aff5b211 Merge "Preserving /avb/* keys to /metadata" 2020-02-13 23:52:40 +00:00
Jeffrey Huang
66f58a3ecc Add apex available to liblog
Bug: 145923087
Test: m -j
Change-Id: I3ac890cbc71ad062ff095adfa2272f6f76db466b
2020-02-13 12:46:09 -08:00
Automerger Merge Worker
b8709d62fd Merge "build code_coverage.policy with Android.bp" am: 59de77e777
Change-Id: Idbd5b181486935f6a218fc3e8a3fc75f6ac04d0b
2020-02-13 17:25:30 +00:00
Ray Essick
59de77e777 Merge "build code_coverage.policy with Android.bp" 2020-02-13 17:13:23 +00:00
Bowgo Tsai
196cc58781 Preserving /avb/* keys to /metadata
Those keys will be used for key revocation check by DSU installation
service. Note that failing to copy those keys to /metadata is NOT fatal,
because it is auxiliary to perform public key matching prior to booting
into DSU images on next boot. The actual key matching will still be done
on next DSU boot.

Bug: 146910547
Test: boot device, checks the avb keys are copied to /metadata/gsi/dsu/avb/.
Change-Id: I25a4eba82e84288bac7a859205c920628a063651
2020-02-13 15:15:20 +08:00
Automerger Merge Worker
6a4a3e2604 Merge "Add apex available to libutils" am: ab19b995be
Change-Id: Id2021fed69bd6fa13b2328d496d8ab0ef720dec0
2020-02-13 06:20:55 +00:00
Jeffrey Huang
ab19b995be Merge "Add apex available to libutils" 2020-02-13 06:06:02 +00:00
Jeffrey Huang
18986cb220 Add apex available to libutils
Bug: 145922701
Test: m -j
Change-Id: I32a15359bc2f97675f8b5e7e112978667f43bf4f
2020-02-12 17:57:04 -08:00
Automerger Merge Worker
cb96f344f8 Merge "build crash_dump.policy files using Android.bp" am: 1dbd649cf7
Change-Id: I3aa737cdf1a340715539f0bc7b3b26e869fcca53
2020-02-12 23:11:11 +00:00
Ray Essick
1dbd649cf7 Merge "build crash_dump.policy files using Android.bp" 2020-02-12 22:43:12 +00:00
Automerger Merge Worker
1b378271f4 Merge "fs_mgr: fstab: Fix parse warning typo" am: 4ddb495354
Change-Id: I4184edb4a430562a30d6da02e34ed4142c641123
2020-02-12 18:23:57 +00:00
Treehugger Robot
4ddb495354 Merge "fs_mgr: fstab: Fix parse warning typo" 2020-02-12 18:20:49 +00:00
Automerger Merge Worker
6d3c0ef08c Merge changes from topic "snapshotctl_log" am: da8a404473
Change-Id: I4ebac8b522159ed3183ee6f5caeba38fd662f43e
2020-02-12 18:20:41 +00:00
Yifan Hong
da8a404473 Merge changes from topic "snapshotctl_log"
* changes:
  libsnapshot callstack files readable by dumpstate
  snapshotctl logs readable by dumpstate
  snapshotctl_log dir readable by dumpstate
2020-02-12 18:18:59 +00:00
Automerger Merge Worker
066cfa3726 Merge "fs_mgr: overlayfs: CreateDynamicScratch for *partition_exists" am: 684122a264
Change-Id: I02520fe874e0ba5adefeb597acd31b401e635563
2020-02-12 18:15:25 +00:00
Treehugger Robot
684122a264 Merge "fs_mgr: overlayfs: CreateDynamicScratch for *partition_exists" 2020-02-12 18:00:41 +00:00
Felix
92ed423711 fs_mgr: fstab: Fix parse warning typo
Looks like a copy-paste omission.

Change-Id: Ib8ad3a938654786747540690f4bba93d6573d74d
Signed-off-by: Felix <google@ix5.org>
2020-02-12 17:30:28 +01:00
Automerger Merge Worker
38669ed46d Merge "storaged:Thread out of sync will cause null pointer crash" am: 2929ab63e3
Change-Id: I643b5246b809f72a8cf0b3c7013c40941b8d45ad
2020-02-12 02:17:52 +00:00
Treehugger Robot
2929ab63e3 Merge "storaged:Thread out of sync will cause null pointer crash" 2020-02-12 02:04:43 +00:00
Automerger Merge Worker
fddc5b2fb1 Merge "String16: operator<<" am: 824418c370
Change-Id: I2ee6e01d1898aa2fec3df5caaa440eef314aeb66
2020-02-11 23:03:21 +00:00
Steven Moreland
824418c370 Merge "String16: operator<<" 2020-02-11 22:43:26 +00:00
Automerger Merge Worker
ebfe76c75e Merge "Initialize key structure to zero in charger" am: ef0252108c
Change-Id: I54fec19c99b8483344bb8e3687debea8eddd24b6
2020-02-11 21:56:04 +00:00
Treehugger Robot
ef0252108c Merge "Initialize key structure to zero in charger" 2020-02-11 21:41:17 +00:00
Automerger Merge Worker
f31b36ffe8 Merge "Explicitly disable FUSE" am: ec9c803503
Change-Id: I66d60bdcc009168f7ebb94d5c03018c2f874f1fb
2020-02-11 21:34:23 +00:00
Automerger Merge Worker
14e0b48b59 Merge "[vts-core] fix the test error of KernelLibcutilsTest." am: 3d6154ffe9
Change-Id: I171adcbaf5d444912c077815469c1d0386a60060
2020-02-11 21:33:56 +00:00
Zimuzo Ezeozue
ec9c803503 Merge "Explicitly disable FUSE" 2020-02-11 21:17:53 +00:00
Treehugger Robot
3d6154ffe9 Merge "[vts-core] fix the test error of KernelLibcutilsTest." 2020-02-11 21:15:57 +00:00
Yifan Hong
faa49d1d00 libsnapshot callstack files readable by dumpstate
Set callstack logs as 0644 so that they are readable
by dumpstate.

Test: take OTA, cancel, delete /data/misc/update_engine/prefs/*
manually, retrigger OTA (so that callstack is logged), then re-take bug report
Bug: 148818798

Change-Id: I598e484b57dcd3ce6ed7bb483aee57ce2ba881e7
2020-02-11 10:57:51 -08:00
Yifan Hong
bdf93248a3 snapshotctl logs readable by dumpstate
Set persistent logs for snapshotctl to 0644
so that they are readable by dumpstate.

Not using mode field in open() because it is masked
by umask. Directly use fchmod instead.

Test: reboot and take bugreport
Bug: 148818798

Change-Id: I515f8fd1345fcfb82aa2a1ec0c95da4b6921c039
2020-02-11 10:57:51 -08:00
Yifan Hong
7d28688f96 snapshotctl_log dir readable by dumpstate
Set snapshotctl_log as 0755 so that it is
readable by dumpstate.

Test: bugreport
Bug: 148818798
Change-Id: I6ff52cf0a2e928c74df31aa054ae780f919d6eb0
2020-02-11 10:57:51 -08:00
Ray Essick
1e9375d6ac build code_coverage.policy with Android.bp
use Android.bp instead of Android.mk;
This also allows build to include the files within an apex

Bug: 147914640
Test: build, check filesystem
Change-Id: I574d9ce984e09af95c7673494c8c714169f69b08
2020-02-11 10:33:38 -08:00
Mark Salyzyn
5ced7600d1 fs_mgr: overlayfs: CreateDynamicScratch for *partition_exists
Commit 69def12f08
("overlayfs: Refactor how the scratch device is deduced, again.")
introduced a regression which dropped a call to
dm.GetDmDevicePathByName.  The call was formerly done to check if
a partition existed and shortcuted the logic.  As a result when
the partition exists and is already instantiated, CreateDynamicScratch
function fails to fill out *scratch_device return value.

The bandaid is to call GetBootScratchDevice() to leverage its own
GetDmDevicePathByName call to fill out if it is detected as an empty
value in CreateDynamicScratch, only called under this condition.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Test: adb-remount-test.sh
Bug: 148881519
Change-Id: I40464e8dd17d25a292a275d0b9df5f9519b794fb
2020-02-11 09:41:09 -08:00
Zim
a3209c5f57 Explicitly disable FUSE
It is already disabled, but having an explcit value in the prop makes
some code in the system_server, easier.

Will follow up with a cl to explicitly enable it on internal master,
aosp will remain this way since it doesn't have the additional
components to run FUSE.

Test: Freshly wiped and flashed device has persist.sys.fuse set to false
Bug: 135341433
Merged-In: I1493e2806823b5751794a9a17ee248dc72b857ff
Change-Id: Ibb955a543e367aa2f4518d5c1c4d070cd084eca0
2020-02-11 16:56:47 +00:00
shaozhongqi
cda9b2a500 storaged:Thread out of sync will cause null pointer crash
if other process binder calls dumpPerfHistory when storaged is started, there will be a problem with the storage_sp null pointer

Test: Manual

Bug: 149251684

Change-Id: I9bf61ceb7c34326e95f2355129714d28153a994c
Signed-off-by: shaozhongqi <shaozhongqi@xiaomi.com>
2020-02-11 16:03:41 +08:00
Automerger Merge Worker
cb7854556d Merge "Add a switch to enforce avb for DSU in userdebug" am: cd8b982e40
Change-Id: Ib98c288a375362191fa6736f2e44ff19c895644b
2020-02-11 06:40:10 +00:00
Howard Chen
cd8b982e40 Merge "Add a switch to enforce avb for DSU in userdebug" 2020-02-11 06:21:38 +00:00
Automerger Merge Worker
0c1f55b3ed Merge "Refine set_sched_policy behavior" am: 6075b1fa9a
Change-Id: I2d18ee9868ab052a731c35328cc270ce7e5702ee
2020-02-11 03:43:48 +00:00
Treehugger Robot
6075b1fa9a Merge "Refine set_sched_policy behavior" 2020-02-11 03:25:33 +00:00
Automerger Merge Worker
1b7787e33a Merge "Create directory to store pre-reboot information before reboot" am: 9272319714
Change-Id: I75f979929d74dee093a175dfbdb38edb40d6aa0c
2020-02-11 03:08:55 +00:00
Jerry Chang
9272319714 Merge "Create directory to store pre-reboot information before reboot" 2020-02-11 02:49:29 +00:00
Stephane Lee
d43724d0b3 Initialize key structure to zero in charger
This is necessary because the key callback may not
be called before the states are checked.

Bug: 149107347
Test: Ensure charger does not reboot

Change-Id: I08d9e4b4046768eb0c0ca6171a2e5b7e5409d073
2020-02-10 16:38:04 -08:00
Automerger Merge Worker
25168b017d Merge "Remove String16 header cruft." am: 770a0f078d
Change-Id: If923aa149715904935dd0902a767788422f5c81b
2020-02-11 00:02:48 +00:00
Treehugger Robot
770a0f078d Merge "Remove String16 header cruft." 2020-02-10 23:50:09 +00:00
Automerger Merge Worker
d4aca92af5 Merge changes I1bf07301,I48e8ebf3 am: c17c5b00e1
Change-Id: Ic71d8da7d163b931f79edbc2d92063e4d3cac049
2020-02-10 23:16:40 +00:00
Treehugger Robot
c17c5b00e1 Merge changes I1bf07301,I48e8ebf3
* changes:
  Remove more duplicated symlinks
  Remove duplicated debugfs symlink
2020-02-10 23:10:08 +00:00
Automerger Merge Worker
bd7792fa19 Merge "libinit_test_utils: -= libhidl-gen-utils header" am: 1da736cb3a
Change-Id: I1e41465044ad57a9786732ade21bcffc7ca72bf1
2020-02-10 23:09:43 +00:00
Steven Moreland
1da736cb3a Merge "libinit_test_utils: -= libhidl-gen-utils header" 2020-02-10 22:53:41 +00:00