From f7a0b42d09f8a08f8e06b64022e5b86db656c16b Mon Sep 17 00:00:00 2001
From: Bryce Lee <brycelee@google.com>
Date: Thu, 16 Feb 2017 14:05:06 -0800
Subject: [PATCH] Stop screen sharing when exiting MediaProjectionDemo.

The existing implementation will leave screen sharing running after
stop, causing the VirtualDisplay to not be destroyed. This change
makes sure any screen sharing ends on stop.

This change also addresses the the ToggleButton's state being saved.

Test: manual
Bug: 26221019
Change-Id: I51ac8bf09932a83100776c919146eed8c28f35b3
---
 .../apis/media/projection/MediaProjectionDemo.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/samples/ApiDemos/src/com/example/android/apis/media/projection/MediaProjectionDemo.java b/samples/ApiDemos/src/com/example/android/apis/media/projection/MediaProjectionDemo.java
index f8a5d0551..5cf6d6dee 100644
--- a/samples/ApiDemos/src/com/example/android/apis/media/projection/MediaProjectionDemo.java
+++ b/samples/ApiDemos/src/com/example/android/apis/media/projection/MediaProjectionDemo.java
@@ -88,6 +88,13 @@ public class MediaProjectionDemo extends Activity {
         s.setSelection(0);
 
         mToggle = (ToggleButton) findViewById(R.id.screen_sharing_toggle);
+        mToggle.setSaveEnabled(false);
+    }
+
+    @Override
+    protected void onStop() {
+        stopScreenSharing();
+        super.onStop();
     }
 
     @Override
@@ -140,6 +147,7 @@ public class MediaProjectionDemo extends Activity {
         if (mToggle.isChecked()) {
             mToggle.setChecked(false);
         }
+
         mScreenSharing = false;
         if (mVirtualDisplay != null) {
             mVirtualDisplay.release();