Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
439,003 Commits 3 Branches 0 Tags
37bc8a96a757ce877fee4e6bc98b443e75ca590c
Commit Graph

439003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
37bc8a96a7 Merge "Change the visibility of nav bar methods" 2019-08-20 02:48:37 +00:00
Ivan Chiang
72d08095da Merge "Avoid crossing the user streams" 2019-08-20 02:40:51 +00:00
TreeHugger Robot
aa27745e42 Merge "Use non-wakeup alarm for delay constraint." 2019-08-20 01:51:27 +00:00
Curtis Belmonte
1cc22dd948 [automerger skipped] Merge "Fix face auth not triggering after lock icon pressed" into qt-qpr1-dev am: 0d0bf428b9 
am: 3dcb06d687 -s ours
am skip reason: change_id Icecd7cb76688cd19f7e3b445a8228b21e1599068 with SHA1 6a0634dcfe is in history

Change-Id: I8486ce9d5c4e199c6325c5251baa02822e2fa0d2
 2019-08-19 18:49:01 -07:00
Curtis Belmonte
3dcb06d687 Merge "Fix face auth not triggering after lock icon pressed" into qt-qpr1-dev 
am: 0d0bf428b9

Change-Id: Iac00caccc37e43c79c36532948bc4d0042f222c9
 2019-08-19 18:37:23 -07:00
Jordan Liu
782405a8a3 [automerger skipped] Merge "Do not notify SS change with invalid subId" am: 3878f50107 am: 77e183ba6e am: be27410a12 am: a924317c6d -s ours 
am: a192a3f9f0 -s ours
am skip reason: change_id I2ba6a971fff4e29ccd2166c381308fcd953f5bc0 with SHA1 55b2bc4615 is in history

Change-Id: I22b9447b35ef99c29d0f582bb58d80850f5d20a7
 2019-08-19 18:27:55 -07:00
Curtis Belmonte
0d0bf428b9 Merge "Fix face auth not triggering after lock icon pressed" into qt-qpr1-dev 2019-08-20 01:11:59 +00:00
Jordan Liu
a192a3f9f0 [automerger skipped] Merge "Do not notify SS change with invalid subId" am: 3878f50107 am: 77e183ba6e am: be27410a12 
am: a924317c6d -s ours
am skip reason: change_id I2ba6a971fff4e29ccd2166c381308fcd953f5bc0 with SHA1 55b2bc4615 is in history

Change-Id: I9e81935aed016459db716379db08cb7528e6250b
 2019-08-19 18:06:04 -07:00
Jeff Sharkey
7585618d96 Merge "Check for mTransport before trying to configure." 2019-08-20 01:03:27 +00:00
Nathan Harold
7600721279 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" into qt-qpr1-dev am: a9df8f6993 
am: a9e34e367f

Change-Id: Ibd5badfa8d4183bb39109ca86b7a0db0e9f343bc
 2019-08-19 17:46:10 -07:00
Jordan Liu
a924317c6d Merge "Do not notify SS change with invalid subId" am: 3878f50107 am: 77e183ba6e 
am: be27410a12

Change-Id: I44acb8be1b5eb998091948ffffbbf33eb6375096
 2019-08-19 17:45:09 -07:00
Jordan Liu
be27410a12 Merge "Do not notify SS change with invalid subId" am: 3878f50107 
am: 77e183ba6e

Change-Id: I5ac6db21166a18f64b7cd4a9ae6d0b305c4b9523
 2019-08-19 17:34:02 -07:00
Jeff Sharkey
570926daef Merge "Migrate MediaScannerConnection to using call()." 2019-08-20 00:29:26 +00:00
Jordan Liu
77e183ba6e Merge "Do not notify SS change with invalid subId" 
am: 3878f50107

Change-Id: Ic8e760342a288dc7fe0f38408dea468a9e8c31a6
 2019-08-19 17:24:34 -07:00
Nathan Harold
a9e34e367f Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" into qt-qpr1-dev 
am: a9df8f6993

Change-Id: I67052710756bf91f965c874cb3e42c8b531a1a51
 2019-08-19 17:24:27 -07:00
