Commit Graph

45924 Commits

Author SHA1 Message Date
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
Brad Ebinger
db7da4cba8 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" 2019-02-14 21:01:05 +00: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
a23ceba5c3 Merge "Add ACCESS_FINE_LOCATION to permissions" 2019-02-13 23:21:43 +00: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
e3b4e0262c Merge "Support entitlement check in DSDS" 2019-02-13 02:29:01 +00: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
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
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
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
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
Treehugger Robot
35416e7529 Merge "Add Enterprise owners for Enterprise settings" 2019-01-24 22:56:27 +00: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
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
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
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
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
Nathan Harold
7588ef1518 Merge "Fix BandMode Dialog Crash on Open due to Style" 2019-01-08 00:18:21 +00:00
Treehugger Robot
6827785e52 Merge "Add support for FEATURE_NFC_ANDROID_BEAM" 2019-01-04 21:49:14 +00:00
Nathan Harold
63b1ab12f6 Fix BandMode Dialog Crash on Open due to Style
This sidesteps an error saying that the radio
BandMode activity must inherit from an AppCompat
style. Instead the window is now full-screen and
matches the theme of the RadioInfo menu.

Bug: 117571514
Test: manual - open the activity without a crash and
      verify that the new style change is effective.
Change-Id: I6e49d731e039709db43dfa6531723781e9e48640
2019-01-03 09:51:49 -08:00
Pengquan Meng
66d28c3e37 Merge "Add PreferenceChangeListener to ApnSettings" 2018-12-27 23:36:18 +00:00
Lei Yu
81cb8a2612 Merge "Update color-check-baseline.xml" 2018-12-27 21:35:31 +00:00
Pengquan Meng
2f434aa7ca Add PreferenceChangeListener to ApnSettings
The PreferenceChangeListener was removed from aosp/779634, when the
selected apn is changed, the result is not saved to the database.

In this CL, we add the PreferenceChangeListener back.

Bug: 121229775
Test: build & manual test
Change-Id: Ief1a2e05c072e5eff8060731b044c19878d346be
2018-12-27 13:27:26 -08:00
Lei Yu
3cab6d51fb Update color-check-baseline.xml
Since these colors are already fixed in internal master(ag/4164571).
This CL only update the baseline and won't merge down.

Change-Id: I19dbca351fb786b9dbbb84bf7f50ccc0347bd0cf
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 110960820
Test: repohook
2018-12-21 14:20:01 -08:00
Jack Yu
bcd6a7db39 Merge "Moved data settings to phone" 2018-12-21 02:29:43 +00:00
Calvin Pan
d594716359 Merge "Rename SIM_APN_LIST to SIM_APN_URI" 2018-12-21 01:31:44 +00:00
Jack Yu
e5accf70fb Moved data settings to phone
Since there are multiple DcTrackers, but we only have
one set of data settings. So we need to move them from
DcTracker to Phone.

Test: Telephony sanity tests + unit tests
Bug: 73659459
Merged-In: If11a6eff057a18b4aa97addbb348537bd3194e1a
Change-Id: If11a6eff057a18b4aa97addbb348537bd3194e1a
(cherry picked from commit 50972ed89e)
2018-12-20 15:23:11 -08:00
Treehugger Robot
fd0426d438 Merge "Remove unused system properties" 2018-12-20 09:24:39 +00:00
calvinpan
9b56a8b278 Rename SIM_APN_LIST to SIM_APN_URI
In Telephony SIM_APN_LIST had been rename to SIM_APN_URI.

Bug: 120031619
Test: Build pass.
Change-Id: I203c765c7ba6ee468f76dbfdb84b50c787ac8dbe
2018-12-20 07:09:42 +00:00
Inseob Kim
1119bb9399 Remove unused system properties
Properties ro.config.license_path and ro.config.manual_path are not set
from anywhere but only from a test.

Bug: N/A
Test: mma -j
Change-Id: I651405f3a201f5129bf37059e96e7bcc5efa73bf
Merged-In: I651405f3a201f5129bf37059e96e7bcc5efa73bf
2018-12-20 00:33:24 +00:00
Ruchi Kandoi
b7251fa693 Add support for FEATURE_NFC_ANDROID_BEAM
Test: Check if app shows the Toggle switch
Bug: 117519147
Change-Id: I395653dd977dc9b149fc343b533d15df71affaf1
2018-12-18 16:08:43 -08:00
Treehugger Robot
765621670b Merge "Refine APN fetching logic" 2018-12-17 08:03:04 +00:00
Josh Hou
e519cd6e68 Refine APN fetching logic
APN fetching logic has been encapsulated in URL_SIM_APN_LIST API in
TelephonyProvider

Bug: 115709816
Test: Live network test
Change-Id: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b
Merged-In: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b
2018-12-17 07:16:50 +00:00
Treehugger Robot
889a8a3757 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" 2018-12-13 05:45:20 +00:00
Xin Li
419086d8b3 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: I63bedf30fa0a4629cfab1dbe94359b4d36cf9ac1
2018-12-11 15:24:05 -08:00