diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java
index 3018fe2594d91..6efb01110b2b4 100644
--- a/core/java/android/app/ActivityView.java
+++ b/core/java/android/app/ActivityView.java
@@ -239,6 +239,8 @@ public class ActivityView extends ViewGroup {
         }
 
         mTextureView.setSurfaceTextureListener(null);
+
+        mThread.quit();
     }
 
     private void attachToSurfaceWhenReady() {