Commit Graph

2811 Commits

Author SHA1 Message Date
Jordan Liu
2869e57522 Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7 am: 649f3bf73f
am: 56ed1f9c9d

Change-Id: I039843725244d892248591cf4e88e1840e506733
2017-09-20 00:12:10 +00:00
Jordan Liu
649f3bf73f Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
am: c8ad4a82c7

Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17
2017-09-19 23:55:48 +00:00
Jordan Liu
c8ad4a82c7 Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" 2017-09-19 23:39:42 +00:00
Tyler Gunn
4714011c23 Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am: 99d28ebbda am: 8b2e421025
am: c26e534bef

Change-Id: I447794014fe74f6efb4c712808704b8b0f8bc43f
2017-09-19 16:52:09 +00:00
Tyler Gunn
8b2e421025 Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
am: 99d28ebbda

Change-Id: I99ff94901868d3b16a20a6592e106bc0645b863e
2017-09-19 16:37:38 +00:00
Tyler Gunn
99d28ebbda Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." 2017-09-19 16:28:52 +00:00
Pengquan Meng
f05a01caf3 Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac
am: b3bc234dfa

Change-Id: I5df968dbf00665d3bfdd451dc4e03fda055c371a
2017-09-19 01:38:10 +00:00
Pengquan Meng
74bd3daaac Merge "Incorrect decoding when TP-OA contains non-integer information"
am: 2bcc7fac89

Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
2017-09-19 01:23:53 +00:00
Erika Avenberg
0be6d7cbd8 Incorrect decoding when TP-OA contains non-integer information
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.

This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0

Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
 information in the semi-octets other than "1111" (e.g. 1110)
 it shall display the semi-octet as the representation given
 in GSM 44.008 [12] under "called BCD number", viz 1010="*",
 1011="#", 1100="a", 1101="b", 1110="c"."

Bug: 65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
2017-09-18 15:21:08 -07:00
Tyler Gunn
c4fd93e43b Fix ImsCallProfile parceling and add protection for invalid parcelables.
Two things:
1. The writeToParcel and readFromParcel in the ImsCallProfile never
worked; they were not parceling the Bundle properly.
2. Ensuring on writeToParcel that invalid Bundle contents are removed and
not sent across a Binder interface.

The existing Bundle.filterValues method accomplishes this by ensuring only
primitive types and android.* namespace parcelables are included in the
Bundle.  We use this to ensure that when the ImsCallProfile instances cross
the binder call boundary, package-local Parcelables don't cause the
Bundle to be invalidated when unmarshaled in a place where the
pacakge-local parcelable is not available.

Test: Manual, also wrote new unit tests
Bug: 65562929
Change-Id: Iea982d14a053414b9a4daba998c021c61902119d
2017-09-12 19:13:30 -07:00
Treehugger Robot
d217a0c5a7 Merge "Add ims registration status" 2017-09-11 19:44:31 +00:00
Ping Sun
56b0dfb38c Add ims registration status
Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 23:25:29 +00:00
Ping Sun
86bd4769fa Add ims registration status
Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 21:02:05 +00:00
Ping Sun
816f93ed9f Add ims registration status
Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 21:00:06 +00:00
Xiangyu/Malcolm Chen
647f6a7ceb Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev
am: aa4c059da1

Change-Id: Ie4484da4a56fc041d21afcc2a3ebb7a387cbd52c
2017-09-06 01:22:49 +00:00
Xiangyu/Malcolm Chen
aa4c059da1 Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev 2017-09-06 01:09:35 +00:00
Brad Ebinger
7b01ee5cda Merge "Adds ERROR state to ImsConfig"
am: 6391598412

Change-Id: I612aae570b12b1106f515d32bd8caa3843a3953e
2017-09-01 21:37:49 +00:00
Brad Ebinger
df99d59284 Adds ERROR state to ImsConfig
Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.

Bug: 64540800
Test: Manual
Merged-In: Id412c0be939da6240a66a942730fd18badabb6c6
Change-Id: I0b79837c694d245999031ec65783857e114b7c75
2017-09-01 10:16:26 -07:00
Brad Ebinger
063d5e871a Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
am: ed6e29f292

Change-Id: Id412c0be939da6240a66a942730fd18badabb6c6
2017-08-30 18:48:34 +00:00
Brad Ebinger
ed6e29f292 Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev 2017-08-30 18:31:43 +00:00
Tyler Gunn
bbe8f8fd07 Merge "Handle alternate status values." into oc-mr1-dev
am: 0240dc99db

Change-Id: Ie386bdb4c77df1305d80f604f48174794c3ee0c1
2017-08-29 22:07:41 +00:00
Malcolm Chen
b0d99e435b Add EVENT_ROAMING_SETTING_CHANGE in DctConstants.
Bug: 64746542
Test: Manual
Change-Id: I91a0cb078e40b5491085a39de7c551065c00da30
2017-08-29 20:56:58 +00:00
Brad Ebinger
27ca268756 Adds ERROR state to ImsConfig
Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.

Bug: 64540800
Test: Manual
Change-Id: I0b79837c694d245999031ec65783857e114b7c75
2017-08-29 16:29:18 +00:00
Tyler Gunn
b229ddabda Handle alternate status values.
Some carriers use sendrecv to indicate a call in a conference is active,
and sendonly to indicate that the remote party has held the call.
Adding support for these status values.

This ensures that remotely held calls for these carriers are set to held.

