Chalard Jean
aa5d185d7b
Merge "Support VPN Proxy(2/2)" am: 2a695c4b7b
...
am: e2f74af063
2019-03-08 07:44:56 -08:00
Chalard Jean
e2f74af063
Merge "Support VPN Proxy(2/2)"
...
am: 2a695c4b7b
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
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
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
8ef38e1939
Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" am: 50a39ba9a9
...
am: c307426ebe
2019-03-01 18:13:47 -08:00
Andrii Kulian
c307426ebe
Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""
...
am: 50a39ba9a9
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
2019-03-02 01:44:55 +00:00
Takamasa Kuramitsu
08415faf4a
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" am: b67697cf38
...
am: b496699104
2019-03-01 16:52:30 -08:00
Takamasa Kuramitsu
b496699104
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
...
am: b67697cf38
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
2019-03-01 00:22:38 +00:00
Neil Fuller
641ea6e4fa
Merge "Update the timestamp used for time zone filtering" am: 51376aefc1
...
am: d2b3df945c
2019-02-27 11:10:27 -08:00
Neil Fuller
d2b3df945c
Merge "Update the timestamp used for time zone filtering"
...
am: 51376aefc1
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
d3b25ae1f5
Merge "Add additional anomaly types." am: 64bf0a791e
...
am: e709ac7a4c
2019-02-25 23:00:09 -08:00
Joe Onorato
e709ac7a4c
Merge "Add additional anomaly types."
...
am: 64bf0a791e
2019-02-25 22:48:39 -08:00
Xin Li
e01bd73441
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
...
am: fc53be7b56
2019-02-25 19:17:55 -08:00
Xin Li
d453b1c2ce
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
am: 1994397e6a
2019-02-25 16:18:26 -08:00
Youming Ye
ecd1998ea0
Merge "Fix issue that the wifi calling text cannot be customized based on sim" am: 5b3ee7afaa
...
am: e3844769e6
2019-02-25 13:08:32 -08: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
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
Bill Yi
1b7db3cb3e
[automerger skipped] Import translations. DO NOT MERGE
...
am: 02681df33f
2019-02-21 18:14:54 -08: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
Bill Yi
02681df33f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
2019-02-21 16:40:33 -08: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
Kiyoung Kim
9602f7eb0b
Merge "Schematize Crypto system properties" am: b837a44716
...
am: a078a02c42
2019-02-20 17:07:08 -08:00
Kiyoung Kim
a078a02c42
Merge "Schematize Crypto system properties"
...
am: b837a44716
2019-02-20 16:34:01 -08:00
Kiyoung Kim
b837a44716
Merge "Schematize Crypto system properties"
2019-02-21 00:16:45 +00:00
Xin Li
b637de1cb8
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: d4716c1a62 -s ours
...
am: 92fc138524
2019-02-20 11:47:29 -08:00
Xin Li
92fc138524
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
...
am: d4716c1a62
2019-02-20 11:06:41 -08:00
Xin Li
3003b4b39c
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 9d8c2cc2c6 -s ours
...
am: a99376f647
2019-02-20 09:29:00 -08:00
Xin Li
a99376f647
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
...
am: 9d8c2cc2c6
2019-02-20 08:52:26 -08:00
Xin Li
d4716c1a62
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
2019-02-20 16:25:59 +00:00
Xin Li
9d8c2cc2c6
DO NOT MERGE - Merge PPRL.190205.001 into master
...
Bug: 124234733
Change-Id: I3db6a7deadc7a88e071105be9ddb911da7e9bacd
2019-02-18 15:58:44 -08:00
Kiyoung Kim
9c9b9394de
Schematize Crypto system properties
...
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug: 117924132
Test: m -j
Change-Id: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
Merged-In: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
2019-02-15 02:30:30 +00:00
Xin Li
82b262afbd
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
...
am: f6aad2aee8
2019-02-14 17:18:04 -08:00
Xin Li
44ace71846
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: d61c2adf09
2019-02-14 14:41:06 -08:00
Xin Li
f6aad2aee8
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
2019-02-14 22:11:39 +00:00
Brad Ebinger
9f2b104953
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am: db7da4cba8
...
am: ee4a5291a1
2019-02-14 13:19:37 -08:00
Brad Ebinger
ee4a5291a1
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
...
am: db7da4cba8
2019-02-14 13:15:44 -08:00
Brad Ebinger
db7da4cba8
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
2019-02-14 21:01:05 +00:00
