Commit Graph

5268 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
86ce8f764b DO NOT MERGE DMD: Support minimum refresh rate
Bug: 139685237
Change-Id: Ib41dee351276d70733fffa18620455e4e6f9ddfc
2019-08-21 13:42:03 -07:00
Long Ling
999a704b02 DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager
am: 6f13f12213

Change-Id: I299e0eecf9d52e12ecf71b1f1b566637f4479e02
2019-08-21 12:55:19 -07:00
Raman Tenneti
120715a56b Merge "Wait until any background events are processed." into stage-aosp-master am: 0589325300
am: 8cf1cab8c4

Change-Id: I7648fba978a44d421021e4a7e4a821ebf3ef4b38
2019-08-21 12:31:17 -07:00
Raman Tenneti
8cf1cab8c4 Merge "Wait until any background events are processed." into stage-aosp-master
am: 0589325300

Change-Id: I198e5863a5f4f3e8b7dec0e5ae13be2548719285
2019-08-21 12:09:54 -07:00
Long Ling
6f13f12213 DO NOT MERGE 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-08-21 10:45:29 -07:00
Long Ling
66e9298ac6 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
Bug: 139138964
Change-Id: I077380583f0daf650b17832a6cec4919b41ac155
2019-08-21 10:45:22 -07:00
Jeff Sharkey
9f6f8bedbc Wait until any background events are processed.
Some MediaProvider events (such as thumbnail invalidation) are
handled on a background thread.  To reduce flaky tests, wait until
all background events have been processed, which is more robust
than sleep.

Bug: 134879702
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ia032b19c1b0e5c0096c55bf3d46a5153525e89fa
(cherry picked from commit efad242f35)
2019-08-19 22:15:51 +00:00
Kevin Chyn
709b0a4a74 Merge "Remove unused setting" into qt-r1-dev
am: 95a675ce91

Change-Id: Ia72e5c6625f8213c807966312550111bcbdcb767
2019-08-19 15:08:45 -07:00
Kevin Chyn
95a675ce91 Merge "Remove unused setting" into qt-r1-dev 2019-08-19 21:50:22 +00:00
Kevin Chyn
d806bc4c11 Remove unused setting
Bug: 139554930

Test: manual
Change-Id: I5c4af200b0c61efb9a0f76d00c2f047d4880d77b
Merged-In: I5c4af200b0c61efb9a0f76d00c2f047d4880d77b
2019-08-17 04:52:47 +00:00
Kevin Hufnagle
98fdc74e1c Merge "docs: Removed dates in obsolete field messages." into qt-dev am: 45855214b5
am: 3956d9606c

Change-Id: I2171e3587c1f4394bc47b082b7723f9722bc054f
2019-08-07 15:34:29 -07:00
Kevin Hufnagle
66c6c0b5a1 Merge "docs: Removed dates in obsolete field messages." into qt-dev
am: 45855214b5

Change-Id: Ib60b83f6d0c372a7fc6b9069f8c5ddb20d10fd90
2019-08-07 15:23:41 -07:00
Kevin Hufnagle
3956d9606c Merge "docs: Removed dates in obsolete field messages." into qt-dev
am: 45855214b5

Change-Id: I549026ea364645a8d60a1a06df9b20886a6df97a
2019-08-07 15:23:39 -07:00
Kevin Hufnagle
6f809e2f7c docs: Removed dates in obsolete field messages.
Notices about obsolete fields and methods now mention the publish
location (Google Play Store) or Android version (Q and higher).

Test: make ds-docs

Bug: 122482744
Change-Id: Idb60fef711401d43af8eb71343f157590c311571
2019-08-06 18:21:18 -07:00
Adrian Roos
fde134f106 GestureNav: Log exclusion rect heights
am: 5f2c9a14f5

Change-Id: I6b72f4b68773a21575296601f5545746d012524e
2019-08-05 14:17:15 -07:00
Adrian Roos
5f2c9a14f5 GestureNav: Log exclusion rect heights
Logs the rejected and requested exclusion rect heights.

Test: adb shell device_config put android:window_manager key_system_gesture_exclusion_log_debounce_millis 1000
Bug: 135152789
Change-Id: Ie12640f4bf0a8b40b666e604188a0bedd85e8981
Exempt-From-Owner-Approval: DeviceConfig.java: Adding constant to WindowManager namespace.
2019-08-05 21:19:40 +02:00
Michael Wright
d6bd615920 Merge "Read the high refresh rate blacklist from DeviceConfig." into qt-r1-dev
am: 6173ba7475

Change-Id: Ifcbac79c98889f3b0f1463537f5e179164e8075a
2019-07-11 20:52:21 -07:00
Michael Wright
6a51b35a7d Read the high refresh rate blacklist from DeviceConfig.
When available, we should read the high refresh rate blacklist from
DeviceConfig, and use the device's configured list as a default /
fallback. This lets us change the blacklist in the field in case we find
additional compatibility issues, or one of the developers fixes their
app and asks us to remove them from the blacklist.

Fixes: 132338514
Test: atest WmTests:HighRefreshRateBlacklistTest
Exempt-From-Owner-Approval: TBR
Merged-In: I984dab60eeafff01758ac38c3db6056b33f662a6
Change-Id: I984dab60eeafff01758ac38c3db6056b33f662a6
2019-07-11 16:26:35 +02:00
Adrian Roos
ace63f135b Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev am: 8ef731c232
am: bee24f79f7

