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

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

Snap for 12525705 from 34df4e84 to 25Q2-release 

Change-Id: I0bc9e4125fc4c9a2440f7ca09b3ceafa8c9d2b45
parents 8b18d267 34df4e84

Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -125,3 +125,9 @@ filegroup { 
    srcs: ["aidl/android/hardware/display/IDeviceProductInfoConstants.aidl"],

    path: "aidl",

}



dirgroup {

    name: "trusty_dirgroup_frameworks_native",

    dirs: ["libs/binder"],

    visibility: ["//trusty/vendor/google/aosp/scripts"],

}

cmds/dumpstate/DumpstateInternal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ bool DropRootUser() { 


    const uint32_t cap_syslog_mask = CAP_TO_MASK(CAP_SYSLOG);

    const uint32_t cap_syslog_index = CAP_TO_INDEX(CAP_SYSLOG);

    bool has_cap_syslog = (capdata[cap_syslog_index].effective & cap_syslog_mask) != 0;

    bool has_cap_syslog = (capdata[cap_syslog_index].permitted & cap_syslog_mask) != 0;



    memset(&capdata, 0, sizeof(capdata));

    if (has_cap_syslog) {

include/audiomanager/AudioManager.h

+5 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum { 
    PLAYER_MUTE_PLAYBACK_RESTRICTED = (1 << 3),

    PLAYER_MUTE_CLIENT_VOLUME = (1 << 4),

    PLAYER_MUTE_VOLUME_SHAPER = (1 << 5),

    PLAYER_MUTE_PORT_VOLUME = (1 << 6),

};



struct mute_state_t {
@@ -74,6 +75,8 @@ struct mute_state_t { 
    bool muteFromClientVolume = false;

    /** Flag used when volume is muted by volume shaper. */

    bool muteFromVolumeShaper = false;

    /** Flag used when volume is muted by port volume. */

    bool muteFromPortVolume = false;



    explicit operator int() const

    {
@@ -83,6 +86,7 @@ struct mute_state_t { 
        result |= muteFromPlaybackRestricted * PLAYER_MUTE_PLAYBACK_RESTRICTED;

        result |= muteFromClientVolume * PLAYER_MUTE_CLIENT_VOLUME;

        result |= muteFromVolumeShaper * PLAYER_MUTE_VOLUME_SHAPER;

        result |= muteFromPortVolume * PLAYER_MUTE_PORT_VOLUME;

        return result;

    }

include/input/InputDevice.h

+5 −6
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ class InputDeviceInfo { 
public:

    InputDeviceInfo();

    InputDeviceInfo(const InputDeviceInfo& other);

    InputDeviceInfo& operator=(const InputDeviceInfo& other);

    ~InputDeviceInfo();



    struct MotionRange {
@@ -315,13 +316,11 @@ public: 


    inline const InputDeviceViewBehavior& getViewBehavior() const { return mViewBehavior; }



    inline void setKeyCharacterMap(const std::shared_ptr<KeyCharacterMap> value) {

        mKeyCharacterMap = value;

    inline void setKeyCharacterMap(std::unique_ptr<KeyCharacterMap> value) {

        mKeyCharacterMap = std::move(value);

    }



    inline const std::shared_ptr<KeyCharacterMap> getKeyCharacterMap() const {

        return mKeyCharacterMap;

    }

    inline const KeyCharacterMap* getKeyCharacterMap() const { return mKeyCharacterMap.get(); }



    inline void setVibrator(bool hasVibrator) { mHasVibrator = hasVibrator; }

    inline bool hasVibrator() const { return mHasVibrator; }
@@ -364,7 +363,7 @@ private: 
    std::optional<KeyboardLayoutInfo> mKeyboardLayoutInfo;

    uint32_t mSources;

    int32_t mKeyboardType;

    std::shared_ptr<KeyCharacterMap> mKeyCharacterMap;

    std::unique_ptr<KeyCharacterMap> mKeyCharacterMap;

    std::optional<InputDeviceUsiVersion> mUsiVersion;

    ui::LogicalDisplayId mAssociatedDisplayId{ui::LogicalDisplayId::INVALID};

    bool mEnabled;

include/input/InputEventBuilders.h

+3 −0
Original line number Diff line number Diff line
@@ -250,6 +250,9 @@ class MotionEventBuilder { 
public:

    MotionEventBuilder(int32_t action, int32_t source) {

        mAction = action;

        if (mAction == AMOTION_EVENT_ACTION_CANCEL) {

            mFlags |= AMOTION_EVENT_FLAG_CANCELED;

        }

        mSource = source;

        mEventTime = systemTime(SYSTEM_TIME_MONOTONIC);

        mDownTime = mEventTime;