Nathan Harold
353d7558b9
Merge "Catch IllegalArgumentException on NetworkScan.stopScan" am: 84c2b6a843
...
am: b4b64bbbdd
2018-09-27 17:28:05 -07:00
Nathan Harold
b4b64bbbdd
Merge "Catch IllegalArgumentException on NetworkScan.stopScan"
...
am: 84c2b6a843
2018-09-27 17:13:12 -07:00
Nathan Harold
84c2b6a843
Merge "Catch IllegalArgumentException on NetworkScan.stopScan"
2018-09-27 23:55:01 +00:00
Xiangyu/Malcolm Chen
d6b4d9379e
Merge "Implement equal method in SubscriptionInfo." am: e0ae5ff8cc
...
am: 9bb8d34a9e
2018-09-27 14:17:00 -07:00
Xiangyu/Malcolm Chen
9bb8d34a9e
Merge "Implement equal method in SubscriptionInfo."
...
am: e0ae5ff8cc
2018-09-27 14:08:37 -07:00
Malcolm Chen
3c758b701c
Implement equal method in SubscriptionInfo.
...
Bug: 115541873 92796390
Test: manual with test app
Change-Id: I217f9d612df5cecac8f0359649f3e79a60a95dde
Merged-In: I217f9d612df5cecac8f0359649f3e79a60a95dde
2018-09-27 11:59:31 -07:00
Lalit Maganti
6180735106
DO NOT MERGE Revert "new System API for preferred network mode"
...
This reverts commit 8a8832fd81
2018-09-27 18:44:16 +00:00
Nathan Harold
ce40801ef5
Catch IllegalArgumentException on NetworkScan.stopScan
...
IllegalArgumentException is thrown when a terminated
scan calls stop. This change softens the exception and
error type that is logged and considers this normal.
Bug: 113823866
Test: compilation
Change-Id: I7ce60d6badfac52156cceca83b39c1afe21b4eda
2018-09-27 11:17:22 -07:00
Lalit Maganti
ce30e31664
Merge "Revert "Revert "new System API for preferred network mode""" am: c5a1a5e543
...
am: b65be923cb
2018-09-27 09:10:05 -07:00
Lalit Maganti
b65be923cb
Merge "Revert "Revert "new System API for preferred network mode"""
...
am: c5a1a5e543
2018-09-27 08:37:50 -07:00
Lalit Maganti
c5a1a5e543
Merge "Revert "Revert "new System API for preferred network mode"""
2018-09-27 15:00:12 +00:00
Lalit Maganti
70534bf1be
Revert "Revert "new System API for preferred network mode""
...
This reverts commit dada4c60d8
2018-09-27 14:57:06 +00:00
Lalit Maganti
81462faf05
Merge "Revert "new System API for preferred network mode"" am: 4106e419b2
...
am: 164774b7bb
2018-09-27 06:52:40 -07:00
Lalit Maganti
164774b7bb
Merge "Revert "new System API for preferred network mode""
...
am: 4106e419b2
2018-09-27 06:34:08 -07:00
Lalit Maganti
4106e419b2
Merge "Revert "new System API for preferred network mode""
2018-09-27 12:17:40 +00:00
Lalit Maganti
dada4c60d8
Revert "new System API for preferred network mode"
...
This reverts commit 8a8832fd81
2018-09-27 10:52:55 +00:00
Chen Xu
d2bd668324
Merge "new System API for preferred network mode" am: 314dcd2874
...
am: 4560dbd05a
2018-09-26 17:58:00 -07:00
Chen Xu
4560dbd05a
Merge "new System API for preferred network mode"
...
am: 314dcd2874
2018-09-26 17:42:58 -07:00
Chen Xu
314dcd2874
Merge "new System API for preferred network mode"
2018-09-27 00:30:29 +00:00
Tyler Gunn
546c7f8123
Merge "Cleanup deprecated or removed telephony methods." am: c4833e862e
...
am: 95981b0488
2018-09-26 15:17:39 -07:00
Tyler Gunn
95981b0488
Merge "Cleanup deprecated or removed telephony methods."
...
am: c4833e862e
2018-09-26 15:05:47 -07:00
Tyler Gunn
c4833e862e
Merge "Cleanup deprecated or removed telephony methods."
2018-09-26 21:55:36 +00:00
chen xu
8a8832fd81
new System API for preferred network mode
...
1. new System API for getPreferredNetworkType
2. new System API for preferred network mode
Bug: 115894190
Test: unit test
Change-Id: I34b060d3f915f2c74b2b9412d03f849e9d037c0b
Merged-in: Ic108c484905f80783982a22e8152609257d684b5
2018-09-26 14:49:07 -07:00
Chen Xu
dd5a4d9917
Merge "expose getAidForApptype to system API" am: 7cdc0f00eb
...
am: 5d3b3d8ac8
2018-09-26 14:48:28 -07:00
Chen Xu
5d3b3d8ac8
Merge "expose getAidForApptype to system API"
...
am: 7cdc0f00eb
2018-09-26 14:39:27 -07:00
Chen Xu
7cdc0f00eb
Merge "expose getAidForApptype to system API"
2018-09-26 21:03:26 +00:00
Shuo Qian
0e4e2ef977
Merge "Make SubscriptionManager.isActiveSubId public" am: fafc51a088
...
am: a4107d39ad
2018-09-26 11:47:00 -07:00
Shuo Qian
a4107d39ad
Merge "Make SubscriptionManager.isActiveSubId public"
...
am: fafc51a088
2018-09-26 11:35:51 -07:00
Shuo Qian
fafc51a088
Merge "Make SubscriptionManager.isActiveSubId public"
2018-09-26 18:19:52 +00:00
Hall Liu
fd56736cd4
Merge "Add intdef for Telephony network type constants" am: 544b8efa46
...
am: 89ec00b622
2018-09-25 16:39:13 -07:00
Hall Liu
89ec00b622
Merge "Add intdef for Telephony network type constants"
...
am: 544b8efa46
2018-09-25 16:20:58 -07:00
Kikkawa Shohei
db6110d9a9
Show "Call Blocking disabled" notification always when emergency call
...
am: 638d11e0bb
2018-09-25 16:03:52 -07:00
Youming Ye
b869100b2a
Merge "Show "Call Blocking disabled" notification always when emergency call"
...
am: 6fa8bcb841
2018-09-25 15:54:45 -07:00
Hall Liu
544b8efa46
Merge "Add intdef for Telephony network type constants"
2018-09-25 22:45:39 +00:00
Chen Xu
42c4682c15
Merge "expose getIsimDomain to systemAPI" am: 56d40d3c78
...
am: 2b38567586
2018-09-25 15:45:33 -07:00
Chen Xu
2b38567586
Merge "expose getIsimDomain to systemAPI"
...
am: 56d40d3c78
2018-09-25 15:34:10 -07:00
Youming Ye
6fa8bcb841
Merge "Show "Call Blocking disabled" notification always when emergency call"
2018-09-25 22:29:39 +00:00
Chen Xu
56d40d3c78
Merge "expose getIsimDomain to systemAPI"
2018-09-25 22:14:34 +00:00
Hall Liu
210a4862f6
Merge "Add the EMBMS group call API" am: 52a8fdb7bd
...
am: 6c6c859c6a
2018-09-25 14:47:25 -07:00
Hall Liu
6c6c859c6a
Merge "Add the EMBMS group call API"
...
am: 52a8fdb7bd
2018-09-25 14:22:45 -07:00
fionaxu
56dd7acda2
expose getAidForApptype to system API
...
Bug: 115891723
Test: telephony unit test
Change-Id: Ica1d6facba229781806c2c205406c658ac5ad838
2018-09-25 14:05:40 -07:00
Hall Liu
52a8fdb7bd
Merge "Add the EMBMS group call API"
2018-09-25 20:38:23 +00:00
Hall Liu
cb46f9eeba
Add intdef for Telephony network type constants
...
Change-Id: Id212f5009ff2d57344dd747c1837ad9ff1546e31
Fixes: 116592397
Test: compiles
2018-09-25 11:21:30 -07:00
Kikkawa Shohei
638d11e0bb
Show "Call Blocking disabled" notification always when emergency call
...
Currently "Call Blocking disabled" notification is shown only when any
setting of "Enhanced Blocked number" is enabled, and it's not shown even
if only "blocked number" is enabled.
This patch adds new CarrierConfig key to show "Call Blocking disabled"
notification always when "Enhanced Blocked number" is enabled and
making emergency call.
Test: manual - Verified behavior about Block numbers settings
Test: auto - Passed BlockedNumberProviderTest
Bug: 115697577
Change-Id: I2281c21992928037ea38227b7476adc76b6755e8
2018-09-25 14:18:55 +09:00
Hall Liu
a7b0c1f054
Add the EMBMS group call API
...
Add APIs for apps to access a LTE broadcast group call service provided
by a preinstalled middleware app, and add system APIs for the
preinstalled middleware app to communicate with frontend apps.
Bug: 112731375
Test: CTS
Change-Id: Ie6817cbc6c3b69de7a4d66c4cfc103b02e15ad6b
2018-09-24 17:26:25 -07:00
Tyler Gunn
2c52f8f90d
Merge "Add support for network identified emergency calls." am: 108349f8d6
...
am: 6d400c7352
2018-09-24 16:23:02 -07:00
Tyler Gunn
6d400c7352
Merge "Add support for network identified emergency calls."
...
am: 108349f8d6
2018-09-24 16:14:14 -07:00
Tyler Gunn
108349f8d6
Merge "Add support for network identified emergency calls."
2018-09-24 22:50:50 +00:00
sqian
ec149463cc
Make SubscriptionManager.isActiveSubId public
...
Rename subId to subscriptionId
Bug: 113072551
Test: Treehugger
Change-Id: I6f7e0d06a2ad2367dad04723fea808cad8f9597a
2018-09-24 12:30:10 -07:00
Tyler Gunn
98b1ba015f
Cleanup deprecated or removed telephony methods.
...
Mark previously deprecated TelephonyManager APIs as @remove; some of these
have valid public APIs; for now just calling the public APIs to give more
time for API consumers to transition over to the new methods.
Remove ITelephony AIDL calls for removed methods.
Removed ITelephony light greylist for removed methods; see bug for details.
There are public alternatives for most of the remove AIDL methods; a couple
of the subscription specific ones are not available directly but the
non-subscription specific versions should suffice.
Test: Compile/build/manual
Bug: 115776310
Change-Id: Iff4bf99b34b8e14d5a4dc1d2f4e4926880b6434c
2018-09-24 18:02:44 +00:00
