Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
424,056 Commits 3 Branches 0 Tags
efa747d1e372a71446953484517ccbc205a0f8da
Commit Graph

424056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Dupin
efa747d1e3 Merge "Lock screen string change" into qt-r1-dev 
am: ea82651abc

Change-Id: I5af007f0124d09d3d1f4733c1a2009b19e1d5d81
 2019-06-05 15:40:47 -07:00
Joshua Mccloskey
be8c898737 Merge "Fixed talkback issue" into qt-r1-dev 
am: 7f22b4d5be

Change-Id: Ib6cd205e23c49ff808a0b3a849b9cddb279c0a3a
 2019-06-05 15:39:56 -07:00
Lucas Dupin
05ff5a14de Merge "Fix issue where panel opacity could be wrong" into qt-dev am: 30e9b45cd9 
am: 3db3383e99

Change-Id: I0df6c337ebd709ac953e19456f80b0034f4eaa82
 2019-06-05 15:38:51 -07:00
Alex Salo
c0f24f5007 Merge "Don't call ActivityManagerService on main thread" into qt-dev am: 9a01bb4280 
am: 545cc77897

Change-Id: I06e08b8c2b1e970bab01d8a12c6ca1e4e46afacc
 2019-06-05 15:38:04 -07:00
Mathieu Chartier
d405bc5af4 Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07 
am: 63b02d86ae

Change-Id: Ia5e73ba231298978f84ba1d9e974c144565db336
 2019-06-05 15:37:21 -07:00
Bill Yi
2e43d74d2f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0906e02aa3 -s ours 
am: 31d62741d2 -s ours
am skip reason: subject contains skip directive

Change-Id: If6497b7c751ae002b994a56444138b7be08c52ad
 2019-06-05 15:36:24 -07:00
Bill Yi
2ba15a932f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 452be4963c -s ours 
am: fb900c8432 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibadb8968f89bf856e75ea8797be42185e480e1a8
 2019-06-05 15:35:36 -07:00
Tracy Zhou
30e87713f6 Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev am: 289583ec1a 
am: d1f08c582a

Change-Id: Ib77af4226a06a5fd959f858512c318999601a5e4
 2019-06-05 15:34:47 -07:00
Hui Yu
d74aa7dab1 Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5 
am: c1dceabb36

Change-Id: I384a7caff8df918db0b9124a1b7f19f0dc4dd0fb
 2019-06-05 15:33:54 -07:00
