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

424855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jiyong Park
418ab7419d [automerger skipped] Merge "Add workaround for b/124210145" am: 8402337237 am: c11ffe7ddc -s ours 
am: 2fe1f58742 -s ours
am skip reason: change_id I6760f6e4068239361c495ae7c0de3e25f91d38e1 with SHA1 6651eb2142 is in history

Change-Id: I9c1efc14710a3a16087726f5d796d6510756f334
 2019-06-10 20:47:36 -07:00
Jiyong Park
2fe1f58742 [automerger skipped] Merge "Add workaround for b/124210145" am: 8402337237 
am: c11ffe7ddc -s ours
am skip reason: change_id I6760f6e4068239361c495ae7c0de3e25f91d38e1 with SHA1 6651eb2142 is in history

Change-Id: I6d62b3d595d11bc63db3e602a6cdbfa5dc629a73
 2019-06-10 20:42:47 -07:00
Jiyong Park
c11ffe7ddc Merge "Add workaround for b/124210145" 
am: 8402337237

Change-Id: I59c430f90a054d29699a4bfb67be4f7b4d9a6653
 2019-06-10 20:33:50 -07:00
Treehugger Robot
8402337237 Merge "Add workaround for b/124210145" 2019-06-11 03:25:45 +00:00
Android Build Merger (Role)
3ef8a027ae Merge "Merge "Try augmented autofill if regular autofill is disabled." into qt-dev am: e33ff60894 am: bb4c4a885f" into qt-r1-dev-plus-aosp 2019-06-11 02:59:44 +00:00
Adam He
a0f5ac628e Merge "Try augmented autofill if regular autofill is disabled." into qt-dev am: e33ff60894 
am: bb4c4a885f

Change-Id: Ic04dd2e141ba40ded41a85f4d8559d3b2adf97e3
 2019-06-10 19:58:35 -07:00
Adam He
a625861be7 Merge "Try augmented autofill if regular autofill is disabled." into qt-dev am: e33ff60894 
am: 3d89433432

Change-Id: I7368ec6679fb170529274a4b63e8ae6ca9d3706f
 2019-06-10 19:58:32 -07:00
Adam He
3d89433432 Merge "Try augmented autofill if regular autofill is disabled." into qt-dev 
am: e33ff60894

Change-Id: Ia7ac96c7b0e0b60f6286e7df798c9af33dd676d3
 2019-06-10 19:52:43 -07:00
Adam He
bb4c4a885f Merge "Try augmented autofill if regular autofill is disabled." into qt-dev 
am: e33ff60894

Change-Id: I05e68a72367bb69a9dcdda6125ec31cc02e9c173
 2019-06-10 19:52:18 -07:00
TreeHugger Robot
e33ff60894 Merge "Try augmented autofill if regular autofill is disabled." into qt-dev 2019-06-11 02:35:38 +00:00
Lifu Tang
a7813acb3b Merge "Filter "Android System" from recent location apps" into qt-r1-dev 
am: 00da57f945

Change-Id: Ice32b18adc14ab49d4348d707227f7d1ea29dce3
 2019-06-10 18:24:41 -07:00
TreeHugger Robot
00da57f945 Merge "Filter "Android System" from recent location apps" into qt-r1-dev 2019-06-11 01:18:27 +00:00
Hongyi Zhang
4f916851a5 Merge "Fix NPE in removeGeofence" into qt-dev am: 365e2c0dae 
am: 70cd8e7b38

Change-Id: Id549d4c3d84eac2295f100a9a60d0b92ecf0f832
 2019-06-10 18:15:57 -07:00
Android Build Merger (Role)
bea3ef178c Merge "Merge "Fix NPE in removeGeofence" into qt-dev am: 365e2c0dae am: e9d993474a" into qt-r1-dev-plus-aosp 2019-06-11 01:14:49 +00:00
Hongyi Zhang
efe13f821a Merge "Fix NPE in removeGeofence" into qt-dev am: 365e2c0dae 
am: e9d993474a

Change-Id: I3c07647a50cc872393e7f0a52aef16b179a342c0
 2019-06-10 18:14:10 -07:00
Android Build Merger (Role)
1cb6282a65 Merge "Merge "Correct sequencing of widget vs boot-complete broadcasts" into qt-dev am: 335dfdec1e am: f1445d54f9" into qt-r1-dev-plus-aosp 2019-06-11 01:13:50 +00:00
Christopher Tate
339a389b3e Merge "Correct sequencing of widget vs boot-complete broadcasts" into qt-dev am: 335dfdec1e 
am: f1445d54f9

