Merge "Unbind from overlay before checking attached." into tm-dev

core/java/android/service/dreams/DreamService.java

@@ -1038,14 +1038,14 @@ public class DreamService extends Service implements Window.Callback {
         }
         mFinished = true;
 
+        mOverlayConnection.unbind(this);
+
         if (mDreamToken == null) {
             Slog.w(mTag, "Finish was called before the dream was attached.");
             stopSelf();
             return;
         }
 
-        mOverlayConnection.unbind(this);
-
         try {
             // finishSelf will unbind the dream controller from the dream service. This will
             // trigger DreamService.this.onDestroy and DreamService.this will die.