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

Commit b0c41a1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Merge redfin/bramble support."

parents 3bef7fe5 6922a97e

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ java_library { 
        "apex_aidl_interface-java",

        "suspend_control_aidl_interface-java",

        "framework-protos",

        "game-driver-protos",

        "updatable-driver-protos",

        "android.hidl.base-V1.0-java",

        "android.hardware.cas-V1.0-java",

        "android.hardware.cas-V1.1-java",

core/java/android/companion/BluetoothDeviceFilter.java

+10 −0
Original line number Diff line number Diff line
@@ -141,6 +141,16 @@ public final class BluetoothDeviceFilter implements DeviceFilter<BluetoothDevice 
        return Objects.hash(mNamePattern, mAddress, mServiceUuids, mServiceUuidMasks);

    }



    @Override

    public String toString() {

        return "BluetoothDeviceFilter{"

                + "mNamePattern=" + mNamePattern

                + ", mAddress='" + mAddress + '\''

                + ", mServiceUuids=" + mServiceUuids

                + ", mServiceUuidMasks=" + mServiceUuidMasks

                + '}';

    }



    @Override

    public int describeContents() {

        return 0;

core/java/android/content/pm/PermissionInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -525,6 +525,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
        if ((level & PermissionInfo.PROTECTION_FLAG_APP_PREDICTOR) != 0) {

            protLevel += "|appPredictor";

        }

        if ((level & PermissionInfo.PROTECTION_FLAG_COMPANION) != 0) {

            protLevel += "|companion";

        }

        if ((level & PermissionInfo.PROTECTION_FLAG_RETAIL_DEMO) != 0) {

            protLevel += "|retailDemo";

        }

core/java/android/hardware/camera2/CameraDevice.java

+3 −1
Original line number Diff line number Diff line
@@ -683,6 +683,8 @@ public abstract class CameraDevice implements AutoCloseable { 
     *<p>BACKWARD_COMPATIBLE devices capable of streaming concurrently with other devices as described by

     * {@link android.hardware.camera2.CameraManager#getConcurrentCameraIds} have the

     * following guaranteed streams (when streaming concurrently with other devices)</p>

     * <p> Note: The sizes mentioned for these concurrent streams are the maximum sizes guaranteed

     * to be supported. Sizes smaller than these, obtained by {@link StreamConfigurationMap#getOutputSizes} for a particular format, are supported as well. </p>

     *

     * <table>

     * <tr><th colspan="5">Concurrent stream guaranteed configurations</th></tr>
@@ -696,7 +698,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * </table><br>

     * </p>

     *

     * <p> Devices which are not backwards-compatible, support a mandatory single stream of size sVGA with image format {@code DEPTH16} during concurrent operation.

     * <p> Devices which are not backwards-compatible, support a mandatory single stream of size sVGA with image format {@code DEPTH16} during concurrent operation. </p>

     *

     * <p> For guaranteed concurrent stream configurations:</p>

     * <p> sVGA refers to the camera device's maximum resolution for that format from {@link StreamConfigurationMap#getOutputSizes} or

core/java/android/hardware/display/DisplayManagerInternal.java

+7 −0
Original line number Diff line number Diff line
@@ -259,6 +259,13 @@ public abstract class DisplayManagerInternal { 
    public abstract DisplayedContentSample getDisplayedContentSample(

            int displayId, long maxFrames, long timestamp);



    /**

     * Temporarily ignore proximity-sensor-based display behavior until there is a change

     * to the proximity sensor state. This allows the display to turn back on even if something

     * is obstructing the proximity sensor.

     */

    public abstract void ignoreProximitySensorUntilChanged();



    /**

     * Describes the requested power state of the display.

     *