Commit Graph

5405 Commits

Author SHA1 Message Date
Kevin Chyn
de57cea3c3 resolve merge conflicts of 2c712acefa to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie50a4cf9233732646ef340dbce54f5f51bda64cd
2019-09-26 21:09:25 -07:00
joshmccloskey
2c712acefa Added secure setting for face re enrollment.
am: cfc621518c

Change-Id: If3ed42ee2cebd112a5d243eab516f25dc3946e92
2019-09-26 20:06:54 -07:00
joshmccloskey
cfc621518c Added secure setting for face re enrollment.
Test: Verified that the flag could be modified with
adb shell settings put secure...
Bug: 141380252

Change-Id: Ifa24b688a487482e5b02689c1046d85423f73280
2019-09-26 15:54:45 -07:00
Alan Stokes
4e1a74241b Remove unused package_verifier_state setting.
This was added during O development but never used. (It was going to
be used to store whether GPP was enabled, but the relevant settings
screen was implemented in GMS Core instead. See b/31002801, especially
comment 7 onwards.)

It now serves no purpose other than misinformation.

I also updated the test so when backup of settings is misconfigured
the error message tells you which ones.

Change-Id: Ib5e9a9ced1d1a43844889192cefddeec335f9f78
Fix: 34259924
Bug: 135751498
Test: Builds
Test: atest SettingsProviderTest
2019-09-24 15:56:08 +01:00
Stanley Wang
a6d940fc23 Update search indexable interface for dynamic indexing.
Test: manual
Fixes: 140912225
Change-Id: I1290e6569a4712169cabd3d19dffaf200cd93f4b
2019-09-23 11:27:38 +08:00
TreeHugger Robot
32fee770ff Merge "LOCATION_PROVIDERS_ALLOWED fixes" 2019-09-17 18:47:53 +00:00
Amit Mahajan
d0b019bf49 Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093 am: f87866ba9f am: fd8765b95e
am: 0c8c4978ab

Change-Id: I8f82a752c12dc91e8126d2ee923a560d6de2dd8a
2019-09-17 10:55:02 -07:00
Amit Mahajan
0c8c4978ab Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093 am: f87866ba9f
am: fd8765b95e

Change-Id: I1ce7fc6f311f9462f1f505ef5387b2416728c794
2019-09-17 10:49:05 -07:00
Amit Mahajan
fd8765b95e Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093
am: f87866ba9f

Change-Id: I93c5b77138ce7b23e27371a7be15f00e25b987e1
2019-09-17 10:43:02 -07:00
Amit Mahajan
f87866ba9f Merge "Fix descriptions for default SIM in global preferences"
am: eeeb74a093

Change-Id: Ie4e492062c0c1a91b36abce43fde3506ae2cbc60
2019-09-17 10:31:23 -07:00
Taesu Lee
0399854df0 Fix descriptions for default SIM in global preferences
Test: Not required.

Change-Id: I7f32eb495b53d13aba50b07d86e63f0549e9e6bb
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-09-17 13:45:54 +09:00
Mady Mellor
fd48588768 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev 2019-09-16 21:55:51 +00:00
Soonil Nagarkar
4052fc6795 Merge "Remove all code dealing with obsolete location status" 2019-09-16 18:38:57 +00:00
Soonil Nagarkar
fc9c7f8532 Remove all code dealing with obsolete location status
Test: manual
Change-Id: I0fde3dd9bdd418ab63c61c5afc093d8eef72e600
2019-09-13 13:03:14 -07:00
Chen Xu
b9a1eefec6 make CallerInfo as SystemAPI
1. move CallerInfo from telephony.internal to andorid.telephony package
2. expose APIs inside CallerInfo which are consumed by non-telephony
code.

Bug: 140908357
Test: Build
Change-Id: Ie95897c77e97e40f5357c107aede82edfea44d5a
2019-09-12 23:21:06 -07:00
Mady Mellor
a5813e0e3d qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ia7364529ea58070c8d45ecd726ab6ac7d34f2abe
Merged-In: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
Merged-In: Ic3a4ba793db7f1361678ef51c411d9eab85d9b85
2019-09-11 22:42:54 +00:00
Mady Mellor
3e3e48e981 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp 2019-09-11 22:40:21 +00:00
Soonil Nagarkar
10b1960160 LOCATION_PROVIDERS_ALLOWED fixes
Remove unnecessary lock from Settings and fix very old race condition
bug with LOCATION_PROVIDERS_ALLOWED, far too late for the fix to
actually help.