Change-Id: Ic14aaff3851fe0d71100c6f65c8ee46d08ece432
2019-07-04 08:21:20 -07:00
Adrian Roos
7ca3a9c19f Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev
am: 8ef731c232

Change-Id: I38453506b3801252c44289a988998261ad97d70b
2019-07-04 08:07:23 -07:00
Adrian Roos
bee24f79f7 Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev
am: 8ef731c232

Change-Id: Ie23184e62d410cff170232d15720b22d53f7e6df
2019-07-04 08:07:23 -07:00
Adrian Roos
019a52b4ad WM: implicitly exclude all edges for pre-Q immersive sticky apps
Bug: 135522625
Test: atest DisplayContentTests
Change-Id: Ibe6c2c6d269b15c2e79ac0241b93e42c44a167c9
Exempt-From-Owner-Approval: TBR
2019-07-04 14:35:34 +00:00
Beverly
5f70f7b861 Merge "Add gesture touch counts" into qt-r1-dev
am: 8607680ee7

Change-Id: I2436437e4e8fefbc514d20a3d7f8d04559e03416
2019-07-02 11:41:05 -07:00
TreeHugger Robot
8607680ee7 Merge "Add gesture touch counts" into qt-r1-dev 2019-07-02 17:42:00 +00:00
Selim Cinek
7bed31955b Merge changes I089fa8ff,I8db745c1,I6fa83189 into qt-r1-dev
am: a0aa088c9f

Change-Id: I6d97a64ad21a4125761da9a833ca4bf0654e7642
2019-06-29 16:49:07 -07:00
Selim Cinek
a0aa088c9f Merge changes I089fa8ff,I8db745c1,I6fa83189 into qt-r1-dev
* changes:
  Showing heads up for music when bypassing
  Not rendering background when bypassing
  Made sure the lock icon is invisible while hunned
2019-06-29 23:11:43 +00:00
Selim Cinek
e3c6e46e95 Showing heads up for music when bypassing
Users where missing the music controls so
we are showing a headsup for them on the
lockscreen.

Fixes: 	134543453
Change-Id: I089fa8ff35b918f485f79e09393173f05971a73e
2019-06-28 19:14:55 -07:00
Edgar Wang
aa9010894b Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev
am: 98a51d1080

Change-Id: Ia5aebe8d37a7c375137dc0c4895da62a6ed305cc
2019-06-28 14:30:25 -07:00
Beverly
e6727ee6da Add gesture touch counts
Test: manual
Bug: 136229528
Change-Id: I805dfbba821c798c59c0d232e60f41890bc9b20d
2019-06-28 14:23:58 -04:00
Jorim Jaggi
52ba8df055 Merge "GestureNav: Limit exclusion rects" into qt-dev am: ea3216d462
am: de8014e068

Change-Id: Ibaa2b5dbe34ed53f3c64feca4d71dfa43b6d5f44
2019-06-28 08:53:29 -07:00
Jorim Jaggi
5f6a315ed3 Merge "GestureNav: Limit exclusion rects" into qt-dev
am: ea3216d462

Change-Id: Iec5962ddf1dc34f24b99add93a65fc4f69debcde
2019-06-28 08:22:48 -07:00
Jorim Jaggi
de8014e068 Merge "GestureNav: Limit exclusion rects" into qt-dev
am: ea3216d462

Change-Id: Id52bcbd80028ce0030b7f8b38058e7a786744497
2019-06-28 07:48:06 -07:00
Adrian Roos
506267d5f4 GestureNav: Limit exclusion rects
Add limits for system gesture exclusion on the left and right edges.
This prevents non-immersive-sticky apps from totally disabling the
back gesture.

Bug: 135522625
Test: atest SystemGestureExclusionRectsTest

Merged-In: Ib26161663a6aababe803d3c70044f4017bdbe675
Change-Id: Ib26161663a6aababe803d3c70044f4017bdbe675
2019-06-28 17:59:06 +08:00
Edgar Wang
98a51d1080 Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev 2019-06-27 06:36:34 +00:00
Robert Snoeberger
be57a19313 Merge "Handle case that settings string is JSON" into qt-r1-dev
am: 6060068d5a

Change-Id: I3386b08801beb7356edb37c5485b29188d8a7c3f
2019-06-21 10:07:18 -07:00
Robert Snoeberger
06d2500944 Handle case that settings string is JSON
Settings.Secure string for clock face may be JSON so that it can contain
the timestamp that it was set for logging purposes.

Bug: 134687399
Test: Added SettingsWrapperTest
Change-Id: I50afba479c30029428819c6616ca754db681a2b4
2019-06-20 15:06:28 -04:00
Lucas Dupin
7c7b8c28ca Allow wake_lock_screen when AOD is off
Also decoupling the settings, so they can be configured
separately.

Fixes: 135023656
Test: manual
Test: adb shell settings put secure doze_wake_lock_screen_gesture 0
Test: adb shell settings put secure doze_wake_lock_screen_gesture 1
Change-Id: I2138d5d06919b9c23428663e49381fc1b694e301
2019-06-17 23:56:52 +00:00