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

Commit 9bc11c03 authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix CDM UI regressions" into main

parents 10a1ab5f fed5619a

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();