Fix android.bat for Windows SDK.

[android-x86/sdk.git] / sdkmanager / libs / sdkuilib / src / com / android / sdkuilib / internal / repository / SdkUpdaterWindowImpl2.java

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
index 4be4448..3ba9887 100755 (executable)
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
@@ -305,24 +305,29 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow {
             // would fail to load. The MenuBarWrapper below helps to make\r
             // that indirection.\r
 \r
-            new MenuBarWrapper(APP_NAME, menuTools) {\r
-                @Override\r
-                public void onPreferencesMenuSelected() {\r
-                    showRegisteredPage(Purpose.SETTINGS);\r
-                }\r
+            try {\r
+                new MenuBarWrapper(APP_NAME, menuTools) {\r
+                    @Override\r
+                    public void onPreferencesMenuSelected() {\r
+                        showRegisteredPage(Purpose.SETTINGS);\r
+                    }\r
 \r
-                @Override\r
-                public void onAboutMenuSelected() {\r
-                    showRegisteredPage(Purpose.ABOUT_BOX);\r
-                }\r
+                    @Override\r
+                    public void onAboutMenuSelected() {\r
+                        showRegisteredPage(Purpose.ABOUT_BOX);\r
+                    }\r
 \r
-                @Override\r
-                public void printError(String format, Object... args) {\r
-                    if (mUpdaterData != null) {\r
-                        mUpdaterData.getSdkLog().error(null, format, args);\r
+                    @Override\r
+                    public void printError(String format, Object... args) {\r
+                        if (mUpdaterData != null) {\r
+                            mUpdaterData.getSdkLog().error(null, format, args);\r
+                        }\r
                     }\r
-                }\r
-            };\r
+                };\r
+            } catch (Exception e) {\r
+                mUpdaterData.getSdkLog().error(e, "Failed to setup menu bar");\r
+                e.printStackTrace();\r
+            }\r
         }\r
     }\r
 \r