Nathan Harold
a9df8f6993 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" into qt-qpr1-dev 2019-08-19 23:58:38 +00:00
Jordan Liu
3878f50107 Merge "Do not notify SS change with invalid subId" 2019-08-19 23:57:24 +00:00
Ryan Mitchell
9cdb3cdbb8 Merge "Only check sibling config values to dedupe" 2019-08-19 23:53:55 +00:00
TreeHugger Robot
51e47a544b Merge "Fix face auth not triggering after lock icon pressed" 2019-08-19 23:30:31 +00:00
Sally Yuen
b3d0111b46 Merge "Add more ScrollDeltaX/Y support to AccessibilityRecord." 2019-08-19 23:10:07 +00:00
Kevin Chyn
b5b81ee32e [automerger skipped] Merge "Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 am: 709b0a4a74" into qt-qpr1-dev-plus-aosp 
am: 2300a4ec62 -s ours
am skip reason: change_id I5c4af200b0c61efb9a0f76d00c2f047d4880d77b with SHA1 d806bc4c11 is in history

Change-Id: I60b01b00ac68a888d8dca0a76b97b1ce59bde5df
 2019-08-19 15:55:07 -07:00
Kevin Chyn
3dc631cfc9 [automerger skipped] Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 am: d670c6c1f8 
am: fb1d9de34d -s ours
am skip reason: change_id I5c4af200b0c61efb9a0f76d00c2f047d4880d77b with SHA1 499ff8a5ca is in history

Change-Id: I1be56c549ad4281be7994d6ae47f19ad1e8a1568
 2019-08-19 15:48:05 -07:00
Yifan Hong
a4616d3ae7 Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 am: 8eec5d9ee4 am: ba28a3a57e am: caa60f0b28 
am: aaa6279a4e

Change-Id: I89c87fbaab030d3d08200e84a4899b82a5235bc8
 2019-08-19 15:38:32 -07:00
Siarhei Vishniakou
17de4f2f6e Merge "[automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours am: 2a051239f9 -s ours am: 3385b207b0 -s ours am: df94a3cfaf -s ours 
am: 6bc154fc2c -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: Icaf11e6167d8dc5364dde7f7d425e293c87c86a6
 2019-08-19 15:27:15 -07:00
Android Build Merger (Role)
2300a4ec62 Merge "Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 am: 709b0a4a74" into qt-qpr1-dev-plus-aosp 2019-08-19 22:23:17 +00:00
Kevin Chyn
3667ad74bc Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 
am: 709b0a4a74

Change-Id: Ib0f2717c125b37ca5327bb1662d668d39632ae5e
 2019-08-19 15:22:06 -07:00
Roy Want
2604f2f74d Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev am: 4e027572e3 am: 612c4b08ec 
am: 7209e34cb7

Change-Id: I4f37fd54b45060d9152cd3644ae6a4287a6099b7
 2019-08-19 15:21:55 -07:00
Kevin Chyn
fb1d9de34d Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 
am: d670c6c1f8

Change-Id: Ib27536f48a565716b43b49d7a69f968009087f13
 2019-08-19 15:21:44 -07:00
Nate Fischer
b4375909c3 Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea am: b4defd6887 am: a93efb8218 
am: 98edba2fcf

Change-Id: Ib47a73cceb980d2b8053fe2a72ab303253615d0d
 2019-08-19 15:17:41 -07:00
Heemin Seog
f59e125fa9 Change the visibility of nav bar methods 
This will help OEMs to customize the exact behavior of showing/hiding
the nav bar if they choose to extend the CarSysUI for their own
purposes.

Bug: 138242566
Test: build, manual
Change-Id: I91c76bd5d646cd356e67fe4f6900d081c6929614
 2019-08-19 15:13:07 -07:00
Nate Fischer
fca2f0e554 Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea am: 6201d28952 am: 38b8fca177 
am: 105de6c194

Change-Id: I49045968c55c589d20cd1eec50f33ad0634b927a
 2019-08-19 15:10:20 -07: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
d670c6c1f8 Merge "Remove unused setting" into qt-r1-dev 
am: 95a675ce91

Change-Id: I5d1d1d70a0936c4542d26f7f7216a2d6a66eb1e6
 2019-08-19 15:08:27 -07:00
Jeff Sharkey
316a617795 Check for mTransport before trying to configure. 
Bug: 139554125
Test: atest FrameworksCoreTests:android.content.ContentProviderTest
Change-Id: I4a2d78de257cb898b75543dcbfde4b6317b3393f
 2019-08-19 16:04:57 -06:00
Roy Want
ca7dc1a72a Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev am: 4e027572e3 am: ac9c2723c6 
am: b7a647f676

Change-Id: Ia22a173359eb79a3f8f21612364b33724a827ae0
 2019-08-19 15:00:20 -07:00
