Commit Graph

46269 Commits

Author SHA1 Message Date
Hall Liu
23551e561f Merge "Show the disclaimer regarding WFC location privacy policy" am: 5697a7e85d
am: fa412244c8

Change-Id: Id628e249c421740339dab7ce8abf60371fb12110
2019-04-01 17:13:21 -07:00
Hall Liu
fa412244c8 Merge "Show the disclaimer regarding WFC location privacy policy"
am: 5697a7e85d

Change-Id: Iddb15758aefffade3138d0d8c42a953d50640b14
2019-04-01 16:25:49 -07:00
Hall Liu
5697a7e85d Merge "Show the disclaimer regarding WFC location privacy policy" 2019-04-01 22:55:51 +00:00
Fan Zhang
74fa961299 Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup" am: 8877dc8fd0
am: 3a19c32bfe

Change-Id: Ifc39462efeb50a6776cf4e419df650164ad5f1a5
2019-04-01 14:50:41 -07:00
Fan Zhang
3a19c32bfe Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup"
am: 8877dc8fd0

Change-Id: I34fd41dfc4e12c069f78cb017f8f754a43689b74
2019-04-01 14:45:32 -07:00
Xiangyu/Malcolm Chen
33aba7c0d0 Merge "Move SIM select logic from SimSelectNotification to Telephony." am: 6fca0c9495
am: d42dcf04db

Change-Id: I5f57320b1ad10e5207771bae0495eac656240a02
2019-04-01 14:32:12 -07:00
Fan Zhang
8877dc8fd0 Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup" 2019-04-01 21:11:38 +00:00
Xiangyu/Malcolm Chen
d42dcf04db Merge "Move SIM select logic from SimSelectNotification to Telephony."
am: 6fca0c9495

Change-Id: I85ec9746b8df4a5eb53d6e0fe7e29434f12ec812
2019-04-01 14:06:49 -07:00
Xiangyu/Malcolm Chen
6fca0c9495 Merge "Move SIM select logic from SimSelectNotification to Telephony." 2019-04-01 20:51:54 +00:00
Torbjorn Eklund
428ba7cde6 WifiCallingSettingsForSubTest: Solve casting problem in setup
Solves casting problem in WifiCallingSettingsForSubTest that causes all
tests in this file to fail in the setup-function.

The wfc mode buttons has changed from being a ListPreference to be a
ListWithEntrySummaryPreference. The test cases have now been updated
accordingly.

Problem was introduced by the following two patches that conflict with
each other. The test cases in WifiCallingSettingsForSubTest works
correctly when each patch is tested in isolation, but failed when they
were both merged:
73ffcf4999
8498436a96

Bug: 129545431
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: Ib6988e514bbad2023ba6cfc2e1d8734b68cabc31
2019-04-01 07:27:04 +00:00
Malcolm Chen
5cc16b2cc0 Move SIM select logic from SimSelectNotification to Telephony.
SimSelectNotification used to listen to SIM_STATE_CHANGED from Telephony
and do checkings to decide whether to pop up notification and
SimDialogActivity. The logic needs updated and only Telephony knows it
well. So this change moves the logic into Telephony. SimSelectNotification
only listens to Telephony's decision, brings up notification and trigger
SimDialogActivity.

Bug: 128645056
Test: sanity and manual
Change-Id: I6153e27dd00dd9cdf8682f135eb39f8af3a75608
Merged-In: I6153e27dd00dd9cdf8682f135eb39f8af3a75608
2019-03-29 14:42:48 -07:00
Qingxi Li
d3527bf14b [automerger skipped] Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset" am: bdef91f964 -s ours
am: bd5f4328f5 -s ours
am skip reason: subject contains skip directive

Change-Id: I23f3800d8bd6432c7aa9a59ae7cee29e73c7c834
2019-03-27 17:56:15 -07:00
Qingxi Li
bd5f4328f5 [automerger skipped] Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset"
am: bdef91f964 -s ours
am skip reason: subject contains skip directive

Change-Id: I362517c36ff77b36336fcc52a684dd29b50bab94
2019-03-27 17:46:52 -07:00
Treehugger Robot
bdef91f964 Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset" 2019-03-28 00:27:30 +00:00
Qingxi Li
6f096fd706 [DO NOT MERGE] Fix the typo of the error message of eSIM reset
Bug: 129085179
Test: N/A
Change-Id: Iad8fdc7368a4d91aff9eb3035bfe91592d6bce1b
2019-03-27 23:32:28 +00:00
Yong Shi
cfb4ca74c1 Show the disclaimer regarding WFC location privacy policy
In some countries the rules is very strict about responsibility and
liability around location data during emergency calls. The purpose of
this feature is to notify end user that the location information will
be shared for calls over wifi calling.

