Commit Graph

46029 Commits

Author SHA1 Message Date
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
Mark Chien
e3b4e0262c Merge "Support entitlement check in DSDS" 2019-02-13 02:29:01 +00:00
Kiyoung Kim
974ace22f9 Merge "Schematize ADB system properties"
am: 750b90a22b

Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576
2019-02-12 18:06:33 -08:00
Fan Zhang
3905ad125d Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" 2019-02-13 00:12:08 +00:00
Torbjorn Eklund
73ffcf4999 Close Wi-Fi Calling screen if provisioning status changes to disallow
Starts to listen for provisioning changes in Wi-Fi Calling screen and
closes the screen if the Wi-Fi Calling provisioning status changes to
disallow.

This prevents the Wi-Fi Calling screen from being kept open if the Wi-Fi
Calling provisioning status is changed to disallow while the Wi-Fi
Calling screen is open.

Bug: 119389855
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Merged-In: I2af91c3734274f0aea942a8bb894d6f4ce295354
Change-Id: I2af91c3734274f0aea942a8bb894d6f4ce295354
2019-02-13 00:11:30 +00:00
Treehugger Robot
750b90a22b Merge "Schematize ADB system properties" 2019-02-12 18:35:23 +00:00
markchien
c992d0f4a9 Support entitlement check in DSDS
Get resource from preferred SIM's subId.

Bug: 122108346
Bug: 120069528
Test: atest TetherServiceTest
Change-Id: Ia4279a418dfa6cd14942b7f4d2a313156066381b
Merged-in: Ia4279a418dfa6cd14942b7f4d2a313156066381b
2019-02-12 16:17:36 +08:00
Kiyoung Kim
4d8f4919e0 Merge "Schematize Display system properties"
am: b139a4c16b

Change-Id: I82b157865fb288044c251d6d78ca850b22502db0
2019-02-11 19:13:51 -08:00
Kiyoung Kim
6ade19a3bf Schematize ADB 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: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
Merged-In: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
2019-02-12 02:58:11 +00:00
Treehugger Robot
b139a4c16b Merge "Schematize Display system properties" 2019-02-12 02:50:08 +00:00
android-build-team Robot
98cdb732ce Snap for 5180536 from c103b546d2 to pi-platform-release
Change-Id: Ice12b1967a41a792bb4e1816d0fe07bc61328788
2019-02-09 02:23:26 +00:00
Hall Liu
a6840cac03 Add ACCESS_FINE_LOCATION to permissions
Add ACCESS_FINE_LOCATION to permissions in order to satisfy new
restrictions.

Bug: 116258458
Test: manual
Change-Id: Icdc45c3a02cd5bf784d0475243b7d53ba9861777
2019-02-05 17:09:22 -08:00
Stanley Tng
f8ba53c6fb Merge "Update the Hearing Aids Strings"
am: 3afa2a7acb

Change-Id: I5310642f04558d961aa82df933791b08d883d92e
2019-02-05 13:05:41 -08:00
Treehugger Robot
3afa2a7acb Merge "Update the Hearing Aids Strings" 2019-02-05 20:20:51 +00:00
Stanley Tng
d6f1b59c93 Update the Hearing Aids Strings
Minor update to the Hearing Aids string by making it plural and also
remove a redundant word "currently".

Bug: 121036176
Test: Compile
Change-Id: I829b8028408f5d07d950580bd4d90ca41bd334f3
2019-02-02 17:56:19 +00:00
Pavel Grafov
7c47743851 Merge "Update to use new ConnectivityManager API."
am: 70b1830e7e

Change-Id: Ide228930858fc8eccfac060858b0da86725f229a
2019-01-28 20:28:09 -08:00
Pavel Grafov
70b1830e7e Merge "Update to use new ConnectivityManager API." 2019-01-28 20:15:49 +00:00
Pavel Grafov
6a0a7be9a2 Update to use new ConnectivityManager API.
Bug: 77468593
Test: builds
Change-Id: I1fa542e015add2dd8b0e8620f2021c1a5c1c9f1a
2019-01-25 18:58:17 +00:00
Eran Messeri
74bd41f305 Merge "Add Enterprise owners for Enterprise settings"
am: 35416e7529

