Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
388,321 Commits 3 Branches 0 Tags
e42a94ea3e65d6ad71bbf5ff59ae67e80b0c9f21
Commit Graph

4296 Commits

Author SHA1 Message Date
SongFerng Wang
e42a94ea3e Merge "add four new carrier configs for supplementary service precautions." 2018-10-08 06:28:43 +00:00
Sooraj Sasindran
e9bcb328bd Merge "Rename ANAS to ANS" 2018-10-06 03:41:26 +00:00
Hall Liu
50600fcc61 Merge "Wire up the stopRtt API" am: 2d82493ded am: c7d6900e49 
am: 41535c78be

Change-Id: Ia5e8888fbdff213167f031d221f301d5c4659cfc
 2018-10-05 18:32:14 -07:00
Hall Liu
41535c78be Merge "Wire up the stopRtt API" am: 2d82493ded 
am: c7d6900e49

Change-Id: I76eb7a9ac0c89b962241e4787a6306ad65e37792
 2018-10-05 18:19:54 -07:00
Hall Liu
c7d6900e49 Merge "Wire up the stopRtt API" 
am: 2d82493ded

Change-Id: I720ec95129c7da6b0fbd802522f6b85f54de2f7b
 2018-10-05 18:08:28 -07:00
Hall Liu
2d82493ded Merge "Wire up the stopRtt API" 2018-10-06 00:49:14 +00:00
Pengquan Meng
4ddb43ddf1 Merge "Fix incorrect API comments of getSubId()" am: 66a0899785 
am: 5a75425936

Change-Id: I85a566c0eb25c73237c31b1f89975ed898a4f829
 2018-10-05 17:46:38 -07:00
Pengquan Meng
5a75425936 Merge "Fix incorrect API comments of getSubId()" 
am: 66a0899785

Change-Id: Ia4f100021e33aac65208eb2ef4c15ca0f1b7d5c4
 2018-10-05 17:35:11 -07:00
Pengquan Meng
66a0899785 Merge "Fix incorrect API comments of getSubId()" 2018-10-06 00:13:01 +00:00
Shuo Qian
bc905712fc Merge "Add Parcelable EmergencyNumber and APIs" am: 379ca95c89 am: e414f5ed16 
am: ffdf4d26ec

Change-Id: I4106b0a3e519c2a89db29196edfe05a6a515125d
 2018-10-05 16:22:13 -07:00
Shuo Qian
ffdf4d26ec Merge "Add Parcelable EmergencyNumber and APIs" am: 379ca95c89 
am: e414f5ed16

Change-Id: Ic3f48cc3df90edde8c5ed1941a4e5a6f4e7ab572
 2018-10-05 16:08:31 -07:00
Shuo Qian
e414f5ed16 Merge "Add Parcelable EmergencyNumber and APIs" 
am: 379ca95c89

Change-Id: I03c07a695d03409e6be4f5a98f37d4191bdc5dd1
 2018-10-05 15:51:38 -07:00
Shuo Qian
379ca95c89 Merge "Add Parcelable EmergencyNumber and APIs" 2018-10-05 22:29:36 +00:00
Pengquan Meng
4e2678d184 Fix incorrect API comments of getSubId() 
getSubid() return the SubscriptionManager#getDefaultSubscriptionId()
when TelephonyManager created without the subId.

Bug: 111453847
Test: Build
Merged-In: I8e38ef43b5f23bbedc4d584df78c12f250b88fcc
Change-Id: I8e38ef43b5f23bbedc4d584df78c12f250b88fcc
 2018-10-05 14:25:52 -07:00
Pengquan Meng
030a248749 Merge "Fix incorrect API comments of getSubId()" 2018-10-05 21:20:41 +00:00
Tyler Gunn
de3dd49761 Merge "Add finer grained call fail reasons." am: 5d0d0edc22 am: 46f1dfdf2d 
am: 62077422bb

Change-Id: Iacefb95808a99bd3a9a2f59f3201e6d8b73498a5
 2018-10-05 14:17:44 -07:00
Tyler Gunn
62077422bb Merge "Add finer grained call fail reasons." am: 5d0d0edc22 
am: 46f1dfdf2d

