Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set mOriginatingAddress and mRecipientAddress separately"

Browse Source 
am: 44ea78d8ff

Change-Id: Ieb3e2b98cc61fef472fe471ae05bf9db7a9b66ed
This commit is contained in:
Amit Mahajan
2019-06-21 16:39:09 -07:00
committed by android-build-merger
parent 70ad27cfb5 44ea78d8ff
commit ab90035993
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/com/android/internal/telephony/cdma/SmsEnvelope.java
View File

@@ -96,6 +96,12 @@ public final class SmsEnvelope {
*/
public CdmaSmsSubaddress origSubaddress;
/**
* The destination subaddress identifies the target of the SMS message.
* (See 3GPP2 C.S0015-B, v2, 3.4.3.4)
*/
public CdmaSmsSubaddress destSubaddress;
/**
* The 6-bit bearer reply parameter is used to request the return of a
* SMS Acknowledge Message.

21
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
View File

@@ -615,10 +615,11 @@ public class SmsMessage extends SmsMessageBase {
}
addr.origBytes = data;
Rlog.pii(LOG_TAG, "Addr=" + addr.toString());
mOriginatingAddress = addr;
if (parameterId == DESTINATION_ADDRESS) {
// Original address awlays indicates one sender's address for 3GPP2
// Here add recipient address support along with 3GPP
if (parameterId == ORIGINATING_ADDRESS) {
env.origAddress = addr;
mOriginatingAddress = addr;
} else {
env.destAddress = addr;
mRecipientAddress = addr;
}
break;
@@ -636,6 +637,11 @@ public class SmsMessage extends SmsMessageBase {
subdata[index] = convertDtmfToAscii(b);
}
subAddr.origBytes = subdata;
if (parameterId == ORIGINATING_SUB_ADDRESS) {
env.origSubaddress = subAddr;
} else {
env.destSubaddress = subAddr;
}
break;
case BEARER_REPLY_OPTION:
dis.read(parameterData, 0, parameterLen);
@@ -665,9 +671,6 @@ public class SmsMessage extends SmsMessageBase {
}
// link the filled objects to this SMS
mOriginatingAddress = addr;
env.origAddress = addr;
env.origSubaddress = subAddr;
mEnvelope = env;
mPdu = pdu;
@@ -706,12 +709,12 @@ public class SmsMessage extends SmsMessageBase {
if (mOriginatingAddress != null) {
decodeSmsDisplayAddress(mOriginatingAddress);
if (VDBG) Rlog.v(LOG_TAG, "SMS originating address: "
+ mOriginatingAddress.address);
if (VDBG) Rlog.v(LOG_TAG, "SMS originating address: " + mOriginatingAddress.address);
}
if (mRecipientAddress != null) {
decodeSmsDisplayAddress(mRecipientAddress);
if (VDBG) Rlog.v(LOG_TAG, "SMS destination address: " + mRecipientAddress.address);
}
if (mBearerData.msgCenterTimeStamp != null) {