129189 2014-02-21 18:01:27 -0800 [iOS Media] Wireless target UI 2014-02-21 18:40:07 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino commit-queue eric.carlson glenn jer.noble philipj sergio oldest_to_newest 983469 0 dino 2014-02-21 18:01:27 -0800 Provide some UI for both selecting a wireless target, and showing that playback is happening on the target. <rdar://problem/16100060> <rdar://problem/15349928> 983475 1 224938 dino 2014-02-21 18:16:25 -0800 Created attachment 224938 Patch 983480 2 224938 eric.carlson 2014-02-21 18:33:18 -0800 Comment on attachment 224938 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224938&action=review Thanks you! > Source/WebCore/ChangeLog:22 > + (audio::-webkit-media-controls-panel): This needs to be position relative for > + the wireless playback status to fill the viewport. Don't you mean position absolute? 983484 3 dino 2014-02-21 18:38:50 -0800 (In reply to comment #2) > (From update of attachment 224938 [details]) > > Source/WebCore/ChangeLog:22 > > + (audio::-webkit-media-controls-panel): This needs to be position relative for > > + the wireless playback status to fill the viewport. > > Don't you mean position absolute? Yes, I did. Thanks! 983485 4 dino 2014-02-21 18:40:07 -0800 Committed r164519: <http://trac.webkit.org/changeset/164519> 224938 2014-02-21 18:16:25 -0800 2014-02-21 18:33:18 -0800 Patch bug-129189-20140222131625.patch text/plain 13712 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmMyNjM5ZmQ5YTZjYzc3 NTg0MzEzNDM5NDQ3MTQ3OWM3NmQzMDI4Ny4uYWM1OWNkZjQxNmRkZWNkOTMxZjYxYzcxMWIxODMy NGJjMDBlZTIyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE0LTAyLTIxICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TIE1lZGlhXSBXaXJlbGVz cyB0YXJnZXQgVUkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyOTE4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEltcGxlbWVudCBhIHByb3RvdHlwZSBVSSBmb3Igd2lyZWxlc3MgcGxheWJhY2sgdGFyZ2V0 cy4gVGhlIFVJCisgICAgICAgIGRvZXNuJ3QgY3VycmVudGx5IHdvcmssIGJ1dCBjYW4gYmUgc2lt dWxhdGVkIHZpYSBhIGNsYXNzIHZhcmlhYmxlCisgICAgICAgIGluIENvbnRyb2xsZXJJT1MuCisK KyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5jc3M6Cisg ICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCBidXR0b24pOiBSZXNl dCB0aGUgZGVmYXVsdCBzdHlsZSBvZgorICAgICAgICBidXR0b24gZWxlbWVudHMsIHRvIGF2b2lk IGdldHRpbmcgYSBib3JkZXIuCisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy13aXJlbGVzcy1wbGF5YmFjay1zdGF0dXMpOiBIb2xkcyB0aGUgVUkgc2hvd2luZworICAgICAg ICB0aGUgdXNlciB0aGF0IHRoZSBtZWRpYSBpcyBwbGF5aW5nIG9uIGFub3RoZXIgdGFyZ2V0Lgor ICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtd2lyZWxlc3MtcGxheWJhY2st c3RhdHVzLmhpZGRlbik6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13 aXJlbGVzcy1wbGF5YmFjay1waWNrZXItYnV0dG9uKTogVGhlIGJ1dHRvbiB0bworICAgICAgICB0 cmlnZ2VyIHNlbGVjdGlvbiBvZiB0YXJnZXRzLgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtd2lyZWxlc3MtcGxheWJhY2stcGlja2VyLWJ1dHRvbi5hY3RpdmUpOgorICAg ICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwpOiBUaGlzIG5lZWRzIHRv IGJlIHBvc2l0aW9uIHJlbGF0aXZlIGZvcgorICAgICAgICB0aGUgd2lyZWxlc3MgcGxheWJhY2sg c3RhdHVzIHRvIGZpbGwgdGhlIHZpZXdwb3J0LgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250 cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzOgorICAgICAgICAoQ29udHJvbGxlcklPUyk6IENoZWNr IGZvciB0YXJnZXRzLgorICAgICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUuYWRkVmlkZW9M aXN0ZW5lcnMpOgorICAgICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUucmVtb3ZlVmlkZW9M aXN0ZW5lcnMpOgorICAgICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUuVUlTdHJpbmcpOiBO ZXcgbWV0aG9kIHRvIHJldHVybiBsb2NhbGl6ZWQgc3RyaW5ncyAod2l0aAorICAgICAgICBhIEZJ WE1FKS4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnNob3VsZEhhdmVBbnlVSSk6 IE5lZWRzIHRvIGRpc3BsYXkgaWYgdGhlcmUgaXMgYSB3aXJlbGVzcworICAgICAgICB0YXJnZXQu CisgICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS5jdXJyZW50UGxheWJhY2tUYXJnZXRJ c1dpcmVsZXNzKToKKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnVwZGF0ZVdpcmVs ZXNzUGxheWJhY2tTdGF0dXMpOiBDcmVhdGUgdGhlIHN0YXR1cyBjb250ZW50LAorICAgICAgICBy ZXBsYWNpbmcgdGhlIGRldmljZSBuYW1lIGlmIGl0IGlzIGF2YWlsYWJsZS4KKyAgICAgICAgKENv bnRyb2xsZXJJT1MucHJvdG90eXBlLnVwZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlKToKKyAg ICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLmNyZWF0ZUNvbnRyb2xzKToKKyAgICAgICAg KENvbnRyb2xsZXJJT1MucHJvdG90eXBlLmNvbmZpZ3VyZUlubGluZUNvbnRyb2xzKToKKyAgICAg ICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLmhhbmRsZVdpcmVsZXNzUGxheWJhY2tDaGFuZ2Up OgorICAgICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUuaGFuZGxlV2lyZWxlc3NUYXJnZXRB dmFpbGFibGVDaGFuZ2UpOgorICAgICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUuaGFuZGxl V2lyZWxlc3NQaWNrZXJCdXR0b25DbGlja2VkKToKKwogMjAxNC0wMi0xOCAgWmFuIERvYmVyc2Vr ICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgTW92ZSBJbmRleGVkREIgbW9kdWxl LCBMZXZlbERCIGNvZGUgdG8gc3RkOjp1bmlxdWVfcHRyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5jc3MgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5jc3MKaW5kZXgg NDVhNjY2Y2NkMWExYmJjNTNkOTM0NGY1MDE1OTZmMGI3YzExNDA1ZS4uNjRiOWI3OTYwYmUwZTJk MGU2ZGU3MDQwNTZmNzA1YmRhNDI0OGE5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuY3NzCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzcwpAQCAtMSw1ICsx LDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTIsIDIwMTMgQXBwbGUgSW5jLiAgQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMiwgMjAxMywgMjAxNCBBcHBsZSBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CkBAIC01NSw2ICs1NSw0NyBAQCB2aWRlbzotd2Via2l0LWZ1bGwtcGFnZS1tZWRpYTo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1wYW5lbCB7CiAgICAgZm9udC1mYW1pbHk6IC1hcHBsZS1zeXN0ZW0t Zm9udDsKIH0KIAordmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgaW5wdXRbdHlw ZT0iYnV0dG9uIl0sCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCBpbnB1dFt0 eXBlPSJidXR0b24iXSwKK3ZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIGJ1dHRv biwKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIGJ1dHRvbiB7CisgICAgcGFk ZGluZzogMDsKKyAgICBib3JkZXI6IG5vbmU7CisgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBub25l OworfQorCit2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay1z dGF0dXMsCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay1z dGF0dXMgeworICAgIGRpc3BsYXk6IGJsb2NrOworICAgIHdpZHRoOiAxMDAlOworICAgIGhlaWdo dDogMTAwJTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibGFjazsKKyAgICBiYWNrZ3JvdW5kLXJl cGVhdDogbm8tcmVwZWF0OworICAgIGJhY2tncm91bmQtcG9zaXRpb246IDUwJSA1MCU7CisgICAg YmFja2dyb3VuZC1zaXplOiAxMDAlIDUwJTsKK30KKwordmlkZW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtd2lyZWxlc3MtcGxheWJhY2stc3RhdHVzLmhpZGRlbiwKK2F1ZGlvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNrLXN0YXR1cy5oaWRkZW4geworICAgIGRpc3Bs YXk6IG5vbmU7Cit9CisKK3ZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBs YXliYWNrLXBpY2tlci1idXR0b24sCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJl bGVzcy1wbGF5YmFjay1waWNrZXItYnV0dG9uIHsKKyAgICBkaXNwbGF5OiBibG9jazsKKyAgICB3 aWR0aDogMjFweDsKKyAgICBoZWlnaHQ6IDIxcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDkyLCA5MiwgOTIpOworICAgIC13ZWJraXQtbWFzay1yZXBlYXQ6IG5vLXJlcGVhdDsKKyAgICAt d2Via2l0LW1hc2stcG9zaXRpb246IDAgMXB4OworICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJs KCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9z dmciIHZpZXdCb3g9IjAgMCAzNTAgMzA1Ij48ZyBmaWxsPSJ3aGl0ZSI+PHBvbHlnb24gcG9pbnRz PSI1MC42OTksMjkzIDE3NSwxNDYgMjk5LjMwMiwyOTMiLz48cG9seWdvbiBwb2ludHM9IjksOSA5 LDIxMyA5Ny4zOTIsMjEzIDExMC45MjEsMTk3IDI1LDE5NyAyNSwyNSAzMjUsMjUgMzI1LDE5NyAy MzkuMDc5LDE5NyAyNTIuNjA4LDIxMyAzNDEsMjEzIDM0MSw5Ii8+PC9nPjwvc3ZnPicpOworfQor Cit2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay1waWNrZXIt YnV0dG9uLmFjdGl2ZSwKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBs YXliYWNrLXBpY2tlci1idXR0b24uYWN0aXZlIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMTA2 MEZFOworfQorCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWNvbnRhaW5lciwKIGF1 ZGlvOjotd2Via2l0LW1lZGlhLXRleHQtdHJhY2stY29udGFpbmVyIHsKICAgICBwb3NpdGlvbjog cmVsYXRpdmU7CkBAIC02NCw3ICsxMDUsNyBAQCBhdWRpbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRy YWNrLWNvbnRhaW5lciB7CiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCwKIGF1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIHsKICAgICBib3gtc2l6aW5nOiBib3Jk ZXItYm94OwotICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7 CiAgICAgYm90dG9tOiAwOwogICAgIHdpZHRoOiAxMDAlOwogICAgIHBhZGRpbmctYm90dG9tOiAx cHg7CkBAIC05MSw3ICsxMzIsNiBAQCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5l bDpob3ZlciB7CiAgICAgb3BhY2l0eTogMTsKIH0KIAotCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1yZXdpbmQtYnV0dG9uLAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcmV3 aW5kLWJ1dHRvbiwKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIC5tdXRlLWJv eCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRp YUNvbnRyb2xzaU9TLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNpT1MuanMKaW5kZXggZTg1NjViNzkyNjBiM2JlNzIwNTYwZDhkMWRiZjA4MzIw NmJjYTQ0NS4uMjc3Mjg1NTFkNWQ3OTNkMDBjYjk0MjA0ZTczODVhMzcwNGU0ZjZkNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNp T1MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29u dHJvbHNpT1MuanMKQEAgLTUsMTggKzUsMzEgQEAgZnVuY3Rpb24gY3JlYXRlQ29udHJvbHMocm9v dCwgdmlkZW8sIGhvc3QpCiAKIGZ1bmN0aW9uIENvbnRyb2xsZXJJT1Mocm9vdCwgdmlkZW8sIGhv c3QpCiB7CisgICAgdGhpcy5oYXNXaXJlbGVzc1BsYXliYWNrVGFyZ2V0cyA9IGZhbHNlOwogICAg IENvbnRyb2xsZXIuY2FsbCh0aGlzLCByb290LCB2aWRlbywgaG9zdCk7CisKKyAgICB0aGlzLnVw ZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlKCk7CisgICAgdGhpcy51cGRhdGVXaXJlbGVzc1Bs YXliYWNrU3RhdHVzKCk7CiB9OwogCiAvKiBFbnVtcyAqLwogQ29udHJvbGxlcklPUy5TdGFydFBs YXliYWNrQ29udHJvbHMgPSAyOwogCisvKiBHbG9iYWxzICovCitDb250cm9sbGVySU9TLmdXaXJl bGVzc0ltYWdlID0gJ2RhdGE6aW1hZ2Uvc3ZnK3htbDt1dGY4LDxzdmcgeG1sbnM9Imh0dHA6Ly93 d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMjAwIDI0NSI+PGcgZmlsbD0iIzEwNjBG RSI+PHBhdGggZD0iTTE5My42LDYuM3YxMjEuNkg2LjRWNi4zSDE5My42IE0xOTkuMSwwLjdIMC45 djEzMi43aDE5OC4yVjAuN0wxOTkuMSwwLjd6Ii8+PHBhdGggZD0iTTQzLjUsMTM5LjNjMTUuOCw4 LDM1LjMsMTIuNyw1Ni41LDEyLjdzNDAuNy00LjcsNTYuNS0xMi43SDQzLjV6Ii8+PC9nPjxnIHRl eHQtYW5jaG9yPSJtaWRkbGUiIGZvbnQtZmFtaWx5PSJIZWx2ZXRpY2EgTmV1ZSI+PHRleHQgeD0i MTAwIiB5PSIyMDQiIGZpbGw9IndoaXRlIiBmb250LXNpemU9IjI0Ij4jI0RFVklDRV9UWVBFIyM8 L3RleHQ+PHRleHQgeD0iMTAwIiB5PSIyMzQiIGZpbGw9IiM1QzVDNUMiIGZvbnQtc2l6ZT0iMjEi PiMjREVWSUNFX05BTUUjIzwvdGV4dD48L2c+PC9zdmc+JzsKK0NvbnRyb2xsZXJJT1MuZ1NpbXVs YXRlV2lyZWxlc3NQbGF5YmFja1RhcmdldCA9IGZhbHNlOyAvLyBVc2VkIGZvciB0ZXN0aW5nIHdo ZW4gdGhlcmUgYXJlIG5vIHdpcmVsZXNzIHRhcmdldHMuCisKIENvbnRyb2xsZXJJT1MucHJvdG90 eXBlID0gewogICAgIGFkZFZpZGVvTGlzdGVuZXJzOiBmdW5jdGlvbigpIHsKICAgICAgICAgQ29u dHJvbGxlci5wcm90b3R5cGUuYWRkVmlkZW9MaXN0ZW5lcnMuY2FsbCh0aGlzKTsKIAogICAgICAg ICB0aGlzLmxpc3RlbkZvcih0aGlzLnZpZGVvLCAnd2Via2l0YmVnaW5mdWxsc2NyZWVuJywgdGhp cy5oYW5kbGVGdWxsc2NyZWVuQ2hhbmdlKTsKICAgICAgICAgdGhpcy5saXN0ZW5Gb3IodGhpcy52 aWRlbywgJ3dlYmtpdGVuZGZ1bGxzY3JlZW4nLCB0aGlzLmhhbmRsZUZ1bGxzY3JlZW5DaGFuZ2Up OworCisgICAgICAgIGlmICh3aW5kb3cuV2ViS2l0UGxheWJhY2tUYXJnZXRBdmFpbGFiaWxpdHlF dmVudCkgeworICAgICAgICAgICAgdGhpcy5saXN0ZW5Gb3IodGhpcy52aWRlbywgJ3dlYmtpdGN1 cnJlbnRwbGF5YmFja3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkJywgdGhpcy5oYW5kbGVXaXJlbGVz c1BsYXliYWNrQ2hhbmdlKTsKKyAgICAgICAgICAgIHRoaXMubGlzdGVuRm9yKHRoaXMudmlkZW8s ICd3ZWJraXRwbGF5YmFja3RhcmdldGF2YWlsYWJpbGl0eWNoYW5nZWQnLCB0aGlzLmhhbmRsZVdp cmVsZXNzVGFyZ2V0QXZhaWxhYmxlQ2hhbmdlKTsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBy ZW1vdmVWaWRlb0xpc3RlbmVyczogZnVuY3Rpb24oKSB7CkBAIC0yNCw4ICszNywxMiBAQCBDb250 cm9sbGVySU9TLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLnN0b3BMaXN0ZW5pbmdGb3Io dGhpcy52aWRlbywgJ3dlYmtpdGJlZ2luZnVsbHNjcmVlbicsIHRoaXMuaGFuZGxlRnVsbHNjcmVl bkNoYW5nZSk7CiAgICAgICAgIHRoaXMuc3RvcExpc3RlbmluZ0Zvcih0aGlzLnZpZGVvLCAnd2Vi a2l0ZW5kZnVsbHNjcmVlbicsIHRoaXMuaGFuZGxlRnVsbHNjcmVlbkNoYW5nZSk7Ci0gICAgfSwK IAorICAgICAgICBpZiAod2luZG93LldlYktpdFBsYXliYWNrVGFyZ2V0QXZhaWxhYmlsaXR5RXZl bnQpIHsKKyAgICAgICAgICAgIHRoaXMuc3RvcExpc3RlbmluZ0Zvcih0aGlzLnZpZGVvLCAnd2Vi a2l0Y3VycmVudHBsYXliYWNrdGFyZ2V0aXN3aXJlbGVzc2NoYW5nZWQnLCB0aGlzLmhhbmRsZVdp cmVsZXNzUGxheWJhY2tDaGFuZ2UpOworICAgICAgICAgICAgdGhpcy5zdG9wTGlzdGVuaW5nRm9y KHRoaXMudmlkZW8sICd3ZWJraXRwbGF5YmFja3RhcmdldGF2YWlsYWJpbGl0eWNoYW5nZWQnLCB0 aGlzLmhhbmRsZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlQ2hhbmdlKTsKKyAgICAgICAgfQorICAg IH0sCiAKICAgICBjcmVhdGVCYXNlOiBmdW5jdGlvbigpIHsKICAgICAgICAgQ29udHJvbGxlci5w cm90b3R5cGUuY3JlYXRlQmFzZS5jYWxsKHRoaXMpOwpAQCAtMzksNiArNTYsMjIgQEAgQ29udHJv bGxlcklPUy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuc3RvcExpc3RlbmluZ0Zvcih0aGlz LmJhc2UsICdtb3VzZW91dCcsIHRoaXMuaGFuZGxlV3JhcHBlck1vdXNlT3V0KTsKICAgICB9LAog CisgICAgVUlTdHJpbmc6IGZ1bmN0aW9uKHMpeworICAgICAgICB2YXIgc3RyaW5nID0gQ29udHJv bGxlci5wcm90b3R5cGUuVUlTdHJpbmcuY2FsbCh0aGlzLCBzKTsKKyAgICAgICAgaWYgKHN0cmlu ZykKKyAgICAgICAgICAgIHJldHVybiBzdHJpbmc7CisKKyAgICAgICAgaWYgKHRoaXMubG9jYWxp emVkU3RyaW5nc1tzXSkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLmxvY2FsaXplZFN0cmluZ3Nb c107CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJldHVybiBzOyAvLyBGSVhNRTogTE9HIHNv bWV0aGluZyBpZiBzdHJpbmcgbm90IGxvY2FsaXplZC4KKyAgICB9LAorICAgIGxvY2FsaXplZFN0 cmluZ3M6IHsKKyAgICAgICAgLy8gRklYTUU6IE1vdmUgbG9jYWxpemF0aW9uIHRvIGV4dCBzdHJp bmdzIGZpbGUgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTIwOTU2PgorICAgICAgICAnIyNERVZJQ0Vf VFlQRSMjJzogJ0FpclBsYXknLAorICAgICAgICAnIyNERVZJQ0VfTkFNRSMjJzogJ1RoaXMgdmlk ZW8gaXMgcGxheWluZyBvbiAiIyNERVZJQ0VfTkFNRSMjIi4nLAorICAgIH0sCisKICAgICBzaG91 bGRIYXZlU3RhcnRQbGF5YmFja0J1dHRvbjogZnVuY3Rpb24oKSB7CiAgICAgICAgIHZhciBhbGxv d3NJbmxpbmUgPSB0aGlzLmhvc3QubWVkaWFQbGF5YmFja0FsbG93c0lubGluZTsKIApAQCAtNjgs MTIgKzEwMSw2MCBAQCBDb250cm9sbGVySU9TLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAg c2hvdWxkSGF2ZUFueVVJOiBmdW5jdGlvbigpIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuc2hvdWxk SGF2ZVN0YXJ0UGxheWJhY2tCdXR0b24oKSB8fCBDb250cm9sbGVyLnByb3RvdHlwZS5zaG91bGRI YXZlQW55VUkuY2FsbCh0aGlzKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuc2hvdWxkSGF2ZVN0YXJ0 UGxheWJhY2tCdXR0b24oKSB8fCBDb250cm9sbGVyLnByb3RvdHlwZS5zaG91bGRIYXZlQW55VUku Y2FsbCh0aGlzKSB8fCB0aGlzLmN1cnJlbnRQbGF5YmFja1RhcmdldElzV2lyZWxlc3MoKTsKKyAg ICB9LAorCisgICAgY3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzczogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIENvbnRyb2xsZXJJT1MuZ1NpbXVsYXRlV2lyZWxlc3NQbGF5 YmFja1RhcmdldCB8fCAoKHR5cGVvZiB0aGlzLnZpZGVvLndlYmtpdEN1cnJlbnRQbGF5YmFja1Rh cmdldElzV2lyZWxlc3MgPT09ICJmdW5jdGlvbiIpICYmIHRoaXMudmlkZW8ud2Via2l0Q3VycmVu dFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcygpKTsKKyAgICB9LAorCisgICAgdXBkYXRlV2lyZWxl c3NQbGF5YmFja1N0YXR1czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuY3Vy cmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcygpKSB7CisgICAgICAgICAgICB2YXIgYmFja2dy b3VuZEltYWdlU1ZHID0gInVybCgnIiArIENvbnRyb2xsZXJJT1MuZ1dpcmVsZXNzSW1hZ2UgKyAi JykiOworCisgICAgICAgICAgICB2YXIgZGV2aWNlVHlwZSA9IHRoaXMuVUlTdHJpbmcoJyMjREVW SUNFX1RZUEUjIycpOworICAgICAgICAgICAgYmFja2dyb3VuZEltYWdlU1ZHID0gYmFja2dyb3Vu ZEltYWdlU1ZHLnJlcGxhY2UoJyMjREVWSUNFX1RZUEUjIycsIGRldmljZVR5cGUpOworCisgICAg ICAgICAgICAvLyBGSVhNRTogR2V0IHRoZSBkZXZpY2UgdHlwZSBhbmQgbmFtZSBmcm9tIHRoZSBo b3N0LgorICAgICAgICAgICAgdmFyIGRldmljZU5hbWUgPSAidW5rbm93biI7CisgICAgICAgICAg ICB2YXIgZGV2aWNlTmFtZSA9IHRoaXMuVUlTdHJpbmcoJyMjREVWSUNFX05BTUUjIycpLnJlcGxh Y2UoJyMjREVWSUNFX05BTUUjIycsIGRldmljZU5hbWUpOzsKKyAgICAgICAgICAgIGJhY2tncm91 bmRJbWFnZVNWRyA9IGJhY2tncm91bmRJbWFnZVNWRy5yZXBsYWNlKCcjI0RFVklDRV9OQU1FIyMn LCBkZXZpY2VOYW1lKTsKKworICAgICAgICAgICAgdGhpcy5jb250cm9scy53aXJlbGVzc1BsYXli YWNrU3RhdHVzLnN0eWxlLmJhY2tncm91bmRJbWFnZSA9IGJhY2tncm91bmRJbWFnZVNWRzsKKyAg ICAgICAgICAgIHRoaXMuY29udHJvbHMud2lyZWxlc3NQbGF5YmFja1N0YXR1cy5zZXRBdHRyaWJ1 dGUoJ2FyaWEtbGFiZWwnLCBkZXZpY2VUeXBlICsgIiwgIiArIGRldmljZU5hbWUpOworCisgICAg ICAgICAgICB0aGlzLmNvbnRyb2xzLndpcmVsZXNzUGxheWJhY2tTdGF0dXMuY2xhc3NMaXN0LnJl bW92ZSh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKKyAgICAgICAgICAgIHRoaXMuY29udHJvbHMu d2lyZWxlc3NUYXJnZXRQaWNrZXIuY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuYWN0aXZl KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHRoaXMuY29udHJvbHMud2lyZWxlc3NQ bGF5YmFja1N0YXR1cy5jbGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOworICAg ICAgICAgICAgdGhpcy5jb250cm9scy53aXJlbGVzc1RhcmdldFBpY2tlci5jbGFzc0xpc3QucmVt b3ZlKHRoaXMuQ2xhc3NOYW1lcy5hY3RpdmUpOworICAgICAgICB9CisgICAgfSwKKworICAgIHVw ZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBp ZiAoQ29udHJvbGxlcklPUy5nU2ltdWxhdGVXaXJlbGVzc1BsYXliYWNrVGFyZ2V0IHx8IHRoaXMu aGFzV2lyZWxlc3NQbGF5YmFja1RhcmdldHMpCisgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLndp cmVsZXNzVGFyZ2V0UGlja2VyLmNsYXNzTGlzdC5yZW1vdmUodGhpcy5DbGFzc05hbWVzLmhpZGRl bik7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuY29udHJvbHMud2lyZWxlc3NUYXJn ZXRQaWNrZXIuY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKICAgICB9LAog CiAgICAgY3JlYXRlQ29udHJvbHM6IGZ1bmN0aW9uKCkgewogICAgICAgICBDb250cm9sbGVyLnBy b3RvdHlwZS5jcmVhdGVDb250cm9scy5jYWxsKHRoaXMpOwogCisgICAgICAgIHZhciB3aXJlbGVz c1BsYXliYWNrU3RhdHVzID0gdGhpcy5jb250cm9scy53aXJlbGVzc1BsYXliYWNrU3RhdHVzID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CisgICAgICAgIHdpcmVsZXNzUGxheWJhY2tT dGF0dXMuc2V0QXR0cmlidXRlKCdwc2V1ZG8nLCAnLXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJl bGVzcy1wbGF5YmFjay1zdGF0dXMnKTsKKyAgICAgICAgd2lyZWxlc3NQbGF5YmFja1N0YXR1cy5j bGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOworCisgICAgICAgIHZhciB3aXJl bGVzc1RhcmdldFBpY2tlciA9IHRoaXMuY29udHJvbHMud2lyZWxlc3NUYXJnZXRQaWNrZXIgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCdidXR0b24nKTsKKyAgICAgICAgd2lyZWxlc3NUYXJnZXRQ aWNrZXIuc2V0QXR0cmlidXRlKCdwc2V1ZG8nLCAnLXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJl bGVzcy1wbGF5YmFjay1waWNrZXItYnV0dG9uJyk7CisgICAgICAgIHdpcmVsZXNzVGFyZ2V0UGlj a2VyLnNldEF0dHJpYnV0ZSgnYXJpYS1sYWJlbCcsIHRoaXMuVUlTdHJpbmcoJ0Nob29zZSBXaXJl bGVzcyBEaXNwbGF5JykpOworICAgICAgICB0aGlzLmxpc3RlbkZvcih3aXJlbGVzc1RhcmdldFBp Y2tlciwgJ2NsaWNrJywgdGhpcy5oYW5kbGVXaXJlbGVzc1BpY2tlckJ1dHRvbkNsaWNrZWQpOwor ICAgICAgICBpZiAoIUNvbnRyb2xsZXJJT1MuZ1NpbXVsYXRlV2lyZWxlc3NQbGF5YmFja1Rhcmdl dCkKKyAgICAgICAgICAgIHdpcmVsZXNzVGFyZ2V0UGlja2VyLmNsYXNzTGlzdC5hZGQodGhpcy5D bGFzc05hbWVzLmhpZGRlbik7CisKICAgICAgICAgdGhpcy5saXN0ZW5Gb3IodGhpcy5jb250cm9s cy5zdGFydFBsYXliYWNrQnV0dG9uLCAndG91Y2hzdGFydCcsIHRoaXMuaGFuZGxlU3RhcnRQbGF5 YmFja0J1dHRvblRvdWNoU3RhcnQpOwogICAgICAgICB0aGlzLmxpc3RlbkZvcih0aGlzLmNvbnRy b2xzLnN0YXJ0UGxheWJhY2tCdXR0b24sICd0b3VjaGVuZCcsIHRoaXMuaGFuZGxlU3RhcnRQbGF5 YmFja0J1dHRvblRvdWNoRW5kKTsKICAgICAgICAgdGhpcy5saXN0ZW5Gb3IodGhpcy5jb250cm9s cy5zdGFydFBsYXliYWNrQnV0dG9uLCAndG91Y2hjYW5jZWwnLCB0aGlzLmhhbmRsZVN0YXJ0UGxh eWJhY2tCdXR0b25Ub3VjaENhbmNlbCk7CkBAIC0xMTEsOCArMTkyLDExIEBAIENvbnRyb2xsZXJJ T1MucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICBjb25maWd1cmVJbmxpbmVDb250cm9sczog ZnVuY3Rpb24oKSB7CisgICAgICAgIHRoaXMuYmFzZS5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xz LndpcmVsZXNzUGxheWJhY2tTdGF0dXMpOworCiAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwu YXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy5wbGF5QnV0dG9uKTsKICAgICAgICAgdGhpcy5jb250 cm9scy5wYW5lbC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLnRpbWVsaW5lQm94KTsKKyAgICAg ICAgdGhpcy5jb250cm9scy5wYW5lbC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLndpcmVsZXNz VGFyZ2V0UGlja2VyKTsKICAgICAgICAgdGhpcy5jb250cm9scy50aW1lbGluZUJveC5hcHBlbmRD aGlsZCh0aGlzLmNvbnRyb2xzLmN1cnJlbnRUaW1lKTsKICAgICAgICAgdGhpcy5jb250cm9scy50 aW1lbGluZUJveC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLnRpbWVsaW5lKTsKICAgICAgICAg dGhpcy5jb250cm9scy50aW1lbGluZUJveC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLnJlbWFp bmluZ1RpbWUpOwpAQCAtMjc0LDYgKzM1OCwyMSBAQCBDb250cm9sbGVySU9TLnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy51cGRhdGVDb250cm9scygpOwogICAgIH0sCiAKKyAgICBoYW5kbGVX aXJlbGVzc1BsYXliYWNrQ2hhbmdlOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHVw ZGF0ZVdpcmVsZXNzUGxheWJhY2tTdGF0dXMoKTsKKyAgICB9LAorCisgICAgaGFuZGxlV2lyZWxl c3NUYXJnZXRBdmFpbGFibGVDaGFuZ2U6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAg dGhpcy5oYXNXaXJlbGVzc1BsYXliYWNrVGFyZ2V0cyA9IGV2ZW50LmF2YWlsYWJpbGl0eSA9PSAi YXZhaWxhYmxlIjsKKyAgICAgICAgdXBkYXRlV2lyZWxlc3NUYXJnZXRBdmFpbGFibGUoKTsKKyAg ICB9LAorCisgICAgaGFuZGxlV2lyZWxlc3NQaWNrZXJCdXR0b25DbGlja2VkOiBmdW5jdGlvbihl dmVudCkKKyAgICB7CisgICAgICAgIHZpZGVvLndlYmtpdFNob3dQbGF5YmFja1RhcmdldFBpY2tl cigpOworICAgIH0sCiB9OwogCiBPYmplY3QuY3JlYXRlKENvbnRyb2xsZXIucHJvdG90eXBlKS5l eHRlbmQoQ29udHJvbGxlcklPUy5wcm90b3R5cGUpOwo=