Test: Manual
Bug: 33272103
Change-Id: I4a950c4e143d5ac396b30569dbda0b1cf4e92a3e
2017-08-28 17:44:55 +00:00
Tyler Gunn
63769af59d Merge changes from topic 'call-session-may'
am: 21e4dbb6ed

Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
2017-08-11 18:33:44 +00:00
Tyler Gunn
21e4dbb6ed Merge changes from topic 'call-session-may'
* changes:
  Add callSessionMayHandover API to ImsCallSession.
  IMS: Support for Possible Call Session Handover
2017-08-11 18:14:02 +00:00
Brad Ebinger
44da663308 Merge "Change IMS callback AIDLs to be oneway"
am: a46600e0e7

Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
2017-08-11 00:42:30 +00:00
Treehugger Robot
a46600e0e7 Merge "Change IMS callback AIDLs to be oneway" 2017-08-11 00:31:41 +00:00
Brad Ebinger
0f4db7d193 Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.

This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.

Bug: 63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
2017-08-10 23:15:41 +00:00
Brad Ebinger
bc13df8ce8 Merge "Add method that checks the Binder status of ImsConfig"
am: 6ffc855e8d

Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
2017-08-10 23:02:56 +00:00
Brad Ebinger
6ffc855e8d Merge "Add method that checks the Binder status of ImsConfig" 2017-08-10 22:50:45 +00:00
Amit Mahajan
3d9c4fa14f Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a am: 1cdd44bd9d
am: 793c4be8d4

Change-Id: I4c7b7180fe9b56b5d7483f435a6d70530d89295f
2017-08-10 17:54:12 +00:00
Amit Mahajan
e6a10f5b6a Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019
am: e1e32370e2

Change-Id: Ice6d00e2cdfc7b3afff23b3a64d50afc85a56830
2017-08-10 17:46:01 +00:00
Amit Mahajan
793c4be8d4 Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a
am: 1cdd44bd9d

Change-Id: I8ed8d16910331f09a0e44e908e7ac89e990af141
2017-08-10 17:34:07 +00:00
Amit Mahajan
e1e32370e2 Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7
am: 1a808fc019

Change-Id: I27f67b172bd8096ee00b9c80bb9699b33eff97f7
2017-08-10 17:27:24 +00:00
Amit Mahajan
cfbd4a354a Merge "The method of parseEfSpdi does not match TS24008."
am: cd03d0db9d

Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
2017-08-10 16:12:19 +00:00
Amit Mahajan
3466cda3d7 Merge "Get isim card data use subId."
am: 854edcff16

Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
2017-08-10 16:06:36 +00:00
Amit Mahajan
cd03d0db9d Merge "The method of parseEfSpdi does not match TS24008." 2017-08-10 15:59:43 +00:00
Brad Ebinger
9cf842c531 Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.

Bug: 62723694
Test: maual, follow bug procedure
Merged-In: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
2017-08-09 16:56:42 -07:00
Chen Xu
825345628c Merge "Handle invalid destination address gracefully"
am: a753dfd2e8

Change-Id: I103f925d8008748b5cc5e15a48f0773c092e293a
2017-08-09 07:24:05 +00:00
Jack Yu
54ccaa0e99 Merge "Moved channels settings from carrier config to resources"
am: 79eddf8c0a

Change-Id: If2c2e6e1d260fae50a15c8a3aa8fba4460884ec1
2017-08-09 07:16:37 +00:00
yanxue.xu
9957f979e1 Get isim card data use subId.
Get isim card data is obtained the default card data instead of the corresponding card data.
It is necessary to obtain the card data according to the subid.
Test: Get isim card data use subId.

Change-Id: I9ad90f8180f35449879507b6f086c4be01aacc9d
2017-08-09 14:58:25 +08:00
Chen Xu
a753dfd2e8 Merge "Handle invalid destination address gracefully" 2017-08-09 01:09:42 +00:00
fionaxu
b50183d2fd Handle invalid destination address gracefully
Bug: 37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
2017-08-08 16:41:23 -07:00
Jack Yu
0fc9492176 Moved channels settings from carrier config to resources
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.

Test: Manual
bug: 31223529
Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
2017-08-08 15:34:28 -07:00
Tyler Gunn
71c29cfad9 Add callSessionMayHandover API to ImsCallSession.
This matches the new AIDL definition in the API.

Test: Manual
Bug: 62489988
Change-Id: I97ad5b5359f19d533b5b8644fd37008c0c69bf9c
2017-08-08 13:10:48 -07:00
Anju Mathapati
efed6f6bd4 IMS: Support for Possible Call Session Handover
Adding the callSessionMayHandover API that allows
for the lower layers to indicate that the call session
may handover based on actions taken by the user/UI
layer.
The API provides current and target RAT information
pertaining to the possible handover.

Bug: 62489988
Test: Manual
Change-Id: I006462ce5688bb99a94d5135574fb2c17878685a
2017-08-08 12:52:53 -07:00
fionaxu
9e3413d416 Merge "app link handling under restricted mobile data" into oc-dr1-dev am: 93bf6200eb
am: aa73a69d3a

Change-Id: Idbfec034c44a355ddcf702bbfffea8107a48f702
2017-08-08 09:08:42 +00:00
fionaxu
a40b8b7431 Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
2017-08-08 09:02:23 +00:00
TreeHugger Robot
93bf6200eb Merge "app link handling under restricted mobile data" into oc-dr1-dev 2017-08-08 08:57:16 +00:00