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

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

Snap for 11071763 from e41337d7 to 24Q1-release 

Change-Id: I64c3025b79815adf886abf43b18d3eb204c742ea
parents 64e8eb75 e41337d7

flags/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ aconfig_declarations { 
      "telecom_incallservice_flags.aconfig",

      "telecom_default_phone_account_flags.aconfig",

      "telecom_callaudioroutestatemachine_flags.aconfig",

      "telecom_anomaly_report_flags.aconfig",

      "telecom_callaudiomodestatemachine_flags.aconfig",

      "telecom_calllog_flags.aconfig",

      "telecom_resolve_hidden_dependencies.aconfig"

    ],

flags/telecom_anomaly_report_flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"



flag {

  name: "gen_anom_report_on_focus_timeout"

  namespace: "telecom"

  description: "When getCurrentFocusCall times out, generate an anom. report"

  bug: "309541253"

}

flags/telecom_callaudiomodestatemachine_flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"



flag {

  name: "set_audio_mode_before_abandon_focus"

  namespace: "telecom"

  description: "Set audio mode to MODE_NORMAL before abandon the audio focus."

  bug: "281841785"

}

flags/telecom_incallservice_flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ flag { 
  description: "Binds to InCallServices when call requires no call filtering on watch"

  bug: "282113261"

}



flag {

  name: "ecc_keyguard"

  namespace: "telecom"

  description: "Ensure that users are able to return to call from keyguard UI for ECC"

  bug: "306582821"

}
 
 No newline at end of file

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

+9 −2
Original line number Diff line number Diff line
@@ -277,8 +277,15 @@ public class CallAudioModeStateMachine extends StateMachine { 
            Log.i(LOG_TAG, "Audio focus entering UNFOCUSED state");

            mLocalLog.log("Enter UNFOCUSED");

            if (mIsInitialized) {

                mCallAudioManager.setCallAudioRouteFocusState(CallAudioRouteStateMachine.NO_FOCUS);

                if (mFeatureFlags.setAudioModeBeforeAbandonFocus()) {

                    mAudioManager.setMode(AudioManager.MODE_NORMAL);

                    mCallAudioManager.setCallAudioRouteFocusState(

                            CallAudioRouteStateMachine.NO_FOCUS);

                } else {

                    mCallAudioManager.setCallAudioRouteFocusState(

                            CallAudioRouteStateMachine.NO_FOCUS);

                    mAudioManager.setMode(AudioManager.MODE_NORMAL);

                }

                mLocalLog.log("Mode MODE_NORMAL");

                mMostRecentMode = AudioManager.MODE_NORMAL;

                // Don't release focus here -- wait until we get a signal that any other audio