commit f8470de583a66be1f35d1d91702bf2e9587c7558
author Tor Norbye <tnorbye@google.com> Fri Apr 18 18:07:13 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 18 18:07:13 2014 +0000
tree 9edaac67235663c00020f21369c8ab182487ccb4
parent 43a96b1a60aa34d98dfb9d6980ed355fdd608fd4
parent 8145665b8f6675472ae5b63dcb372b5879ff833d

Merge "Update the "SDK valid" error message while user edits textfield" into idea133

android/src/com/android/tools/idea/configurations/DeviceMenuAction.java

diff --git a/android/src/com/android/tools/idea/configurations/DeviceMenuAction.java b/android/src/com/android/tools/idea/configurations/DeviceMenuAction.java
index ba9b4e1..59389f1 100644
--- a/android/src/com/android/tools/idea/configurations/DeviceMenuAction.java
+++ b/android/src/com/android/tools/idea/configurations/DeviceMenuAction.java
@@ -133,7 +133,10 @@
     }
 
     AndroidFacet facet = AndroidFacet.getInstance(configurationManager.getModule());
-    assert facet != null;
+    if (facet == null) {
+      // Unlikely, but has happened - see http://b.android.com/68091
+      return group;
+    }
     final AvdManager avdManager = facet.getAvdManagerSilently();
     if (avdManager != null) {
       boolean separatorNeeded = false;