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

Commit 05c8697d authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "No need to show user consent for SingleDevice && isSkipPrompt" into... 

Merge "No need to show user consent for SingleDevice && isSkipPrompt" into tm-dev am: 98054aa2 am: 82686b1a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17948532



Change-Id: I4d5d71ed04db87825b87b93469959e7166f9c7ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de5f5a5b 82686b1a

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

+8 −0
Original line number Diff line number Diff line
@@ -484,6 +484,14 @@ public class CompanionDeviceActivity extends FragmentActivity implements 
        if (deviceFilterPairs.isEmpty()) return;



        mSelectedDevice = requireNonNull(deviceFilterPairs.get(0));

        // No need to show user consent dialog if it is a singleDevice

        // and isSkipPrompt(true) AssociationRequest.

        // See AssociationRequestsProcessor#mayAssociateWithoutPrompt.

        if (mRequest.isSkipPrompt()) {

            mSingleDeviceSpinner.setVisibility(View.GONE);

            onUserSelectedDevice(mSelectedDevice);

            return;

        }



        final String deviceName = mSelectedDevice.getDisplayName();

        final Spanned title = getHtmlFromResources(