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

Commit 07509412 authored by Howard Chen's avatar Howard Chen Committed by android-build-merger
Browse files

Merge "Add SD card support for AOT" into qt-dev 

am: d71df284

Change-Id: I7d77edba5cbd5d9a3d76e7678b09e1daae1108c2
parents 10c58877 d71df284

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

+34 −2
Original line number Diff line number Diff line
@@ -18,16 +18,23 @@ package com.android.server; 


import android.content.Context;

import android.content.pm.PackageManager;

import android.gsi.GsiInstallParams;

import android.gsi.GsiProgress;

import android.gsi.IGsiService;

import android.os.Environment;

import android.os.IBinder;

import android.os.IBinder.DeathRecipient;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.image.IDynamicSystemService;

import android.os.storage.StorageManager;

import android.os.storage.StorageVolume;

import android.util.Slog;



import java.io.File;



/**

 * DynamicSystemService implements IDynamicSystemService. It provides permission check before

 * passing requests to gsid
@@ -36,7 +43,7 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements 
    private static final String TAG = "DynamicSystemService";

    private static final String NO_SERVICE_ERROR = "no gsiservice";

    private static final int GSID_ROUGH_TIMEOUT_MS = 8192;



    private static final String PATH_DEFAULT = "/data/gsi";

    private Context mContext;

    private volatile IGsiService mGsiService;
@@ -105,7 +112,32 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements 


    @Override

    public boolean startInstallation(long systemSize, long userdataSize) throws RemoteException {

        return getGsiService().startGsiInstall(systemSize, userdataSize, true) == 0;

        // priority from high to low: sysprop -> sdcard -> /data

        String path = SystemProperties.get("os.aot.path");

        if (path.isEmpty()) {

            final int userId = UserHandle.myUserId();

            final StorageVolume[] volumes =

                    StorageManager.getVolumeList(userId, StorageManager.FLAG_FOR_WRITE);

            for (StorageVolume volume : volumes) {

                if (volume.isEmulated()) continue;

                if (!volume.isRemovable()) continue;

                if (!Environment.MEDIA_MOUNTED.equals(volume.getState())) continue;

                File sdCard = volume.getPathFile();

                if (sdCard.isDirectory()) {

                    path = sdCard.getPath();

                    break;

                }

            }

            if (path.isEmpty()) {

                path = PATH_DEFAULT;

            }

            Slog.i(TAG, "startInstallation -> " + path);

        }

        GsiInstallParams installParams = new GsiInstallParams();

        installParams.installDir = path;

        installParams.gsiSize = systemSize;

        installParams.userdataSize = userdataSize;

        return getGsiService().beginGsiInstall(installParams) == 0;

    }



    @Override