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

Commit 210ce9bf authored by Evan Chen's avatar Evan Chen
Browse files

No need to show views if isSkipPrompt is true 

Immediately return if isSkipPrompt is true when user
selected the device.

Test: cts
Fix: 303300448
Change-Id: I0ef2376abbe5a16335636d5f01b8b84478a7f164
parent da3e9759

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

+17 −8
Original line number Diff line number Diff line
@@ -527,6 +527,15 @@ public class CompanionDeviceActivity extends FragmentActivity implements 


        final Drawable profileIcon = getIcon(this, PROFILE_ICON.get(deviceProfile));



        // No need to show permission consent dialog if it is a isSkipPrompt(true)

        // AssociationRequest. See AssociationRequestsProcessor#mayAssociateWithoutPrompt.

        if (mRequest.isSkipPrompt()) {

            Log.d(TAG, "Skipping the permission consent dialog.");

            mSingleDeviceSpinner.setVisibility(View.GONE);

            onUserSelectedDevice(mSelectedDevice);

            return;

        }



        updatePermissionUi();



        mProfileIcon.setImageDrawable(profileIcon);
@@ -598,6 +607,14 @@ public class CompanionDeviceActivity extends FragmentActivity implements 


        Log.d(TAG, "onDeviceClicked(): " + mSelectedDevice.toShortString());



        // No need to show permission consent dialog if it is a isSkipPrompt(true)

        // AssociationRequest. See AssociationRequestsProcessor#mayAssociateWithoutPrompt.

        if (mRequest.isSkipPrompt()) {

            Log.d(TAG, "Skipping the permission consent dialog.");

            onUserSelectedDevice(mSelectedDevice);

            return;

        }



        updatePermissionUi();



        mSummary.setVisibility(View.VISIBLE);
@@ -615,14 +632,6 @@ public class CompanionDeviceActivity extends FragmentActivity implements 
                this, TITLES.get(deviceProfile), mAppLabel, remoteDeviceName);

        final Spanned summary;



        // No need to show permission consent dialog if it is a isSkipPrompt(true)

        // AssociationRequest. See AssociationRequestsProcessor#mayAssociateWithoutPrompt.

        if (mRequest.isSkipPrompt()) {

            mSingleDeviceSpinner.setVisibility(View.GONE);

            onUserSelectedDevice(mSelectedDevice);

            return;

        }



        if (deviceProfile == null && mRequest.isSingleDevice()) {

            summary = getHtmlFromResources(this, summaryResourceId, remoteDeviceName);

            mConstraintList.setVisibility(View.GONE);