LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 3856 into donut

Browse Source 
* changes:
  SDK Updater: fix install in new directory.
This commit is contained in:
Android (Google) Code Review
2009-06-11 10:24:54 -07:00
parent 3aa7f5d637 9888f2038e
commit 134c84ab62
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
View File

@@ -586,13 +586,13 @@ public class Archive implements IDescription {
destFolder.getPath());
return false;
}
}
if (!unzipDestFolder.mkdirs()) {
monitor.setResult("Failed to create temp directory %1$s",
monitor.setResult("Failed to create directory %1$s",
unzipDestFolder.getPath());
return false;
}
}
if (!unzipFolder(archiveFile, getSize(), unzipDestFolder, desc, monitor)) {
return false;

7
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
View File

@@ -317,10 +317,13 @@ public class UpdaterWindowImpl {
mUpdaterData.getSources().add(
new RepoSource(SdkRepository.URL_GOOGLE_SDK_REPO_SITE, false /* addonOnly */));
String url = System.getenv("TEMP_SDK_URL"); // TODO STOPSHIP temporary remove before shipping
if (url != null) {
String str = System.getenv("TEMP_SDK_URL"); // TODO STOPSHIP temporary remove before shipping
if (str != null) {
String[] urls = str.split(";");
for (String url : urls) {
mUpdaterData.getSources().add(new RepoSource(url, false /* addonOnly */));
}
}
mRemotePackagesPage.setInput(mUpdaterData.getSourcesAdapter());
}