Commit Graph

58450 Commits

Author SHA1 Message Date
Automerger Merge Worker e18e48b18a Merge "fs_mgr: fstab: Fix parse warning typo" am: 4ddb495354 am: 1b378271f4
Change-Id: I3234070728b4f6c91ab2260713155070f7525c61
2020-02-12 18:31:12 +00:00
Automerger Merge Worker 9345bfb0b2 Merge changes from topic "snapshotctl_log" am: da8a404473 am: 6d3c0ef08c
Change-Id: Iee9eabede08c37156a0b99025069f6ceb4d6b22d
2020-02-12 18:31:06 +00:00
Automerger Merge Worker 47afe8f609 Merge "fs_mgr: overlayfs: CreateDynamicScratch for *partition_exists" am: 684122a264 am: 066cfa3726
Change-Id: I1f266476be118a1ceccbdd77db8eba782889443b
2020-02-12 18:30:58 +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
Zimuzo Ezeozue 6d3fa224af Merge "FUSE flag on by default" 2020-02-12 13:15:48 +00:00
Joshua Duong ef28ca4cdc Move adb RSA utilities into its own library.
Since both the client and daemon will now be generating keys.

BUG: b/111434128

Test: atest adb_crypto_test
Change-Id: I6fac562ae5629ab30b6639fbd88d822dae6e96bd
2020-02-11 20:49:20 -08:00
Joshua Duong 9e96e71067 [adbwifi] Add adb protos.
BUG: b/111434128

Test: make
Change-Id: I7eef85c773e219e1873c9fbc30d14c17c110c3bf
2020-02-11 20:49:15 -08:00
Automerger Merge Worker 1d237b5b46 Merge "storaged:Thread out of sync will cause null pointer crash" am: 2929ab63e3 am: 38669ed46d am: eda17739dd
Change-Id: If695fe32c32fb597286c7de710a030259743ba17
2020-02-12 02:43:14 +00:00
Automerger Merge Worker eda17739dd Merge "storaged:Thread out of sync will cause null pointer crash" am: 2929ab63e3 am: 38669ed46d
Change-Id: I10bced277ec46a64837efc619e752b7f793c4aaf
2020-02-12 02:32:22 +00: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 0a65df1375 Merge "String16: operator<<" am: 824418c370 am: fddc5b2fb1 am: 3b9b60c70c
Change-Id: If8fbaca1ab88dd538ddf4425e1b7bd8abede77a6
2020-02-11 23:26:19 +00:00
Automerger Merge Worker 3b9b60c70c Merge "String16: operator<<" am: 824418c370 am: fddc5b2fb1
Change-Id: I368465a5a8865ea056a865bc08b77fc03c17175b
2020-02-11 23:24:32 +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 833c7745dc Merge "Initialize key structure to zero in charger" am: ef0252108c am: ebfe76c75e am: 33875834cc
Change-Id: Ibb4d2d0ee8dbaba65e0982061a6cea7f2eafb969
2020-02-11 22:14:48 +00:00
Automerger Merge Worker 8894e72b5f Merge "Explicitly disable FUSE" am: ec9c803503 am: f31b36ffe8 am: 36e457a77d
Change-Id: If484a28f560c4cdebb7486608bf2001afeb5edd7
2020-02-11 22:14:33 +00:00
Automerger Merge Worker ed830505b2 Merge "[vts-core] fix the test error of KernelLibcutilsTest." am: 3d6154ffe9 am: 14e0b48b59 am: 7ef1507434
Change-Id: I90840a20974875b13b3546ae162f5bd5dca13ecd
2020-02-11 22:13:46 +00:00
Automerger Merge Worker 33875834cc Merge "Initialize key structure to zero in charger" am: ef0252108c am: ebfe76c75e
Change-Id: Ie923c20e07ed6c7fe5338769d7c8ffa0092de02d
2020-02-11 22:08:08 +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
Automerger Merge Worker 36e457a77d Merge "Explicitly disable FUSE" am: ec9c803503 am: f31b36ffe8
Change-Id: Ied10221b6fe36577d07dbc08abba85fcd8c832f4
2020-02-11 21:54:15 +00:00
Automerger Merge Worker 7ef1507434 Merge "[vts-core] fix the test error of KernelLibcutilsTest." am: 3d6154ffe9 am: 14e0b48b59
Change-Id: I94946e2f43634921ffdadd1ed372df747be0d81a
2020-02-11 21:53:39 +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
Zim 8dacabe6b3 FUSE flag on by default
This will make the FUSE filesystem the default on the build

Test: https://android-build.googleplex.com/builds/forrest/run/L11100000458471772
Bug: 135341433
Change-Id: I1493e2806823b5751794a9a17ee248dc72b857ff
2020-02-11 13:40:34 +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 2696acfc0c Merge "Add a switch to enforce avb for DSU in userdebug" am: cd8b982e40 am: cb7854556d am: 751db75205
Change-Id: I4daa81573ce14ce4ea033bb4d3f228379d8d9bc2
2020-02-11 07:05:36 +00:00
Automerger Merge Worker 751db75205 Merge "Add a switch to enforce avb for DSU in userdebug" am: cd8b982e40 am: cb7854556d
Change-Id: I821f1932b53bdd9b5da5974fea785ba3ffd06501
2020-02-11 06:51:13 +00: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 7a787e3065 Merge "Refine set_sched_policy behavior" am: 6075b1fa9a am: 0c1f55b3ed am: 3829759c93
Change-Id: I8ef1c29c7b3adf801908ea83170ee91d11f90d6a
2020-02-11 04:05:30 +00:00
Automerger Merge Worker 3829759c93 Merge "Refine set_sched_policy behavior" am: 6075b1fa9a am: 0c1f55b3ed
Change-Id: I58e971729d663036d6111158f33edcba45ffa576
2020-02-11 03:52:37 +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
Automerger Merge Worker 41c8c0e3da Merge "Create directory to store pre-reboot information before reboot" am: 9272319714 am: 1b7787e33a am: 0a1b6ab601
Change-Id: I94d6c085aa1b29af51bdf40d615729f6b7bd8d95
2020-02-11 03:27:40 +00:00
Treehugger Robot 6075b1fa9a Merge "Refine set_sched_policy behavior" 2020-02-11 03:25:33 +00:00