Stan Iliev
9b21b970bc
Merge "Fix pop-up shadow drawn in the wrong place with Skia pipeline" into oc-dev am: a5c6ba3473
...
am: 563c5d3643
Change-Id: I8a24e8d642d49cb4822db50bbf3b2fe6e5ec9122
2017-04-04 22:34:40 +00:00
Stan Iliev
563c5d3643
Merge "Fix pop-up shadow drawn in the wrong place with Skia pipeline" into oc-dev
...
am: a5c6ba3473
Change-Id: If6f000705c2d7ca63ea8397a26242ef986e34e39
2017-04-04 22:29:36 +00:00
Seigo Nonaka
c483838dcb
Merge "Need to return false if addSkTypeface fails." into oc-dev am: 46f847fb76
...
am: 7ef7398dea
Change-Id: I8e472ef9948db82a123c1a84a7635e716f2df150
2017-04-04 22:26:24 +00:00
TreeHugger Robot
a5c6ba3473
Merge "Fix pop-up shadow drawn in the wrong place with Skia pipeline" into oc-dev
2017-04-04 22:23:02 +00:00
Seigo Nonaka
7ef7398dea
Merge "Need to return false if addSkTypeface fails." into oc-dev
...
am: 46f847fb76
Change-Id: I25fa1e54a66c3f84dab8f50914fe3da6f368e19e
2017-04-04 22:17:12 +00:00
TreeHugger Robot
46f847fb76
Merge "Need to return false if addSkTypeface fails." into oc-dev
2017-04-04 22:11:32 +00:00
Tyler Gunn
65f1f8b36a
Merge "Merge "Add api to retrieve call creation time." am: f19c52d20d am: 777adc636b am: eee4d5157a" into oc-dev-plus-aosp
...
am: c5cedc7bb7
Change-Id: Ic0b481c3cbab39e2a521588ef907144221018edd
2017-04-04 22:01:08 +00:00
Felipe Leme
3a41d7f10b
Merge "Initial implementation of autofill partitioning." into oc-dev am: ba2e284a62
...
am: dac7ecebe7
Change-Id: Ia1e8bd053d925e1acd28d873c3e167b9ded02e85
2017-04-04 21:56:41 +00:00
Android Build Merger (Role)
c5cedc7bb7
Merge "Merge "Add api to retrieve call creation time." am: f19c52d20d am: 777adc636b am: eee4d5157a" into oc-dev-plus-aosp
2017-04-04 21:54:25 +00:00
Tyler Gunn
36cd1fd124
Merge "Add api to retrieve call creation time." am: f19c52d20d am: 777adc636b
...
am: eee4d5157a
Change-Id: I9af3abdb0cf76b4e70547b1c58732fef3e07f86b
2017-04-04 21:53:01 +00:00
Felipe Leme
dac7ecebe7
Merge "Initial implementation of autofill partitioning." into oc-dev
...
am: ba2e284a62
Change-Id: I245fc0402f526f2e1ad512c3df5f885856193c5c
2017-04-04 21:49:45 +00:00
Tyler Gunn
eee4d5157a
Merge "Add api to retrieve call creation time." am: f19c52d20d
...
am: 777adc636b
Change-Id: I6de08d4ac661f097181835b16c5e20a801787814
2017-04-04 21:47:51 +00:00
Hall Liu
d4edd23f40
Merge "IMS: RTT interface changes" am: 814fdf9312 am: bc56b97770 am: 7d1712e5b9
...
am: 85313f8c35
Change-Id: I440d62ac4b49d2b1d1475259237d67b5ee937fd1
2017-04-04 21:44:14 +00:00
TreeHugger Robot
ba2e284a62
Merge "Initial implementation of autofill partitioning." into oc-dev
2017-04-04 21:42:52 +00:00
Tyler Gunn
777adc636b
Merge "Add api to retrieve call creation time."
...
am: f19c52d20d
Change-Id: I42313561c2d4e612feb428f79a64c10a64bf011a
2017-04-04 21:42:14 +00:00
Miao Wang
e83d5cada3
Merge "[RenderScript] Connect ANativeWindow to BufferQueue before calling AllocationSetSurface." into oc-dev am: 8788f64b8d
...
am: 92dde2e20f
Change-Id: Ia3dfc3c799160edd50590ef13df22cba50205b1d
2017-04-04 21:40:38 +00:00
Hall Liu
85313f8c35
Merge "IMS: RTT interface changes" am: 814fdf9312 am: bc56b97770
...
am: 7d1712e5b9
Change-Id: Ia5c6a16a69c71cfd96479e8df403669d5aaff6f9
2017-04-04 21:37:53 +00:00
TreeHugger Robot
9d64a418bb
Merge "Optimize Canvas::drawGlyphs"
2017-04-04 21:36:10 +00:00
Tyler Gunn
f19c52d20d
Merge "Add api to retrieve call creation time."
2017-04-04 21:35:26 +00:00
Jeff Sharkey
f4628d92e0
Merge "Offer to "fixup" GIDs used for app data." into oc-dev am: 359ce10912
...
am: 200d520261
Change-Id: Id2e36dad9e750904c8c2b6e2de61a173631a73e0
2017-04-04 21:34:03 +00:00
Hall Liu
7d1712e5b9
Merge "IMS: RTT interface changes" am: 814fdf9312
...
am: bc56b97770
Change-Id: Ia4f93347b8bcc668344ce78055c17a691dad4237
2017-04-04 21:31:41 +00:00
Miao Wang
92dde2e20f
Merge "[RenderScript] Connect ANativeWindow to BufferQueue before calling AllocationSetSurface." into oc-dev
...
am: 8788f64b8d
Change-Id: If4033d7c453446d32124ca67246b371817c56772
2017-04-04 21:30:45 +00:00
Hall Liu
bc56b97770
Merge "IMS: RTT interface changes"
...
am: 814fdf9312
Change-Id: Ifecb02604cebdd5ae1a16d996940d11bee920ea8
2017-04-04 21:28:10 +00:00
TreeHugger Robot
8788f64b8d
Merge "[RenderScript] Connect ANativeWindow to BufferQueue before calling AllocationSetSurface." into oc-dev
2017-04-04 21:26:17 +00:00
Jeff Sharkey
200d520261
Merge "Offer to "fixup" GIDs used for app data." into oc-dev
...
am: 359ce10912
Change-Id: I4a15ad2c025728313f6024dec9a49e6dfff1ac68
2017-04-04 21:25:36 +00:00
Hall Liu
814fdf9312
Merge "IMS: RTT interface changes"
2017-04-04 21:21:17 +00:00
TreeHugger Robot
359ce10912
Merge "Offer to "fixup" GIDs used for app data." into oc-dev
2017-04-04 21:18:21 +00:00
Hiroki Yamamoto
5889c3628b
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am: 4df6c75b99 am: d0be609210 am: d98be4a456
...
am: 775c258fd8
Change-Id: I52ebec5d98b3703ce9b6075568e41fc73ee1a9dc
2017-04-04 21:18:10 +00:00
Hiroki Yamamoto
775c258fd8
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am: 4df6c75b99 am: d0be609210
...
am: d98be4a456
Change-Id: Ideac6fbfb6638e43ef499ff75a804295457e7c50
2017-04-04 21:13:42 +00:00
Hiroki Yamamoto
d98be4a456
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am: 4df6c75b99
...
am: d0be609210
Change-Id: I8dd81fe9b4bb71b856a023c99594568d0442837c
2017-04-04 21:09:39 +00:00
Hiroki Yamamoto
d0be609210
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
...
am: 4df6c75b99
Change-Id: If1803f92474fbb6a3dc4aa47674e547443942440
2017-04-04 21:05:41 +00:00
Treehugger Robot
4df6c75b99
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
2017-04-04 20:57:53 +00:00
Hiroki Yamamoto
57a5145a01
Protect CANCEL_HANDOVER_TRANSFER broadcast
...
Bug: 36662809
Test: cancel AndroidBeam and check if the error log is not shown
Change-Id: Ic442753aacf97f7f5a7e449685c2b1414e77e957
2017-04-04 20:56:36 +00:00
Fyodor Kupolov
e901810862
Merge "Dump PackageInstaller state outside of mPackages lock" into oc-dev am: 2b285566a4
...
am: 79151ce8b5
Change-Id: Idaac5880933d4277dad21ccd9c9f8964a8ec1ece
2017-04-04 20:50:36 +00:00
Fyodor Kupolov
79151ce8b5
Merge "Dump PackageInstaller state outside of mPackages lock" into oc-dev
...
am: 2b285566a4
Change-Id: I92ba7cbdf8a8bf533e37d3f8d080d083e951cf65
2017-04-04 20:45:03 +00:00
Tony Mantler
defa3297ac
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev am: 56a090bf37
...
am: 76bdb7f8aa
Change-Id: I9c46c76e12c85083aaeadb361e058fc382d510bc
2017-04-04 20:44:36 +00:00
TreeHugger Robot
2b285566a4
Merge "Dump PackageInstaller state outside of mPackages lock" into oc-dev
2017-04-04 20:40:48 +00:00
Todd Kennedy
fdb8916ece
Merge "rebind if the connection drops" into oc-dev am: dff13a0bb1
...
am: a2c07cec34
Change-Id: I497b7415146efa6f5c5f6320651bffaa4cfd77c1
2017-04-04 20:39:32 +00:00
Tony Mantler
76bdb7f8aa
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
...
am: 56a090bf37
Change-Id: I973fa6ec82f5b45c0b516743da9111891a2cb348
2017-04-04 20:38:07 +00:00
Todd Kennedy
a2c07cec34
Merge "rebind if the connection drops" into oc-dev
...
am: dff13a0bb1
Change-Id: I4cb5542b28829d9f8dfe6989d37610c733a6457b
2017-04-04 20:34:32 +00:00
TreeHugger Robot
56a090bf37
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
2017-04-04 20:31:47 +00:00
Stan Iliev
d7410f7829
Fix pop-up shadow drawn in the wrong place with Skia pipeline
...
Fix a bug in DrawShadow matrix calculation. Recorded matrix does
not need to be applied, because parent display lists have already
replayed matrix transformations.
Test: added a new HWUI unit test that is passing only after this fix
Bug: 33103723
Change-Id: I7a47dbe879df6b9e5920a47c0e1168d9902a3e70
2017-04-04 16:24:55 -04:00
TreeHugger Robot
dff13a0bb1
Merge "rebind if the connection drops" into oc-dev
2017-04-04 20:23:36 +00:00
Michael Wright
5f4895462c
Merge "Make shutdown use the UI context." into oc-dev am: 5879d28f4d
...
am: 5ac389b032
Change-Id: Iab7dff9378e84df01cc8aa61f53b889bc1222001
2017-04-04 20:16:06 +00:00
Evan Rosky
464e0be97e
Merge "More finishing-up of cluster implementation" into oc-dev am: baa9a3f4b9
...
am: ed5f192ee4
Change-Id: I71fad3befed770158735a683a627fc63b69c8e4e
2017-04-04 20:08:36 +00:00
Michael Wright
5ac389b032
Merge "Make shutdown use the UI context." into oc-dev
...
am: 5879d28f4d
Change-Id: I51e92495a3c8b98357f82b5dea83608ea36aabc0
2017-04-04 20:03:40 +00:00
Evan Rosky
ed5f192ee4
Merge "More finishing-up of cluster implementation" into oc-dev
...
am: baa9a3f4b9
Change-Id: Iedba1beb89d3d5fb7aa5ea8b6361e7c346521d37
2017-04-04 19:54:02 +00:00
Jeremy Joslin
1b331bdd67
Merge "Migrate the NETWORK_SCORER_APP Setting." into oc-dev am: 0bbde28dd4
...
am: a1670692ac
Change-Id: If9134de003ad02fea1f3dbcb16c101ee0653ad13
2017-04-04 19:53:59 +00:00
TreeHugger Robot
5879d28f4d
Merge "Make shutdown use the UI context." into oc-dev
2017-04-04 19:52:09 +00:00
Selim Gurun
4b2b262de5
Merge "Disable WebView autocomplete feature." into oc-dev am: dd7414a644
...
am: 912a291335
Change-Id: I57d82168042a67bbbdd5f4a59a9ecefdb8ca0940
2017-04-04 19:49:25 +00:00