Test: presubmits
Bug: 139487787
Change-Id: I50a597291e589b3cb9bdd616808409a0421a0bfb
2019-09-10 15:48:01 -07:00
Xin Li
d57e959e71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Mady Mellor
8e10394ccc qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ic3a4ba793db7f1361678ef51c411d9eab85d9b85
Merged-In: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
2019-09-09 21:48:30 +00:00
Jonathan Scott
7f08445f65 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3
am: 719cd95a84

Change-Id: I27898e265c24dbb7c4668cb47dbcb23ebdbf2b95
2019-09-06 04:57:04 -07:00
Jonathan Scott
719cd95a84 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev
am: b01fe73ed3

Change-Id: I800c640883b1ef9eff5fff0200a0785ccd2d18ae
2019-09-06 04:44:09 -07:00
Jonathan Scott
68f73efcb9 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev
am: b01fe73ed3

Change-Id: Idd7424cf00a3c5d8d41e3e051d78d0ac4d6c4a19
2019-09-06 04:44:06 -07:00
Jonathan Scott
a5e4422d14 Add MANAGED_PROVISIONING_DPC_DOWNLOADED.
Test: Just adding a constant
Bug: 132261064
Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
2019-09-05 17:31:12 +01:00
Long Ling
1961cf1cdc Move device config key high_refresh_rate_blacklist to display_manager
high_refresh_rate_blacklist belongs to smooth display feature. Move the
key from namespace window_manager to display_manager.

Bug: 139138964
Test: atest WmTests:HighRefreshRateBlacklistTest
Test: Manual adb shell device_config/dumpsys window
Change-Id: I3ae8ecce80ef97c4683a1c18ad81dc78456e9d57
2019-09-03 17:02:11 -07:00
Jeff Sharkey
80cdd27194 Merge "Ignore broken tests, fix flaky tests." 2019-08-30 18:53:09 +00:00
Mady Mellor
8c209679f5 Merge "qt-r1-bubbles-dev @ build 5835883" 2019-08-30 18:11:37 +00:00
Aurimas Liutikas
488d37b2d0 Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be am: ed5beec21b
am: de0ebb082e

Change-Id: I60c55b6706e8d43121e8b2c7a35efff38668f66b
2019-08-30 08:54:38 -07:00
Aurimas Liutikas
de0ebb082e Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be
am: ed5beec21b

Change-Id: I202951d51820be47b9195734601830553215bdd7
2019-08-30 08:43:01 -07:00
Aurimas Liutikas
ed5beec21b Merge "Add missing nullability annotations." into stage-aosp-master
am: 85c0a5a2be

Change-Id: Ic9ea2b9840fbb678bbb6ab77038415581feba918
2019-08-30 08:35:52 -07:00
Mady Mellor
06b770cf14 qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
2019-08-29 20:24:52 -07:00
Aurimas Liutikas
4d1699da48 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-29 17:15:44 -07:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +00:00
Jeff Sharkey
9857135126 Ignore broken tests, fix flaky tests.
Bug: 112545973
Test: atest --test-mapping frameworks/base/core/java/android/provider/
Change-Id: I0d7635b165826fda9e590b24d17f9bcffaab1cc8
2019-08-29 14:13:09 -06:00
Dave Mankoff
10b34a5a9c Merge "Use a testable version of DeviceConfig in the FalsingManager." 2019-08-29 19:58:37 +00:00
Ian Kasprzak
1a5bb83588 [DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495
- Moved exclude filters to existing stanzas
- Removed new stanzas added w/ filters
- Removed un-needed filters because existing "include-filter"
  already excludes failing tests.

Disabling in preparation for merge to aosp-master (Q release).

Disabling the following tests:
FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate
CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices
CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures
CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest

Test: Forrest
Exempt-From-Owner-Approval: Disabling known failing TEST_MAPPING tests
for AOSP push to Q.

Change-Id: I4dc2408c5bc6d421654f871c5d63d402c1d96d91
2019-08-29 10:38:56 -07:00
Al Sutton
d4299771ec Add test mappings to ensure settings backup tests run on appropriate changes.
In core/java/android/provider we want to run the tests which were being run
before they were moved into the SettingsProviderTest suite. To do this I've
followed the existing pattern of running tests marked with the @Presubmit
annotation.

In packages/SettingsProvider we want to run the whole suite on any changes,
which is why there is no filter on that change.

Bug: 139449903
Test: atest and manual verification the moved tests run
Change-Id: If7fd3978a96b979e1cf340803f5a36412de36f65
2019-08-29 07:13:57 +01:00
Raman Tenneti
f997c75d69 [DO NOT MERGE] Disabled the following tests in TEST_MAPPING:
FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate
CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices
CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures
CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest

Disabling in preparation for merge to aosp-master (Q release).

Test: Forrest (atest)
L55600000358896983, L81400000359164936
BUG: 139704630
BUG: 139535570
BUG: 139536812
BUG: 139535125
BUG: 139305203
Change-Id: I9be2efd464fe031a0269fa5a3913ddb4959ba05d
Exempt-From-Owner-Approval: Disabling known failing TEST_MAPPING tests for AOSP push to Q.
2019-08-28 23:48:13 +00:00
Dave Mankoff
186bd74665 Use a testable version of DeviceConfig in the FalsingManager.
Clean up the listeners in the test (and elswhere).

Bug: 139051615
Test: atest SystemUITests
Change-Id: I35fa49f9aeeac98da9e4dafa7ae50d67262b2a0b
2019-08-28 12:34:42 -04:00
Al Sutton
0833b2e6f8 Move the list of settings to backup out of the Settings class
Bug: 139449903
Test: atest SettingsProviderTest
Change-Id: Ia1636732e4b6458fd874a6748dddfcaf7d967545
2019-08-28 14:51:20 +01:00
Al Sutton
91f89d0a8b Move the validators out of the settings class
Currently the validators static initialiser gets triggered when the
relevant settings class is accessed. Moving them out to the
SettingsBackupAgent (which is the only place they're used) has two
main advantages;

1) All apps accessing the Settings classes no longer trigger the
static initialisers and so are faster.

2) Putting them in SettingsBackupAgent gets them off the
bootclasspath of all apps and makes the framework jars smaller.