Change-Id: Ifca132fd271c311937f60bb6501d9d1f6de796bd
 2018-10-05 14:01:31 -07:00
Tyler Gunn
46f1dfdf2d Merge "Add finer grained call fail reasons." 
am: 5d0d0edc22

Change-Id: I06cda0a862459e0c805039f7cc6f1b70337f40de
 2018-10-05 13:49:31 -07:00
Tyler Gunn
5d0d0edc22 Merge "Add finer grained call fail reasons." 2018-10-05 20:35:55 +00:00
SongFerngWang
165d2d2f0c add four new carrier configs for supplementary service precautions. 
The carrier configs control the supplementary service precautions for
call forwarding ,call barring ,caller id ,and call waiting .

Bug: 80404623
Test: Build pass

Change-Id: I5fbe9734dbb092b25fd145344c7559d2dee79df2
 2018-10-06 00:39:37 +08:00
Pengquan Meng
ec70b5737f Fix incorrect API comments of getSubId() 
getSubid() return the SubscriptionManager#getDefaultSubscriptionId()
when TelephonyManager created without the subId.

Bug: 111453847
Test: Build
Change-Id: I8e38ef43b5f23bbedc4d584df78c12f250b88fcc
 2018-10-04 22:50:20 -07:00
sqian
ff1dc37540 Add Parcelable EmergencyNumber and APIs 
Test: unit test
Bug: 112657134
Change-Id: If926291e3f6fb6d2a3acd3d28d2ead85fbf01364
 2018-10-04 17:07:57 -07:00
Cassie Han
5d82f62bdb Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" am: 56dedc8fe8 
am: 086476e72e

Change-Id: I12868c85b5645b84097566a936d7692ddb6fdcb7
 2018-10-04 14:01:08 -07:00
Cassie Han
086476e72e Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" 
am: 56dedc8fe8

Change-Id: I5be733e8edf4a07840b1d87ab295be606fbbadbb
 2018-10-04 13:51:56 -07:00
Cassie Han
56dedc8fe8 Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" 2018-10-04 20:35:07 +00:00
Cassie
5d2b861509 Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting' 
Bug: 116363528
Test: Maunal test
Change-Id: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
Merged-In: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
 2018-10-04 20:31:05 +00:00
Pengquan Meng
a7ea740f3a Merge "Add isManualNetworkSelectionAllowed api to telephonyManager" 2018-10-04 18:12:08 +00:00
TreeHugger Robot
e01c5446d1 Merge "Fix getApnTypesBitmaskFromString in ApnSetting" 2018-10-04 16:42:45 +00:00
Tyler Gunn
a63836eb9e Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." am: 440158df4f am: ca239d77d6 
am: b2af2d531a

Change-Id: Id829ee7236120b0d0ada8bd698c9d68c6333485b
 2018-10-04 09:12:00 -07:00
Tyler Gunn
b2af2d531a Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." am: 440158df4f 
am: ca239d77d6

Change-Id: I6edd5403d90b0a3f7779026480835175693a2228
 2018-10-04 08:56:55 -07:00
Tyler Gunn
ca239d77d6 Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." 
am: 440158df4f

Change-Id: I73172c9f46aefe6382806ce30552a9498ebb7868
 2018-10-04 08:39:53 -07:00
Tyler Gunn
440158df4f Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." 2018-10-04 15:21:51 +00:00
clownshen
6400b9311d New carrier config enhanced_4g_lte_title_variant_int 
Carriers requires that changing the title as "4G Calling" for Enhanced 4G LTE
Mode settings.
Using int as index of string array would more flexible for different carriers

Bug: 112676117
Test: Manual test, setting config to 0, 1 or -1 to change the index for
verifying different variant title of Enhanced 4G LTE Mode settings.

Change-Id: Iaf81b5418c02a972981bd7e84a9db8922a5e1774
(cherry picked from commit efc342bfc3)
 2018-10-04 04:59:41 +00:00
Clown SHEN
a66bd3992d Merge "New carrier config enhanced_4g_lte_title_variant_int" 
am: 1bab71e0c4

