Merge "Use new GsiInstallParams struct" (6b1e8cc0) · Commits · e / os / android_frameworks_base

core/java/android/os/image/DynamicSystemManager.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -104,16 +104,17 @@ public class DynamicSystemManager {
		* Start DynamicSystem installation. This call may take an unbounded amount of time. The caller
		* may use another thread to call the getStartProgress() to get the progress.
		*
		* @param systemSize system size in bytes
		* @param userdataSize userdata size in bytes
		* @param name The DSU partition name
		* @param size Size of the DSU image in bytes
		* @param readOnly True if the partition is read only, e.g. system.
		* @return {@code true} if the call succeeds. {@code false} either the device does not contain
		* enough space or a DynamicSystem is currently in use where the {@link #isInUse} would be
		* true.
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)
		public Session startInstallation(long systemSize, long userdataSize) {
		public Session startInstallation(String name, long size, boolean readOnly) {
		try {
		if (mService.startInstallation(systemSize, userdataSize)) {
		if (mService.startInstallation(name, size, readOnly)) {
		return new Session();
		} else {
		return null;

+4 −3

Original line number	Diff line number	Diff line
		@@ -24,11 +24,12 @@ interface IDynamicSystemService
		* Start DynamicSystem installation. This call may take 60~90 seconds. The caller
		* may use another thread to call the getStartProgress() to get the progress.
		*
		* @param systemSize system size in bytes
		* @param userdataSize userdata size in bytes
		* @param name The DSU partition name
		* @param size Size of the DSU image in bytes
		* @param readOnly True if this partition is readOnly
		* @return true if the call succeeds
		*/
		boolean startInstallation(long systemSize, long userdataSize);
		boolean startInstallation(@utf8InCpp String name, long size, boolean readOnly);

		/**
		* Query the progress of the current installation operation. This can be called while

+7 −5

Original line number	Diff line number	Diff line
		@@ -99,12 +99,14 @@ class InstallationAsyncTask extends AsyncTask<String, Long, Throwable> {
		// init input stream before calling startInstallation(), which takes 90 seconds.
		initInputStream();

		Thread thread = new Thread(() -> {
		Thread thread =
		new Thread(
		() -> {
		mDynSystem.startInstallation("userdata", mUserdataSize, false);
		mInstallationSession =
		mDynSystem.startInstallation(mSystemSize, mUserdataSize);
		mDynSystem.startInstallation("system", mSystemSize, true);
		});


		thread.start();

		while (thread.isAlive()) {

+12 −4

Original line number	Diff line number	Diff line
		@@ -115,7 +115,8 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements
		}

		@Override
		public boolean startInstallation(long systemSize, long userdataSize) throws RemoteException {
		public boolean startInstallation(String name, long size, boolean readOnly)
		throws RemoteException {
		// priority from high to low: sysprop -> sdcard -> /data
		String path = SystemProperties.get("os.aot.path");
		if (path.isEmpty()) {
		@@ -137,11 +138,18 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements
		}
		Slog.i(TAG, "startInstallation -> " + path);
		}
		IGsiService service = getGsiService();
		GsiInstallParams installParams = new GsiInstallParams();
		installParams.installDir = path;
		installParams.gsiSize = systemSize;
		installParams.userdataSize = userdataSize;
		return getGsiService().beginGsiInstall(installParams) == 0;
		installParams.name = name;
		installParams.size = size;
		installParams.wipe = readOnly;
		installParams.readOnly = readOnly;
		if (service.beginGsiInstall(installParams) != 0) {
		Slog.i(TAG, "Failed to install " + name);
		return false;
		}
		return true;
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ public class DynamicSystemServiceTest extends AndroidTestCase {
		public void test1() {
		assertTrue("dynamic_system service available", mService != null);
		try {
		mService.startInstallation(1 << 20, 8 << 30);
		mService.startInstallation("userdata", 8L << 30, false);
		fail("DynamicSystemService did not throw SecurityException as expected");
		} catch (SecurityException e) {
		// expected