Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 352e82e4 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Fix broken docs in companion" into main

parents 95046d06 1dc3ac9b

api/javadoc-lint-baseline

+0 −9
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ android/app/appsearch/SearchSpec.java:929: lint: Unresolved link/see tag "Featur 
android/app/job/JobParameters.java:128: lint: Unresolved link/see tag "android.app.job.JobInfo.Builder#setPeriodic(boolean) periodic jobs" in android.app.job.JobParameters [101]

android/app/sdksandbox/AppOwnedSdkSandboxInterface.java:9: lint: Unresolved link/see tag "SdkSandboxController#getAppOwnedSdkSandboxInterfaces" in android.app.sdksandbox.AppOwnedSdkSandboxInterface [101]

android/app/sdksandbox/SdkSandboxManager.java:112: lint: Unresolved link/see tag "AppOwnedSdkSandboxInterfaces" in android.app.sdksandbox.SdkSandboxManager [101]

android/companion/CompanionDeviceService.java:273: lint: Unresolved link/see tag "android.companion.AssociationInfo#isSelfManaged() self-managed" in android.companion.CompanionDeviceService [101]

android/companion/CompanionDeviceService.java:282: lint: Unresolved link/see tag "android.companion.AssociationInfo#isSelfManaged() self-managed" in android.companion.CompanionDeviceService [101]

android/companion/virtual/VirtualDevice.java:15: lint: Unresolved link/see tag "android.companion.virtual.VirtualDeviceManager.VirtualDevice VirtualDeviceManager.VirtualDevice" in android.companion.virtual.VirtualDevice [101]

android/companion/virtual/VirtualDevice.java:70: lint: Unresolved link/see tag "android.companion.virtual.VirtualDeviceParams.Builder#setName(String)" in android.companion.virtual.VirtualDevice [101]

android/content/AttributionSource.java:291: lint: Unresolved link/see tag "setNextAttributionSource" in android.content.AttributionSource.Builder [101]

android/content/Context.java:2872: lint: Unresolved link/see tag "android.telephony.MmsManager" in android.content.Context [101]

android/content/Intent.java:4734: lint: Unresolved link/see tag "android.content.pm.UserInfo#isProfile()" in android.content.Intent [101]
@@ -242,8 +238,6 @@ android/view/animation/AnimationUtils.java:64: lint: Unresolved link/see tag "Bu 
android/view/contentcapture/ContentCaptureSession.java:188: lint: Unresolved link/see tag "UPSIDE_DOWN_CAKE" in android.view.contentcapture.ContentCaptureSession [101]

com/android/internal/policy/PhoneWindow.java:172: lint: Unresolved link/see tag "Build.VERSION_CODES#VANILLA_ICE_CREAM" in com.android.internal.policy.PhoneWindow [101]



com/android/server/companion/virtual/VirtualDeviceImpl.java:134: lint: Unresolved link/see tag "DisplayManager" in android [101]

com/android/server/companion/virtual/VirtualDeviceImpl.java:134: lint: Unresolved link/see tag "VirtualDeviceManager.VirtualDevice" in android [101]

com/android/server/broadcastradio/aidl/ConversionUtils.java:70: lint: Unresolved link/see tag "IdentifierType#DAB_SID_EXT" in android [101]

com/android/server/broadcastradio/aidl/ConversionUtils.java:70: lint: Unresolved link/see tag "ProgramSelector#IDENTIFIER_TYPE_DAB_DMB_SID_EXT" in android [101]

com/android/server/broadcastradio/aidl/ConversionUtils.java:70: lint: Unresolved link/see tag "RadioTuner" in android [101]
@@ -261,9 +255,6 @@ com/android/server/pm/PackageInstallerSession.java:327: lint: Unresolved link/se 
com/android/server/pm/PackageInstallerSession.java:358: lint: Unresolved link/see tag "IntentSender" in android [101]

com/android/server/devicepolicy/DevicePolicyManagerService.java:860: lint: Unresolved link/see tag "android.security.IKeyChainService#setGrant" in android [101]



android/companion/virtual/sensor/VirtualSensorDirectChannelWriter.java:-4: lint: Invalid tag: @Override [131]

android/companion/virtual/sensor/VirtualSensorDirectChannelWriter.java:-1: lint: Invalid tag: @Override [131]