David Sehr
8dbb0ea596 [automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a 
am: 883b12f4a0 -s ours
am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 0d1014c9e3 is in history

Change-Id: I3d51fe5662b13a8664410380f9147bfd26f3d5b4
 2019-06-05 15:32:57 -07:00
Winson Chung
79c0b37dd2 Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev am: c8120d6d6a 
am: 8533a4cc62

Change-Id: I67baacee7f41852f50e7b325f35c3ecbe038002a
 2019-06-05 15:32:02 -07:00
Jovana Knezevic
ecb54c56b5 Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee 
am: 7e80654f56

Change-Id: I860520d24575bd80a93cac175b7941ee6c7685b9
 2019-06-05 15:31:08 -07:00
Mady Mellor
2a9c25564a Merge "Post finishing after transition in onBackPressed" into qt-dev am: 57854d3b90 
am: d562e7511b

Change-Id: Iab56329a4688f24c03e613f4a712bb6a1c45814a
 2019-06-05 15:30:18 -07:00
Wale Ogunwale
e2d54d719c Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev am: 2aa255a746 
am: ccbe8239ae

Change-Id: I0538320701a64cdc9c4712d2f8b620c05a09f8c5
 2019-06-05 15:29:30 -07:00
Matt Casey
f56ab49a6c Merge "Rendering fixes for assist handles." into qt-dev am: 075baa2e9b 
am: 1bdee403fc

Change-Id: If2f17730179bb43ca6d7e5f32125b3fbdcaccd54
 2019-06-05 15:28:35 -07:00
Lorenzo Colitti
2765cfb5e6 Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: e2fb127e41 
am: b1d32ef751

Change-Id: Iee2af3679bbb8ef507855849cdccdf4d0fda9da3
 2019-06-05 15:27:37 -07:00
Makoto Onuki
1f34785cf4 Merge "Fix slow query log." into qt-dev am: dee07f5d7f 
am: e95419371a

Change-Id: I9937a8851771e9bbf03210eaedf7601432ddca44
 2019-06-05 15:26:47 -07:00
Kevin Chyn
1cc9bbbe3a Merge "Use real gatekeeper HAT for resetting lockout" into qt-r1-dev 
am: fbd90d3dec

Change-Id: I45fc9c6f6e27dab8e47c4a7e98ccd6a02a3a5734
 2019-06-05 15:26:04 -07:00
Govinda Wasserman
77791e0ce3 Merge "Fixes timestamp passed to the Assistant" into qt-r1-dev 
am: 0ce43fa68c

Change-Id: I09cfe4c9c151876b8f62645b7c2c0a03b265a8b6
 2019-06-05 15:25:25 -07:00
Robert Snoeberger
32de62d8cf Merge "Prevent clock-lock overlap with pulsing on AOD." into qt-r1-dev 
am: 30a416fdea

Change-Id: I239e7cd8697f8015295ccda938eed9c3f9a0c01d
 2019-06-05 15:24:42 -07:00
Hongyi Zhang
f0d95b97ba Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d0453641 
am: 01d0acfed0

Change-Id: I5a2e8ba2b59863476395291834efcd671554d304
 2019-06-05 15:24:04 -07:00
Victor Hsieh
336c1a4596 Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662 
am: 00e482d84e

Change-Id: I426558687b9154919df33f91d57985c3c8960435
 2019-06-05 15:23:13 -07:00
Lucas Dupin
883581f176 Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev 
am: 9369357e1d

Change-Id: I2591f861e338dda0d667874103e89c3833f707f8
 2019-06-05 15:22:28 -07:00
Govinda Wasserman
202b070e2b Merge "Refactors logging into its own function" into qt-r1-dev 
am: ab6d79eefd

Change-Id: I27052fa2790eaf161e1e76dd7763ec0da1b05285
 2019-06-05 15:20:20 -07:00
Winson Chung
52b1251305 Merge "Ensure that the IME switcher button is always touchable" into qt-dev am: f106e0a8fa 
am: c9dbc123ca

Change-Id: Icfef97e30b8c7d95aec8f63244f8e29d8f42cdd7
 2019-06-05 14:54:11 -07:00
Winson Chung
c9dbc123ca Merge "Ensure that the IME switcher button is always touchable" into qt-dev 
am: f106e0a8fa

Change-Id: I00f6aa22ba7569e3980b1c086ebdf55b1a773911
 2019-06-05 14:48:14 -07:00
Winson Chung
f106e0a8fa Merge "Ensure that the IME switcher button is always touchable" into qt-dev 2019-06-05 21:31:32 +00:00
Brian Duddie
fc06205561 Merge "Clarify documentation for sensor placement" into qt-dev am: 6e9c0741b5 
am: 985f1299cf

Change-Id: Ibb11b813ccd32d6ae986baf0385d7cb4b90e07dd
 2019-06-05 14:01:00 -07:00
Brian Duddie
985f1299cf Merge "Clarify documentation for sensor placement" into qt-dev 
am: 6e9c0741b5

Change-Id: I56695e9ea76f802b171c47fbb3f2dead651eb697
 2019-06-05 13:53:01 -07:00
TreeHugger Robot
6e9c0741b5 Merge "Clarify documentation for sensor placement" into qt-dev 2019-06-05 20:36:42 +00:00
Fabian Kozynski
92bee05891 Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev am: 15e2d7e50b 
am: e0047318d6

Change-Id: I95804c928e0baced524d1d8f75bed1fae68e7568
 2019-06-05 13:25:11 -07:00
Julia Reynolds
752efb1197 Merge "Read the subtext of noti guts field on selection" into qt-dev am: 8ef8577391 
am: 09e8873efe

Change-Id: Ia896f63672aa2f2bd50957aa7de89bdf94583fcf
 2019-06-05 13:22:49 -07:00
Matt Casey
ecf9bb5851 Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev am: 92d7f42baa 
am: 6a07469e23

Change-Id: I26827273c85818996ba3279047dd8d5615b1e8df
 2019-06-05 13:18:57 -07:00
Fabian Kozynski
e0047318d6 Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev 
am: 15e2d7e50b

Change-Id: Ia6a7ec214dac0b1f45a1b6f62ccccd6d9988fe23
 2019-06-05 13:18:13 -07:00
Julia Reynolds
09e8873efe Merge "Read the subtext of noti guts field on selection" into qt-dev 
am: 8ef8577391

Change-Id: Ic2a9f406330053aec127962a96de1390a34fb1ac
 2019-06-05 13:15:53 -07:00
Lorenzo Colitti
c13520f53e Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2 
am: eabf2d0b8d

Change-Id: I29e8139e908fc68dd656143a19aa2ef142f9108d
 2019-06-05 13:13:24 -07:00
Matt Casey
6a07469e23 Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev 
am: 92d7f42baa

Change-Id: I462a25f23c0a993288fd003b0231cebb47c31633
 2019-06-05 13:10:48 -07:00
Fabian Kozynski
15e2d7e50b Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev 2019-06-05 20:10:09 +00:00
TreeHugger Robot
8ef8577391 Merge "Read the subtext of noti guts field on selection" into qt-dev 2019-06-05 20:00:32 +00:00
Lorenzo Colitti
eabf2d0b8d Merge "Always prompt for limited connectivity." into qt-dev 
am: 4a5a129fb2

Change-Id: I41177562415409ec69b9116caa8f3f2cad03b38e
 2019-06-05 12:55:31 -07:00
Matt Casey
92d7f42baa Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev 2019-06-05 19:02:35 +00:00
TreeHugger Robot
4a5a129fb2 Merge "Always prompt for limited connectivity." into qt-dev 2019-06-05 18:50:32 +00:00
Brian Duddie
086d840d74 Clarify documentation for sensor placement 
Update documentation to be in sync with new language added to HAL
interface, which better explains the expected payload, format, and
usage.

Fixes: 133264933
Test: make docs, view HTML
Change-Id: Ib602674d395cb8c8e6431d23b051685c8d172560
 2019-06-05 11:44:44 -07:00
Xiangyu/Malcolm Chen
ebfa265e01 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: b613fec2f8 
am: da3dad46d0

Change-Id: I3a11c3f541af539ce6014d4003461f57f079beb3
 2019-06-05 11:35:01 -07:00
Julia Reynolds
daab21a050 Read the subtext of noti guts field on selection 
When using a11y services

Test: manual with Talkback
Bug: 133649570
Change-Id: Id022e47bef9848e4c5237808659531f8d1c0c953
 2019-06-05 18:33:38 +00:00
Chen Xu
4a71793add [automerger skipped] Merge "Get the resources associated with subid to support MSIM" am: cdbb700fa3 am: 302b8e8cfe -s ours 
am: e499d9f43c -s ours
am skip reason: change_id Ib00cfe3640b59db5f971c32741eed999131e67c0 with SHA1 ea6d2b1e1e is in history

Change-Id: I2971b0218b1ca82b63145fda3f9e08e718931e45
 2019-06-05 11:27:37 -07:00
Svetoslav Ganov
eaeaf5e182 Merge "Add OWNERS for DeviceConfig" am: 83ea055e8e am: f42291962b 
am: 413fad031f

Change-Id: I97de3f3e563f65b2ca0fbbb1897e39ac4fd12035
 2019-06-05 11:26:27 -07:00
Brad Ebinger
3adc5d9613 [automerger skipped] Merge "Fix parcelling issue for certain fields." am: 541f01b1bc am: 07eec6e05d -s ours 
am: acef882e70 -s ours
am skip reason: change_id I5ab4f5f3fa05ffe837f1a5b5bccfb93df4902574 with SHA1 362d320315 is in history

Change-Id: I3bf7879fc3d5e89ffef654d138549c09c5d1f3bb
 2019-06-05 11:24:52 -07:00
Xiangyu/Malcolm Chen
da3dad46d0 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev 
am: b613fec2f8

Change-Id: Ib3b670d0d0709640bd8498259a918357595c07f0
 2019-06-05 11:21:23 -07:00
Youming Ye
f1529a69a6 Merge "Add carrier config for conference participants data support" am: 93931ccb81 am: c575a96d53 
am: d7fa6f5516

Change-Id: If6bfd6e45b19f2dde2e5c83133ae9f0ff0a40adb
 2019-06-05 11:21:22 -07:00