Merge "No need to show views if isSkipPrompt is true" into main (b84448f3) · Commits · e / os / android_frameworks_base

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_ICONS.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, PROFILE_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);