Commit Graph

7794 Commits

Author SHA1 Message Date
Pengquan Meng
41ed670552 Merge "Add NR to preferred network type combination" 2018-12-22 04:48:40 +00:00
Nathan Harold
bc18834f9e Merge "Refactor SignalStrength" am: 0f1bf44c99 am: 77a7e552e6
am: b7d3f47536

Change-Id: Ic6f24455d20452d192302c13f766012bd4e2c70a
2018-12-21 17:17:18 -08:00
Nathan Harold
b7d3f47536 Merge "Refactor SignalStrength" am: 0f1bf44c99
am: 77a7e552e6

Change-Id: If6529167138e2d7521179a6b26389752dde6fe45
2018-12-21 17:04:24 -08:00
Nathan Harold
0f1bf44c99 Merge "Refactor SignalStrength" 2018-12-22 00:38:05 +00:00
Jordan Liu
5151b7df4e Merge "SubscriptionInfo contains int cardId" am: 97c9aba888
am: 212e2576e1

Change-Id: I5bee233bf3603a11f7da8b04a51919da838cb130
2018-12-21 14:19:19 -08:00
Pengquan Meng
8bcdc4cf66 Add NR to preferred network type combination
This add NR 5G to preferred network type and move preferredNetworkMode
from SystemApi to hidden api as we are not going to support
preferredNetworMode enum in the future.

Bug: 111453000
Test: build
Change-Id: I08a8f7bf44a62ef109583b82b22f65fd6f89c71d
2018-12-21 13:55:31 -08:00
Jordan Liu
97c9aba888 Merge "SubscriptionInfo contains int cardId" 2018-12-21 21:55:07 +00:00
Chen Xu
8229f4c5f8 Merge "new SystemAPI for preciseCallState and DisconnectCause" am: 6eacd30e8f
am: f034647231

Change-Id: I2320bd6f4b85ef55a2fe3b7c865ffde67d71d415
2018-12-20 20:19:15 -08:00
Chen Xu
6eacd30e8f Merge "new SystemAPI for preciseCallState and DisconnectCause" 2018-12-21 03:52:16 +00:00
Jack Yu
dba27b47b1 Merge "Moved data settings to phone" am: 9ceab92e6e
am: 95712322df

Change-Id: I74687df8a95bff2dfb355e215ff28b04f77ead5e
2018-12-20 19:12:00 -08:00
Calvin Pan
5f5461ad1a Merge "Public SIM_APN_URI uri and deprecated mcc, mnc, mvno_type, mvno_data" am: d839b0d384 am: faf8c714b7
am: b000ae8707

Change-Id: I0fe486b37521df918120cca1233d299ec68ce84b
2018-12-20 18:33:19 -08:00
Jack Yu
9ceab92e6e Merge "Moved data settings to phone" 2018-12-21 02:29:43 +00:00
Calvin Pan
b000ae8707 Merge "Public SIM_APN_URI uri and deprecated mcc, mnc, mvno_type, mvno_data" am: d839b0d384
am: faf8c714b7

Change-Id: I8e043242130824f6702b765cae8596c0b431d06d
2018-12-20 18:21:00 -08:00
Calvin Pan
d839b0d384 Merge "Public SIM_APN_URI uri and deprecated mcc, mnc, mvno_type, mvno_data" 2018-12-21 01:31:44 +00:00
Xiangyu/Malcolm Chen
fdae9d3f01 Merge "Add APIs to indicate which subscriptions should be hidden from user" am: 00baab3d29
am: 477d3989d3

Change-Id: I159f2fa823f93ba8540dfa8ef5367b7b813cfee1
2018-12-20 17:12:31 -08:00
Xiangyu/Malcolm Chen
e5af4b656e Merge changes from topic "118349116" am: 90f496b14c
am: 14823f0ced

Change-Id: I35bf3e4ca0b829f7bced78924036054b8c170f43
2018-12-20 16:58:32 -08:00
Malcolm Chen
71f85f597f Add APIs to remove sub from a group and get subs in the same gorup. am: be9240bcf0
am: 7e1f24c626

Change-Id: I0802842535ffd512efbe99e968d44fab1725c8d1
2018-12-20 16:52:54 -08:00
Malcolm Chen
7e1f24c626 Add APIs to remove sub from a group and get subs in the same gorup.
am: be9240bcf0

Change-Id: If82ec04193b9288ff56ac1850899beadaf392d48
2018-12-20 16:29:58 -08:00
TreeHugger Robot
9d4d53746f Merge "Add systemApi for Activation type & selection profile action" 2018-12-21 00:14:48 +00:00
Xiangyu/Malcolm Chen
00baab3d29 Merge "Add APIs to indicate which subscriptions should be hidden from user" 2018-12-21 00:05:17 +00:00
Xiangyu/Malcolm Chen
90f496b14c Merge changes from topic "118349116"
* changes:
  Fix broken building offline-sdk-docs.
  Add APIs to remove sub from a group and get subs in the same gorup.
