Merge "Fix broken documentation in Activity.java" into main
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 7bc6f9bf..0f3347f 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5556,8 +5556,7 @@
* reported to {@link #onRequestPermissionsResult}.
* Should be >= 0.
* @param deviceId The app is requesting permissions for this device. The primary/physical
- * device is assigned {@link Context#DEVICE_ID_DEFAULT}, and {@link
- * android.companion.virtual.VirtualDeviceManager.VirtualDevice virtual devices}
+ * device is assigned {@link Context#DEVICE_ID_DEFAULT}, and virtual devices
* are assigned unique device Ids.
*
* @throws IllegalArgumentException if requestCode is negative.
@@ -5634,8 +5633,7 @@
* {@link android.content.pm.PackageManager#PERMISSION_GRANTED} or
* {@link android.content.pm.PackageManager#PERMISSION_DENIED}. Never null.
* @param deviceId The deviceId for which permissions were requested. The primary/physical
- * device is assigned {@link Context#DEVICE_ID_DEFAULT}, and {@link
- * android.companion.virtual.VirtualDeviceManager.VirtualDevice virtual devices}
+ * device is assigned {@link Context#DEVICE_ID_DEFAULT}, and virtual devices
* are assigned unique device Ids.
*
* @see #requestPermissions
@@ -5664,8 +5662,7 @@
*
* @param permission A permission your app wants to request.
* @param deviceId The app is requesting permissions for this device. The primary/physical
- * device is assigned {@link Context#DEVICE_ID_DEFAULT}, and {@link
- * android.companion.virtual.VirtualDeviceManager.VirtualDevice virtual devices}
+ * device is assigned {@link Context#DEVICE_ID_DEFAULT}, and virtual devices
* are assigned unique device Ids.
* @return Whether you should show permission rationale UI.
*