Paul Lawrence
b841d0dc95
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev am: 89e1217c8f
...
am: 3dc6c2b6cd
2018-05-31 16:30:49 -07:00
TreeHugger Robot
98b80379fe
Merge "Attempting to fix the black flicker"
2018-05-31 23:19:51 +00:00
Brad Ebinger
ba6b7c4d75
Merge "IMS: Support for Implicit Call Rejection" am: 19d032b695 am: 982ceb81a9
...
am: f122c22c50
2018-05-31 16:18:39 -07:00
Calin Juravle
aa046797ce
Merge "Update the boot image profile and preloaded classes" into pi-dev am: a78334f80c
...
am: 97208b949b
2018-05-31 16:00:58 -07:00
Jason Monk
3257ce60dc
Merge "Protect broadcasts we use to talk to settings" into pi-dev am: 3dbd752246
...
am: f65e34a95b
2018-05-31 15:28:53 -07:00
TreeHugger Robot
374fc1a24f
Merge "Pass correct preserve window value to performStop."
2018-05-31 22:06:36 +00:00
Ryan Mitchell
40c95320fd
Merge "AAPT2: Add Proguard rules for nav fragments"
2018-05-31 21:32:39 +00:00
TreeHugger Robot
dd309ea63a
Merge "Bind correct FBO when drawing a WebView into a layer."
2018-05-31 21:21:52 +00:00
Paul Lawrence
3dc6c2b6cd
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
...
am: 89e1217c8f
2018-05-31 14:21:39 -07:00
Brad Ebinger
f122c22c50
Merge "IMS: Support for Implicit Call Rejection" am: 19d032b695
...
am: 982ceb81a9
2018-05-31 14:02:10 -07:00
TreeHugger Robot
7c91d02a2b
Merge "Refactor audio code out of bootanimation_main."
2018-05-31 20:38:11 +00:00
John Reck
cc2eee89c8
Attempting to fix the black flicker
...
Bug: 79231206
Test: Repro steps from bug
Change-Id: I4c2810c42a7a4358f64584da3ab0cdf1499e71b6
2018-05-31 19:55:54 +00:00
Derek Sollenberger
02456f0ce1
Bind correct FBO when drawing a WebView into a layer.
...
The WebView was unable to draw into either a standard clipped
layer or the "fading edges" unclipped layer. This CL and its
companion test cases ensure that both work with simple and
complex clips.
Bug: 79619253
Bug: 80443556
Bug: 80477645
Test: atest CtsUiRenderingTestCases:.LayerTests
Change-Id: I0e16b724f74415a61cc2a841ccf4a491f293ac94
2018-05-31 15:55:13 -04:00
Pavel Maltsev
ca380037bd
Merge "Merge "Fix comments to reflect changes in eth service" into pi-dev am: 44f7147084" into pi-dev-plus-aosp
...
am: 358c593f33
2018-05-31 12:50:26 -07:00
Jorim Jaggi
2eb755d012
Merge "Merge "Updates to shared lib for Launcher" into pi-dev am: f4833c4fb2" into pi-dev-plus-aosp
...
am: 8ea57c6592
2018-05-31 12:40:03 -07:00
Remi NGUYEN VAN
41c279655a
Merge "Add missing dependencies for libdexfile" am: 286aa939af am: e78185076c
...
am: e6657a0cca
2018-05-31 12:29:56 -07:00
Adrian Roos
a2897b5c98
Merge "Cutout Overlay: Flip color in inverted color mode" into pi-dev am: aceee95fa0
...
am: d955cdf889
2018-05-31 12:23:50 -07:00
TreeHugger Robot
3795062f23
Merge "Protect usage data with OP_GET_USAGE_STATS."
2018-05-31 19:21:14 +00:00
David Brazdil
7258366360
More additions to hidden API list greylist am: 132e75bd51
...
am: a782e5dbbf
2018-05-31 12:18:46 -07:00
Calin Juravle
97208b949b
Merge "Update the boot image profile and preloaded classes" into pi-dev
...
am: a78334f80c
2018-05-31 12:16:38 -07:00
David Brazdil
0c84e084fa
[automerger skipped] Merge "Build dark greylist from public + light grey API" into pi-dev am: abed288a08 -s ours
...
am: e084cb25c1
2018-05-31 12:14:54 -07:00
Jason Monk
f65e34a95b
Merge "Protect broadcasts we use to talk to settings" into pi-dev
...
am: 3dbd752246
2018-05-31 12:11:28 -07:00
Brad Ebinger
982ceb81a9
Merge "IMS: Support for Implicit Call Rejection"
...
am: 19d032b695
2018-05-31 12:10:05 -07:00
David Brazdil
872ef5cda0
[automerger skipped] Build dark greylist from public + light grey API am: 94c2ab6562 -s ours
...
am: b39e4589c7
2018-05-31 12:07:56 -07:00
Android Build Merger (Role)
ebbab12792
Merge "Merge "Add MediaMuxer APIs to light grey." into pi-dev am: cbe39d1a56 am: c657c961dc"
2018-05-31 19:04:23 +00:00
Nicolas Geoffray
d914a7acab
Merge "Add MediaMuxer APIs to light grey." into pi-dev am: cbe39d1a56
...
am: c657c961dc
2018-05-31 12:03:57 -07:00
TreeHugger Robot
8de0dc407b
Merge "Supress text replacement spans for ellipsis"
2018-05-31 19:03:31 +00:00
Felka Chang
a6600d57a4
Merge "Fix text is cut off in corner cut out condition" into pi-dev am: 544cbc9b97
...
am: fdae858850
2018-05-31 11:58:50 -07:00
Nicolas Geoffray
13d0e43671
Merge "Hidden API bugbot update" into pi-dev am: b50d9f8123
...
am: 3428cbf8fe
2018-05-31 11:53:29 -07:00
Ed Coyne
33f4b7d63b
Refactor audio code out of bootanimation_main.
...
So it can be shared with the iot/ variant I refactored it into the
audioplay.h file. This keeps all of the audio code local, we could hide
the functions and only expose the callback but that would make testing
harder.
Test: Ran a bootanimation.zip with audio.wav on Marlin, works as expected.
Bug: 67051984
Change-Id: Ie31dc5f2cfaad5bb23134ef81be712afa6b3cd6f
2018-05-31 11:50:47 -07:00
TreeHugger Robot
89e1217c8f
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
2018-05-31 18:49:38 +00:00
Bill Yi
d2f6a0f13b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 737d83180e -s ours
...
am: ae790fc733
2018-05-31 11:48:13 -07:00
Lorenzo Colitti
ba7ce273c6
Merge "Don't complain if a VPN changes capabilities." into pi-dev am: 0a93a3530d
...
am: fc9df9896c
2018-05-31 11:46:43 -07:00
Android Build Merger (Role)
358c593f33
Merge "Merge "Fix comments to reflect changes in eth service" into pi-dev am: 44f7147084" into pi-dev-plus-aosp
2018-05-31 18:34:00 +00:00
Pavel Maltsev
d400338c6b
Merge "Fix comments to reflect changes in eth service" into pi-dev
...
am: 44f7147084
2018-05-31 11:33:20 -07:00
Android Build Merger (Role)
8ea57c6592
Merge "Merge "Updates to shared lib for Launcher" into pi-dev am: f4833c4fb2" into pi-dev-plus-aosp
2018-05-31 18:27:13 +00:00
Jorim Jaggi
4edb110569
Merge "Updates to shared lib for Launcher" into pi-dev
...
am: f4833c4fb2
2018-05-31 11:26:41 -07:00
Remi NGUYEN VAN
e6657a0cca
Merge "Add missing dependencies for libdexfile" am: 286aa939af
...
am: e78185076c
2018-05-31 11:25:40 -07:00
Adrian Roos
d955cdf889
Merge "Cutout Overlay: Flip color in inverted color mode" into pi-dev
...
am: aceee95fa0
2018-05-31 11:22:16 -07:00
David Brazdil
a782e5dbbf
More additions to hidden API list greylist
...
am: 132e75bd51
2018-05-31 11:17:46 -07:00
David Brazdil
e084cb25c1
[automerger skipped] Merge "Build dark greylist from public + light grey API" into pi-dev
...
am: abed288a08
2018-05-31 11:15:46 -07:00
David Brazdil
b39e4589c7
[automerger skipped] Build dark greylist from public + light grey API
...
am: 94c2ab6562
2018-05-31 11:02:28 -07:00
Nicolas Geoffray
c657c961dc
Merge "Add MediaMuxer APIs to light grey." into pi-dev
...
am: cbe39d1a56
2018-05-31 10:56:29 -07:00
Felka Chang
fdae858850
Merge "Fix text is cut off in corner cut out condition" into pi-dev
...
am: 544cbc9b97
2018-05-31 10:52:02 -07:00
Nicolas Geoffray
3428cbf8fe
Merge "Hidden API bugbot update" into pi-dev
...
am: b50d9f8123
2018-05-31 10:47:28 -07:00
Bill Yi
ae790fc733
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 737d83180e
2018-05-31 10:42:55 -07:00
Lorenzo Colitti
fc9df9896c
Merge "Don't complain if a VPN changes capabilities." into pi-dev
...
am: 0a93a3530d
2018-05-31 10:41:34 -07:00
Calin Juravle
a78334f80c
Merge "Update the boot image profile and preloaded classes" into pi-dev
2018-05-31 17:31:48 +00:00
Remi NGUYEN VAN
e78185076c
Merge "Add missing dependencies for libdexfile"
...
am: 286aa939af
2018-05-31 10:27:22 -07:00
TreeHugger Robot
3dbd752246
Merge "Protect broadcasts we use to talk to settings" into pi-dev
2018-05-31 17:20:21 +00:00
