From ea5ebaa50c7e63843b859d027355d5de3e249338 Mon Sep 17 00:00:00 2001
From: Noah Wang <nfw@google.com>
Date: Tue, 11 Apr 2017 17:22:52 -0700
Subject: [PATCH] Prevent gaining audio focus when opening magnification
 screen.

bug: 30521125
Change-Id: I22fe63ed2b0529c2a08b7be03c12753f3f060c1a
---
 .../ToggleScreenMagnificationPreferenceFragment.java         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index c6dc7a7cf31..37a32d55223 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -20,6 +20,7 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Point;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnPreparedListener;
 import android.net.Uri;
@@ -76,6 +77,9 @@ public class ToggleScreenMagnificationPreferenceFragment extends
                 }
             });
 
+            // Make sure the VideoView does not request audio focus.
+            videoView.setAudioFocusRequest(AudioManager.AUDIOFOCUS_NONE);
+
             // Resolve and set the video content
             Bundle args = getArguments();
             if ((args != null) && args.containsKey(
@@ -85,6 +89,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
                         getPrefContext().getPackageName(),
                         args.getInt(AccessibilitySettings.EXTRA_VIDEO_RAW_RESOURCE_ID))));
             }
+
             // Make sure video controls (e.g. for pausing) are not displayed.
             videoView.setMediaController(null);