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

Commit b5e07a56 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Fix build break."

parents 50a562c6 fa8a17ed

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

+0 −1
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ public class IccSmsInterfaceManager { 
     *  android application framework. This intent is broadcasted at

     *  the same time an SMS received from radio is acknowledged back.

     */

    @Override

    public void injectSmsPdu(byte[] pdu, String format, PendingIntent receivedIntent) {

        // TODO Check if the calling package has access to call this SIM restricted API.

        if (Rlog.isLoggable("SMS", Log.VERBOSE)) {

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

+11 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ package com.android.internal.telephony; 
import android.app.PendingIntent;

import android.os.ServiceManager;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;



import com.android.internal.telephony.ISms;

import com.android.internal.telephony.Phone;
@@ -273,6 +274,16 @@ public class UiccSmsController extends ISms.Stub { 
        return null;

    }



    @Override

    public void injectSmsPdu(byte[] pdu, String format, PendingIntent receivedIntent) {

        injectSmsPdu(SubscriptionManager.getPreferredSmsSubId(), pdu, format, receivedIntent);

    }



    // FIXME: Add injectSmsPdu to ISms.aidl

    public void injectSmsPdu(long subId, byte[] pdu, String format, PendingIntent receivedIntent) {

        getIccSmsInterfaceManager(subId).injectSmsPdu(pdu, format, receivedIntent);

    }



    /**

     * get sms interface manager object based on subscription.

     **/