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

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

Snap for 11038355 from da111027 to 24Q1-release 

Change-Id: Ie61efe38f487760e6eedbdcac7f8a509694c9de2
parents 770bd0d6 da111027

flags/telecom_api_flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -20,3 +20,10 @@ flag { 
  description: "When set, Telecom will auto-unbind if a ConnectionService returns no connections after some time."

  bug: "293458004"

}



flag{

  name: "add_call_uri_for_missed_calls"

  namespace: "telecom"

  description: "The key is used for dialer apps to mark missed calls as read when it gets the notification on reboot."

  bug: "292597423"

}

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

+14 −7
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.telecom;





import android.annotation.FlaggedApi;

import android.app.ActivityManager;

import android.bluetooth.BluetoothDevice;

import android.content.BroadcastReceiver;
@@ -1751,6 +1752,7 @@ public class CallAudioRouteStateMachine extends StateMachine { 
                }

                return;

            case UPDATE_SYSTEM_AUDIO_ROUTE:

                if (mFeatureFlags.availableRoutesNeverUpdatedAfterSetSystemAudioState()) {

                    // Ensure available routes is updated.

                    updateRouteForForegroundCall();

                    // Ensure current audio state gets updated to take this into account.
@@ -1758,6 +1760,11 @@ public class CallAudioRouteStateMachine extends StateMachine { 
                    // Either resend the current audio state as it stands, or update to reflect any

                    // changes put into place based on mAvailableRoutes

                    setSystemAudioState(mCurrentCallAudioState, true);

                } else {

                    updateInternalCallAudioState();

                    updateRouteForForegroundCall();

                    resendSystemAudioState();

                }

                return;

            case RUN_RUNNABLE:

                java.lang.Runnable r = (java.lang.Runnable) msg.obj;

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

+7 −2
Original line number Diff line number Diff line
@@ -263,8 +263,13 @@ public final class CallLogManager extends CallsManagerListenerBase { 
            logCall(call, type, new LogCallCompletedListener() {

                @Override

                public void onLogCompleted(@Nullable Uri uri) {

                    if (mFeatureFlags.addCallUriForMissedCalls()){

                        mMissedCallNotifier.showMissedCallNotification(

                            new MissedCallNotifier.CallInfo(call));

                                new MissedCallNotifier.CallInfo(call), uri);

                    } else {

                        mMissedCallNotifier.showMissedCallNotification(

                                new MissedCallNotifier.CallInfo(call), /* uri= */ null);

                    }

                }

            }, result);

        } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ public class CallsManager extends Call.ListenerBase 
            if (result.shouldShowNotification) {

                Log.i(this, "onCallScreeningCompleted: blocked call, showing notification.");

                mMissedCallNotifier.showMissedCallNotification(

                        new MissedCallNotifier.CallInfo(incomingCall));

                        new MissedCallNotifier.CallInfo(incomingCall), /* uri= */ null);

            }

        }

    }

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

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


package com.android.server.telecom;



import android.annotation.Nullable;

import android.net.Uri;

import android.os.UserHandle;

import android.telecom.PhoneAccountHandle;
@@ -85,7 +86,7 @@ public interface MissedCallNotifier extends CallsManager.CallsManagerListener { 


    void clearMissedCalls(UserHandle userHandle);



    void showMissedCallNotification(CallInfo call);

    void showMissedCallNotification(CallInfo call, @Nullable Uri uri);



    void reloadAfterBootComplete(CallerInfoLookupHelper callerInfoLookupHelper,

            CallInfoFactory callInfoFactory);