2018-12-21 00:04:57 +00:00
Jack Yu
5bf83d8e24 Moved data settings to phone
Since there are multiple DcTrackers, but we only have
one set of data settings. So we need to move them from
DcTracker to Phone.

Test: Telephony sanity tests + unit tests
Bug: 73659459

Merged-In: Ica24b708beb63156937e88198a4c915485771b0a
Change-Id: Ica24b708beb63156937e88198a4c915485771b0a
(cherry picked from commit 335860e44f)
2018-12-20 15:25:21 -08:00
Nathan Harold
f23153f166 Refactor SignalStrength
Refactor SignalStrength as a container of
individual CellSignalStrength objects for each
radio technology.

-Change SignalStrength to contain CellSignalStrength
 rather than individual measurements.
-Change the constructors for SignalStrength to take
 CellSignalStrength objects.
-Consolidate all the logic for calculating the getLevel()
 function to CellSignalStrength.
-Store the level value in SignalStrengths rather than
 compute it on the fly when needed.
-Add a few missing functions needed by SignalStrength:
     -CellSignalStrengthCdma#getEvdoAsuLevel()
     -CellSignalStrengthTdscdma#getRscp()
-Convert CellSignalStrength classes to take actual values
 instead of ASU values.

Bug: 25984037
Test: atest SignalStrengthTest
Change-Id: I302e7a8c6f68559dc69a3138061eec739ee7561f
2018-12-20 13:53:43 -08:00
Jiuyu Sun
023dfa28b2 Merge "Support profile policy rule as a resolvable error." 2018-12-20 21:47:44 +00:00
Xiangyu/Malcolm Chen
264901e694 Merge "Remove mistake of calling iSub twice in getSelectableSubscriptionInfoList" 2018-12-20 19:49:55 +00:00
Qingxi Li
f697be5eca Add systemApi for Activation type & selection profile action
Bug: 119315548
Test: TreeHugger
Change-Id: Ib237918928c0fefbbcc21eeb5f34a85fbfc2a344
2018-12-20 11:37:29 -08:00
chen xu
970d77913b new SystemAPI for preciseCallState and DisconnectCause
1. decouple disconnectCause and preciseDisconnectCuase from
 preciseCallState.
 2. expose preciseCallState to SystemAPI and expose
onPreciseCallStateChanged to System API
3. remove/hide ImsReasonInfo from PreciseDisconnectCuase
4. expose DiconnectCuase and PreciseDisconnectCause to System API
5. new onDisconnectCauseChanged API on PhoneStateListener for CS call
 and use ImsCallSessionListener for IMS call(imsreasonInfo)
6. add read_precise_phone_state to shell apk to enable GTS test

Bug: 119890559
Test: atest GtsGmscoreHostTestCases:TelephonyHostTest#testPhoneStateListener
Change-Id: If9256feff16b6bcaef1dfe194c2b0df2a48436b0
(cherry picked from commit 6a942d488a)
Merged-in: If9256feff16b6bcaef1dfe194c2b0df2a48436b0
2018-12-20 18:41:11 +00:00
Michael Groover
71654bbda4 Merge "Enable device identifier check for non-priv apps" 2018-12-20 15:27:55 +00:00
Chen Xu
9a8b822096 Merge "refactor dataFailCause" am: 9371864133
am: ab7ada8060

Change-Id: I33f628f04da1402fe402c5234a78d4cf9d436d00
2018-12-19 23:26:59 -08:00
calvinpan
5e27237f59 Public SIM_APN_URI uri and deprecated mcc, mnc, mvno_type, mvno_data
Deprecated legacy mno and mvno columns to support carrier id and public
the SIM_APN_URI to provide app more simplier query current SIM's APN.

Bug: 120031619
Test: Build pass.
Change-Id: Ie06dfc55248b871c45ff3274de17d6eafd82d846
2018-12-20 15:16:23 +08:00
chen xu
5e499effba refactor dataFailCause
1. add comments for each data fail cause.
2. refactor dataFailCause from enum to int

Bug: 119891533
Test: Build & unit test
Change-Id: Ic453f80a3d0ccd22c6c4c1f4b2c90e2bf40cfbe1
(cherry picked from commit 3016167192)
Merged-in: Ic453f80a3d0ccd22c6c4c1f4b2c90e2bf40cfbe1
2018-12-19 21:59:50 -08:00
Malcolm Chen
0db9aa1693 Add APIs to indicate which subscriptions should be hidden from user
Bug: 120573892
Test: manual
Change-Id: I46b20241b71fef2938d7340fcf0b02173d83ed87
Merged-In: I46b20241b71fef2938d7340fcf0b02173d83ed87
2018-12-19 19:18:55 -08:00
Malcolm Chen
18350e409e Fix broken building offline-sdk-docs.
TelephonyManager#hasCarrierPrivileges(int) is hidden API so it
shouldn't be referenced in public API descriptions.

Bug: 120622105
Test: none
Change-Id: Ia6b6ec2c16b824b8eb092920089cb77cdc54bfb7
Merged-In: Ia6b6ec2c16b824b8eb092920089cb77cdc54bfb7
2018-12-19 19:17:30 -08:00
Malcolm Chen
be9240bcf0 Add APIs to remove sub from a group and get subs in the same gorup.
Add APIs in SubscriptionController so that caller with permissions
can remove subscriptions from a group or get all subscriptions with
the same group.

