Commit Graph

3869 Commits

Author SHA1 Message Date
Polina Bondarenko
308bcec713 Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780 am: cf176500e6
am: b46a93ff04

Change-Id: I8f17bef7ccde5953f5b810bd806fc51a4c69e194
2017-01-23 17:20:58 +00:00
Polina Bondarenko
b46a93ff04 Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780
am: cf176500e6

Change-Id: Ic278e3a9bd7c9c99345150228c6e87343737079e
2017-01-23 17:14:35 +00:00
Treehugger Robot
6d064d8780 Merge "Make TelephonyManager#get/setAllowedCarriers system api" 2017-01-23 17:01:25 +00:00
Chen Xu
038bea5dd1 Merge "Initial change on carrier signal filtering" am: bfdce89f36 am: 1507930691
am: 923046251b

Change-Id: I0762a7787c4136de027f8ee5def592bc85be25b6
2017-01-20 04:13:03 +00:00
Chen Xu
923046251b Merge "Initial change on carrier signal filtering" am: bfdce89f36
am: 1507930691

Change-Id: I2edbdbd65fd90215b39e1b5f4a888c9df119b841
2017-01-20 03:54:22 +00:00
Polina Bondarenko
d5cfe6cdf1 Make TelephonyManager#get/setAllowedCarriers system api
Make TelephonyManager#get/setAllowedCarriers system api under
PackageManager#FEATURE_TELEPHONY_CARRIERLOCK feature flag.

Bug: 33480084
Test: cts

Merged-In: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a

Change-Id: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a
2017-01-19 16:43:29 +01:00
fionaxu
3e713e090c Initial change on carrier signal filtering
- add new carrier config
- configure defaultcarrierapp as the default receiver for redirection
  signal

Bug: 30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony

Change-Id: I094c39fe21e6883d2acef8f7479b948fc77ce14e
Merged-In: CHANGE-ID I14bb1a885d1eaca9a144eb1e1caca72339d67d2e
2017-01-19 00:36:16 -08:00
Ta-wei Yen
9e3a4957fc Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb am: ea0e111468
am: 89a85b0683

Change-Id: I24966bccbea07ac42d4199d71c59c76ae19c967a
2017-01-17 19:59:43 +00:00
Ta-wei Yen
89a85b0683 Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb
am: ea0e111468

Change-Id: Ie40ccdc2ad2a30e8bbf3d6a6c4013ff5faf10cdd
2017-01-17 19:53:42 +00:00
Ta-wei Yen
68d03b23bb Merge "Add getNetworkSpecifier() and getCarrierConfig()" 2017-01-17 19:38:27 +00:00
Polina Bondarenko
55745eca73 Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8 am: e2b306e30e
am: d4c48e911e

Change-Id: Iac1e5f257d6a8263c78af8d9199848244fe6d93c
2017-01-16 18:10:40 +00:00
Polina Bondarenko
d4c48e911e Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8
am: e2b306e30e

Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c
2017-01-16 18:02:32 +00:00
Treehugger Robot
dc61ad0ad8 Merge "Make TelephonyManager.getImei a system APIs." 2017-01-16 17:49:59 +00:00
Ta-wei Yen
eca691efcb Add getNetworkSpecifier() and getCarrierConfig()
This allows making network request and getting carrier config on a
specfic SIM.

Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Merged-In: Id52688d73b74bc55ee2da71a22454957fdd7b57b
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
2017-01-13 23:53:51 +00:00
Chen Xu
10839091d9 Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e
am: c90dc2072c

Change-Id: Ie694f05799bfeb123c7d12477855237444dff415
2017-01-13 21:15:55 +00:00
Chen Xu
c90dc2072c Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd
am: 1d0877f59e

Change-Id: I1df7d283d8339065d4418af562775c3aea56a707
2017-01-13 02:33:24 +00:00
Chen Xu
4533b1ccdd Merge "Default Carrier app for traffic mitigation" 2017-01-13 02:22:38 +00:00
fionaxu
a21a87b7a4 Default Carrier app for traffic mitigation
- have the basic function working, support traffic mitigation and
  captive portal login
