Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support cuttlefish with an emulated 2GB SD"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-22 19:10:37 +00:00
committed by Gerrit Code Review
parent 2dcd402cdc 5a276985c2
commit 7c5f3fe057
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/DynamicSystemService.java
View File

@@ -28,6 +28,7 @@ import android.os.ServiceManager;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.image.IDynamicSystemService; import android.os.image.IDynamicSystemService;
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import android.util.Slog; import android.util.Slog;
@@ -40,6 +41,7 @@ import java.io.File;
*/ */
public class DynamicSystemService extends IDynamicSystemService.Stub { public class DynamicSystemService extends IDynamicSystemService.Stub {
private static final String TAG = "DynamicSystemService"; private static final String TAG = "DynamicSystemService";
private static final long MINIMUM_SD_MB = (30L << 10);
private static final int GSID_ROUGH_TIMEOUT_MS = 8192; private static final int GSID_ROUGH_TIMEOUT_MS = 8192;
private static final String PATH_DEFAULT = "/data/gsi/"; private static final String PATH_DEFAULT = "/data/gsi/";
private Context mContext; private Context mContext;
@@ -95,6 +97,13 @@ public class DynamicSystemService extends IDynamicSystemService.Stub {
if (!volume.isMountedWritable()) { if (!volume.isMountedWritable()) {
continue; continue;
} }
DiskInfo disk = volume.getDisk();
long mega = disk.size >> 20;
Slog.i(TAG, volume.getPath() + ": " + mega + " MB");
if (mega < MINIMUM_SD_MB) {
Slog.i(TAG, volume.getPath() + ": insufficient storage");
continue;
}
File sd_internal = volume.getInternalPathForUser(userId); File sd_internal = volume.getInternalPathForUser(userId);
if (sd_internal != null) { if (sd_internal != null) {
path = new File(sd_internal, dsuSlot).getPath(); path = new File(sd_internal, dsuSlot).getPath();