Change-Id: I2823cff17e5b77b3cd449d739c908b0b8c0c9c58
2019-01-24 15:03:28 -08:00
Treehugger Robot
35416e7529 Merge "Add Enterprise owners for Enterprise settings" 2019-01-24 22:56:27 +00:00
Dan Albert
2105dc52dd Merge "Revert "Update to use new ConnectivityManager API.""
am: 9c7ddce334

Change-Id: Icd2bf95c10716d324b47151fddc34a31f5736355
2019-01-24 13:39:06 -08:00
Dan Albert
9c7ddce334 Merge "Revert "Update to use new ConnectivityManager API."" 2019-01-24 21:08:46 +00:00
Dan Albert
6e91f68ae4 Revert "Update to use new ConnectivityManager API."
This reverts commit 9a9f6f313b.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Ia0ff7cdf77b4edf3bdf5e4c54376b730df48373e
2019-01-24 21:06:02 +00:00
Pavel Grafov
525b0dbc17 Merge "Update to use new ConnectivityManager API."
am: 161f5ec3e9

Change-Id: I14a198bf8c95501473ac963ee6e00331e09daa76
2019-01-24 09:50:37 -08:00
Pavel Grafov
161f5ec3e9 Merge "Update to use new ConnectivityManager API." 2019-01-24 17:34:55 +00:00
Eran Messeri
3cb95abd04 Add Enterprise owners for Enterprise settings
Add owners from the Android Enterprise team to source files that are
either owned or are mostly modified by the Android Enterprise team.

Test: gerrit uploader
Bug: 33166666
Change-Id: I8b4ec7c8895b02c45a6a14d52a3742334234904a
2019-01-24 12:29:56 +00:00
Pavel Grafov
9a9f6f313b Update to use new ConnectivityManager API.
Bug: 77468593
Test: builds
Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1
Merged-In: I614c20b9a1c6748614163766866bb59b15d794f1
2019-01-23 19:53:01 +00:00
Kiyoung Kim
59e3152a0e Schematize Display 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: If0b7658e4f04848a6a068c18e93026591b7b5518
Merged-In: I83b40ddfcde32d8d03fae73f5c252013933c466c
2019-01-21 15:00:10 +09:00
Fan Zhang
0d8ea3bfce Merge "Add Dynamic tiles"
am: 15bf05f6fd

Change-Id: I0998725bc59e1d4f9b8afff388c2a9a3c680423c
2019-01-17 17:08:14 -08:00
Fan Zhang
15bf05f6fd Merge "Add Dynamic tiles" 2019-01-18 00:47:52 +00:00
jin.dong
b82df9bd43 Add Dynamic tiles
Add new CategoryKey for screens below:
    about_legal.xml
    my_device_info.xml
    battery_saver_settings.xml

Bug: 113249409
Change-Id: I3cdad9b6ceeba0df3e0e9db4607daffcc5cbdc8b
Merged-In: I3cdad9b6ceeba0df3e0e9db4607daffcc5cbdc8b
2019-01-16 00:54:07 +00:00
Anton Hansson
bc79e6e6f3 Merge "Make the Settings permission a required module"
am: 480b56e3d6

Change-Id: I2316d82bb50778e6f524d708cc1711dcd69f1f9d
2019-01-14 08:11:21 -08:00
Anton Hansson
480b56e3d6 Merge "Make the Settings permission a required module" 2019-01-14 16:03:16 +00:00
Anton Hansson
09064cf6d9 Make the Settings permission a required module
This will include the Settings permission file whenever
the Settings app is installed.

Bug: 110072687
Test: make
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ia2548355282498bceeffddb564de32a6cb857c66
Merged-In: Ia2548355282498bceeffddb564de32a6cb857c66
(cherry picked from commit 16322a0271)
2019-01-14 15:50:28 +00:00
Anton Hansson
297fe94122 Merge "Move Settings app to /product"
am: 0a399bf543

Change-Id: Ia4a28ee04e834727d7cfa86e67f1038f16aeee1d
2019-01-14 01:22:53 -08:00
Anton Hansson
0a399bf543 Merge "Move Settings app to /product" 2019-01-14 09:06:25 +00:00
Anton Hansson
9a7786b3e1 Move Settings app to /product
Since this app is frequently customized by OEMs, it doesn't
fit in the mainline /system image right now. Move it to
/product.

Bug: 110072687
Test: make
Change-Id: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
Merged-In: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
(cherry picked from commit f109282c8e)
2019-01-11 16:41:54 +00:00