diff options
| -rw-r--r-- | services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java index 657e261a345f..7d9d660af536 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java @@ -1349,14 +1349,14 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub private boolean shouldShowBlockedActivityDialog(ComponentName blockedComponent, ComponentName blockedAppStreamingActivityComponent) { - if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) { - return true; - } if (Objects.equals(blockedComponent, blockedAppStreamingActivityComponent)) { // Do not show the dialog if it was blocked for some reason already to avoid // infinite blocking loop. return false; } + if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) { + return true; + } // Do not show the dialog if disabled by policy. return getDevicePolicy(POLICY_TYPE_BLOCKED_ACTIVITY_BEHAVIOR) == DEVICE_POLICY_DEFAULT; } |