Merge "disksize: force 6G for api 24 and later" into snap-temp-L93900000956627620snap-temp-L93900000956627620

1 files changed, 2 insertions, 1 deletions

diff --git a/android-qemu2-glue/main.cpp b/android-qemu2-glue/main.cpp
index e737d004e1..da9e2ac539 100755
--- a/android-qemu2-glue/main.cpp
+++ b/android-qemu2-glue/main.cpp
@@ -1818,7 +1818,8 @@ extern "C" int main(int argc, char** argv) {
     // studio avd manager does not allow user to change partition size, set a
     // lower limit to 6GB.
     constexpr auto kMinPlaystoreImageSize = 6LL * 1024 * 1024 * 1024;
-    if (fc::isEnabled(fc::PlayStoreImage)) {
+    const int myApiLevel = avd ? avdInfo_getApiLevel(avd) : 1000;
+    if (myApiLevel >= 24 || fc::isEnabled(fc::PlayStoreImage)) {
         if (firstTimeSetup &&
             android_hw->disk_dataPartition_size < kMinPlaystoreImageSize) {
             android_hw->disk_dataPartition_size = kMinPlaystoreImageSize;