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

Commit dd856284 authored by Nicolas Sleiman's avatar Nicolas Sleiman Committed by Automerger Merge Worker
Browse files

Merge "Use the incoming call's user to get the ringtone." into udc-dev am: 8947db1b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22712062



Change-Id: Ic5a0abce26bc25865dbdbec50ac2f5c348ab67fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12c40656 8947db1b

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

+2 −1
Original line number Diff line number Diff line
@@ -72,9 +72,10 @@ public class RingtoneFactory { 
        AudioAttributes audioAttrs = getDefaultRingtoneAudioAttributes(hapticChannelsMuted);



        // Use the default ringtone of the work profile if the contact is a work profile contact.

        // or the default ringtone of the receiving user.

        Context userContext = isWorkContact(incomingCall) ?

                getWorkProfileContextForUser(mCallsManager.getCurrentUserHandle()) :

                getContextForUserHandle(mCallsManager.getCurrentUserHandle());

                getContextForUserHandle(incomingCall.getUserHandleFromTargetPhoneAccount());

        Uri ringtoneUri = incomingCall.getRingtone();

        Ringtone ringtone = null;