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

Commit fba67965 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Support P2P SMS" into main

parents 3ce6d435 e66f7832

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

+9 −0
Original line number Diff line number Diff line
@@ -5497,4 +5497,13 @@ public class GsmCdmaPhone extends Phone { 
            mSafetySource.refresh(mContext, refreshBroadcastId);

        }

    }



    /**

     * @return The sms dispatchers controller

     */

    @Override

    @Nullable

    public SmsDispatchersController getSmsDispatchersController() {

        return mIccSmsInterfaceManager.mDispatchersController;

    }

}

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

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ public class IccSmsInterfaceManager { 
    final protected Context mContext;

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    final protected AppOpsManager mAppOps;

    @VisibleForTesting

    public SmsDispatchersController mDispatchersController;

    private SmsPermissions mSmsPermissions;

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

+2 −2
Original line number Diff line number Diff line
@@ -202,9 +202,9 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
                        tracker.onSent(mContext);

                        mTrackers.remove(token);

                        mPhone.notifySmsSent(tracker.mDestAddress);

                        mSmsDispatchersController.notifySmsSentToEmergencyStateTracker(

                        mSmsDispatchersController.notifySmsSent(

                                tracker.mDestAddress, tracker.mMessageId, true,

                                tracker.isSinglePartOrLastPart());

                                tracker.isSinglePartOrLastPart(), true /*success*/);

                        break;

                    case ImsSmsImplBase.SEND_STATUS_ERROR:

                        tracker.onFailed(mContext, reason, networkReasonCode);

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

+8 −0
Original line number Diff line number Diff line
@@ -4920,6 +4920,14 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        return mDataNetworkController;

    }



    /**

     * @return The sms dispatchers controller

     */

    @Nullable

    public SmsDispatchersController getSmsDispatchersController() {

        return null;

    }



    /**

     * @return The data settings manager

     */

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

+4 −4
Original line number Diff line number Diff line
@@ -1017,8 +1017,8 @@ public abstract class SMSDispatcher extends Handler { 
     */

    protected void notifySmsSentFailedToEmergencyStateTracker(SmsTracker tracker,

            boolean isOverIms) {

        mSmsDispatchersController.notifySmsSentFailedToEmergencyStateTracker(

                tracker.mDestAddress, tracker.mMessageId, isOverIms);

        mSmsDispatchersController.notifySmsSent(tracker.mDestAddress, tracker.mMessageId,

                isOverIms, true /*isLastSmsPart*/, false /*success*/);

    }



    /**
@@ -1053,9 +1053,9 @@ public abstract class SMSDispatcher extends Handler { 
            }

            tracker.onSent(mContext);

            mPhone.notifySmsSent(tracker.mDestAddress);

            mSmsDispatchersController.notifySmsSentToEmergencyStateTracker(

            mSmsDispatchersController.notifySmsSent(

                    tracker.mDestAddress, tracker.mMessageId, false,

                    tracker.isSinglePartOrLastPart());

                    tracker.isSinglePartOrLastPart(), true /*success*/);



            mPhone.getSmsStats().onOutgoingSms(

                    tracker.mImsRetry > 0 /* isOverIms */,