Commit Graph

2792 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
TreeHugger Robot
93bf6200eb Merge "app link handling under restricted mobile data" into oc-dr1-dev 2017-08-08 08:57:16 +00:00
fionaxu
d60a9d0e58 app link handling under restricted mobile data
1. new actions to allow default carrier app dynamically enable/disable
app-link filtering
2. new intent to notify registered carrier apps of other default
networks
3. signal-to-actions config to sepcify carrier actions on default
network change
default network available -> disable intent filter for app-link
defaut network lost -> enable intent filter for app-link
4. new carrier actions to allow carrier apps to register/unregister
other network status dynmacially

Bug: 62487488
Test: Manual
Change-Id: Ie9fa9f3f4ca38f9f26a90a3dbf95f7f20a8ad773
2017-08-04 18:13:12 -07:00
Jonathan Basseri
6442cc90b5 Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Merged-In: I64f31d111213281edeaeda6a09b163b860261b2d
Change-Id: I541b445b410329798acdaaaccc50955cd1574ae2
2017-08-04 16:53:03 -07:00
Jonathan Basseri
7728849a39 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am: 85a215bae7

Change-Id: I30dddd90e5984519219865752f563a45962be593
2017-08-02 01:58:18 +00:00
Jonathan Basseri
379128e5c2 Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit 6f4657363c.

Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
2017-08-02 01:10:47 +00:00
Jonathan Basseri
02cc8151a6 Merge "Move getNetworkCountryIso impl from TM to PIM."
am: 58bbef15d8

Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
2017-08-01 22:34:44 +00:00
Jonathan Basseri
6f4657363c Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
2017-08-01 22:24:05 +00:00
Brad Ebinger
14c4f3db48 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
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
2017-07-27 12:57:03 -07:00
Derek Tan
f1328fee0d Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev 2017-07-07 23:12:44 +00:00
kun.tang
8cd6dad005 The method of parseEfSpdi does not match TS24008.
Accordding to TS51101 and TS31102, Each PLMN is coded as follows:
Mobile Country Code (MCC) followed by the Mobile Network Code (MNC) according to 3GPP TS 24.008
Test: Boot phone and check log, wether parseEfSpdi works fine.

Change-Id: Iada3f25287e586ddb518a2916009f535011a8ab5
2017-07-04 17:33:52 +08:00
Derek Tan
cda9a836a9 Prevent any app except LPA to create logical channel to AID of ISD-R.
Bug: 33077154
Test: manual verification using LPA and Tycho.

Change-Id: I4ef85529d0f63d46849d5afe76df90a27171e7db
2017-06-27 15:03:51 -07:00
Jeff Davidson
7b69a86b02 Add EuiccManager#retainSubscriptionsOnFactoryReset API.
By default, all subscriptions are wiped on first boot after a factory
reset. This ensures that if data is wiped outside of userspace (e.g.
in fastboot/recovery), the profiles are wiped, as there's no way to
offer this option to users in those modes - the radio isn't available
for us to access the eUICC.

This API provides a way to bypass this wipe if the user opts to retain
the policies for a wipe done from userspace (e.g. by unchecking the
"Wipe eUICC" checkbox in platform settings before wiping). We tell the
LPA to note this and skip the wipe on the ensuing factory reset.

Change-Id: I2fe472417497e28b043841a5aa2dc9efa45ebbff
Test: TreeHugger
Fixes: 62681577
2017-06-27 09:23:07 -07:00
TreeHugger Robot
776220d029 Merge "Pass calling package to resolution UI." into oc-dr1-dev 2017-06-27 00:48:39 +00:00
Ying Xu
231e291b06 Merge "Fix the inconsistency of scan status." into oc-dr1-dev 2017-06-26 23:10:00 +00:00
Ying Xu
e30cfbea60 Merge "Fix the inconsistency of scan status." am: 41be35a1bd
am: ac2d00a195

Change-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a
2017-06-26 17:27:21 +00:00
Jack Yu
5af2d63721 Merge "Refactored area update info support" into oc-dr1-dev 2017-06-23 23:13:58 +00:00
yinxu
548475c58d Fix the inconsistency of scan status.
In types.hal and ril.h, the scan status is defined as:
    PARTIAL = 0x01
    COMPLETE = 0x02

But in NetworkScanResult.java, the scan status is defined as:
    public static final int SCAN_STATUS_PARTIAL = 0
    public static final int SCAN_STATUS_COMPLETE = 1

This CL makes changes to NetworkScanResult.java so that the scan status
is consistent both in Telephony and RIL.

Cherry-picked cleanly from:
https://android-review.googlesource.com/#/c/422183/

Test: Telephony sanity tests
Bug: 30954762

Merged-in: Iadcd344ad3fe682da98a1a41c2964583f67dc792
Change-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792
(cherry picked from commit ad50361ece)
2017-06-23 15:39:13 -07:00