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

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

Snap for 10675748 from 00b7e58a to udc-qpr1-release

Change-Id: Iafc00dbed910eeb37a40cac64a1731db988cbca7
parents dc971220 00b7e58a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ private:
    std::shared_ptr<ISoundDose> mHalSoundDose GUARDED_BY(mLock);
    std::shared_ptr<HalSoundDoseCallback> mHalSoundDoseCallback GUARDED_BY(mLock);

    bool mUseFrameworkMel GUARDED_BY(mLock) = true;
    bool mUseFrameworkMel GUARDED_BY(mLock) = false;
    bool mComputeCsdOnAllDevices GUARDED_BY(mLock) = false;

    bool mEnabledCsd GUARDED_BY(mLock) = true;
+1 −2
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ TEST_F(SoundDoseManagerTest, GetDefaultForceComputeCsdOnAllDevices) {
}

TEST_F(SoundDoseManagerTest, GetDefaultForceUseFrameworkMel) {
    // TODO: for now dogfooding with internal MEL. Revert to false when using the HAL MELs
    EXPECT_TRUE(mSoundDoseManager->forceUseFrameworkMel());
    EXPECT_FALSE(mSoundDoseManager->forceUseFrameworkMel());
}

TEST_F(SoundDoseManagerTest, SetAudioDeviceCategoryStopsNonHeadphone) {