From 17e2e158c47ce2c3d5ada3b3aa473bb420337422 Mon Sep 17 00:00:00 2001
From: Tim Peng <timhypeng@google.com>
Date: Tue, 19 May 2020 10:08:14 +0800
Subject: [PATCH] Talkback focus doesn't move in liner order after tapping
 selected option in switch device panel

-Not to reflash UI to reset the focus order
-Reflash UI only when connect() is valid

Bug: 156336275
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibb20252167ba13309065e4672f92cdf645661a0e
---
 .../android/settings/media/MediaDeviceUpdateWorker.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
index a97681165d4..bce9c340c76 100644
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -128,10 +128,11 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker
 
     public void connectDevice(MediaDevice device) {
         ThreadUtils.postOnBackgroundThread(() -> {
-            mLocalMediaManager.connectDevice(device);
-            ThreadUtils.postOnMainThread(() -> {
-                notifySliceChange();
-            });
+            if (mLocalMediaManager.connectDevice(device)) {
+                ThreadUtils.postOnMainThread(() -> {
+                    notifySliceChange();
+                });
+            }
         });
     }