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

Commit 7695b8ae authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9365099 from 438967a4 to udc-release 

Change-Id: I268290c6d23263d57f0c1f26e1b745866700c8ef
parents e33802c5 438967a4

include/android/sensor.h

+5 −1
Original line number Diff line number Diff line
@@ -601,12 +601,15 @@ typedef struct AHeadingEvent { 
    float accuracy;

} AHeadingEvent;



// LINT.IfChange

/**

 * Information that describes a sensor event, refer to

 * <a href="/reference/android/hardware/SensorEvent">SensorEvent</a> for additional

 * documentation.

 *

 * NOTE: changes to this struct has to be backward compatible and reflected in

 * sensors_event_t

 */

/* NOTE: changes to this struct has to be backward compatible */

typedef struct ASensorEvent {

    int32_t version; /* sizeof(struct ASensorEvent) */

    int32_t sensor;  /** The sensor that generates this event */
@@ -651,6 +654,7 @@ typedef struct ASensorEvent { 
    uint32_t flags;

    int32_t reserved1[3];

} ASensorEvent;

// LINT.ThenChange (hardware/libhardware/include/hardware/sensors.h)



struct ASensorManager;

/**

include/input/DisplayViewport.h

+4 −10
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <ftl/string.h>

#include <gui/constants.h>

#include <input/Input.h>

#include <ui/Rotation.h>



#include <cinttypes>

#include <optional>
@@ -29,13 +30,6 @@ using android::base::StringPrintf; 


namespace android {



enum {

    DISPLAY_ORIENTATION_0 = 0,

    DISPLAY_ORIENTATION_90 = 1,

    DISPLAY_ORIENTATION_180 = 2,

    DISPLAY_ORIENTATION_270 = 3

};



/**

 * Describes the different type of viewports supported by input flinger.

 * Keep in sync with values in InputManagerService.java.
@@ -54,7 +48,7 @@ enum class ViewportType : int32_t { 
 */

struct DisplayViewport {

    int32_t displayId; // -1 if invalid

    int32_t orientation;

    ui::Rotation orientation;

    int32_t logicalLeft;

    int32_t logicalTop;

    int32_t logicalRight;
@@ -74,7 +68,7 @@ struct DisplayViewport { 


    DisplayViewport()

          : displayId(ADISPLAY_ID_NONE),

            orientation(DISPLAY_ORIENTATION_0),

            orientation(ui::ROTATION_0),

            logicalLeft(0),

            logicalTop(0),

            logicalRight(0),
@@ -111,7 +105,7 @@ struct DisplayViewport { 


    void setNonDisplayViewport(int32_t width, int32_t height) {

        displayId = ADISPLAY_ID_NONE;

        orientation = DISPLAY_ORIENTATION_0;

        orientation = ui::ROTATION_0;

        logicalLeft = 0;

        logicalTop = 0;

        logicalRight = width;

include/input/Input.h

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ public: 


    inline const ui::Transform& getTransform() const { return mTransform; }



    int getSurfaceRotation() const;

    std::optional<ui::Rotation> getSurfaceRotation() const;



    inline float getXPrecision() const { return mXPrecision; }

include/input/TouchVideoFrame.h

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#pragma once



#include <ui/Rotation.h>



#include <stdint.h>

#include <sys/time.h>

#include <vector>
@@ -58,7 +60,7 @@ public: 
     * Rotate the video frame.

     * The rotation value is an enum from ui/Rotation.h

     */

    void rotate(int32_t orientation);

    void rotate(ui::Rotation orientation);



private:

    uint32_t mHeight;

libs/binder/ndk/include_cpp/android/binder_interface_utils.h

+4 −0
Original line number Diff line number Diff line
@@ -196,6 +196,10 @@ class BnCInterface : public INTERFACE { 


    bool isRemote() override final { return false; }



    static std::string makeServiceName(std::string_view instance) {

        return INTERFACE::descriptor + ("/" + std::string(instance));

    }



   protected:

    /**

     * This function should only be called by asBinder. Otherwise, there is a possibility of