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

am 134c84ab: Merge change 3856 into donut

Browse Source 
Merge commit '134c84ab6206fa9929356662943df686412913c7'

* commit '134c84ab6206fa9929356662943df686412913c7':
  SDK Updater: fix install in new directory.
This commit is contained in:
Android (Google) Code Review
2009-06-11 11:41:48 -07:00
committed by The Android Open Source Project
parent 9f6f2a3e1f 134c84ab62
commit 4b03e4ea19
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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