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

Commit b60eb365 authored by Vlad Popa's avatar Vlad Popa Committed by Automerger Merge Worker
Browse files

Merge "CSD: Fix setCsd TestApi logic" into udc-dev am: 1f8197ab 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21751163



Change-Id: I4f36aa01e65c72b1d673da9998828c61c70966e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b158645c 1f8197ab

services/core/java/com/android/server/audio/SoundDoseHelper.java

+21 −5
Original line number Diff line number Diff line
@@ -366,6 +366,21 @@ public class SoundDoseHelper { 
            return;

        }



        SoundDoseRecord[] doseRecordsArray;

        synchronized (mCsdStateLock) {

            mCurrentCsd = csd;



            mDoseRecords.clear();



            if (mCurrentCsd > 0.0f) {

                final SoundDoseRecord record = new SoundDoseRecord();

                record.timestamp = SystemClock.elapsedRealtime();

                record.value = csd;

                mDoseRecords.add(record);

            }

            doseRecordsArray = mDoseRecords.toArray(new SoundDoseRecord[0]);

        }



        final ISoundDose soundDose = mSoundDose.get();

        if (soundDose == null) {

            Log.w(TAG, "Sound dose interface not initialized");
@@ -373,11 +388,7 @@ public class SoundDoseHelper { 
        }



        try {

            final SoundDoseRecord record = new SoundDoseRecord();

            record.timestamp = System.currentTimeMillis();

            record.value = csd;

            final SoundDoseRecord[] recordArray = new SoundDoseRecord[] { record };

            soundDose.resetCsd(csd, recordArray);

            soundDose.resetCsd(csd, doseRecordsArray);

        } catch (RemoteException e) {

            Log.e(TAG, "Exception while setting the CSD value", e);

        }
@@ -648,6 +659,11 @@ public class SoundDoseHelper { 


    /*package*/ void dump(PrintWriter pw) {

        pw.print("  mEnableCsd="); pw.println(mEnableCsd);

        if (mEnableCsd) {

            synchronized (mCsdStateLock) {

                pw.print("  mCurrentCsd="); pw.println(mCurrentCsd);

            }

        }

        pw.print("  mSafeMediaVolumeState=");

        pw.println(safeMediaVolumeStateToString(mSafeMediaVolumeState));

        pw.print("  mSafeMediaVolumeIndex="); pw.println(mSafeMediaVolumeIndex);