Bug: 118349116
Test: unittest
Change-Id: Iba4d31b437b372b3f41a6ed23f03b96a685a324c
Merged-In: Iba4d31b437b372b3f41a6ed23f03b96a685a324c
2018-12-19 19:02:12 -08:00
Pengquan Meng
aa63821b54 Merge "Add get/set PreferredNetworkTypeBitmap" 2018-12-20 01:46:59 +00:00
Chen Xu
7178101645 Merge "refactor dataFailCause" 2018-12-20 01:26:21 +00:00
Sooraj Sasindran
a65ba74e84 Merge "Define entry and exit threshold for opportunistic" 2018-12-20 00:11:30 +00:00
Malcolm Chen
f6169a0996 Remove mistake of calling iSub twice in getSelectableSubscriptionInfoList
Don't call getAvailableSubscriptionInfoList twice in
getSelectableSubscriptionInfoList.

Test: build
Change-Id: Ie5821b1d8a01834228401ce6bb1e9ae251168760
2018-12-19 15:56:13 -08:00
Jordan Liu
bd00ed6978 SubscriptionInfo contains int cardId
We rename the old "String cardId" field to "String cardString". The new
int cardId refers to the publically exposed cardId.

Also deprecate the few-arg constructor. Its okay to use in existing
cases which don't care about the extra arguments (certain tests and
transient SubscriptionInfo objects which aren't really used) but should
not be used in general.

Bug: 80097562
Test: manual
Change-Id: I92264b95da64be77367e869f774bc65f8934fd32
Merged-In: I92264b95da64be77367e869f774bc65f8934fd32
2018-12-19 15:27:06 -08:00
Holly Jiuyu Sun
881fe4c820 Support profile policy rule as a resolvable error.
Resolvable errors in the download step are present in a bit map and
returned to the calling app. The calling app can resolve all the
resolvable errors at one time.
Also pass cardId around for future use.

Bug: 68941776
Test: test on phone
Change-Id: I37a365bce2eb183161a2649ca8098504b6ed2370
2018-12-19 12:18:37 -08:00
chen xu
3016167192 refactor dataFailCause
1. add comments for each data fail cause.
2. refactor dataFailCause from enum to int

Bug: 119891533
Test: Build & unit test
Change-Id: Ic453f80a3d0ccd22c6c4c1f4b2c90e2bf40cfbe1
2018-12-19 11:59:42 -08:00
Pengquan Meng
6d8e76f08a Add get/set PreferredNetworkTypeBitmap
Bug: 111453000
Test: build
Change-Id: Icbd3b2108ce8eb75e863dcf38fb8249c1e37ea91
2018-12-19 11:42:41 -08:00
Nathan Harold
275352a965 Merge "Annotate getMobileNetworkOperator() as Nullable" am: 795641f25e am: bef297206b
am: 8ef57c30f8

Change-Id: I8c10f9dd89d0f3e27cc0f99f8dc7739c16dadf85
2018-12-19 11:42:39 -08:00
Nathan Harold
8ef57c30f8 Merge "Annotate getMobileNetworkOperator() as Nullable" am: 795641f25e
am: bef297206b

Change-Id: I92f7ea6f56a62ff167a1a8710d42639a598a2bd2
2018-12-19 11:24:45 -08:00
Nathan Harold
ca4a17063f Merge "Annotate CallbackExecutor in requestCellInfoUpdate" am: ff9932a7aa am: 0e4586f47b
am: a6d51ea03e

Change-Id: Iedb4ae4bcaf89a09d1886bda5b971fbfd2e36ea5
2018-12-19 11:05:16 -08:00
Nathan Harold
795641f25e Merge "Annotate getMobileNetworkOperator() as Nullable" 2018-12-19 18:49:56 +00:00
Nathan Harold
a6d51ea03e Merge "Annotate CallbackExecutor in requestCellInfoUpdate" am: ff9932a7aa
am: 0e4586f47b

Change-Id: I0dfa32f5b988a55d01bda9295efab5ba27fbc0f6
2018-12-19 10:48:23 -08:00
Chen Xu
eb04d15cd8 Merge "add carrierid in subscriptionInfo" am: dcab1747cf
am: 0ee1e893ac

Change-Id: Ic0cbe9fd707d48d62b40ea6a03bcc55cd507ee71
2018-12-19 10:34:28 -08:00
Nathan Harold
ff9932a7aa Merge "Annotate CallbackExecutor in requestCellInfoUpdate" 2018-12-19 18:26:37 +00:00
chen xu
64e81db02f add carrierid in subscriptionInfo
add carrierid in subscritionInfo so that apps can get
subId, carrierid and other sim related info from a single call

Bug: 119676543
Test: gts SubscriptionInfoTest
Change-Id: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
(cherry picked from commit 0034bb393c)
Merged-in: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
2018-12-18 23:21:57 -08:00