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

Commit 1a9d70ab authored by uabdullah's avatar uabdullah Committed by android-build-merger
Browse files

Merge changes I3f6a5887,Icf91804d 

am: 360c751f

Change-Id: I9e167dbf6710acd74e19af25148893070ed7a925
parents 72ae058a 360c751f

java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.dialer.voicemail.listui;



import android.content.Context;

import android.media.AudioManager;

import android.media.MediaPlayer;

import android.media.MediaPlayer.OnCompletionListener;

import android.media.MediaPlayer.OnErrorListener;
@@ -63,6 +64,7 @@ public class NewVoicemailMediaPlayer { 
          () -> {

            try {

              mediaPlayer.setDataSource(context, uri);

              setAudioManagerToNonSpeakerMode(context);

            } catch (IOException e) {

              LogUtil.i(

                  "NewVoicemailMediaPlayer",
@@ -86,6 +88,13 @@ public class NewVoicemailMediaPlayer { 
    }

  }



  /** We should never start playing voicemails from the speaker mode */

  private void setAudioManagerToNonSpeakerMode(Context context) {

    AudioManager audioManager = context.getSystemService(AudioManager.class);

    audioManager.setMode(AudioManager.STREAM_MUSIC);

    audioManager.setSpeakerphoneOn(false);

  }



  private void verifyListenersNotNull() {

    Assert.isNotNull(

        newVoicemailMediaPlayerOnErrorListener,

java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
  -->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/dialer_theme_color">

    android:layout_height="match_parent">



  <include layout="@layout/rtt_banner"/>