Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a9747ec authored by Evan Chen's avatar Evan Chen Committed by Hung-ying Tyan
Browse files

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
Bug: 353187081
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fed5619a564e9e6802340cca73d11159f710cd75)
Merged-In: Iccd74ad5d74be605cf2b88edefa5bc998dfb1461
Change-Id: Iccd74ad5d74be605cf2b88edefa5bc998dfb1461
parent cd6318bd

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java

+1 −1
Original line number Diff line number Diff line
@@ -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<DeviceFilter<?>> allFilters = request.getDeviceFilters();