aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/app
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2012-03-26 13:54:52 -0700
committerRaphael <raphael@google.com>2012-03-26 13:54:52 -0700
commita8e8c674ee38afbaf497f48dfaf528c5213133b5 (patch)
tree5e1de2191dd940572f01b8834dc3fd443acc09a1 /sdkmanager/app
parentb764200fe538498746c7f15e2109a60fba565aca (diff)
downloadsdk-a8e8c674ee38afbaf497f48dfaf528c5213133b5.zip
sdk-a8e8c674ee38afbaf497f48dfaf528c5213133b5.tar.gz
sdk-a8e8c674ee38afbaf497f48dfaf528c5213133b5.tar.bz2
SDK Manager: remove "update sdk" action.
In v1, using the SDK Launcher.exe would issue "android update sdk" which would pop a window ready to install. The launcher was fixed in the sdkman v2 but the command-line flag was still supported. Remove it since it just doesn't work the same way in the new UI. Solves SDK issue 23294. Change-Id: If3a30685f9a3f06888e386a918e9fd59c691c58b
Diffstat (limited to 'sdkmanager/app')
-rw-r--r--sdkmanager/app/src/com/android/sdkmanager/Main.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index d86ba8d..79dc5a7 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -286,7 +286,7 @@ public class Main {
if (mSdkCommandLine.getFlagNoUI(verb)) {
updateSdkNoUI();
} else {
- showSdkManagerWindow(true /*autoUpdate*/);
+ showSdkManagerWindow();
}
} else if (SdkCommandLine.OBJECT_ADB.equals(directObject)) {
@@ -294,7 +294,7 @@ public class Main {
}
} else if (SdkCommandLine.VERB_SDK.equals(verb)) {
- showSdkManagerWindow(false /*autoUpdate*/);
+ showSdkManagerWindow();
} else if (SdkCommandLine.VERB_AVD.equals(verb)) {
showAvdManagerWindow();
@@ -308,7 +308,7 @@ public class Main {
moveAvd();
} else if (verb == null && directObject == null) {
- showSdkManagerWindow(false /*autoUpdate*/);
+ showSdkManagerWindow();
} else {
mSdkCommandLine.printHelpAndExit(null);
@@ -318,7 +318,7 @@ public class Main {
/**
* Display the main SDK Manager app window
*/
- private void showSdkManagerWindow(boolean autoUpdate) {
+ private void showSdkManagerWindow() {
try {
MessageBoxLog errorLogger = new MessageBoxLog(
"SDK Manager",
@@ -332,10 +332,6 @@ public class Main {
SdkInvocationContext.STANDALONE);
window.registerPage(SettingsPage.class, UpdaterPage.Purpose.SETTINGS);
window.registerPage(AboutPage.class, UpdaterPage.Purpose.ABOUT_BOX);
- if (autoUpdate) {
- window.setInitialPage(PackagesPage.class);
- window.setRequestAutoUpdate(true);
- }
window.open();
errorLogger.displayResult(true);