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

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

Snap for 9509200 from 992d9e0a to udc-release 

Change-Id: I75b1ac411184f31067a818aa75f04e4eebe08847
parents f0adff37 992d9e0a

data/etc/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -166,6 +166,12 @@ prebuilt_etc { 
    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.telephony.satellite.prebuilt.xml",

    src: "android.hardware.telephony.satellite.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.usb.accessory.prebuilt.xml",

    src: "android.hardware.usb.accessory.xml",

data/etc/android.hardware.telephony.satellite.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Feature for devices that support Satellite communication via Satellite HAL APIs. -->

<permissions>

    <feature name="android.hardware.telephony.satellite" />

</permissions>

include/input/Input.h

+1 −0
Original line number Diff line number Diff line
@@ -1132,6 +1132,7 @@ enum class PointerIconStyle : int32_t { 
    TYPE_ZOOM_OUT = 1019,

    TYPE_GRAB = 1020,

    TYPE_GRABBING = 1021,

    TYPE_HANDWRITING = 1022,



    TYPE_SPOT_HOVER = 2000,

    TYPE_SPOT_TOUCH = 2001,

include/input/InputDevice.h

+15 −5
Original line number Diff line number Diff line
@@ -214,6 +214,12 @@ struct KeyboardLayoutInfo { 
    std::string layoutType;

};



// The version of the Universal Stylus Initiative (USI) protocol supported by the input device.

struct InputDeviceUsiVersion {

    int32_t majorVersion = -1;

    int32_t minorVersion = -1;

};



/*

 * Describes the characteristics and capabilities of an input device.

 */
@@ -235,7 +241,7 @@ public: 


    void initialize(int32_t id, int32_t generation, int32_t controllerNumber,

                    const InputDeviceIdentifier& identifier, const std::string& alias,

                    bool isExternal, bool hasMic);

                    bool isExternal, bool hasMic, int32_t associatedDisplayId);



    inline int32_t getId() const { return mId; }

    inline int32_t getControllerNumber() const { return mControllerNumber; }
@@ -295,8 +301,12 @@ public: 


    std::vector<InputDeviceLightInfo> getLights();



    inline void setSupportsUsi(bool supportsUsi) { mSupportsUsi = supportsUsi; }

    inline bool supportsUsi() const { return mSupportsUsi; }

    inline void setUsiVersion(std::optional<InputDeviceUsiVersion> usiVersion) {

        mUsiVersion = std::move(usiVersion);

    }

    inline std::optional<InputDeviceUsiVersion> getUsiVersion() const { return mUsiVersion; }



    inline int32_t getAssociatedDisplayId() const { return mAssociatedDisplayId; }



private:

    int32_t mId;
@@ -310,8 +320,8 @@ private: 
    uint32_t mSources;

    int32_t mKeyboardType;

    std::shared_ptr<KeyCharacterMap> mKeyCharacterMap;

    // Whether this device supports the Universal Stylus Initiative (USI) protocol for styluses.

    bool mSupportsUsi;

    std::optional<InputDeviceUsiVersion> mUsiVersion;

    int32_t mAssociatedDisplayId;



    bool mHasVibrator;

    bool mHasBattery;

libs/binder/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ cc_defaults { 


    srcs: [

        "Binder.cpp",

        "BinderRecordReplay.cpp",

        "BpBinder.cpp",

        "Debug.cpp",

        "FdTrigger.cpp",
@@ -84,6 +83,7 @@ cc_defaults { 
        "IResultReceiver.cpp",

        "Parcel.cpp",

        "ParcelFileDescriptor.cpp",

        "RecordedTransaction.cpp",

        "RpcSession.cpp",

        "RpcServer.cpp",

        "RpcState.cpp",