1 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/incallui/AudioRouteSelectorActivity.java b/java/com/android/incallui/AudioRouteSelectorActivity.java
index f0ae79bc2..2fdc89aa8 100644
--- a/java/com/android/incallui/AudioRouteSelectorActivity.java
+++ b/java/com/android/incallui/AudioRouteSelectorActivity.java
@@ -57,7 +57,9 @@ public class AudioRouteSelectorActivity extends FragmentActivity
     if (audioRouteSelectorDialogFragment != null) {
       audioRouteSelectorDialogFragment.dismiss();
     }
-    // We don't expect the activity to resume
-    finish();
+    // We don't expect the activity to resume, except for orientation change.
+    if (!isChangingConfigurations()) {
+      finish();
+    }
   }
 }