Change-Id: Ib87178956277f6ec0be1e8b66370c4ceee8d5dff
 2018-10-03 17:27:37 -07:00
Clown SHEN
1bab71e0c4 Merge "New carrier config enhanced_4g_lte_title_variant_int" 2018-10-04 00:07:19 +00:00
Jack Yu
c79b4690dc Merge "Renamed get network registration states API" am: 2966539634 am: 70015f07b9 
am: 0ab35f0ffc

Change-Id: If81b411d72f69cf6e1381fb1a0ecf1e84fd05aec
 2018-10-03 15:35:58 -07:00
Jack Yu
0ab35f0ffc Merge "Renamed get network registration states API" am: 2966539634 
am: 70015f07b9

Change-Id: I5d8298f0fec6f06d7a45502eaf62b3984b856420
 2018-10-03 15:18:22 -07:00
Pengquan Meng
2f2ceb7efd Add isManualNetworkSelectionAllowed api to telephonyManager 
Bug: 111453847
Test: build
Change-Id: Icdd60ab03fee4b2e7a08dda3c5c127a19ecac7ce
 2018-10-03 22:17:32 +00:00
Jack Yu
70015f07b9 Merge "Renamed get network registration states API" 
am: 2966539634

Change-Id: I0d406759e0649ba03392497b6757fba6aeebcff2
 2018-10-03 15:05:59 -07:00
Jack Yu
2966539634 Merge "Renamed get network registration states API" 2018-10-03 21:35:57 +00:00
Youming Ye
a7597c6173 Merge "Fix ImsManager callback called once registered" am: 4fb756984d am: b245fc9f1d 
am: 4d1df38683

Change-Id: I7dd888864b82e4f4f79a561d777185a16bf0b610
 2018-10-03 13:59:50 -07:00
Youming Ye
4d1df38683 Merge "Fix ImsManager callback called once registered" am: 4fb756984d 
am: b245fc9f1d

Change-Id: I4c2b70f9faf61a9cd6863a8ab71222dd15738d1a
 2018-10-03 13:45:07 -07:00
Youming Ye
b245fc9f1d Merge "Fix ImsManager callback called once registered" 
am: 4fb756984d

Change-Id: I65ebd913f108022061511a625c9da38b4cf4cd58
 2018-10-03 13:29:32 -07:00
Youming Ye
4fb756984d Merge "Fix ImsManager callback called once registered" 2018-10-03 20:15:35 +00:00
Sooraj Sasindran
15d5bf1ed6 Rename ANAS to ANS 
Rename ANAS to ANS

Bug: 117156243
Test: verified using developer options to enable and disable
Change-Id: I7fe454a5a0eee339461db064c683972846e11cc5
 2018-10-03 10:09:02 -07:00
Nathan Harold
8a376e5c45 Merge "Use SDK Constant for NeighboringCellInfo Docstring" am: d264669c7c am: 2bd1b867fd 
am: 26d444ad37

Change-Id: I8c89863797a50d7e2f3f9b958b8bb3bef2b0213f
 2018-10-02 20:43:49 -07:00
Nathan Harold
26d444ad37 Merge "Use SDK Constant for NeighboringCellInfo Docstring" am: d264669c7c 
am: 2bd1b867fd

Change-Id: Ic065be4595472c31b6a9460a30522c2b43d1a32f
 2018-10-02 20:20:01 -07:00
Nathan Harold
2bd1b867fd Merge "Use SDK Constant for NeighboringCellInfo Docstring" 
am: d264669c7c

Change-Id: Ic9c21bcbc51e942432aaf64f1ce1d9089de6bdd0
 2018-10-02 19:37:04 -07:00
Jack Yu
735381e5e5 Merge "Merge "Reworked getNetworkRegistrationStates API" am: f2e9856f49 am: 2835cb7d87" into pi-dev-plus-aosp 
am: 17961fb01b

Change-Id: I9fe0fb6e24922130b8e161cd9a332583883b8f02
 2018-10-02 18:53:04 -07:00
Nathan Harold
d264669c7c Merge "Use SDK Constant for NeighboringCellInfo Docstring" 2018-10-03 01:21:17 +00:00