am 9a7b2700: Merge change 21645 into donut

Merge commit '9a7b2700fd015252f59a25524f8f6231f9bb1fc4' into eclair

* commit '9a7b2700fd015252f59a25524f8f6231f9bb1fc4':
  Make SSL error a bit more human readable.

1 files changed, 3 insertions, 0 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java
index 1d76655..d86859d 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java
@@ -31,6 +31,7 @@ import java.net.URL;
 import java.util.ArrayList;

 import java.util.HashMap;

 

+import javax.net.ssl.SSLKeyException;

 import javax.xml.XMLConstants;

 import javax.xml.parsers.DocumentBuilder;

 import javax.xml.parsers.DocumentBuilderFactory;

@@ -191,6 +192,8 @@ public class RepoSource implements IDescription {
             if (exception[0] != null) {

                 if (exception[0] instanceof FileNotFoundException) {

                     reason = "File not found";

+                } else if (exception[0] instanceof SSLKeyException) {

+                    reason = "SSL error. You might want to force download through http in the settings.";

                 } else if (exception[0].getMessage() != null) {

                     reason = exception[0].getMessage();

                 }