| commit | e414925c5604ad7b1695eacc70fe5b4d87b05cbb | [log] [tgz] |
|---|---|---|
| author | Vladimir Komsiyski <vladokom@google.com> | Fri Oct 11 11:19:28 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 11 11:19:28 2024 +0000 |
| tree | b3b0af2a0b56d1db79bc251b1bc11a81fc1aa9f8 | |
| parent | 29dd9150119d65aca198ce8610183567a6a62af1 [diff] | |
| parent | a71d18b2990a8595eb5a97a1ab106a82e196adb7 [diff] |
Merge "Fix a typo when checking custom policy" into main
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 3d67ed4..281a2ce 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
@@ -909,7 +909,7 @@ break; case POLICY_TYPE_CLIPBOARD: if (Flags.crossDeviceClipboard()) { - if (policyType == DEVICE_POLICY_CUSTOM + if (devicePolicy == DEVICE_POLICY_CUSTOM && mContext.checkCallingOrSelfPermission(ADD_TRUSTED_DISPLAY) != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("Requires ADD_TRUSTED_DISPLAY permission to "