Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df am: 4dfd3dcd3a

Change-Id: Ica2a8b1cc55c88ba705e0213180f175da87e274b

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

@@ -1075,8 +1075,12 @@ public class DreamService extends Service implements Window.Callback {
 
                     @Override
                     public void onViewDetachedFromWindow(View v) {
-                        mActivity = null;
-                        finish();
+                        if (mActivity == null || !mActivity.isChangingConfigurations()) {
+                            // Only stop the dream if the view is not detached by relaunching
+                            // activity for configuration changes.
+                            mActivity = null;
+                            finish();
+                        }
                     }
                 });
     }