diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-07-21 15:25:32 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2009-07-21 15:25:32 -0700 |
| commit | 8c78ba643862731c603677284ae88089a959cc52 (patch) | |
| tree | 4da10686c893dcff7ce903b521edc6a6e354951a | |
| parent | 277f7af74f2f177c41438e923b54b3dc1ecbe228 (diff) | |
| download | android_development-8c78ba643862731c603677284ae88089a959cc52.tar.gz android_development-8c78ba643862731c603677284ae88089a959cc52.tar.bz2 android_development-8c78ba643862731c603677284ae88089a959cc52.zip | |
Use the proper URL for the google repository.
Also fix an NPE.
| -rw-r--r-- | tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java | 4 | ||||
| -rwxr-xr-x | tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepository.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java index b79016668..ad4782f56 100644 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java @@ -72,7 +72,9 @@ public class AndroidVersion { public void saveProperties(Properties props) { props.setProperty(PROP_API_LEVEL, Integer.toString(mApiLevel)); - props.setProperty(PROP_CODENAME, mCodename); + if (mCodename != null) { + props.setProperty(PROP_CODENAME, mCodename); + } } /** diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepository.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepository.java index 5a1d54241..88d18dbfd 100755 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepository.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepository.java @@ -26,7 +26,7 @@ public class SdkRepository { /** The URL of the official Google sdk-repository site. */
public static final String URL_GOOGLE_SDK_REPO_SITE =
- "https://dl.google.com/android/repository/"; //$NON-NLS-1$
+ "https://dl-ssl.google.com/android/repository/"; //$NON-NLS-1$
public static final String URL_DEFAULT_XML_FILE = "repository.xml"; //$NON-NLS-1$
|