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

Commit 4c3645cc authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

resolve merge conflicts of 0b6c8180 to rvc-dev-plus-aosp 

Change-Id: Ie13012e51d5846335169fdad979b9e92bc0ba920
Exempt-From-Owner-Approval: merge
parents e140816f 0b6c8180

telephony/java/android/telephony/TelephonyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -4926,7 +4926,8 @@ public class TelephonyManager { 
            ITelephony telephony = getITelephony();

            if (telephony != null) {

                telephony.sendVisualVoicemailSmsForSubscriber(

                        mContext.getOpPackageName(), null, subId, number, port, text, sentIntent);

                        mContext.getOpPackageName(), mContext.getAttributionTag(), subId, number,

                        port, text, sentIntent);

            }

        } catch (RemoteException ex) {

        }