diff options
2 files changed, 3 insertions, 1 deletions
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<DeviceFilter<?>> allFilters = request.getDeviceFilters(); |