Change-Id: I670074a41352419a2b5c9ee5e7e23fe2c0aac77a
 2019-06-10 18:13:06 -07:00
Christopher Tate
96e9494a48 Merge "Correct sequencing of widget vs boot-complete broadcasts" into qt-dev am: 335dfdec1e 
am: e1270f7086

Change-Id: I6496cfdd213d33e2d9ebcd499ef5dc151742ab45
 2019-06-10 18:12:36 -07:00
Android Build Merger (Role)
7f4c975e65 Merge "Merge "Show notifications when default launcher changes" into qt-dev am: 2407da88a7 am: 6e753f31c5" into qt-r1-dev-plus-aosp 2019-06-11 01:11:27 +00:00
Mehdi Alizadeh
01206d7f02 Merge "Show notifications when default launcher changes" into qt-dev am: 2407da88a7 
am: 6e753f31c5

Change-Id: I16c27ca77d165c0ac253a1dfe119bbe048546925
 2019-06-10 18:10:33 -07:00
Mehdi Alizadeh
2bfe56818a Merge "Show notifications when default launcher changes" into qt-dev am: 2407da88a7 
am: 93bf15fbd1

Change-Id: I619f3093d7637a84aa12b032032f6d66f75882bd
 2019-06-10 18:09:54 -07:00
Hongyi Zhang
70cd8e7b38 Merge "Fix NPE in removeGeofence" into qt-dev 
am: 365e2c0dae

Change-Id: Idea7c8911a09578103e033430fbb7186b30ba777
 2019-06-10 18:03:14 -07:00
Hongyi Zhang
e9d993474a Merge "Fix NPE in removeGeofence" into qt-dev 
am: 365e2c0dae

Change-Id: I99001500e313ac65d56564663688ed5f90e82114
 2019-06-10 18:02:30 -07:00
Christopher Tate
e1270f7086 Merge "Correct sequencing of widget vs boot-complete broadcasts" into qt-dev 
am: 335dfdec1e

Change-Id: I31bd10f7b3b90cc7f8cab6817f13cc694f8a4d47
 2019-06-10 18:00:31 -07:00
Christopher Tate
f1445d54f9 Merge "Correct sequencing of widget vs boot-complete broadcasts" into qt-dev 
am: 335dfdec1e

Change-Id: I66a8173b8298773ee879a33bbbe43cc4f23d5a43
 2019-06-10 17:58:53 -07:00
Mehdi Alizadeh
6e753f31c5 Merge "Show notifications when default launcher changes" into qt-dev 
am: 2407da88a7

Change-Id: Id06b0c2ea9edc71e9c687c988301b43c3e238f93
 2019-06-10 17:57:25 -07:00
Mehdi Alizadeh
93bf15fbd1 Merge "Show notifications when default launcher changes" into qt-dev 
am: 2407da88a7

Change-Id: I6757ccecebaf63ad011d3e168121af0f9cfcac89
 2019-06-10 17:54:24 -07:00
Hongyi Zhang
365e2c0dae Merge "Fix NPE in removeGeofence" into qt-dev 2019-06-11 00:04:24 +00:00
TreeHugger Robot
335dfdec1e Merge "Correct sequencing of widget vs boot-complete broadcasts" into qt-dev 2019-06-10 23:35:20 +00:00
Adam He
3ca2ba3811 Try augmented autofill if regular autofill is disabled. 
Fixes: 134914712
Test: atest android.autofillservice.cts.augmented
Change-Id: I7440bc4a9bff0b62b2625cd5bf24d3e276e4802c
 2019-06-10 16:21:31 -07:00