Test: manual - Checked that WFC locatopn privacy policy is shown when
changing wifi calling setting to turned on.
Test: auto - Passed LocationPolicyDisclaimerTest.
Bug: 67872298

Change-Id: I03895743fb8da95269069ad7eda9a7b3e282857e
Merged-In: I03895743fb8da95269069ad7eda9a7b3e282857e
2019-03-25 23:33:17 +00:00
Bill Yi
2fab42da0a [automerger skipped] Import translations. DO NOT MERGE
am: e6d11ed962 -s ours
am skip reason: subject contains skip directive

Change-Id: I144c24a4b3c2dcab4693d0f5eb45a2df29b2c380
2019-03-24 22:38:25 -07:00
Bill Yi
e6d11ed962 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id87c2f36401630b5a5e6b1537ec2a44340cadbec
2019-03-24 15:43:53 -07:00
Lucas Lin
0fa267fd0b Merge "Modify dialog message for partial connectivity" am: f467ee4a28
am: 8701e18275

Change-Id: Icd481ce4dc83b0d60ffeef75bbcfe9277339e4f6
2019-03-21 18:43:39 -07:00
Lucas Lin
8701e18275 Merge "Modify dialog message for partial connectivity"
am: f467ee4a28

Change-Id: I9a022578e14327bfe98a3efa74a99d9f623a031e
2019-03-21 18:31:47 -07:00
Lucas Lin
f467ee4a28 Merge "Modify dialog message for partial connectivity" 2019-03-22 01:16:42 +00:00
lucaslin
411435b669 Modify dialog message for partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.

Bug: 113450764
Bug: 128489091
Test: 1. Build pass.
      2. make -j44 RunSettingsRoboTests
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
      3. Change captive_portal_https_url to https://invalid.com
      to simulate partial connectivity.

Change-Id: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
Merged-In: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
2019-03-21 12:10:02 +08:00
Brad Ebinger
6ed6eeb05f Merge "Do not show Provisioning items for IMS if it is not enabled." am: be10b45fe6
am: 76b4661f56

Change-Id: I04d7e91cce1424608581ca36f6282e71c9d3ac7e
2019-03-18 13:42:49 -07:00
Brad Ebinger
76b4661f56 Merge "Do not show Provisioning items for IMS if it is not enabled."
am: be10b45fe6

Change-Id: Ie8c404d980d7437550019fccdcac0868fa5d845d
2019-03-18 13:29:25 -07:00
Brad Ebinger
be10b45fe6 Merge "Do not show Provisioning items for IMS if it is not enabled." 2019-03-18 17:35:27 +00:00
Hall Liu
770e610a77 Merge "Base implementation of WFC disclaimer UI" am: 7e2c23aa0d
am: 257e6f71ee

Change-Id: Iceb8fffc425756e19b1a2bf16469b0cb69a444da
2019-03-15 17:37:37 -07:00
Hall Liu
257e6f71ee Merge "Base implementation of WFC disclaimer UI"
am: 7e2c23aa0d

Change-Id: Ib89de5bf801b6669795e7c49010136a0e966324a
2019-03-15 17:33:26 -07:00
Hall Liu
7e2c23aa0d Merge "Base implementation of WFC disclaimer UI" 2019-03-16 00:23:23 +00:00
manabu, shimoda
8498436a96 Base implementation of WFC disclaimer UI
Test: manual - Check that no error occurred when changing the wifi
calling settings to turn on.
Test: auto - Passed WifiCallingSettingsForSubTest,
WifiCallingDisclaimerFragmentTest and DisclaimerItemListAdapterTest.
Bug: 67872298

Change-Id: I789f530d3e16baa6e56feaa4269f6696976f747e
Merged-In: I789f530d3e16baa6e56feaa4269f6696976f747e
2019-03-15 22:57:36 +00:00
Amit Mahajan
1285b12980 Merge "Move SMS raw db deletion to phone process." am: 479ec92c27
am: f784db5cae

Change-Id: Ib90080a6fad7ad8914390df8e4aa92749669f1a9
2019-03-14 18:49:59 -07:00
Amit Mahajan
f784db5cae Merge "Move SMS raw db deletion to phone process."
am: 479ec92c27

Change-Id: I38689f5f833825eae230706b536c4ad1ded847bd
2019-03-14 18:45:50 -07:00
Treehugger Robot
479ec92c27 Merge "Move SMS raw db deletion to phone process." 2019-03-15 01:25:28 +00:00
Brad Ebinger
8bff9c3501 Do not show Provisioning items for IMS if it is not enabled.
Do not show IMS related items if FEATURE_TELEPHONY_IMS
is not defined for this device.

