| commit | 47afe8f609e22c60f9f1f656195041b548efa8dd | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 12 18:30:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 12 18:30:58 2020 +0000 |
| tree | ff33176f5de2c5e38bb364e1fe0a54c0786b2b1a | |
| parent | eda17739dde7f4e01fa619f4ab05d7fd03cd0b50 [diff] | |
| parent | 066cfa372634db26fd512a730c27ddf214b4ac7d [diff] |
Merge "fs_mgr: overlayfs: CreateDynamicScratch for *partition_exists" am: 684122a264 am: 066cfa3726 Change-Id: I1f266476be118a1ceccbdd77db8eba782889443b
diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp index 2bc53d3..1fa1aa1 100644 --- a/fs_mgr/fs_mgr_overlayfs.cpp +++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -1026,6 +1026,8 @@ } if (change) *change = true; + } else if (scratch_device->empty()) { + *scratch_device = GetBootScratchDevice(); } return true; }