summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-20Merge cherrypicks of [9427457, 9427458, 9427580, 9427582, 9427507, 9427508, ↵android-10.0.0_r13android10-c2f2-releaseandroid-build-team Robot
9427532, 9427584, 9427394, 9427473, 9427585, 9427396, 9427474, 9427586, 9427587, 9427588, 9427547, 9427589, 9427476, 9427477, 9427478, 9427479, 9427640, 9427548, 9427398, 9427591, 9427509, 9427510, 9427511, 9427512, 9427515, 9427516, 9427517, 9427518, 9427519, 9427720, 9427643, 9427570, 9427721, 9427722, 9427725, 9427726, 9427727, 9427730, 9427731, 9427740, 9427741, 9427742, 9427743, 9427744, 9427745, 9427746, 9427747, 9427571, 9427592, 9427593, 9427647] into qt-c2f2-release Change-Id: Ifcd13263c32d597564f1f5046e3bc2155262363c
2019-09-20Fix issue where notif wouldn't HUNLucas Dupin
DozeSensors and DozeTriggers have code that perform proximity checks in slightly different ways. DozeSensors was updated as part of ag/9185335 bug DozeTriggers wasn't. Bug: 9185335 Fixes: 140701062 Bug: 138765669 Test: partially cover prox, send notification, look at screen Change-Id: Ic85181abb3edd4c77c427faefa4cd6b9c35b498f Merged-In: Ic85181abb3edd4c77c427faefa4cd6b9c35b498f (cherry picked from commit 19ef3004c16f7fa572b98a5c3755fedcfc407410)
2019-09-20Assume sensors perform prox checkLucas Dupin
Assume that doze sensors will be prox gated. Not doing so would be a bad idea anyway since the device would wake up way more often than it should and drain battery. Another improvement on this CL is that regular DozeSensors prox checks are trying to use a binned brightness sensor instead. Fixes: 138765669 Test: atest DozeSensorsTest DozeTriggersTest Test: single tap from AOD (observe no re-registration of lift) Test: 'reach' from AOD (observe no re-registration of lift) Test: receive notification with prox covered or unobstructed Change-Id: I1961ff9b16480ba1a60c397570494dd7acb4802d (cherry picked from commit f40bd8fbb65c896c824fe3f1a5be857bbe8ae281) Merged-In: I1961ff9b16480ba1a60c397570494dd7acb4802d (cherry picked from commit 9bab4a26245ecbc204b617cc3c046bdadf9e65e2)
2019-09-20Add keylayout for original xbox controllerSiarhei Vishniakou
We are still missing a key layout for the original xbox controller with product id 02dd. Add the missing layout here. Bug: 140808513 Test: manual test by plugging in the actual joystick and using the custom tester app Change-Id: Ib84e3ac04ff58f890ce7743423cc9b869af347db (cherry picked from commit 0c1c820d9dcf66a86aaf393e97646082c522f543)
2019-09-20Update Xbox BT controller mapping for new FWJared Henderson
The Xbox controller (product id 0x02fd) is going to have a new firmware update this fall that sends a different keycode (316/BUTTON_MODE) for the Xbox button. The goal is to enable the Xbox button to make it to apps on all Android versions -- with our without a controller-specific key mapping file. Unfortunately, the new Vendor_045e_Product_02fd.kl key mapping file that was added to Android Q maps the pre-firmware-update Xbox key code (172) to BUTTON_MODE, yet it makes no mention of key 316. This results in apps getting a raw 316 scan code instead of a BUTTON_MODE KeyEvent when using a controller with the latest firmware on Android Q. The fix is to add an additional key mapping for 316 that *also* maps to BUTTON_MODE. With both mappings in place, both pre and post firmware-updated controllers will get the correct behavior for the Xbox button on Android Q. Test: AFAIK, no CTS tests exist for Xbox controller key mappings; we'll need to add some at a later date. I was unable to test this change because I'm unable to write to the system directory on any of my devices, but I know that mapping 316 to BUTTON_MODE will fix the issue. Signed-off-by: Jared Henderson <jaredh.microsoft@gmail.com> Bug: 139512030 Bug: 140808513 Merged-In: I8600ea79a0aa8557267d6ca712e5d56680e7a98b Change-Id: I8600ea79a0aa8557267d6ca712e5d56680e7a98b (cherry picked from commit b08c0be8a0e83404faa1a0424afe63ff490ddd37)
2019-09-20[DO NOT MERGE] Check property name before apply high refresh rate black listLong Ling
Bug: 140233077 Change-Id: Ib2afc54c43ae5a9f3af8a0a0e65bc2c930428152 (cherry picked from commit 0113bc0c9520abcc5cdb7a985fc3402bf899252d)
2019-09-20DMD: Support 90hz only in the refresh rate zoneLong Ling
Also allow DeviceConfig to change the zone behavior to 60 Hz only. Change BrightObserver priority to be the lowest so application request won't be overriden by BrightnessObserver Bug: 139487676 Change-Id: I959550350c1ea72f764984226350ebc6e7de591c (cherry picked from commit 73936631d57b4626ba0a389065e2dabcaf0daa79)
2019-09-20Merge cherrypicks of [9426564, 9426565, 9426566, 9426567, 9425837, 9426546, ↵android-build-team Robot
9426547, 9426663, 9425933, 9425934, 9425935, 9426621, 9426622, 9426548, 9426599, 9426920, 9426921, 9426922, 9426923, 9426924, 9426925, 9425775, 9425838, 9426623, 9426664, 9426665, 9426666, 9426667, 9426668, 9426669, 9426568, 9426569] into qt-c2f2-release Change-Id: Ia4fe89419f3803a745a226b5c9f8b4c2f329c7af
2019-09-20RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.Jeff Sharkey
Malicious callers can leak side-channel information by using subqueries in any untrusted inputs where SQLite allows "expr" values. This change offers setStrictGrammar() to prevent this by outright blocking subqueries in WHERE and HAVING clauses, and by requiring that GROUP BY and ORDER BY clauses be composed only of valid columns. This change also offers setStrictColumns() to require that all untrusted column names are valid, such as those in ContentValues. Relaxes to always allow aggregation operators on returned columns, since untrusted callers can always calculate these manually. Bug: 135270103, 135269143 Test: atest android.database.sqlite.cts.SQLiteQueryBuilderTest Test: atest FrameworksCoreTests:android.database.sqlite.SQLiteTokenizerTest Change-Id: I0dacb53170ce573a2fe103cbff455782bfdb5d41 (cherry picked from commit 0e66ea6f3221aa8ccbb78ce38fbcaa67d8ea94f9)
2019-09-20RESTRICT AUTOMERGEJeff Sharkey
Enable stricter SQLiteQueryBuilder options. Malicious callers can leak side-channel information by using subqueries in any untrusted inputs where SQLite allows "expr" values. This change starts using setStrictColumns() and setStrictGrammar() on SQLiteQueryBuilder to block this class of attacks. This means we now need to define the projection mapping of valid columns, which consists of both the columns defined in the public API and columns read internally by DownloadInfo.Reader. We're okay growing sAppReadableColumnsSet like this, since we're relying on our trusted WHERE clause to filter away any rows that don't belong to the calling UID. Remove the legacy Lexer code, since we're now internally relying on the robust and well-tested SQLiteTokenizer logic. Bug: 135270103 Bug: 135269143 Test: atest DownloadProviderTests Test: atest CtsAppTestCases:android.app.cts.DownloadManagerTest Change-Id: Iec1e8ce18dc4a9564318e0473d9d3863c8c2988a (cherry picked from commit 13f49c42599dc2ea0be376be34275aefcb70d398)
2019-09-20Set default phonebook access to ACCESS_REJECTED when user didn't chooseZongheng Wang
one When there's no users' choice to tell us whether to share their phonebook information to the Bluetooth device, set the phonebook access permission to ACCESS_REJECTED. Bug: 138529441 Test: Manual test Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df (cherry picked from commit 810c6d2117aeec7ca749e707b2e3a297eb8a265e) (cherry picked from commit efdcff245255575bcdb8adc65aef7ba9f8fd1725)
2019-09-20Add MANAGED_PROVISIONING_DPC_DOWNLOADED.Jonathan Scott
Test: Just adding a constant Bug: 132261064 Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9 Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9 (cherry picked from commit a5e4422d14b950a159562accbb8bd59cd1874f5d)
2019-09-20Use UnlockMethodCache#canSkipBouncer in user switcherFabian Kozynski
KeyguardMonitor#canSkipBouncer was not updated properly when the phone was unlocked using fingerprint. This CL removes that method and changes UserSwitcherController to query UnlockMethodCache directly, as it was KeyguardMonitor's only client for that method. Test: manual unlocking with FP and with pattern Test: no automated test yet Bug: 140486529 Merged-In: Idbff4fbabca962c632ff5d78b25418c0502db9a7 Change-Id: Idbff4fbabca962c632ff5d78b25418c0502db9a7 (cherry picked from commit d2eb34b689eaa8a9b064b4e69773083c723e3756)
2019-09-20fixes a security vulnerability in slice providerPinyao Ting
Bug: 138441555 Test: Manual Change-Id: Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 Merged-In: Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 (cherry picked from commit 2b415a4c4465a6294e51ad1a8fcf2e6c1497853b) (cherry picked from commit a6364d92edafd79006da671c5d476de77439e45c)
2019-09-20Unset INSTALL_DISABLE_VERIFICATION flag if install is not from systemNikita Ioffe
Bug: 138650665 Test: pushed manual privapp that attempts an install with INSTALL_DISABLE_VERIFICATION flag. Checked that PackageVerifier was called. Change-Id: I041d2e5f6d2609bfe9475f24eefb936f0c8e2a32 Merged-In: I041d2e5f6d2609bfe9475f24eefb936f0c8e2a32 (cherry picked from commit bf8e2576f3cf953217cd68ef616d244d250aaef7)
2019-08-28Merge cherrypicks of [9293684, 9293745, 9293876, 9293759, 9293760, 9293761] ↵android-10.0.0_r8android-build-team Robot
into qt-c2f2-release Change-Id: I19c8c7e05b56dc5bbb267375da458cb7acdd98a0
2019-08-285GE Icon: Show 5G subscript E (italics)vagdevi
URL: https://screenshot.googleplex.com/SpTnerVCnQZ.png Bug: 139776677 Test: manual using PARIS Override for show_carrier_data_icon_pattern_string Change-Id: I69e32c89558fba884bb12d29cb8ff81470591bb0 (cherry picked from commit 47af50d8c8a03e0aec66151f4574e9ece02e8d02)
2019-08-23Merge cherrypicks of [9256783, 9255501, 9255502, 9256667, 9256422, 9256668] ↵android-10.0.0_r7android-build-team Robot
into qt-c2f2-release Change-Id: I5847668b6d045b44d527dace05a8b6144cab5b3a
2019-08-23Revert "Hold Display suspend blocker until doze starts"Adrian Salido
This reverts commit 93e164726f2d243eb75351b4e52d683573f9f802. Reason for revert: This is causing wake lock to remain held while screen is off Bug: 139875245 Change-Id: I0ff714a0cf2496d141d355de68761ab720a09539 (cherry picked from commit 36966ca4ab1966fd33053ff451af52b8ffbca02e)
2019-08-22Snap for 5821701 from 9b94c35a54ef061284f9de04f03b75fd7388fe3c to ↵android-build-team Robot
qt-c2f2-release Change-Id: I6ce0f15cc74432d5005374d127708458ddcf3efe
2019-08-22Merge "DO NOT MERGE DMD: Support minimum refresh rate" into qt-r1-devAdrian Salido
2019-08-22Merge "Hold Display suspend blocker until doze starts" into qt-r1-devTreeHugger Robot
2019-08-21Merge "Only delay bouncer if bypass is off" into qt-r1-devTreeHugger Robot
2019-08-21Hold Display suspend blocker until doze startsSantos Cordon
When transitioning to DOZE, there is a race condition between the release of the display suspend blocker and calling startDream. This creates a gap where the device can suspend before the dream actually starts. In practice, this can cause gestures, which are nitialized from the Dream Service, to not function until something else temporarily wakes up the device enough for the CPU to run a few cycles. This change delays the release of the display suspend blocker if there is a pending recalculation of the sleep/doze state. Bug: 138828701 Test: Manual testing - was 1 in 5 chance of reproing. Tested up to 0 out of 50 after the fix. Test: atest PowerManagerServiceTest Change-Id: Ic6df469972dc5765a8c4507404d1dc33f13ec0c3
2019-08-21Snap for 5820048 from 36da9bb9ffde5385370bc93e0bbb4dce6af82268 to ↵android-build-team Robot
qt-c2f2-release Change-Id: Ic02d2b420cedf46c190c400b0946f8e1dcca04dd
2019-08-21Only delay bouncer if bypass is offLucas Dupin
Test: pull up bouncer with bypass on and off Test: atest KeyguardBouncerTest Fixes: 137563419 Change-Id: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc Merged-In: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc (cherry picked from commit d969b7622420482a4836378a8ad5d61b38e6755c)
2019-08-21Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: If6e4358b08995e5caaaaa90bba9fff23f4e4a486
2019-08-21DO NOT MERGE DMD: Support minimum refresh rateLong Ling
Bug: 139685237 Change-Id: Ib41dee351276d70733fffa18620455e4e6f9ddfc
2019-08-21Merge changes from topic "device_config_for_display_90" into qt-r1-devLong Ling
* changes: DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager DO NOT MERGE Allow DeviceConfig to change display settings DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
2019-08-21Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-devTreeHugger Robot
2019-08-21Merge "Add carrier config for ignoring user RTT setting" into qt-r1-devHall Liu
2019-08-21DO NOT MERGE Move device config key high_refresh_rate_blacklist to ↵Long Ling
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-21DO NOT MERGE Allow DeviceConfig to change display settingsLong Ling
Allow DeviceConfig to change default refresh rate and 60 hz only thresholds. Bug: 139138964 Change-Id: I3bf5f8cf7a99e4723265138004fbbd08102119d9
2019-08-21DO NOT MERGE DeviceConfig: Add Name space and keys for Display ManagerLong Ling
Bug: 139138964 Change-Id: I077380583f0daf650b17832a6cec4919b41ac155
2019-08-21Merge "Treat SENSOR_DIRTY as user not detected" into qt-r1-devTreeHugger Robot
2019-08-21Treat SENSOR_DIRTY as user not detectedIlya Matyukhin
Bug: 139620163 Test: no double vibration on authentication timeout while the sensor is covered. Change-Id: I26ec9ca0f911fb029eb9175fe1923c8e9a27e693
2019-08-21Snap for 5817401 from 776d0367b029e63f1030a9fec89ff3487cf68ce5 to ↵android-build-team Robot
qt-c2f2-release Change-Id: Ic72fbe830ed6b6e2f5f8819fa66166f9b21619bb
2019-08-20[automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the ↵Selim Cinek
notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 -s ours am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history Change-Id: I5451e6467e8ffebd08360abfab9f86a429ed0721
2019-08-20Merge "EglDisplay may be null and cause Null point exception" into qt-r1-devSelim Cinek
2019-08-20Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't ↵Selim Cinek
show while docked" into qt-dev
2019-08-20DO NOT MERGE: Fixed an issue where the notification icons wouldn't show ↵Selim Cinek
while docked Since we're using the pulsing state for docking, the icons would now become clipped while pulsing. Fixes: 139096431 Test: dock, observe notification icons showing Change-Id: If251e6b18c03b2824b4d3ea4dab82d4a403565f1 Merged-In: I8f7bd7a6a0562942ed3e12f28705043722d177e8
2019-08-20Merge "Fixed null callback issue" into qt-r1-devJayachandran Chinnakkannu
2019-08-20Mark USAGE_NOTIFICATION_EVENT vibrations as notificationsAlexey Kuzmin
Non-notification background vibrations are ignored. However, we don't want to ignore notifications that represent various events, such as reminders. Test: Create a calendar event with a reminder. Close calendar and wait for reminder. The device should vibrate when the reminder pops up. Bug: 139523314 Change-Id: I231239daf7cc85bf69aaeef1da31218a23fcf311
2019-08-20Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286, ↵android-build-team Robot
9231355, 9231376, 9231420, 9231462, 9231356, 9231421, 9231422, 9231402, 9231537, 9231557, 9231440, 9231441, 9231287, 9231288, 9231463, 9231464, 9231465, 9231423, 9231289, 9231392, 9230416, 9231466] into qt-c2f2-release Change-Id: I99830fbed77900bc68b49e5f94441d102398bc75
2019-08-20Remove unused settingKevin Chyn
Bug: 139554930 Test: manual Change-Id: I5c4af200b0c61efb9a0f76d00c2f047d4880d77b Merged-In: I5c4af200b0c61efb9a0f76d00c2f047d4880d77b (cherry picked from commit d806bc4c11dea44e28d8752cb849532735e79123)
2019-08-20Fixing a bug where content capture sessions with child sessions could get ↵Mihir Patel
stuck in a state where no event flushing other than forced flushes would occur Fixes: 139202268 Test: atest CtsContentCaptureServiceTestCases Change-Id: I21e9d4db2402fe5210b7d938dac2f12e7557c146 (cherry picked from commit 52ed9ee0387fa4faa91deff970dde779e2ff2f9f)
2019-08-19Merge "Remove unused setting" into qt-r1-devKevin Chyn
2019-08-19Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be ↵TreeHugger Robot
explicit (client)" into qt-r1-dev
2019-08-19Merge "WebView: prettyprint docs" into qt-devNate Fischer
am: 20f2f0b5ea Change-Id: Iad51d33c434a42272c448ba7a807bdcbe6cb51d0
2019-08-19Merge "Fixing a bug where content capture sessions with child sessions could ↵Mihir Patel
get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev