aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2012-03-26 14:09:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-26 14:09:19 -0700
commit1091d6a7cb67cf4efbda20402f4db4aa477fc452 (patch)
treeeecd51576847ef4670c63831cfb2fb5ce533c03a
parent13d674238d8dadfed5b16e69f368f189c1633e34 (diff)
parenta8e8c674ee38afbaf497f48dfaf528c5213133b5 (diff)
downloadsdk-1091d6a7cb67cf4efbda20402f4db4aa477fc452.zip
sdk-1091d6a7cb67cf4efbda20402f4db4aa477fc452.tar.gz
sdk-1091d6a7cb67cf4efbda20402f4db4aa477fc452.tar.bz2
Merge "SDK Manager: remove "update sdk" action."
-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);