Merge "Support cuttlefish with an emulated 2GB SD" am: 7c5f3fe057

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id09e94dbed97fcecd62f458a62cf60c0594e6a1d
This commit is contained in:
Treehugger Robot
2021-02-23 23:33:45 +00:00
committed by Automerger Merge Worker

View File

@@ -28,6 +28,7 @@ import android.os.ServiceManager;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.image.IDynamicSystemService;
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
import android.util.Slog;
@@ -40,6 +41,7 @@ import java.io.File;
*/
public class DynamicSystemService extends IDynamicSystemService.Stub {
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 String PATH_DEFAULT = "/data/gsi/";
private Context mContext;
@@ -95,6 +97,13 @@ public class DynamicSystemService extends IDynamicSystemService.Stub {
if (!volume.isMountedWritable()) {
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);
if (sd_internal != null) {
path = new File(sd_internal, dsuSlot).getPath();