- support carrier customization, OEM could configure a list of carrier
  actions to act upon certain signals
- unit test

Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug: 30958215

Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d
2017-01-12 15:50:18 -08:00
Robert Greenwalt
907585c004 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375
am: 503d8fbb26

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
2017-01-12 23:20:45 +00:00
Robert Greenwalt
503d8fbb26 Merge "Add support for FDN contact dial" am: 082b118641
am: 24dea10375

Change-Id: I5091d35ff79eff952c57109ce120369c95309598
2017-01-12 23:16:20 +00:00
Robert Greenwalt
082b118641 Merge "Add support for FDN contact dial" 2017-01-12 23:07:00 +00:00
Jordan Liu
11765b3fcc Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885
am: 1d67d022fb

Change-Id: I6165395ac186baac90c2d08d7c7114c7b5bc72d3
2017-01-10 23:55:55 +00:00
Jordan Liu
1d67d022fb Merge "Fix naming of key" am: 0b74a1dabb
am: c68c2f6885

Change-Id: Ibdd5177ea43ee9c2ea5603363429a7207a59d5ba
2017-01-10 23:44:43 +00:00
Jordan Liu
7c4bfb28d1 Fix naming of key
CarrierConfig Keys should start with "KEY_".

Test: runtest carrierconfig-unit
Change-Id: I317cdb53a09851a5e1a3832140c7dc28a5cde4a4
Merged-In: Iebb11739ae16e56fe1a0b2fdc9a3e005a71858dc
2017-01-04 14:46:29 -08:00
Robert Greenwalt
5f0dad0e64 resolve merge conflicts of e6b6653da8 to nyc-mr2-dev-plus-aosp
Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac
2017-01-03 11:35:37 -08:00
Robert Greenwalt
e6b6653da8 Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am: 43ced5941e
am: 14a5b810b6

Change-Id: Ib7a87a5028975e8f55dd6ba311cde78a3c1c2460
2017-01-03 17:40:27 +00:00
Robert Greenwalt
43ced5941e Merge "Add IMEI_NOT_ACCEPTED disconnect cause" 2017-01-03 17:26:59 +00:00
Joe LaPenna
dfee8e5f2d Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902
am: 715acea102

Change-Id: I44bc0113697be113ef79ac9a904485b49bed2f87
2016-12-22 21:51:57 +00:00
Joe LaPenna
715acea102 Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f
am: 6f87331902

Change-Id: I3681893e43949060922f72c65f8f106090005d14
2016-12-22 21:47:00 +00:00
Joe LaPenna
5e0164e16c Add simplified_network_settings_bool to CarrierConfig.
Some carriers want to further simplify network settings based on a
variety of wifi or cellular related bundles. Expose a config a
carrier might set to allow SysUi, Settings and platform to adjust.

BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Merged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804
2016-12-22 11:53:10 -08:00
Brad Ebinger
f979b94815 Adds custom call forwarding block while roaming carrier config key
am: eab25ae197

Change-Id: Ic638971c4bae7b496e94431ae2c0f35a22261896
2016-12-21 01:34:11 +00:00
Brad Ebinger
eab25ae197 Adds custom call forwarding block while roaming carrier config key
Adds support for supplying custom call forwarding prefixes in the carrier
config. When a prefix supplied in the carrier config is matched to the number
being dialed, we do not complete the call and instead show an error message
on the dialer UI.

Test: Manual
Bug: 30458052
Merged-In: I3149a565b0fd631d69ab0c0f27be509237b80177
Change-Id: I3149a565b0fd631d69ab0c0f27be509237b80177
2016-12-20 14:34:52 -08:00
Hall Liu
57c781417f Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364
am: fc125a319e

Change-Id: I305223c2a5499b9fdf2f1f59ddfda40712cd6172
2016-12-20 21:28:12 +00:00
Hall Liu
26e5096364 Merge "Adds carrier config to determine if high definition audio is displayed" 2016-12-20 21:13:31 +00:00
Brad Ebinger
721847320b Add UI prompt for MMI code failure on 3gpp
am: ac8d8e7358

