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

Commit db657580 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge "Log to ACTION_AUDIO_STREAM_JOIN_PRESENT_SUCCEED when stream paused." into main

parents d2960b2d c99cabef

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ public class AudioStreamButtonController extends BasePreferenceController 
                        // TODO(b/308368124): Verify if this log is too noisy.

                        mMetricsFeatureProvider.action(

                                mContext,

                                localSourceState == PAUSED

                                        ? SettingsEnums.ACTION_AUDIO_STREAM_JOIN_PRESENT_SUCCEED :

                                SettingsEnums.ACTION_AUDIO_STREAM_JOIN_SUCCEED,

                                SOURCE_ORIGIN_REPOSITORY);

                    }

src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourcePresentState.java

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,18 @@ class SourcePresentState extends AudioStreamStateHandler { 
        return sInstance;

    }



    @Override

    void onEnter(

            AudioStreamPreference preference,

            AudioStreamsProgressCategoryController controller,

            AudioStreamsHelper helper,

            AudioStreamScanHelper scanHelper) {

        mMetricsFeatureProvider.action(

                preference.getContext(),

                SettingsEnums.ACTION_AUDIO_STREAM_JOIN_PRESENT_SUCCEED,

                preference.getSourceOriginForLogging().ordinal());

    }



    @Override

    int getSummary() {

        return AUDIO_STREAM_SOURCE_PRESENT_STATE_SUMMARY;

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -297,7 +297,8 @@ public class AudioStreamButtonControllerTest { 
                mock(BluetoothDevice.class), /* sourceId= */ 0, state);



        verify(mFeatureFactory.metricsFeatureProvider)

                .action(any(), eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_SUCCEED), anyInt());

                .action(any(), eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_PRESENT_SUCCEED),

                        anyInt());



        // Called twice, once in displayPreference, the other one in callback

        verify(mPreference, times(2)).setButton1Enabled(true);

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourcePresentStateTest.java

+18 −0
Original line number Diff line number Diff line
@@ -22,10 +22,12 @@ import static com.android.settings.connecteddevice.audiosharing.audiostreams.Sou 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.os.Bundle;
@@ -64,6 +66,7 @@ public class SourcePresentStateTest { 
    @Mock private AudioStreamPreference mPreference;

    @Mock private AudioStreamsProgressCategoryController mController;

    @Mock private AudioStreamsHelper mHelper;

    @Mock private AudioStreamScanHelper mScanHelper;

    @Mock private AudioStreamsRepository mRepository;

    @Mock private AudioStreamsDashboardFragment mFragment;

    @Mock private FragmentActivity mActivity;
@@ -100,6 +103,21 @@ public class SourcePresentStateTest { 
                .isEqualTo(AudioStreamsProgressCategoryController.AudioStreamState.SOURCE_PRESENT);

    }



    public void testOnEnter_log() {

        when(mPreference.getContext()).thenReturn(mContext);

        when(mPreference.getSourceOriginForLogging())

                .thenReturn(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS);



        mInstance.onEnter(mPreference, mController, mHelper, mScanHelper);



        verify(mFeatureFactory.metricsFeatureProvider)

                .action(

                        eq(mContext),

                        eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_PRESENT_SUCCEED),

                        eq(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS.ordinal()));

    }





    @Test

    public void testGetOnClickListener_startSubSettings() {

        when(mController.getFragment()).thenReturn(mFragment);