android/companion/virtual/sensor/VirtualSensorDirectChannelWriter.java:2: lint: Invalid tag: @Override [131]

android/os/BatteryStatsManager.java:260: lint: Invalid tag: @Deprecated [131]

android/os/BatteryStatsManager.java:275: lint: Invalid tag: @Deprecated [131]

android/view/WindowManager.java:906: lint: @attr must be a field: android.R.attr#Window_windowNoMoveAnimation [106]

core/java/android/companion/CompanionDeviceService.java

+6 −6
Original line number Diff line number Diff line
@@ -161,16 +161,16 @@ public abstract class CompanionDeviceService extends Service { 
    public static final int DEVICE_EVENT_BT_DISCONNECTED = 3;



    /**

     * A companion app for a {@link AssociationInfo#isSelfManaged() self-managed} device will

     * receive the callback {@link #onDeviceEvent(AssociationInfo, int)} if it reports that a

     * device has appeared on its own.

     * A companion app for a self-managed device will receive the callback

     * {@link #onDeviceEvent(AssociationInfo, int)} if it reports that a device has appeared on its

     * own.

     */

    public static final int DEVICE_EVENT_SELF_MANAGED_APPEARED = 4;



    /**

     * A companion app for a {@link AssociationInfo#isSelfManaged() self-managed} device will

     * receive the callback {@link #onDeviceEvent(AssociationInfo, int)} if it reports that a

     * device has disappeared on its own.

     * A companion app for a self-managed device will receive the callback

     * {@link #onDeviceEvent(AssociationInfo, int)} if it reports that a device has disappeared on

     * its own.

     */

    public static final int DEVICE_EVENT_SELF_MANAGED_DISAPPEARED = 5;

core/java/android/companion/virtual/VirtualDevice.java

+0 −5
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ import android.os.RemoteException; 
 *

 * <p>Read-only device representation exposing the properties of an existing virtual device.

 *

 * <p class="note">Not to be confused with {@link VirtualDeviceManager.VirtualDevice}, which is used

 * by the virtual device creator and allows them to manage the device.

 *

 * @see VirtualDeviceManager#registerVirtualDeviceListener

 */

public final class VirtualDevice implements Parcelable {
@@ -120,8 +117,6 @@ public final class VirtualDevice implements Parcelable { 


    /**

     * Returns the name of the virtual device (optionally) provided during its creation.

     *

     * @see VirtualDeviceParams.Builder#setName(String)

     */

    public @Nullable String getName() {

        return mName;

core/java/android/companion/virtual/sensor/VirtualSensorDirectChannelWriter.java

+3 −3
Original line number Diff line number Diff line
@@ -46,15 +46,15 @@ import java.util.concurrent.atomic.AtomicLong; 
 * <pre>

 * VirtualSensorDirectChannelWriter writer = new VirtualSensorDirectChannelWriter();

 * VirtualSensorDirectChannelCallback callback = new VirtualSensorDirectChannelCallback() {

 *     @Override

 *     {@literal @}Override

 *     public void onDirectChannelCreated(int channelHandle, SharedMemory sharedMemory) {

 *         writer.addChannel(channelHandle, sharedMemory);

 *     }

 *     @Override

 *     {@literal @}Override

 *     public void onDirectChannelDestroyed(int channelHandle);

 *         writer.removeChannel(channelHandle);

 *     }

 *     @Override

 *     {@literal @}Override

 *     public void onDirectChannelConfigured(int channelHandle, VirtualSensor sensor, int rateLevel,

 *             int reportToken)

 *         if (!writer.configureChannel(channelHandle, sensor, rateLevel, reportToken)) {

services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
    private static final String TAG = "VirtualDeviceImpl";



    /**

     * Virtual displays created by a {@link VirtualDeviceManager.VirtualDevice} are more consistent

     * with virtual displays created via {@link DisplayManager} and allow for the creation of

     * private, auto-mirror, and fixed orientation displays since

     * Virtual displays created by a {@code VirtualDeviceManager.VirtualDevice} are more consistent

     * with virtual displays created via {@link android.hardware.display.DisplayManager} and allow

     * for the creation of private, auto-mirror, and fixed orientation displays since

     * {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}.

     *

     * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_PUBLIC