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

Commit 191d5d3b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Handle invalid deviceId in device-aware system services" into main

parents 3d8c671e 7357549b

core/api/test-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -970,6 +970,10 @@ package android.companion.virtual { 
    method public void playSoundEffect(int, int);

    method public void playSoundEffect(int, int);

  }

  }





  public final class VirtualDeviceParams implements android.os.Parcelable {

    field public static final int DEVICE_POLICY_INVALID = -1; // 0xffffffff

  }



}

}





package android.companion.virtual.camera {

package android.companion.virtual.camera {

core/java/android/companion/virtual/VirtualDeviceManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ import android.annotation.IntRange; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SuppressLint;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.SystemService;
@@ -326,8 +325,9 @@ public final class VirtualDeviceManager { 
    /**

    /**

     * Returns the device policy for the given virtual device and policy type.

     * Returns the device policy for the given virtual device and policy type.

     *

     *

     * <p>In case the virtual device identifier is not valid, or there's no explicitly specified

     * <p>In case the virtual device identifier is not valid,

     * policy for that device and policy type, then

     * {@link VirtualDeviceParams#DEVICE_POLICY_INVALID} is returned. If there's no explicitly

     * specified policy for that device and policy type, then

     * {@link VirtualDeviceParams#DEVICE_POLICY_DEFAULT} is returned.

     * {@link VirtualDeviceParams#DEVICE_POLICY_DEFAULT} is returned.

     *

     *

     * @hide

     * @hide

core/java/android/companion/virtual/VirtualDeviceParams.java

+13 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.companion.virtual.sensor.IVirtualSensorCallback;

import android.companion.virtual.sensor.IVirtualSensorCallback;

import android.companion.virtual.sensor.VirtualSensor;

import android.companion.virtual.sensor.VirtualSensor;

import android.companion.virtual.sensor.VirtualSensorCallback;

import android.companion.virtual.sensor.VirtualSensorCallback;
@@ -136,11 +137,22 @@ public final class VirtualDeviceParams implements Parcelable { 
    public static final int NAVIGATION_POLICY_DEFAULT_BLOCKED = 1;

    public static final int NAVIGATION_POLICY_DEFAULT_BLOCKED = 1;





    /** @hide */

    /** @hide */

    @IntDef(prefix = "DEVICE_POLICY_",  value = {DEVICE_POLICY_DEFAULT, DEVICE_POLICY_CUSTOM})

    @IntDef(prefix = "DEVICE_POLICY_",  value = {DEVICE_POLICY_INVALID, DEVICE_POLICY_DEFAULT,

            DEVICE_POLICY_CUSTOM})

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    @Target({ElementType.TYPE_PARAMETER, ElementType.TYPE_USE})

    @Target({ElementType.TYPE_PARAMETER, ElementType.TYPE_USE})

    public @interface DevicePolicy {}

    public @interface DevicePolicy {}





    /**

     * Indicates that there is no valid virtual device and it should be treated as an error

     * scenario (or however the caller sees fit).

     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public static final int DEVICE_POLICY_INVALID = -1;



    /**

    /**

     * Indicates that there is no special logic for this virtual device and it should be treated

     * Indicates that there is no special logic for this virtual device and it should be treated

     * the same way as the default device, keeping the default behavior unchanged.

     * the same way as the default device, keeping the default behavior unchanged.

core/java/android/companion/virtual/flags/flags.aconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -229,3 +229,13 @@ flag { 
    bug: "371167033"

    bug: "371167033"

    is_exported: true

    is_exported: true

}

}



flag {

    name: "handle_invalid_device_id"

    namespace: "virtual_devices"

    description: "Handle invalid device ids in various system services"

    bug: "394613051"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

core/java/android/companion/virtualnative/IVirtualDeviceManagerNative.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ interface IVirtualDeviceManagerNative { 
    /**

    /**

     * Counterpart to VirtualDeviceParams#DevicePolicy.

     * Counterpart to VirtualDeviceParams#DevicePolicy.

     */

     */

    const int DEVICE_POLICY_INVALID = -1;

    const int DEVICE_POLICY_DEFAULT = 0;

    const int DEVICE_POLICY_DEFAULT = 0;

    const int DEVICE_POLICY_CUSTOM = 1;

    const int DEVICE_POLICY_CUSTOM = 1;