Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa677e37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support cuttlefish with an emulated 2GB SD" am: 7c5f3fe0 am: ddcba286 am: f4e6cdf9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8921e6a7c9f855bf9a1f7d5c6ea5c3eb2218bfea
parents c7c7cadb f4e6cdf9

services/core/java/com/android/server/DynamicSystemService.java

+9 −0
Original line number Diff line number Diff line
@@ -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();