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

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

Snap for 7673824 from c9691a7b to sc-v2-release

Change-Id: I59513ddbdeefbde8923698a6c501bb000ed92a94
parents 69bcb75a c9691a7b
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -1361,6 +1361,10 @@ aidl2legacy_AudioFlag_audio_flags_mask_t(media::AudioFlag aidl) {
            return AUDIO_FLAG_NO_SYSTEM_CAPTURE;
        case media::AudioFlag::CAPTURE_PRIVATE:
            return AUDIO_FLAG_CAPTURE_PRIVATE;
        case media::AudioFlag::CONTENT_SPATIALIZED:
            return AUDIO_FLAG_CONTENT_SPATIALIZED;
        case media::AudioFlag::NEVER_SPATIALIZE:
            return AUDIO_FLAG_NEVER_SPATIALIZE;
    }
    return unexpected(BAD_VALUE);
}
@@ -1398,6 +1402,10 @@ legacy2aidl_audio_flags_mask_t_AudioFlag(audio_flags_mask_t legacy) {
            return media::AudioFlag::NO_SYSTEM_CAPTURE;
        case AUDIO_FLAG_CAPTURE_PRIVATE:
            return media::AudioFlag::CAPTURE_PRIVATE;
        case AUDIO_FLAG_CONTENT_SPATIALIZED:
            return media::AudioFlag::CONTENT_SPATIALIZED;
        case AUDIO_FLAG_NEVER_SPATIALIZE:
            return media::AudioFlag::NEVER_SPATIALIZE;
    }
    return unexpected(BAD_VALUE);
}
+2 −0
Original line number Diff line number Diff line
@@ -34,4 +34,6 @@ enum AudioFlag {
    MUTE_HAPTIC = 11,
    NO_SYSTEM_CAPTURE = 12,
    CAPTURE_PRIVATE = 13,
    CONTENT_SPATIALIZED = 14,
    NEVER_SPATIALIZE = 15,
}
+3 −3
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ class SensorPoseProviderImpl : public SensorPoseProvider {
    bool waitInitFinished() { return mInitPromise.get_future().get(); }

    void threadFunc(const char* packageName) {
        // Obtain looper.
        mLooper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);

        // The number 19 is arbitrary, only useful if using multiple objects on the same looper.
        constexpr int kIdent = 19;

@@ -155,9 +158,6 @@ class SensorPoseProviderImpl : public SensorPoseProvider {
            return;
        }

        // Obtain looper.
        mLooper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);

        // Create event queue.
        ASensorEventQueue* queue =
                ASensorManager_createEventQueue(sensor_manager, mLooper, kIdent, nullptr, nullptr);
+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ const AudioFlagConverter::Table AudioFlagConverter::mTable[] = {
    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_MUTE_HAPTIC),
    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_NO_SYSTEM_CAPTURE),
    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_CAPTURE_PRIVATE),
    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_CONTENT_SPATIALIZED),
    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_NEVER_SPATIALIZE),
    TERMINATOR
};

+3 −1
Original line number Diff line number Diff line
@@ -163,7 +163,9 @@ std::vector<audio_flags_mask_t> kAudioFlagMasks = {
    AUDIO_FLAG_BYPASS_MUTE,    AUDIO_FLAG_LOW_LATENCY,
    AUDIO_FLAG_DEEP_BUFFER,    AUDIO_FLAG_NO_MEDIA_PROJECTION,
    AUDIO_FLAG_MUTE_HAPTIC,    AUDIO_FLAG_NO_SYSTEM_CAPTURE,
    AUDIO_FLAG_CAPTURE_PRIVATE};
    AUDIO_FLAG_CAPTURE_PRIVATE, AUDIO_FLAG_CONTENT_SPATIALIZED,
    AUDIO_FLAG_NEVER_SPATIALIZE,
    };

std::vector<audio_policy_dev_state_t> kAudioPolicyDeviceStates = {
    AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE,