Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
377,553 Commits 3 Branches 0 Tags
6ac4e148ec1f75e0435be57d0da2f1be18fbf505
Commit Graph

4023 Commits

Author SHA1 Message Date
Meng Wang
21c65aa9c4 Merge "DO NOT MERGE New carrier config enhanced_4g_lte_title_variant_int" into pi-dev 
am: 48186ba033

Change-Id: Ia2f1f8312744c4018194f1a96d237ee0ab2a5510
 2018-09-30 22:06:32 -07:00
Hall Liu
1ae2d86ccc Merge "Add config to only allow auto select of networks" am: e6607763b2 
am: 8d6bfa60c8

Change-Id: I6b6dfca6b33cf4ed33cb749636d5bd233e29f9c5
 2018-09-28 17:40:23 -07:00
Hall Liu
8d6bfa60c8 Merge "Add config to only allow auto select of networks" 
am: e6607763b2

Change-Id: Ibeb3c0d6f5fe54298a44a6a618e103aa710999d6
 2018-09-28 16:39:43 -07:00
Hall Liu
e6607763b2 Merge "Add config to only allow auto select of networks" 2018-09-28 23:15:03 +00:00
Nathan Harold
473c9609a9 Merge "Remove getNeighboringCell API" am: e164be3176 
am: 66c63a4bbe

Change-Id: Icbdc9d3156546ceb3b8a0672687479bea77bb032
 2018-09-28 15:43:39 -07:00
Nathan Harold
66c63a4bbe Merge "Remove getNeighboringCell API" 
am: e164be3176

Change-Id: If1fb597b4d1058359fd1ecebc4f3dec8691fc6d5
 2018-09-28 15:19:49 -07:00
Nathan Harold
e164be3176 Merge "Remove getNeighboringCell API" 2018-09-28 21:40:47 +00:00
clownshen
efc342bfc3 DO NOT MERGE 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
 2018-09-28 17:36:50 +00:00
Nathan Harold
353d7558b9 Merge "Catch IllegalArgumentException on NetworkScan.stopScan" am: 84c2b6a843 
am: b4b64bbbdd

Change-Id: Ic2bcbc4e0ed9a0154699da43b504c93847f4b513
 2018-09-27 17:28:05 -07:00
Nathan Harold
b4b64bbbdd Merge "Catch IllegalArgumentException on NetworkScan.stopScan" 
am: 84c2b6a843

Change-Id: I6d6bdd04eaceeb3dcb1e19487a7c4c44d3b08ec4
 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

Change-Id: I026607617e3270c36ada51cd282f288d4cc8614c
 2018-09-27 14:17:00 -07:00
Xiangyu/Malcolm Chen
9bb8d34a9e Merge "Implement equal method in SubscriptionInfo." 
am: e0ae5ff8cc

Change-Id: I7a57debfd4b07a6a61595da656944295a5fe955e
 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.

Reason: most of the users in this new API are not in pi-dev so this change does
not make sense in this branch.

Change-Id: I73b7834916b4f45017010c45e96ea2538e952443
 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

Change-Id: I68546e0c0cbd8c2ec9606b4fd064f9e31083eb05
 2018-09-27 09:10:05 -07:00
Lalit Maganti
b65be923cb Merge "Revert "Revert "new System API for preferred network mode""" 
am: c5a1a5e543

Change-Id: Ib740d7d217b33e3e5d9217eeb598c42341ed75a7
 2018-09-27 08:37:50 -07:00
Mattias Nilsson
ef87416d7d Add config to only allow auto select of networks 
Make it possible for carriers to prevent users from
doing a manual search of networks when in the home network.
This affects Advanced Networks Settings when the user
is not roaming.

This is sometimes called "Permanent automatic mode".

Test: Add an entry in vendor.xml
Bug: 70499144
Change-Id: I9fe91a8510683e4bb3d51efb168c0d159dbb4591
 2018-09-27 15:19:07 +00: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.

Reason for revert: Breaking aosp-master builds.