Bug: 139449903
Test: atest SettingsProviderTest RunBackupFrameworksServicesRoboTests CtsBackupTestCases CtsBackupHostTestCases GtsBackupTestCases GtsBackupHostTestCases
Change-Id: Ie740c1ea25a01c715964175094677af2e3328732
2019-08-28 14:51:20 +01:00
Long Ling
119ed4506e Merge changes from topic "device_config_for_display_qpr1" into qt-qpr1-dev am: 30e9250f19
am: 7adf3f0109

Change-Id: Ia17a834fa382f31ca30a8df50063554dea0859b0
2019-08-26 23:16:39 -07:00
Long Ling
7adf3f0109 Merge changes from topic "device_config_for_display_qpr1" into qt-qpr1-dev
am: 30e9250f19

Change-Id: I6db03bb92b73c799944764014acb31ebc3038165
2019-08-26 21:59:12 -07:00
Long Ling
ba9b991d1e Merge "DeviceConfig: Add Name space and keys for Display Manager" 2019-08-26 21:59:22 +00:00
Long Ling
3b58effa1a DMD: Support minimum refresh rate
Bug: 139685237
Change-Id: Ib41dee351276d70733fffa18620455e4e6f9ddfc
2019-08-26 11:59:13 -07:00
Long Ling
7227ff19aa DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
am: dde6248065

Change-Id: Ic452fed2390fab0f69799a192ce86402b4c0cb7e
2019-08-23 06:24:30 -07:00
Long Ling
dde6248065 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
Bug: 139138964
Change-Id: I077380583f0daf650b17832a6cec4919b41ac155
2019-08-23 13:00:53 +00:00
Jeff Sharkey
ec19e9b107 Public APIs for ID-specific Uris, misc items.
We have getContentUri() for entire collections of items, but we
only have ID-specific overloads for some of the MediaStore classes;
let's get them all added for consistency.

Remove primary/secondary directory logic, which was replaced by
new RELATIVE_PATH column before Q launched.

Bug: 137890034
Test: atest --test-mapping packages/providers/MediaProvider
Exempt-From-Owner-Approval: trivial API refactoring
Change-Id: Iae4e7fe57adff071c35af459e31223a1fd05fef2
2019-08-22 14:43:24 -06:00
Long Ling
9df1afdec3 DO NOT MERGE DMD: Support minimum refresh rate
am: 86ce8f764b

Change-Id: Iec38a8e5140074311c40fab7583bd164ea5411b1
2019-08-21 19:57:37 -07:00
Long Ling
bc75c53d84 DO NOT MERGE DMD: Support minimum refresh rate
am: 86ce8f764b

Change-Id: I5f0fd5ea784013783fd2c53170406ee2a7f17560
2019-08-21 19:56:54 -07:00