From fed5619a564e9e6802340cca73d11159f710cd75 Mon Sep 17 00:00:00 2001 From: Evan Chen Date: Mon, 17 Jun 2024 20:23:49 +0000 Subject: Fix CDM UI regressions This change addresses two regressions: UI flashing after selecting a device of the same OEM for pairing, and occasional failure to display the spinner in the multiple devices dialog. Flag: EXEMPT bugfix Test: cts Bug: 327049496 Change-Id: Iccd74ad5d74be605cf2b88edefa5bc998dfb1461 --- .../android/companiondevicemanager/CompanionAssociationActivity.java | 2 ++ .../android/companiondevicemanager/CompanionDeviceDiscoveryService.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/CompanionDeviceManager/src') diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java index f98908cf2d56..864de87b918d 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java @@ -568,6 +568,8 @@ public class CompanionAssociationActivity extends FragmentActivity implements updateSingleDeviceUi(); + if (mRequest.isSkipPrompt()) return; + mSummary.setVisibility(View.VISIBLE); mButtonAllow.setVisibility(View.VISIBLE); mButtonNotAllow.setVisibility(View.VISIBLE); diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java index e809433a1261..2a8ce87b7bf6 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java @@ -127,6 +127,7 @@ public class CompanionDeviceDiscoveryService extends Service { return false; } } + sScanResultsLiveData.setValue(Collections.emptyList()); requireNonNull(associationRequest); final Intent intent = new Intent(context, CompanionDeviceDiscoveryService.class); intent.setAction(ACTION_START_DISCOVERY); @@ -192,7 +193,6 @@ public class CompanionDeviceDiscoveryService extends Service { sDiscoveryStarted = true; } mStopAfterFirstMatch = request.isSingleDevice(); - sScanResultsLiveData.setValue(Collections.emptyList()); sStateLiveData.setValue(DiscoveryState.IN_PROGRESS); final List> allFilters = request.getDeviceFilters(); -- cgit v1.2.3-59-g8ed1b