Bug: 118823723
Test: manual
Merged-In: I9624535fe766cd79eadb30502c1a0574650a02ef
Change-Id: I9624535fe766cd79eadb30502c1a0574650a02ef
2019-03-14 15:00:42 -07:00
Amit Mahajan
d0ff80dc79 Move SMS raw db deletion to phone process.
Test: manual
Bug: 127929687
Change-Id: Ib23efc647fbd4b3007197932b9493393dc5b4d5b
2019-03-13 17:36:16 -07:00
Kiyoung Kim
8b8bf4c39e Merge "Schematize Crypto state system property" am: 6c38df5eff
am: 7dc288a899

Change-Id: I865d37316469126cf1cd1bf93bd7427882042c3d
2019-03-12 22:09:21 -07:00
Kiyoung Kim
7dc288a899 Merge "Schematize Crypto state system property"
am: 6c38df5eff

Change-Id: I3ef29bc153839fd18b1144c8128ddf4dbc1e4f60
2019-03-12 21:34:09 -07:00
Treehugger Robot
6c38df5eff Merge "Schematize Crypto state system property" 2019-03-13 01:30:58 +00:00
Hall Liu
6e28351779 Merge "Add description for Wi-Fi calling mode" am: 13e02af2ad
am: a10d7031c3

Change-Id: I18deb6cc090f077ed6d49decdadf7d642075ec5a
2019-03-12 15:52:22 -07:00
Hall Liu
a10d7031c3 Merge "Add description for Wi-Fi calling mode"
am: 13e02af2ad

Change-Id: Iff0a3e6f814a8fbd7b3910589c5e712cd9dc9b26
2019-03-12 14:06:12 -07:00
Hall Liu
13e02af2ad Merge "Add description for Wi-Fi calling mode" 2019-03-12 20:49:21 +00:00
Kazuya Ohshiro
eb57875f64 Add description for Wi-Fi calling mode
Replace the view of dialog with custom view that adds description
as summary.

Test: manual
Bug: 34793636
Change-Id: If9792b0a35c59c1260176b4b2c62107861de73b5
Merged-In: If9792b0a35c59c1260176b4b2c62107861de73b5
2019-03-12 01:42:09 +00:00
Fan Zhang
0ee2857d0a [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8 am: ba87cf7444 am: 9366d11e6d am: 657f8713ff
am: 1b29c28aef

Change-Id: I549324f01db9afe19e21c6c01f02ce3f2a444c33
2019-03-08 15:27:25 -08:00
Fan Zhang
1b29c28aef [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8 am: ba87cf7444 am: 9366d11e6d
am: 657f8713ff

Change-Id: I501ba68b3f6691a627a8828aeca16d495ee52126
2019-03-08 15:07:53 -08:00
Fan Zhang
657f8713ff [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8 am: ba87cf7444
am: 9366d11e6d

Change-Id: Icd4cf6000dd9d72f486417f1d11dde008d49c513
2019-03-08 15:01:41 -08:00
Fan Zhang
9366d11e6d [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8
am: ba87cf7444

Change-Id: I3b3a2411f4be05e1b8f6ecfce3521c5932028038
2019-03-08 14:55:32 -08:00
Chalard Jean
aa5d185d7b Merge "Support VPN Proxy(2/2)" am: 2a695c4b7b
am: e2f74af063

Change-Id: I61f6f949ab79cdcac5d61ae9409c2de09b75db49
2019-03-08 07:44:56 -08:00
Chalard Jean
e2f74af063 Merge "Support VPN Proxy(2/2)"
am: 2a695c4b7b

Change-Id: I58553c28c8f4e87a52169f925da70c2edb89ca71
2019-03-08 06:42:57 -08:00
Brad Ebinger
c1bdc0d512 Merge "WFC roaming mode setting can not be used with a fixed value" am: 7296b6cb1c
am: 3c65dc51f3

Change-Id: I3ffc4a17603e174eec58acfb33e23be86cd0f73f
2019-03-08 06:35:14 -08:00
Brad Ebinger
3c65dc51f3 Merge "WFC roaming mode setting can not be used with a fixed value"
am: 7296b6cb1c

Change-Id: I0b4bd383fe9ac1e057e652664fc3fb0a250f1eeb
2019-03-08 06:08:40 -08:00
Chalard Jean
2a695c4b7b Merge "Support VPN Proxy(2/2)" 2019-03-08 00:34:25 +00:00