diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-15 04:38:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-15 04:38:49 +0000 |
| commit | 12ba9f74d7d7012f61940380491f17ab370bbafd (patch) | |
| tree | 27bba397be0cddadd00f4bca4fa7df7d6f704dc9 | |
| parent | ddd75ba1e6a9cca4beccd7679c6b3b8a7c1e661f (diff) | |
| parent | 184e9461c5fe5cf7924527584db2c526034ee5ad (diff) | |
| download | core-android10-mainline-a-release.tar.gz | |
Snap for 5803298 from 184e9461c5fe5cf7924527584db2c526034ee5ad to qt-aml-releaseandroid-mainline-10.0.0_r2android10-mainline-a-release
Change-Id: I39c87564e8f2327e48c3f6b2236d4949add9844f
| -rw-r--r-- | libmeminfo/vts/AndroidTest.xml | 1 | ||||
| -rw-r--r-- | rootdir/init.rc | 1 | ||||
| -rw-r--r-- | sdcard/sdcard.cpp | 9 |
3 files changed, 3 insertions, 8 deletions
diff --git a/libmeminfo/vts/AndroidTest.xml b/libmeminfo/vts/AndroidTest.xml index 530d16ef0..9614025ae 100644 --- a/libmeminfo/vts/AndroidTest.xml +++ b/libmeminfo/vts/AndroidTest.xml @@ -24,6 +24,7 @@ <option name="binary-test-source" value="_32bit::DATA/nativetest/vts_meminfo_test/vts_meminfo_test" /> <option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_meminfo_test/vts_meminfo_test" /> <option name="binary-test-type" value="gtest"/> + <option name="precondition-first-api-level" value="29" /> <option name="test-timeout" value="10m"/> </test> </configuration> diff --git a/rootdir/init.rc b/rootdir/init.rc index c042c4897..893998cee 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -589,6 +589,7 @@ on post-fs-data symlink /data/data /data/user/0 mkdir /data/media 0770 media_rw media_rw + mkdir /data/media/obb 0770 media_rw media_rw mkdir /data/cache 0770 system cache mkdir /data/cache/recovery 0770 system cache diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp index 0acea7266..2b358197a 100644 --- a/sdcard/sdcard.cpp +++ b/sdcard/sdcard.cpp @@ -214,14 +214,7 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe if (multi_user) { std::string obb_path = source_path + "/obb"; - // Only attempt to prepare the /obb dir if it already exists. We want - // the legacy obb path "/data/media/obb" to be fixed up so that we can - // migrate it to its new location, but we don't want the directory to be - // created if it doesn't already exist. - struct stat sb; - if (TEMP_FAILURE_RETRY(lstat(obb_path.c_str(), &sb)) == 0) { - fs_prepare_dir(obb_path.c_str(), 0775, uid, gid); - } + fs_prepare_dir(obb_path.c_str(), 0775, uid, gid); } exit(0); |