Properly dispose DeviceManager from AvdManager.

Similar issue fixed by patch d1daeae66a0ebdf53076038dc4a1fe099c4141fb
but this time for the AvdManager.

Change-Id: I10af39d364e427d593078f8bfa23bba3ba7e1558

1 files changed, 9 insertions, 1 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/AvdManagerPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/AvdManagerPage.java
index c691b77..1074dfa 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/AvdManagerPage.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/AvdManagerPage.java
@@ -25,6 +25,8 @@ import com.android.sdkuilib.internal.widgets.AvdSelector.DisplayMode;
 import com.android.sdkuilib.repository.ISdkChangeListener;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -39,7 +41,8 @@ import org.eclipse.swt.widgets.Label;
  * thus composed of the {@link AvdManagerWindowImpl1} (the window shell itself) and this
  * page displays the actually list of AVDs and various action buttons.
  */
-public class AvdManagerPage extends Composite implements ISdkChangeListener, DevicesChangeListener {
+public class AvdManagerPage extends Composite
+    implements ISdkChangeListener, DevicesChangeListener, DisposeListener {
 
     private AvdSelector mAvdSelector;
 
@@ -93,6 +96,11 @@ public class AvdManagerPage extends Composite implements ISdkChangeListener, Dev
     }
 
     @Override
+    public void widgetDisposed(DisposeEvent e) {
+        dispose();
+    }
+
+    @Override
     public void dispose() {
         mUpdaterData.removeListener(this);
         mDeviceManager.unregisterListener(this);