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

Commit 7e5e5718 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Resolve setVolume hidden API usage" into main

parents 36ccf97b 09b36b97

src/com/android/server/telecom/CallRecordingTonePlayer.java

+9 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.provider.MediaStore; 
import android.telecom.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.telecom.flags.FeatureFlags;



import java.util.ArrayList;

import java.util.Collections;
@@ -91,7 +92,11 @@ public class CallRecordingTonePlayer extends CallsManagerListenerBase { 
            if (telephonyDevice != null) {

                mRecordingTonePlayer = MediaPlayer.create(mContext, R.raw.record);

                mRecordingTonePlayer.setPreferredDevice(telephonyDevice);

                if (mFeatureFlags.resolveHiddenDependenciesTwo()) {

                    mRecordingTonePlayer.setVolume(0.1f, 0.1f);

                } else {

                    mRecordingTonePlayer.setVolume(0.1f);

                }

                AudioAttributes audioAttributes = new AudioAttributes.Builder()

                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION).build();

                mRecordingTonePlayer.setAudioAttributes(audioAttributes);
@@ -117,16 +122,18 @@ public class CallRecordingTonePlayer extends CallsManagerListenerBase { 
    private final long mRepeatInterval;

    private boolean mIsRecording = false;

    private LoopingTonePlayer mLoopingTonePlayer;

    private FeatureFlags mFeatureFlags;

    private List<Call> mCalls = new ArrayList<>();



    public CallRecordingTonePlayer(Context context, AudioManager audioManager,

            Timeouts.Adapter timeouts,

            TelecomSystem.SyncRoot lock) {

            TelecomSystem.SyncRoot lock, FeatureFlags featureFlags) {

        mContext = context;

        mAudioManager = audioManager;

        mLock = lock;

        mRepeatInterval = timeouts.getCallRecordingToneRepeatIntervalMillis(

                context.getContentResolver());

        mFeatureFlags = featureFlags;

    }



    @Override

src/com/android/server/telecom/CallsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ public class CallsManager extends Call.ListenerBase 
            mCallRecordingTonePlayer = null;

        } else {

            mCallRecordingTonePlayer = new CallRecordingTonePlayer(mContext, audioManager,

                    mTimeoutsAdapter, mLock);

                    mTimeoutsAdapter, mLock, featureFlags);

        }

        mCallAudioManager = new CallAudioManager(mCallAudioRouteAdapter,

                this, callAudioModeStateMachineFactory.create(systemStateHelper,

tests/src/com/android/server/telecom/tests/CallRecordingTonePlayerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class CallRecordingTonePlayerTest extends TelecomTestCase { 
                .thenReturn(500L);

        mCallRecordingTonePlayer = new CallRecordingTonePlayer(

                mComponentContextFixture.getTestDouble().getApplicationContext(),

                mAudioManager, mTimeouts, mSyncRoot);

                mAudioManager, mTimeouts, mSyncRoot, mFeatureFlags);

        when(mAudioManager.getActiveRecordingConfigurations()).thenReturn(null);

    }