diff options
| author | 2024-08-21 10:39:28 +0000 | |
|---|---|---|
| committer | 2024-08-21 10:39:28 +0000 | |
| commit | 6fd37ffbc95711c5a942b31c20d3074d815c37c6 (patch) | |
| tree | bdbd235a97d5cb476cdc3d702b5e7ade9eeb14e1 | |
| parent | 3bf59f0290afaa174704521068796b4bf406ea4f (diff) | |
| parent | 7a4a6171038b5b67b03a98621ba0b8d58dd8fc70 (diff) | |
Merge "Fix the API flag for the package level exemption" into main
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/companion/virtual/VirtualDeviceManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 76012bb9c141..03eab7c28300 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3494,7 +3494,7 @@ package android.companion.virtual { method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void registerIntentInterceptor(@NonNull android.content.IntentFilter, @NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback); method public void removeActivityListener(@NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener); method @FlaggedApi("android.companion.virtual.flags.dynamic_policy") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void removeActivityPolicyExemption(@NonNull android.content.ComponentName); - method @FlaggedApi("android.companion.virtual.flags.dynamic_policy") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void removeActivityPolicyExemption(@NonNull String); + method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void removeActivityPolicyExemption(@NonNull String); method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void removeActivityPolicyExemption(@NonNull android.content.ComponentName, int); method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void removeActivityPolicyExemption(@NonNull String, int); method public void removeSoundEffectListener(@NonNull android.companion.virtual.VirtualDeviceManager.SoundEffectListener); diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java index 68a864d090f9..9e32cbac91eb 100644 --- a/core/java/android/companion/virtual/VirtualDeviceManager.java +++ b/core/java/android/companion/virtual/VirtualDeviceManager.java @@ -847,7 +847,7 @@ public final class VirtualDeviceManager { * @see #addActivityPolicyExemption(String) * @see #setDevicePolicy */ - @FlaggedApi(Flags.FLAG_DYNAMIC_POLICY) + @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API) @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void removeActivityPolicyExemption(@NonNull String packageName) { mVirtualDeviceInternal.removeActivityPolicyPackageExemption( |