Mehdi Alizadeh
2407da88a7 Merge "Show notifications when default launcher changes" into qt-dev 2019-06-10 22:39:20 +00:00
Android Build Merger (Role)
91f77ef0e3 Merge "[automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev am: 5e468cf4dd am: 31e3b9cb80 -s ours am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 f68c4e2ffa is in history" into qt-r1-dev-plus-aosp 2019-06-10 22:32:46 +00:00
Christian Wailes
0bcf4805d8 [automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev am: 5e468cf4dd 
am: 31e3b9cb80 -s ours
am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 f68c4e2ffa is in history

Change-Id: I23f983d59e500da11c1a29f71b4d9ba44baafdb1
 2019-06-10 15:31:57 -07:00
Christian Wailes
bd79bb3dda [automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev am: 5e468cf4dd -s ours 
am: 068b51383f -s ours
am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 f68c4e2ffa is in history

Change-Id: I88d1381642439c857867057c76fbe40d4165507b
 2019-06-10 15:31:55 -07:00
Christian Wailes
31e3b9cb80 Merge "Fixes two data races in USAP pool management." into qt-dev 
am: 5e468cf4dd

Change-Id: I08c601277f24cf918000eb032e7d95f38e6c0c5c
 2019-06-10 15:26:57 -07:00
Christian Wailes
068b51383f [automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev 
am: 5e468cf4dd -s ours
am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 f68c4e2ffa is in history

Change-Id: Iac707f390eba88848c63acdd2c0481ea5208ad1b
 2019-06-10 15:25:56 -07:00
Christian Wailes
5e468cf4dd Merge "Fixes two data races in USAP pool management." into qt-dev 2019-06-10 22:09:43 +00:00
Lifu Tang
f5076dfc51 Filter "Android System" from recent location apps 
Bug: 134674484
Test: build, flash, and test manually
Change-Id: I86879e034b6605a4d3db2024f5e27601a45580fd
 2019-06-10 22:05:04 +00:00
Quang Luong
eba647c3ed Merge "Made AccessPoint's scan result list thread safe" into qt-dev am: 8e13ea659e 
am: fb5ee6dad6

Change-Id: Ia56f213d55536313453b21a792aa015f4ce83e7f
 2019-06-10 14:56:06 -07:00
Quang Luong
98869ac268 Merge "Made AccessPoint's scan result list thread safe" into qt-dev am: 8e13ea659e 
am: 4127f04908

Change-Id: Icbbd5c6404fb9930cc3b2d0d657d1774dee4244c
 2019-06-10 14:50:40 -07:00
Quang Luong
fb5ee6dad6 Merge "Made AccessPoint's scan result list thread safe" into qt-dev 
am: 8e13ea659e

Change-Id: I88d3d604a5679972b9e6652ebd185fe3c11544b9
 2019-06-10 14:46:45 -07:00
Tracy Zhou
ddd5718b92 Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev am: 94a1aafcaa 
am: dc7c33241c

Change-Id: I0621cf5e9a817e9c78144ef83fb6b0f55c109e40
 2019-06-10 14:45:40 -07:00
Quang Luong
4127f04908 Merge "Made AccessPoint's scan result list thread safe" into qt-dev 
am: 8e13ea659e

Change-Id: Iecc9af2241e6425193aefb758b4a26234d14224a
 2019-06-10 14:45:39 -07:00
Tracy Zhou
c710c8939e Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev am: 94a1aafcaa 
am: f7a0c6440e

Change-Id: I06a074868babc4c83e29f487be323996b9cd04ea
 2019-06-10 14:39:40 -07:00
Quang Luong
8e13ea659e Merge "Made AccessPoint's scan result list thread safe" into qt-dev 2019-06-10 21:37:43 +00:00
Tracy Zhou
dc7c33241c Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev 
am: 94a1aafcaa

Change-Id: I76cbf9b242eee489bbad5344c4c4ff0ef6f8b50c
 2019-06-10 14:34:40 -07:00
Tracy Zhou
f7a0c6440e Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev 
am: 94a1aafcaa

Change-Id: Ic2cbb2415f8e5bf5cde7e7ec265f00d0779d94ff
 2019-06-10 14:32:36 -07:00
Tracy Zhou
94a1aafcaa Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev 2019-06-10 21:22:19 +00:00
Eugene Susla
6ad0169048 Merge "Guard against null mFunc in PooledLambdaImpl" into qt-dev am: e64acbea8e 
am: 3d4f87f021

Change-Id: I3c3fa961e3ef8bb07abbe222c88c5f38109eae55
 2019-06-10 14:10:20 -07:00
Eugene Susla
c9298d4882 Merge "Guard against null mFunc in PooledLambdaImpl" into qt-dev am: e64acbea8e 
am: 6fef220b46

Change-Id: I770a2850c36103b1a379dbe9035d191e963ad5d6
 2019-06-10 13:57:29 -07:00