Commit Graph

46238 Commits

Author SHA1 Message Date
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
Kiyoung Kim
a078a02c42 Merge "Schematize Crypto system properties"
am: b837a44716

Change-Id: I55c43d3d1273e2c79ab29c60a714a97d2ca0f264
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
92fc138524 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am: d4716c1a62 -s ours
am skip reason: subject contains skip directive

Change-Id: If29e30a1516d869c647bb9634eb8c1d3b4b9b3f9
2019-02-20 11:06:41 -08:00
Xin Li
a99376f647 [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am: 9d8c2cc2c6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic2e84fd1810cf9eb661c2c4b4b32755821cf17e3
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
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
ee4a5291a1 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
am: db7da4cba8

Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92
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
Xin Li
d61c2adf09 DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
2019-02-14 00:03:58 -08:00
markchien
2ee5beaa32 Merge "Fix wrong TetherProvisioningActivity definition"
am: f1e3e9d627

Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
2019-02-13 22:34:49 -08:00
Treehugger Robot
f1e3e9d627 Merge "Fix wrong TetherProvisioningActivity definition" 2019-02-14 06:19:30 +00:00
markchien
8c713fc756 Fix wrong TetherProvisioningActivity definition
Bug: 122108346
Bug: 120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
2019-02-14 03:24:52 +00:00
Hall Liu
5232a30b03 Merge "Add ACCESS_FINE_LOCATION to permissions"
am: a23ceba5c3

Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b
2019-02-13 16:14:10 -08:00
Hall Liu
a23ceba5c3 Merge "Add ACCESS_FINE_LOCATION to permissions" 2019-02-13 23:21:43 +00:00
Fan Zhang
32fbf4740d Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
am: dabfd96c82

Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
2019-02-13 10:16:15 -08:00
Fan Zhang
dabfd96c82 Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" 2019-02-13 18:04:09 +00:00
Fan Zhang
1ea003e834 Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
This reverts commit 910457e37a.
Fixes: 124370422


Reason for revert: b/124370422


Error: 

The following topic from AOSP:

https://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)

Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:

FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
2019-02-13 17:59:40 +00:00
Mark Chien
0ac1c323b2 Merge "Support entitlement check in DSDS"
am: e3b4e0262c

Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8
2019-02-12 19:25:31 -08:00
Fan Zhang
dd3e2c4f27 Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am: 3905ad125d

Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782
2019-02-12 18:41:40 -08:00