Change-Id: Id83a2fa2dd958a0fbfcb2d5eb90528bcf96737b8
2016-12-19 20:54:27 +00:00
Brad Ebinger
ac8d8e7358 Add UI prompt for MMI code failure on 3gpp
Some carriers do not support call forwarding MMI codes while roaming
on 3gpp networks. A new message has been added that clarifies this
to the user.

Test: Manual
Bug: 30106345
Merged-In: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
Change-Id: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
2016-12-16 16:11:15 -08:00
Junda Liu
0c62aa5f10 Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.
am: 6bb22e3de2

Change-Id: I8228c805c69189966b0b4f12d11ab7c5564766c4
2016-12-16 22:35:13 +00:00
Junda Liu
565fcb4b95 Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev 2016-12-16 22:24:19 +00:00
Polina Bondarenko
f5088c0d77 Merge "Make TelephonyManager APIs public:" am: 441bfc6718 am: 104a5c7a34
am: bab9a7e66e

Change-Id: Ie57e56db0d87968524bc7dc39b2d1061c4ec88b3
2016-12-16 10:53:30 +00:00
Polina Bondarenko
bab9a7e66e Merge "Make TelephonyManager APIs public:" am: 441bfc6718
am: 104a5c7a34

Change-Id: I0d234fd2539a3a9ec58c820a7a7428430aa2255a
2016-12-16 10:45:03 +00:00
Treehugger Robot
441bfc6718 Merge "Make TelephonyManager APIs public:" 2016-12-16 10:29:04 +00:00
Wei Huang
f294be149a Adds carrier config to determine if high definition audio is displayed
Adds a carrier config option to remove HD audio property from a
connection so that HD audio related UI is not displayed
even if connection has High Definition audio support.

Bug: 28654645
Bug: 33062999
Change-Id: Ie2acb3be556b750849c25b856cf9382cf4ebb8d9
Merged-In: I71f35854d35ae73741a36c0e2106695b04471b2e
2016-12-15 15:56:24 -08:00
Wei Huang
0a26ddc7a3 Adds carrier config to determine if high definition audio is displayed
am: f84a966106

Change-Id: I030077b8f9a8fa9f05d1a71f051cd19059c54bab
2016-12-15 23:06:53 +00:00
Polina Bondarenko
933a594c9f Make TelephonyManager.getImei a system APIs.
It is needed for OobConfig app unbundling.

Bug: 33480907
Test: cts
Change-Id: I523416d23ec504ce44051df384d7df4f99e93002
2016-12-15 15:45:47 +01:00
Wei Huang
f84a966106 Adds carrier config to determine if high definition audio is displayed
Adds a carrier config option to remove HD audio property from a
connection so that HD audio related UI is not displayed
even if connection has High Definition audio support.

Bug: 28654645
Bug: 33062999
Change-Id: I71f35854d35ae73741a36c0e2106695b04471b2e
2016-12-14 18:32:44 -08:00
Junda Liu
6bb22e3de2 Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.
Default false. If true, will allow use edited tether APN to take effect.

Bug: b/30622475
Change-Id: I526e41e816582e1c5219600d74980fd7754361e6
2016-12-13 14:53:53 -08:00
Polina Bondarenko
a6dba0ab35 Make TelephonyManager APIs public:
TelephonyManager.getSimState(slotIdx) and
TelephonyManager.SIM_STATE_CARD_RESTRICTED.

It is needed for OobConfig app unbundling.

Bug: 33479833
Test: run cts -m CtsTelephonyTestCases
Change-Id: I375f436bc4e1dcedc0656866a0838c7bf5948422
2016-12-13 21:37:01 +01:00
Joe LaPenna
b0977f52a6 Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395 am: 2bc66bf601
am: b52989c736

Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36
2016-12-12 21:39:55 +00:00
Joe LaPenna
b52989c736 Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395
am: 2bc66bf601

Change-Id: Idaa23641c8e95890271c554dee0244702601a109
2016-12-12 21:34:30 +00:00
Joe LaPenna
2b22ae3b87 Add simplified_network_settings_bool to CarrierConfigManager.
BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I3da3048afcf1547c46db5c76ff68165246faa77a
2016-12-12 19:27:16 +00:00