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

Commit f7f4b949 authored by Thomas Nguyen's avatar Thomas Nguyen
Browse files

Log caller when sending SMS 

Bug: 245672677
Test: manual
- 09-12 21:04:09.078 D SmsController: sendTextForSubscriber caller=com.google.android.apps.messaging

Change-Id: I4fbf28783712708d14d2d629229936ded65199a1
parent 28c071a8

src/java/com/android/internal/telephony/SmsController.java

+15 −3
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ public class SmsController extends ISmsImplBase { 
        if (callingPackage == null) {

            callingPackage = getCallingPackage();

        }

        Rlog.d(LOG_TAG, "sendDataForSubscriber caller=" + callingPackage);



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {
@@ -199,6 +200,8 @@ public class SmsController extends ISmsImplBase { 
        if (callingPackage == null) {

            callingPackage = getCallingPackage();

        }

        Rlog.d(LOG_TAG, "sendTextForSubscriber caller=" + callingPackage);



        if (!getSmsPermissions(subId).checkCallingCanSendText(persistMessageForNonDefaultSmsApp,

                callingPackage, callingAttributionTag, "Sending SMS message")) {

            sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_ERROR_GENERIC_FAILURE);
@@ -277,6 +280,7 @@ public class SmsController extends ISmsImplBase { 
        if (callingPackage == null) {

            callingPackage = getCallingPackage();

        }

        Rlog.d(LOG_TAG, "sendTextForSubscriberWithOptions caller=" + callingPackage);



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {
@@ -306,6 +310,7 @@ public class SmsController extends ISmsImplBase { 
        if (getCallingPackage() != null) {

            callingPackage = getCallingPackage();

        }

        Rlog.d(LOG_TAG, "sendMultipartTextForSubscriber caller=" + callingPackage);



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {
@@ -333,6 +338,7 @@ public class SmsController extends ISmsImplBase { 
        if (callingPackage == null) {

            callingPackage = getCallingPackage();

        }

        Rlog.d(LOG_TAG, "sendMultipartTextForSubscriberWithOptions caller=" + callingPackage);



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {
@@ -558,6 +564,8 @@ public class SmsController extends ISmsImplBase { 
            throw new SecurityException("sendStoredText: Package " + callingPkg

                    + "does not belong to " + Binder.getCallingUid());

        }

        Rlog.d(LOG_TAG, "sendStoredText caller=" + callingPkg);



        if (iccSmsIntMgr != null) {

            iccSmsIntMgr.sendStoredText(callingPkg, callingAttributionTag, messageUri, scAddress,

                    sentIntent, deliveryIntent);
@@ -576,6 +584,8 @@ public class SmsController extends ISmsImplBase { 
            throw new SecurityException("sendStoredMultipartText: Package " + callingPkg

                    + " does not belong to " + Binder.getCallingUid());

        }

        Rlog.d(LOG_TAG, "sendStoredMultipartText caller=" + callingPkg);



        if (iccSmsIntMgr != null) {

            iccSmsIntMgr.sendStoredMultipartText(callingPkg, callingAttributionTag, messageUri,

                    scAddress, sentIntents, deliveryIntents);
@@ -753,6 +763,8 @@ public class SmsController extends ISmsImplBase { 
    public void sendVisualVoicemailSmsForSubscriber(String callingPackage,

            String callingAttributionTag, int subId, String number, int port, String text,

            PendingIntent sentIntent) {

        Rlog.d(LOG_TAG, "sendVisualVoicemailSmsForSubscriber caller=" + callingPackage);



        // Do not send non-emergency SMS in ECBM as it forces device to exit ECBM.

        if(getPhone(subId).isInEcm()) {

            Rlog.d(LOG_TAG, "sendVisualVoicemailSmsForSubscriber: Do not send non-emergency "