Change-Id: Ie48b2125025878ce13953706a7eec24bce38594b
 2018-09-27 14:57:06 +00:00
Lalit Maganti
81462faf05 Merge "Revert "new System API for preferred network mode"" am: 4106e419b2 
am: 164774b7bb

Change-Id: I6f825cf29b11a6b212e5beb163fed01f063befc0
 2018-09-27 06:52:40 -07:00
Lalit Maganti
164774b7bb Merge "Revert "new System API for preferred network mode"" 
am: 4106e419b2

Change-Id: Ifa5956f28ae3581e96f4e9be81cde5c54ddeeedd
 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.

Reason for revert: Causing failures on git_pi-dev-plus-aosp for docs and aosp_sailfish.

Change-Id: I1801188e66420a67244b3223e26334c4650d56be
Merged-In: Ic108c484905f80783982a22e8152609257d684b5
 2018-09-27 10:52:55 +00:00
Chen Xu
d2bd668324 Merge "new System API for preferred network mode" am: 314dcd2874 
am: 4560dbd05a

Change-Id: I43b606e03b9c3276ba7996a5f7feede5d31c0b01
 2018-09-26 17:58:00 -07:00
Chen Xu
4560dbd05a Merge "new System API for preferred network mode" 
am: 314dcd2874

Change-Id: Ic1c8588f2d6d200adba6dcb10c2f991eeff630de
 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

Change-Id: I6f8deead4a501d6a01b08ded93815028dd590412
 2018-09-26 15:17:39 -07:00
Tyler Gunn
95981b0488 Merge "Cleanup deprecated or removed telephony methods." 
am: c4833e862e

Change-Id: I1bad9aed4fb6628f47b5a8704e6d1ee3a54023c2
 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

Change-Id: Ia54c7755ab4881d4986e2e72889ccc4a9af89010
 2018-09-26 14:48:28 -07:00
Chen Xu
5d3b3d8ac8 Merge "expose getAidForApptype to system API" 
am: 7cdc0f00eb

Change-Id: Iad9eb6d5da9767b3c0ae8a09d72eada09f6345db
 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

Change-Id: Iff157bac8d07cbf686089fbdaf8c58c17d10e527
 2018-09-26 11:47:00 -07:00
Shuo Qian
a4107d39ad Merge "Make SubscriptionManager.isActiveSubId public" 
am: fafc51a088

Change-Id: Ieb279a347a42dadefc2fdb3bbea99d455a69a7cb
 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

Change-Id: I95d0f9f62b4b9597cef50b1d8a9e23df09831720
 2018-09-25 16:39:13 -07:00
Hall Liu
89ec00b622 Merge "Add intdef for Telephony network type constants" 
am: 544b8efa46

Change-Id: I28b2eda8004c5807b454918f98542e098f9718d5
 2018-09-25 16:20:58 -07:00
Kikkawa Shohei
db6110d9a9 Show "Call Blocking disabled" notification always when emergency call 
am: 638d11e0bb

Change-Id: I58e99f80e661183aa831c8157f33b8ba6e656278
 2018-09-25 16:03:52 -07:00
Youming Ye
b869100b2a Merge "Show "Call Blocking disabled" notification always when emergency call" 
am: 6fa8bcb841

Change-Id: I14ea5a138db3b26bc043897ae0a65144bdd0a8ec
 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

Change-Id: If5313657b5095d668abc8af7de2c99594372a89b
 2018-09-25 15:45:33 -07:00
Chen Xu
2b38567586 Merge "expose getIsimDomain to systemAPI" 
am: 56d40d3c78

Change-Id: Ie97f07f30ad16eef2b1e98d233fbe40d248402f2
 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

Change-Id: I7e98519115c67eaa49694a3514b80fc54afcc17b
 2018-09-25 14:47:25 -07:00
Hall Liu
6c6c859c6a Merge "Add the EMBMS group call API" 
am: 52a8fdb7bd

Change-Id: Id9bf8b76532001c56e12633d882357e8757202d6
 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