diff options
| author | Raphael Moll <ralf@android.com> | 2012-06-21 21:29:15 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-21 21:29:15 -0700 |
| commit | fb8e29c65e71e69bf9456de48c6991e91be5e6a8 (patch) | |
| tree | 132b9e4e9b34b2767304542ff2f72e3cfca9bc08 | |
| parent | aec21574e51cc4b8588c7260bcbb478e300a65b5 (diff) | |
| parent | 6263542fb2bc1819bd8aeac6fe73374f894503cb (diff) | |
| download | sdk-fb8e29c65e71e69bf9456de48c6991e91be5e6a8.zip sdk-fb8e29c65e71e69bf9456de48c6991e91be5e6a8.tar.gz sdk-fb8e29c65e71e69bf9456de48c6991e91be5e6a8.tar.bz2 | |
Merge "SDK Manager: fix window shell disposed exception."
| -rwxr-xr-x | sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java index cdf5e7b..521e70c 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java @@ -235,7 +235,7 @@ public class UpdaterData implements IUpdaterData { example);
// We may not have any UI. Only display a dialog if there's a window shell available.
- if (mWindowShell != null) {
+ if (mWindowShell != null && !mWindowShell.isDisposed()) {
MessageDialog.openError(mWindowShell,
"Android Virtual Devices Manager",
error);
@@ -1064,7 +1064,7 @@ public class UpdaterData implements IUpdaterData { * This can be called from any thread.
*/
public void broadcastOnSdkLoaded() {
- if (mWindowShell != null && mListeners.size() > 0) {
+ if (mWindowShell != null && !mWindowShell.isDisposed() && mListeners.size() > 0) {
mWindowShell.getDisplay().syncExec(new Runnable() {
@Override
public void run() {
@@ -1085,7 +1085,7 @@ public class UpdaterData implements IUpdaterData { * This can be called from any thread.
*/
private void broadcastOnSdkReload() {
- if (mWindowShell != null && mListeners.size() > 0) {
+ if (mWindowShell != null && !mWindowShell.isDisposed() && mListeners.size() > 0) {
mWindowShell.getDisplay().syncExec(new Runnable() {
@Override
public void run() {
@@ -1106,7 +1106,7 @@ public class UpdaterData implements IUpdaterData { * This can be called from any thread.
*/
private void broadcastPreInstallHook() {
- if (mWindowShell != null && mListeners.size() > 0) {
+ if (mWindowShell != null && !mWindowShell.isDisposed() && mListeners.size() > 0) {
mWindowShell.getDisplay().syncExec(new Runnable() {
@Override
public void run() {
@@ -1127,7 +1127,7 @@ public class UpdaterData implements IUpdaterData { * This can be called from any thread.
*/
private void broadcastPostInstallHook() {
- if (mWindowShell != null && mListeners.size() > 0) {
+ if (mWindowShell != null && !mWindowShell.isDisposed() && mListeners.size() > 0) {
mWindowShell.getDisplay().syncExec(new Runnable() {
@Override
public void run() {
|