Curtis Belmonte
15114abda2 Fix face auth not triggering after lock icon pressed 
Long-pressing on the lock icon after the device has been unlocked causes
it to relock until the user manually authenticates. This intentionally
disables face unlock, since we don't want the device to unlock again
immediately after the lock icon has been pressed. However, when the
device screen turns off, pressing the power button again should
re-trigger face auth.

This commit fixes a bug in that flow where, if a user long presses the
lock icon, then turns the screen off and back on very quickly, face auth
is not retriggered. It does this by resetting the lock icon pressed
status when the device begins going to sleep, rather than when the
screen has been fully turned off.

Test: manual
1. Enroll face and turn off "skip lock screen"
2. Lock device, then wake and unlock with face
3. Long-press on the lock icon to relock device
4. Enter PIN/pattern/password to unlock the device
5. Press power twice in quick succession (without triggering camera)

Before: Lock screen would be shown but face auth would not trigger
After: Lock screen is shown and face auth is triggered

Fixes: 138974321
Change-Id: I7d6a8c2b9cc95d3003f006a403866796dab67e82
Merged-In: Icecd7cb76688cd19f7e3b445a8228b21e1599068
 2019-08-19 14:59:30 -07:00
Yifan Hong
aaa6279a4e Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 am: 8eec5d9ee4 am: ba28a3a57e 
am: caa60f0b28

Change-Id: I810be1081f5d7687c4b00ac7168b2f5591a47965
 2019-08-19 14:57:29 -07:00
Kevin Chyn
95a675ce91 Merge "Remove unused setting" into qt-r1-dev 2019-08-19 21:50:22 +00:00
Siarhei Vishniakou
6bc154fc2c Merge "[automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours am: 2a051239f9 -s ours am: 3385b207b0 -s ours 
am: df94a3cfaf -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: Ibefcad65e8b857c4e42436fc88837b4aa23812a6
 2019-08-19 14:47:08 -07:00
Nate Fischer
200e1233f5 Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea am: 6201d28952 am: e838a0353f 
am: 095e1c1328

Change-Id: Ia247d0f5467886faea98d9055899a33daa8fe170
 2019-08-19 14:45:51 -07:00
Mihir Patel
5590e96cf9 Merge "Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev am: 4aa0aeadff am: 245fc50ce7" into qt-qpr1-dev-plus-aosp 
am: f5c967fd7e

Change-Id: I86d10a2b70c234827addc283932b6731d7c0f783
 2019-08-19 14:42:09 -07:00
Roy Want
7209e34cb7 Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev am: 4e027572e3 
am: 612c4b08ec

Change-Id: I880548c5d75aa158f927241e61f6749a3b7229e1
 2019-08-19 14:41:41 -07:00
Mihir Patel
7e2700d328 Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev am: 4aa0aeadff am: c1b765e744 
am: 6b365322d4

Change-Id: Idcce863bc63e9fb38d5a54080dcd9b86e192941c
 2019-08-19 14:38:34 -07:00
Alex Light
4a57543fb1 [automerger skipped] Merge "Add agent startup-attach" into qt-dev-plus-aosp am: 74f191c782 am: 25abf4d99a 
am: 92ac76bb7d -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 330e8be604 is in history

Change-Id: I179af5fec9055d54b6cd1d3535024d8482b9a290
 2019-08-19 14:34:08 -07:00
Nate Fischer
98edba2fcf Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea am: b4defd6887 
am: a93efb8218

Change-Id: Iab055851d1b32e6bab3f22a74f92776f9dd3124c
 2019-08-19 14:33:01 -07:00
Steven Liu
21078b6b27 Merge "Remove settings and resources about CarrierNetworkNotifier" 2019-08-19 21:24:11 +00:00
Nate Fischer
105de6c194 Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea am: 6201d28952 
am: 38b8fca177

Change-Id: I204f0428686095550a8f7f34c9a815d57597e455
 2019-08-19 14:22:45 -07:00
Neil Fuller
c7d8975011 Merge "Convert last user of Time.format() to an alt." 2019-08-19 21:22:26 +00:00
Yifan Hong
caa60f0b28 Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 am: 8eec5d9ee4 
am: ba28a3a57e

Change-Id: I7f2840e00f6236ec1dd31e88140c9c55cfe2f072
 2019-08-19 14:21:10 -07:00
Roy Want
b7a647f676 Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev am: 4e027572e3 
am: ac9c2723c6

Change-Id: Iaf1d5181e45768c749ed208331bf04812c94c15d
 2019-08-19 14:19:48 -07:00