diff options
| -rw-r--r-- | packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java index 97016f5384f6..1184112fe3da 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java @@ -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); |