Remove unused URL string from InstallerService
Bug: N/A
Test: N/A
Change-Id: Ie9e398fc8f45333fc625214f946fc4c38f424203
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/ImageArchive.java b/android/TerminalApp/java/com/android/virtualization/terminal/ImageArchive.java
index b2a2085..7f14179 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/ImageArchive.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/ImageArchive.java
@@ -16,8 +16,11 @@
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.os.Build;
import android.os.Environment;
+import android.util.Log;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -43,7 +46,8 @@
class ImageArchive {
private static final String DIR_IN_SDCARD = "linux";
private static final String ARCHIVE_NAME = "images.tar.gz";
- private static final String HOST_URL = "https://dl.google.com/android/ferrochrome/latest";
+ private static final String BUILD_TAG = "latest"; // TODO: use actual tag name
+ private static final String HOST_URL = "https://dl.google.com/android/ferrochrome/" + BUILD_TAG;
// Only one can be non-null
private final URL mUrl;
@@ -138,6 +142,8 @@
* an additional input stream which will be used during the installation.
*/
public void installTo(Path dir, Function<InputStream, InputStream> filter) throws IOException {
+ String source = mPath != null ? mPath.toString() : mUrl.toString();
+ Log.d(TAG, "Installing. source: " + source + ", destination: " + dir.toString());
try (InputStream stream = getInputStream(filter);
GzipCompressorInputStream gzStream = new GzipCompressorInputStream(stream);
TarArchiveInputStream tarStream = new TarArchiveInputStream(gzStream)) {
@@ -148,9 +154,9 @@
Path to = dir.resolve(entry.getName());
if (Files.isDirectory(to)) {
Files.createDirectories(to);
- } else {
- Files.copy(tarStream, to, StandardCopyOption.REPLACE_EXISTING);
+ continue;
}
+ Files.copy(tarStream, to, StandardCopyOption.REPLACE_EXISTING);
}
}
commitInstallationAt(dir);
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
index c2b3fd4..ac05d78 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
@@ -48,11 +48,6 @@
public class InstallerService extends Service {
private static final int NOTIFICATION_ID = 1313; // any unique number among notifications
- private static final String IMAGE_URL =
- Arrays.asList(Build.SUPPORTED_ABIS).contains("x86_64")
- ? "https://dl.google.com/android/ferrochrome/latest/x86_64/images.tar.gz"
- : "https://dl.google.com/android/ferrochrome/latest/aarch64/images.tar.gz";
-
private final Object mLock = new Object();
private Notification mNotification;
@@ -191,8 +186,6 @@
// TODO(b/374015561): Support pause/resume download
private boolean downloadFromUrl(boolean isWifiOnly) {
- Log.i(TAG, "trying to download from " + IMAGE_URL);
-
if (!checkForWifiOnly(isWifiOnly)) {
Log.e(TAG, "Install isn't started because Wifi isn't available");
notifyError(getString(R.string.installer_error_no_wifi));