Commit Graph

7231 Commits

Author SHA1 Message Date
Jordan Liu
5151b7df4e Merge "SubscriptionInfo contains int cardId" am: 97c9aba888
am: 212e2576e1

Change-Id: I5bee233bf3603a11f7da8b04a51919da838cb130
2018-12-21 14:19:19 -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
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
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
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
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
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
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
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
Josh Hou
3a71f85085 Merge "Print carrier Id information in toString()" am: 843e387bb6
am: 55b4b268f5

Change-Id: I2a9fa3332c842bda8856006c7963814838ae8544
2018-12-18 17:52:06 -08:00
Josh Hou
843e387bb6 Merge "Print carrier Id information in toString()" 2018-12-19 01:22:25 +00:00
Nathan Harold
6655dddcd5 Annotate CallbackExecutor in requestCellInfoUpdate
Add a missing annotation for CallbackExecutor in
requestCellInfoUpdate().

Bug: 120489428
Test: compilation (no functional change)
Change-Id: I33bba9eb59f81aaefa0194b58936d4f809a8d51f
2018-12-18 15:09:28 -08:00
Nathan Harold
13d6b11987 Annotate getMobileNetworkOperator() as Nullable
Add Nullable annotations for the classes that support
getMobileNetworkOperator().

Bug: 118675404
Test: compilation (no functional change)
Change-Id: I914ec8242aff2f578dfe1f97f2e7cfe2d109c7dc
2018-12-18 13:41:25 -08:00
Chen Xu
31cf647396 Merge "expose Carrier Id related APIs" am: 18b925a7af
am: 0031ae8145

Change-Id: I6e9837cffdcac094557ea99cde0736abdfff0ff9
2018-12-17 13:39:23 -08:00
Chen Xu
18b925a7af Merge "expose Carrier Id related APIs" 2018-12-17 20:56:54 +00:00
Pengquan Meng
b527f8a44c Merge "Add FrequencyRange comparator to ServiceState" am: d0c404cb21
am: 5cb84d7f23

Change-Id: I5550790e9db3604bf35d4f01b6e7fef316e3809e
2018-12-17 11:28:32 -08:00
Pengquan Meng
d0c404cb21 Merge "Add FrequencyRange comparator to ServiceState" 2018-12-17 19:07:27 +00:00
Josh Hou
619ac4fbab Print carrier Id information in toString()
Bug: 115709816
Test: Build pass
Change-Id: Idd3336c472860ad21121029abecb91aa9b8325ec
Merged-In: Idd3336c472860ad21121029abecb91aa9b8325ec
2018-12-17 07:14:26 +00:00
Jack Yu
52fdd0d508 Merge "Renamed data/net service provider onDestroy to close" am: 47d385a5b3
am: 8c539c5eee

Change-Id: If9596c83f8a5e960f4675b80ddcc1eab8f67c178
2018-12-14 15:53:13 -08:00
Pengquan Meng
424acc7f57 Add FrequencyRange comparator to ServiceState
The FrequencyRange is not comparable beucase it's an enum. This change
add a comparator to ServiceState to make the enum comparable.

Bug: 111453000
Test: atest FrameworksTelephonyTests
Merged-In: I59a595bdaf5451d2c4d95b1b5bdfefcba123fea7
Change-Id: I59a595bdaf5451d2c4d95b1b5bdfefcba123fea7
2018-12-14 14:49:18 -08:00
Meng Wang
4f7956f58c Merge "support vzw roaming default on" into pi-dev
am: 369d65b2e9

Change-Id: I056adbebe1efecb1a7d6f4fc09fbd94f1e4b52da
2018-12-14 10:45:56 -08:00
Jack Yu
cd67c02f1c Renamed data/net service provider onDestroy to close
Renamed them to avoid confusion with Android services'
onDestroy().

Test: Telephony sanity tests
Bug: 73659459
Change-Id: I05f68ced65498d6bfeb9e3c9ed3fb6164643bbaa
2018-12-14 00:22:02 -08:00
Chen Xu
f04d5a27d4 Merge "move and rename DcFailCause to DataFailCause" am: d2a163ad38
am: 49ebf0dfed

Change-Id: I725e3c5670428566373590b2c30603b0380fd3e9
2018-12-13 19:07:26 -08:00
Chen Xu
d2a163ad38 Merge "move and rename DcFailCause to DataFailCause" 2018-12-14 02:44:20 +00:00
Youming Ye
c8dad0200a Merge "Propagation of additional Ims Call Fail Causes" am: 97ee6295e9
am: 9834928c12

Change-Id: Ie3d7b237e3d7cfe2c53498807ff18bdbbfae61e9
2018-12-13 16:24:50 -08:00
Youming Ye
97ee6295e9 Merge "Propagation of additional Ims Call Fail Causes" 2018-12-13 23:47:49 +00:00
Sahin Caliskan
02278c9c53 Merge "Move RCS APIs to android.telephony.ims" am: 4929a0d782
am: 7c7dc29e8d

Change-Id: I2301681cd38c2d364c9e3a5bf94adb400065418c
2018-12-13 15:29:00 -08:00
Youming Ye
bab83ccabb Merge "Fix property setting with failure" am: da9de2d7fa
am: 58be59a233

Change-Id: Ia3994b3595d6ccd945dc9ca45f7fc4c46c12908a
2018-12-13 13:53:07 -08:00
chen xu
1afc47b154 move and rename DcFailCause to DataFailCause
Bug: 119891533
Test: Build
Change-Id: I6f0e474a9ee3f8befc8b0a221713a2080b59844c
Merged-in: I6f0e474a9ee3f8befc8b0a221713a2080b59844c
2018-12-13 12:54:38 -08:00
Sahin Caliskan
4929a0d782 Merge "Move RCS APIs to android.telephony.ims" 2018-12-13 20:48:34 +00:00