Brad Ebinger
6ed6eeb05f
Merge "Do not show Provisioning items for IMS if it is not enabled." am: be10b45fe6
...
am: 76b4661f56
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
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
2019-03-15 17:37:37 -07:00
Hall Liu
257e6f71ee
Merge "Base implementation of WFC disclaimer UI"
...
am: 7e2c23aa0d
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
2019-03-14 18:49:59 -07:00
Amit Mahajan
f784db5cae
Merge "Move SMS raw db deletion to phone process."
...
am: 479ec92c27
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
2019-03-12 22:09:21 -07:00
Kiyoung Kim
7dc288a899
Merge "Schematize Crypto state system property"
...
am: 6c38df5eff
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
2019-03-12 15:52:22 -07:00
Hall Liu
a10d7031c3
Merge "Add description for Wi-Fi calling mode"
...
am: 13e02af2ad
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
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
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
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
2019-03-08 14:55:32 -08:00
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
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
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
