Commit Graph

46208 Commits

Author SHA1 Message Date
Fan Zhang
3a19c32bfe Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup"
am: 8877dc8fd0

Change-Id: I34fd41dfc4e12c069f78cb017f8f754a43689b74
2019-04-01 14:45:32 -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
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
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
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
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
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
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
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
Chalard Jean
e2f74af063 Merge "Support VPN Proxy(2/2)"
am: 2a695c4b7b

Change-Id: I58553c28c8f4e87a52169f925da70c2edb89ca71
2019-03-08 06:42:57 -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
Brad Ebinger
7296b6cb1c Merge "WFC roaming mode setting can not be used with a fixed value" 2019-03-07 21:11:51 +00:00
Kitta Koutarou
478e1232a0 WFC roaming mode setting can not be used with a fixed value
WFC roaming mode setting can not be used with a fixed value because it
is changed as WFC home mode changes if
KEY_EDITABLE_WFC_ROAMING_MODE_BOOL is false.

To solve this issue, separate the WFC mode setting of home and roaming.
These can switch behavior by new carrier config
KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL.

Test: manual - Checked that WFC roaming mode is hidden if new config is
true.
Test: manual - Checked that WFC roaming mode is also changed when
change the WFC home mode if new config is true.
Test: auto - Passed WifiCallingSettingsForSubTest.
Bug: 79666081

Merged-In: Ib2363c5d50f5231cc89f287d760ca8728b02b249
Change-Id: Ib2363c5d50f5231cc89f287d760ca8728b02b249
2019-03-06 23:38:11 +00:00
Ryusuke Sawa
9f7875d547 Support VPN Proxy(2/2)
Adding VPN Proxy settings in advanced option.
 - Proxy host name
 - Proxy port

Bug: 118793208
Test: runtest

Change-Id: I40f3cf049f5822eefc3f9e6ba5dd0bb80c9b3945
2019-03-06 10:38:48 +09:00
Andrii Kulian
c307426ebe Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""
am: 50a39ba9a9

Change-Id: I92454274470675dbe533c0713d44c304f0cfaaf0
2019-03-01 18:03:12 -08:00
Andrii Kulian
50a39ba9a9 Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" 2019-03-02 01:52:04 +00:00
Andrii Kulian
c70f3ebc29 Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
This reverts commit e7fe45f4ca.

Reason for revert: broke git_pi-dev-plus-aosp build

Change-Id: I390b0006bb780ce81520ea851f474e0188f0495e
2019-03-02 01:44:55 +00:00
Takamasa Kuramitsu
b496699104 Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
am: b67697cf38

Change-Id: Ic1a3e5d5bd2660b8ed71b0650672321480d60adb
2019-03-01 16:29:52 -08:00
Treehugger Robot
b67697cf38 Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" 2019-03-01 21:48:55 +00:00
Takamasa Kuramitsu
e7fe45f4ca Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
This reverts commit 1ea003e834.
Fixes: 116821732

Reason for revert: blocking issue in b/124370422 is resolved

Change-Id: Ie3d5489e5addf12ed7feeada0ceac196eb272f6b
2019-03-01 00:22:38 +00:00
Neil Fuller
d2b3df945c Merge "Update the timestamp used for time zone filtering"
am: 51376aefc1

Change-Id: I73413541d36f6caac85dd18c2f6d63adee67b95e
2019-02-27 11:01:42 -08:00
Treehugger Robot
51376aefc1 Merge "Update the timestamp used for time zone filtering" 2019-02-27 18:45:08 +00:00
Neil Fuller
d0e076192e Update the timestamp used for time zone filtering
Update the timestamp used for time zone filtering and improve the
comment explaining what it is for.

Bug: 124756276
Test: build only
Change-Id: I2e53b1f3bd36602f8d08967e1335066d93ae05ea
2019-02-27 15:02:03 +00:00
Joe Onorato
e709ac7a4c Merge "Add additional anomaly types."
am: 64bf0a791e

Change-Id: Iebe3695669e87b3109b43becaf869c4b2f9a4b48
2019-02-25 22:48:39 -08:00
Kiyoung Kim
7491e86e2b Schematize Crypto state system property
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: I5df6145a436c38dd9fed4325b02ac37a801c2f5e
Merged-In: I957a8e37a88f7bb6d5007a36c02952d3539580fe
2019-02-26 14:28:34 +09:00
Treehugger Robot
64bf0a791e Merge "Add additional anomaly types." 2019-02-25 19:53:26 +00:00
Joe Onorato
f51826853b Add additional anomaly types.
Test: Treehugger
Bug: 115540658
Change-Id: I369f5bfadfe10810aa33d4127fb9ce69c9c57e7e
2019-02-25 14:51:10 +00:00
Xin Li
fc53be7b56 Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master 2019-02-23 00:39:23 +00:00
Youming Ye
e3844769e6 Merge "Fix issue that the wifi calling text cannot be customized based on sim"
am: 5b3ee7afaa

Change-Id: Iffac84438bf43372a1ddeb4df1ef9d85c9af2a2d
2019-02-22 14:14:11 -08:00
Youming Ye
5b3ee7afaa Merge "Fix issue that the wifi calling text cannot be customized based on sim" 2019-02-22 21:53:12 +00:00
Wenting Xiong
82aa55bcda Fix issue that the wifi calling text cannot be customized based on sim
Some carriers have requirements that the wifi calling text should be
customizable. However, the resources for the wifi calling text are
not obtained based on sim. So it cannot be customized per sim for multi
sim device. To solve this issue, obtain the resources with specified
sim.

Test: manual - Checked that the wifi calling text could be customized
based on sim.
Bug: 117257109

Change-Id: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
Merged-In: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
2019-02-22 01:57:44 +00:00
Xin Li
1994397e6a DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I6eeee632ff6ee7f2d7395344a7887c44c7acd440
2019-02-21 11:03:43 -08:00