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

Commit 160b523e authored by Daniel Hillenbrand's avatar Daniel Hillenbrand Committed by Gerrit Code Review
Browse files

Merge "telephony : update stk functionality for samsung phones ported from CM9" into jellybean

parents 6fd79c16 3d36548d

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -941,6 +941,9 @@ 
         applied. -->

    <bool name="config_hasRemovableLid">false</bool>



    <!-- Boolean to enable stk functionality on Samsung phones -->

    <bool name="config_samsung_stk">false</bool>



    <!-- Possible names from /devices/virtual/switch/dock for a dock device.

         Some kernels use names like CAR and DESK. -->

    <string-array translatable="false" name="config_accessoryDockNames">

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -3683,6 +3683,7 @@ 
  <java-symbol type="bool" name="config_smsSamsungCdmaAlternateMessageIDEncoding" />

  <java-symbol type="integer" name="config_deviceHardwareKeys" />

  <java-symbol type="bool" name="config_hasRemovableLid" />

  <java-symbol type="bool" name="config_samsung_stk" />



  <!-- Notification and battery light -->

  <java-symbol type="bool" name="config_intrusiveBatteryLed" />

telephony/java/com/android/internal/telephony/CommandsInterface.java

+7 −0
Original line number Diff line number Diff line
@@ -1588,4 +1588,11 @@ public interface CommandsInterface { 
     * CM-specific: Ask the RIL about the presence of back-compat flags

     */

    public boolean needsOldRilFeature(String feature);

    /**

     * @hide

     * samsung stk service implementation - set up registrant for sending

     * sms send result from modem(RIL) to catService

     */

    void setOnCatSendSmsResult(Handler h, int what, Object obj);

    void unSetOnCatSendSmsResult(Handler h);

}

telephony/java/com/android/internal/telephony/IccCard.java

+0 −5
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.internal.telephony.PhoneBase; 
import com.android.internal.telephony.CommandsInterface.RadioState;

import com.android.internal.telephony.gsm.SIMFileHandler;

import com.android.internal.telephony.gsm.SIMRecords;

import com.android.internal.telephony.cat.CatService;

import com.android.internal.telephony.cdma.CDMALTEPhone;

import com.android.internal.telephony.cdma.CdmaLteUiccFileHandler;

import com.android.internal.telephony.cdma.CdmaLteUiccRecords;
@@ -65,7 +64,6 @@ public class IccCard { 
    protected PhoneBase mPhone;

    private IccRecords mIccRecords;

    private IccFileHandler mIccFileHandler;

    private CatService mCatService;



    private RegistrantList mAbsentRegistrants = new RegistrantList();

    private RegistrantList mPinLockedRegistrants = new RegistrantList();
@@ -196,8 +194,6 @@ public class IccCard { 
            mIccRecords = is3gpp ? new SIMRecords(this, mPhone.mContext, mPhone.mCM) :

                                   new RuimRecords(this, mPhone.mContext, mPhone.mCM);

        }

        mCatService = CatService.getInstance(mPhone.mCM, mIccRecords,

                mPhone.mContext, mIccFileHandler, this);

        mPhone.mCM.registerForOffOrNotAvailable(mHandler, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);

        mPhone.mCM.registerForOn(mHandler, EVENT_RADIO_ON, null);

        mPhone.mCM.registerForIccStatusChanged(mHandler, EVENT_ICC_STATUS_CHANGED, null);
@@ -208,7 +204,6 @@ public class IccCard { 
        mPhone.mCM.unregisterForIccStatusChanged(mHandler);

        mPhone.mCM.unregisterForOffOrNotAvailable(mHandler);

        mPhone.mCM.unregisterForOn(mHandler);

        mCatService.dispose();

        mCdmaSSM.dispose(mHandler);

        mIccRecords.dispose();

        mIccFileHandler.dispose();

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

+13 −0
Original line number Diff line number Diff line
@@ -212,6 +212,19 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub { 
        return data;

    }



    /**

     * stk send sms Samsung way

     * @param smsc

     * @param pdu

     * @param sentIntent

     * @param deliveryIntent

     */

    public void sendRawPduSat(byte[] smsc, byte[] pdu, PendingIntent sentIntent,

            PendingIntent deliveryIntent) {

        mPhone.getContext();

        mDispatcher.sendRawPdu(smsc, pdu, sentIntent, deliveryIntent,"");

    }



    protected abstract void log(String msg);



}