143585 2015-04-09 15:44:05 -0700 Wireless player placard for OSX 2015-04-13 17:14:39 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned oldest_to_newest 1084084 0 roger_fong 2015-04-09 15:44:05 -0700 This covers both big and small versions. rdar://problem/12067439 1084113 1 250485 roger_fong 2015-04-09 16:19:15 -0700 Created attachment 250485 patch 1084300 2 250485 eric.carlson 2015-04-10 07:14:10 -0700 Comment on attachment 250485 patch View in context: https://bugs.webkit.org/attachment.cgi?id=250485&action=review r=me with the minor changes noted. > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:463 > + inlinePlaybackPlaceholderTextTop.innerText = 'AirPlay'; This string should go into mediaControlsLocalizedStrings.js > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:467 > + inlinePlaybackPlaceholderTextBottom.innerText = 'This video is playing on "AppleTV"' Ditto. > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:1757 > + console.log(deviceName); Please remove this. 1084328 3 roger_fong 2015-04-10 10:19:39 -0700 (In reply to comment #2) > Comment on attachment 250485 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=250485&action=review > > r=me with the minor changes noted. > > > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:463 > > + inlinePlaybackPlaceholderTextTop.innerText = 'AirPlay'; > > This string should go into mediaControlsLocalizedStrings.js > > > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:467 > > + inlinePlaybackPlaceholderTextBottom.innerText = 'This video is playing on "AppleTV"' > > Ditto. Actually I'll just get rid of those two altogether. We always run the updateWirelessPlaybackStatus method on initialization which initializes those values with the appropriate strings anyways. > > > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:1757 > > + console.log(deviceName); > > Please remove this. 1084332 4 roger_fong 2015-04-10 10:34:49 -0700 http://trac.webkit.org/changeset/182631 1085011 5 roger_fong 2015-04-13 17:14:39 -0700 (In reply to comment #4) > http://trac.webkit.org/changeset/182631 http://trac.webkit.org/changeset/182771 250485 2015-04-09 16:19:15 -0700 2015-04-10 07:14:10 -0700 patch patch.patch text/plain 14447 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjYwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE1LTA0LTA5ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIHdpcmVsZXNzIHBs YXllciBwbGFjYXJkIGZvciBPU1guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDM1ODUuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjA2NzQzOT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVs ZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuY3NzOgorICAgICAgICBBZGp1c3Qg YnV0dG9uIHBvc2l0aW9uaW5nIGFuZCBzdmcuCisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay1waWNrZXItYnV0dG9uKToKKyAgICAgICAgKGF1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNrLXBpY2tlci1idXR0 b24ucGxheWluZyk6CisgICAgICAgIFN0eWxlIHRoZSB3aXJlbGVzcyBwbGF5YmFjayBzdGF0dXMg cGxhY2FyZCwgc21hbGwgYW5kIGJpZyB2ZXJzaW9ucy4KKyAgICAgICAgKGF1ZGlvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNrLXN0YXR1cyk6CisgICAgICAgIChhdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay10ZXh0KToKKyAgICAg ICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNrLXRleHQt dG9wKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBs YXliYWNrLXRleHQtYm90dG9tKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXdpcmVsZXNzLXBsYXliYWNrLXN0YXR1cy5zbWFsbCk6CisgICAgICAgIChhdWRpbzo6LXdl YmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay10ZXh0LXRvcC5zbWFsbCk6Cisg ICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay10 ZXh0LWJvdHRvbS5zbWFsbCk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlh Q29udHJvbHNBcHBsZS5qczoKKyAgICAgICAgQWRkIG5ldyB3aXJlbGVzcyBwbGF5ZXIgcGxhY2Fy ZCBlbGVtZW50cy4KKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLmNyZWF0ZUNvbnRyb2xz KToKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLmNvbmZpZ3VyZUlubGluZUNvbnRyb2xz KToKKyAgICAgICAgTWFrZSBzdXJlIHRvIHN3aXRjaCBiZXR3ZWVuIHNtYWxsIGFuZCBiaWcgcGxh Y2FyZHMgd2hlbiBzd2l0Y2hpbmcgYmV0d2VlbiBmdWxsc2NyZWVuIGFuZCBzbWFsbCB2aWRlb3Mu CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5jb25maWd1cmVGdWxsU2NyZWVuQ29udHJv bHMpOgorICAgICAgICAoQ29udHJvbGxlci5wcm90b3R5cGUuaGFuZGxlRnVsbHNjcmVlbkNoYW5n ZSk6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS51cGRhdGVXaXJlbGVzc1BsYXliYWNr U3RhdHVzKToKKwogMjAxNS0wNC0wOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBw bGUuY29tPgogCiAgICAgICAgIFRleHQtY29tYmluZSBlcnJvbmVvdXNseSBkcmF3cyB2ZXJ0aWNh bGx5IGFmdGVyIG5vbi1sYXlvdXQtY2F1c2luZyBzdHlsZSBjaGFuZ2UKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuY3NzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRy b2xzQXBwbGUuY3NzCShyZXZpc2lvbiAxODIyODgpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmNzcwkod29ya2luZyBjb3B5KQpAQCAt Mjk2LDE0ICsyOTYsMTQgQEAgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLW1p bgogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay1waWNr ZXItYnV0dG9uLAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtd2lyZWxlc3MtcGxheWJh Y2stcGlja2VyLWJ1dHRvbiB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdl L3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9 IjAgMCAxNiAxNSIgc3Ryb2tlPSJyZ2JhKDI1NSwyNTUsMjU1LDAuNjgpIj48ZGVmcz4gPGNsaXBQ YXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgaWQ9ImN1dC1ob2xlIj48cGF0aCBkPSJNIDAsMCBMIDE2 LDAgTCAxNiwxNSBMIDAsMTUgeiBNIDAsMTQgTCAxNiwxNCBMIDgsNC41IHoiLz48L2NsaXBQYXRo PjwvZGVmcz48cmVjdCBmaWxsPSJub25lIiBjbGlwLXBhdGg9InVybCgjY3V0LWhvbGUpIiB4PSIw LjUiIHk9IjEuNSIgd2lkdGg9IjE1IiBoZWlnaHQ9IjgiLz48cGF0aCBmaWxsPSJyZ2JhKDI1NSwy NTUsMjU1LDAuNjgpIiBkPSJNIDQuMjUsMTIuNzUgTCAxMS43NSwxMi43NSBMIDgsOC4yNSB6Ii8+ PC9zdmc+Jyk7CisgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWws PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAx NSIgc3Ryb2tlPSJyZ2JhKDI1NSwyNTUsMjU1LDAuNjgpIj48ZGVmcz4gPGNsaXBQYXRoIGZpbGwt cnVsZT0iZXZlbm9kZCIgaWQ9ImN1dC1ob2xlIj48cGF0aCBkPSJNIDAsMC41IEwgMTYsMC41IEwg MTYsMTUuNSBMIDAsMTUuNSB6IE0gMCwxNC41IEwgMTYsMTQuNSBMIDgsNSB6Ii8+PC9jbGlwUGF0 aD48L2RlZnM+PHJlY3QgZmlsbD0ibm9uZSIgY2xpcC1wYXRoPSJ1cmwoI2N1dC1ob2xlKSIgeD0i MC41IiB5PSIyIiB3aWR0aD0iMTUiIGhlaWdodD0iOCIvPjxwYXRoIHN0cm9rZT0ibm9uZSIgZmls bD0icmdiYSgyNTUsMjU1LDI1NSwwLjY4KSIgZD0iTSAzLjUsMTMuMjUgTCAxMi41LDEzLjI1IEwg OCw4IHoiLz48L3N2Zz4nKTsKICAgICBtYXJnaW4tcmlnaHQ6IDE2cHg7CiAgICAgd2lkdGg6IDE2 cHg7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNr LXBpY2tlci1idXR0b24ucGxheWluZywKIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdp cmVsZXNzLXBsYXliYWNrLXBpY2tlci1idXR0b24ucGxheWluZyB7Ci0gICAgYmFja2dyb3VuZC1p bWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5v cmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNSIgc3Ryb2tlPSJyZ2IoMCwxNzIsMjQ1KSI+ PGRlZnM+IDxjbGlwUGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGlkPSJjdXQtaG9sZSI+PHBhdGgg ZD0iTSAwLDAgTCAxNiwwIEwgMTYsMTUgTCAwLDE1IHogTSAwLDE0IEwgMTYsMTQgTCA4LDQuNSB6 Ii8+PC9jbGlwUGF0aD48L2RlZnM+PHJlY3QgZmlsbD0ibm9uZSIgY2xpcC1wYXRoPSJ1cmwoI2N1 dC1ob2xlKSIgeD0iMC41IiB5PSIxLjUiIHdpZHRoPSIxNSIgaGVpZ2h0PSI4Ii8+PHBhdGggZmls bD0icmdiKDAsMTcyLDI0NSkiIGQ9Ik0gNC4yNSwxMi43NSBMIDExLjc1LDEyLjc1IEwgOCw4LjI1 IHoiLz48L3N2Zz4nKTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3Zn K3htbCw8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAw IDE2IDE1IiBzdHJva2U9InJnYigwLDE3MiwyNDUpIj48ZGVmcz4gPGNsaXBQYXRoIGZpbGwtcnVs ZT0iZXZlbm9kZCIgaWQ9ImN1dC1ob2xlIj48cGF0aCBkPSJNIDAsMC41IEwgMTYsMC41IEwgMTYs MTUuNSBMIDAsMTUuNSB6IE0gMCwxNC41IEwgMTYsMTQuNSBMIDgsNSB6Ii8+PC9jbGlwUGF0aD48 L2RlZnM+PHJlY3QgZmlsbD0ibm9uZSIgY2xpcC1wYXRoPSJ1cmwoI2N1dC1ob2xlKSIgeD0iMC41 IiB5PSIyIiB3aWR0aD0iMTUiIGhlaWdodD0iOCIvPjxwYXRoIHN0cm9rZT0ibm9uZSIgZmlsbD0i cmdiKDAsMTcyLDI0NSkiIGQ9Ik0gMy41LDEzLjI1IEwgMTIuNSwxMy4yNSBMIDgsOCB6Ii8+PC9z dmc+Jyk7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRvZ2dsZS1jbG9zZWQt Y2FwdGlvbnMtYnV0dG9uLApAQCAtODMyLDEyICs4MzIsNzUgQEAgYXVkaW86Oi13ZWJraXQtbWVk aWEtdGV4dC10cmFjay1jb250YWluZQogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtd2ly ZWxlc3MtcGxheWJhY2stc3RhdHVzLAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtd2ly ZWxlc3MtcGxheWJhY2stc3RhdHVzIHsKICAgICBkaXNwbGF5OiBibG9jazsKKyAgICBwb3NpdGlv bjogYWJzb2x1dGU7CisgICAgbGVmdDogMHB4OworICAgIHRvcDogMHB4OwogICAgIHdpZHRoOiAx MDAlOwogICAgIGhlaWdodDogMTAwJTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6 aW1hZ2Uvc3ZnK3htbDt1dGY4LDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3Zn IiB2aWV3Qm94PSIwIDAgMTMxIDkwIj48ZyBmaWxsPSJub25lIiBzdHJva2U9InJnYigxNDYsMTQ2 LDE0NikiIHN0cm9rZS13aWR0aD0iNCI+PHJlY3QgeD0iMiIgeT0iMiIgd2lkdGg9IjEyNyIgaGVp Z2h0PSI3NiIvPjxsaW5lIHgxPSIzMCIgeTE9Ijg4IiB4Mj0iMTAxIiB5Mj0iODgiLz48L2c+PC9z dmc+Jyk7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogYmxhY2s7CiAgICAgYmFja2dyb3VuZC1yZXBl YXQ6IG5vLXJlcGVhdDsKLSAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiA1MCUgNTAlOwotICAgIGJh Y2tncm91bmQtc2l6ZTogMTAwJSA1MCU7CisgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogNTAlIGNh bGMoLjUgKiAoMTAwJSAtIDI1cHgpIC0gMjFwdCk7CisgICAgYmFja2dyb3VuZC1zaXplOiAxMzFw eCBhdXRvOworICAgIGNvbG9yOiByZ2IoMTQ1LDE0NSwxNDUpOworICAgIGZvbnQ6IC13ZWJraXQt c21hbGwtY29udHJvbDsKKyAgICB2ZXJ0aWNhbC1hbGlnbjogdGV4dC1ib3R0b207Cit9CisKK3Zp ZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNrLXRleHQsCithdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay10ZXh0IHsKKyAgICBj dXJzb3I6IGRlZmF1bHQ7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHdpZHRoOiAxMDAl OworICAgIHRvcDogY2FsYyguNSAqICgxMDAlIC0gMjVweCkgKyAoLjUgKiAoOTBweCArIDQycHQp IC0gNDJwdCkpOworICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmU7CisgICAgbWFyZ2luOiAw cHg7CisgICAgaGVpZ2h0OiA0MnB0OworfQorCit2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy13aXJlbGVzcy1wbGF5YmFjay10ZXh0LXRvcCwKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXdpcmVsZXNzLXBsYXliYWNrLXRleHQtdG9wIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7 CisgICAgdG9wOiAxNXB0OworICAgIHdpZHRoOiAxMDAlOworICAgIGxpbmUtaGVpZ2h0OiAxMnB0 OworICAgIGhlaWdodDogMTJwdDsKKyAgICBmb250LXNpemU6IDEycHQ7CisgICAgdGV4dC1hbGln bjogY2VudGVyOworICAgIG1hcmdpbjogMHB4OworfQorCit2aWRlbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy13aXJlbGVzcy1wbGF5YmFjay10ZXh0LWJvdHRvbSwKK2F1ZGlvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNrLXRleHQtYm90dG9tIHsKKyAgICBwb3NpdGlv bjogYWJzb2x1dGU7CisgICAgYm90dG9tOiAwOworICAgIGxlZnQ6IDUlOworICAgIHdpZHRoOiA5 MCU7CisgICAgbGluZS1oZWlnaHQ6IDEwcHQ7CisgICAgaGVpZ2h0OiAxMHB0OworICAgIGZvbnQt c2l6ZTogMTBwdDsKKyAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CisgICAgd2hpdGUtc3BhY2U6IG5v d3JhcDsKKyAgICBvdmVyZmxvdzogaGlkZGVuOworICAgIHRleHQtb3ZlcmZsb3c6IGVsbGlwc2lz OworICAgIG1hcmdpbjogMHB4OworfQorCit2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13 aXJlbGVzcy1wbGF5YmFjay1zdGF0dXMuc21hbGwsCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy13aXJlbGVzcy1wbGF5YmFjay1zdGF0dXMuc21hbGwgeworICAgIGJhY2tncm91bmQtaW1h Z2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53 My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MiA0MyI+PGcgZmlsbD0ibm9uZSIgc3Ryb2tl PSJyZ2IoMTQ2LDE0NiwxNDYpIiBzdHJva2Utd2lkdGg9IjIiPjxyZWN0IHg9IjEiIHk9IjEiIHdp ZHRoPSI2MCIgaGVpZ2h0PSIzNiIvPjxsaW5lIHgxPSIxNCIgeTE9IjQyIiB4Mj0iNDgiIHkyPSI0 MiIvPjwvZz48L3N2Zz4nKTsKKyAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiA1MCUgY2FsYyguNSAq ICgxMDAlIC0gMjVweCkgLSA1cHQpOworICAgIGJhY2tncm91bmQtc2l6ZTogNjJweCBhdXRvOwor fQorCit2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay10ZXh0 LXRvcC5zbWFsbCwKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXli YWNrLXRleHQtdG9wLnNtYWxsIHsKKyAgICB0b3A6IDRwdDsKK30KKwordmlkZW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtd2lyZWxlc3MtcGxheWJhY2stdGV4dC1ib3R0b20uc21hbGwsCithdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay10ZXh0LWJvdHRvbS5z bWFsbCB7CisgICAgZGlzcGxheTogbm9uZTsKIH0KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtd2lyZWxlc3MtcGxheWJhY2stc3RhdHVzLmhpZGRlbiwKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNB cHBsZS5qcwkocmV2aXNpb24gMTgyMjgyKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcwkod29ya2luZyBjb3B5KQpAQCAtNDcsNyAr NDcsNiBAQCBDb250cm9sbGVyLlBsYXlBZnRlclNlZWtpbmcgPSAwOwogQ29udHJvbGxlci5QYXVz ZUFmdGVyU2Vla2luZyA9IDE7CiAKIC8qIEdsb2JhbHMgKi8KLUNvbnRyb2xsZXIuZ1dpcmVsZXNz SW1hZ2UgPSAnZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53 My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMDAgMjQ1Ij48ZyBmaWxsPSIjMTA2MEZFIj48 cGF0aCBkPSJNMTkzLjYsNi4zdjEyMS42SDYuNFY2LjNIMTkzLjYgTTE5OS4xLDAuN0gwLjl2MTMy LjdoMTk4LjJWMC43TDE5OS4xLDAuN3oiLz48cGF0aCBkPSJNNDMuNSwxMzkuM2MxNS44LDgsMzUu MywxMi43LDU2LjUsMTIuN3M0MC43LTQuNyw1Ni41LTEyLjdINDMuNXoiLz48L2c+PGcgdGV4dC1h bmNob3I9Im1pZGRsZSIgZm9udC1mYW1pbHk9IkhlbHZldGljYSBOZXVlIj48dGV4dCB4PSIxMDAi IHk9IjIwNCIgZmlsbD0id2hpdGUiIGZvbnQtc2l6ZT0iMjQiPiMjREVWSUNFX1RZUEUjIzwvdGV4 dD48dGV4dCB4PSIxMDAiIHk9IjIzNCIgZmlsbD0iIzVDNUM1QyIgZm9udC1zaXplPSIyMSI+IyNE RVZJQ0VfTkFNRSMjPC90ZXh0PjwvZz48L3N2Zz4nOwogQ29udHJvbGxlci5nU2ltdWxhdGVXaXJl bGVzc1BsYXliYWNrVGFyZ2V0ID0gZmFsc2U7IC8vIFVzZWQgZm9yIHRlc3Rpbmcgd2hlbiB0aGVy ZSBhcmUgbm8gd2lyZWxlc3MgdGFyZ2V0cy4KIENvbnRyb2xsZXIuZ1NpbXVsYXRlT3B0aW1pemVk RnVsbHNjcmVlbkF2YWlsYWJsZSA9IGZhbHNlOyAvLyBVc2VkIGZvciB0ZXN0aW5nIHdoZW4gb3B0 aW1pemVkIGZ1bGxzY3JlZW4gaXMgbm90IGF2YWlsYWJsZS4KIApAQCAtOTcsNiArOTYsNyBAQCBD b250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgcGxheWluZzogJ3BsYXlpbmcnLAogICAg ICAgICBzZWxlY3RlZDogJ3NlbGVjdGVkJywKICAgICAgICAgc2hvdzogJ3Nob3cnLAorICAgICAg ICBzbWFsbDogJ3NtYWxsJywKICAgICAgICAgdGh1bWJuYWlsOiAndGh1bWJuYWlsJywKICAgICAg ICAgdGh1bWJuYWlsSW1hZ2U6ICd0aHVtYm5haWwtaW1hZ2UnLAogICAgICAgICB0aHVtYm5haWxU cmFjazogJ3RodW1ibmFpbC10cmFjaycsCkBAIC00NTUsNiArNDU1LDE3IEBAIENvbnRyb2xsZXIu cHJvdG90eXBlID0gewogICAgICAgICBpZiAoIUNvbnRyb2xsZXIuZ1NpbXVsYXRlT3B0aW1pemVk RnVsbHNjcmVlbkF2YWlsYWJsZSkKICAgICAgICAgICAgIGlubGluZVBsYXliYWNrUGxhY2Vob2xk ZXIuY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKICAgICAgICAgaW5saW5l UGxheWJhY2tQbGFjZWhvbGRlci5zZXRBdHRyaWJ1dGUoJ2FyaWEtbGFiZWwnLCB0aGlzLlVJU3Ry aW5nKCdEaXNwbGF5IE9wdGltaXplZCBGdWxsIFNjcmVlbicpKTsKKyAgICAgICAgCisgICAgICAg IHZhciBpbmxpbmVQbGF5YmFja1BsYWNlaG9sZGVyVGV4dCA9IHRoaXMuY29udHJvbHMuaW5saW5l UGxheWJhY2tQbGFjZWhvbGRlclRleHQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsK KyAgICAgICAgaW5saW5lUGxheWJhY2tQbGFjZWhvbGRlclRleHQuc2V0QXR0cmlidXRlKCdwc2V1 ZG8nLCAnLXdlYmtpdC1tZWRpYS1jb250cm9scy13aXJlbGVzcy1wbGF5YmFjay10ZXh0Jyk7Cisg ICAgICAgIAorICAgICAgICB2YXIgaW5saW5lUGxheWJhY2tQbGFjZWhvbGRlclRleHRUb3AgPSB0 aGlzLmNvbnRyb2xzLmlubGluZVBsYXliYWNrUGxhY2Vob2xkZXJUZXh0VG9wID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgncCcpOworICAgICAgICBpbmxpbmVQbGF5YmFja1BsYWNlaG9sZGVyVGV4 dFRvcC5pbm5lclRleHQgPSAnQWlyUGxheSc7CisgICAgICAgIGlubGluZVBsYXliYWNrUGxhY2Vo b2xkZXJUZXh0VG9wLnNldEF0dHJpYnV0ZSgncHNldWRvJywgJy13ZWJraXQtbWVkaWEtY29udHJv bHMtd2lyZWxlc3MtcGxheWJhY2stdGV4dC10b3AnKTsKKyAgICAgICAgCisgICAgICAgIHZhciBp bmxpbmVQbGF5YmFja1BsYWNlaG9sZGVyVGV4dEJvdHRvbSA9IHRoaXMuY29udHJvbHMuaW5saW5l UGxheWJhY2tQbGFjZWhvbGRlclRleHRCb3R0b20gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdw Jyk7CisgICAgICAgIGlubGluZVBsYXliYWNrUGxhY2Vob2xkZXJUZXh0Qm90dG9tLmlubmVyVGV4 dCA9ICdUaGlzIHZpZGVvIGlzIHBsYXlpbmcgb24gIkFwcGxlVFYiJworICAgICAgICBpbmxpbmVQ bGF5YmFja1BsYWNlaG9sZGVyVGV4dEJvdHRvbS5zZXRBdHRyaWJ1dGUoJ3BzZXVkbycsICctd2Vi a2l0LW1lZGlhLWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNrLXRleHQtYm90dG9tJyk7CiAKICAg ICAgICAgdmFyIHdpcmVsZXNzVGFyZ2V0UGlja2VyID0gdGhpcy5jb250cm9scy53aXJlbGVzc1Rh cmdldFBpY2tlciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2J1dHRvbicpOwogICAgICAgICB3 aXJlbGVzc1RhcmdldFBpY2tlci5zZXRBdHRyaWJ1dGUoJ3BzZXVkbycsICctd2Via2l0LW1lZGlh LWNvbnRyb2xzLXdpcmVsZXNzLXBsYXliYWNrLXBpY2tlci1idXR0b24nKTsKQEAgLTUxMCw2ICs1 MjEsOSBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKIAogICAgIGNvbmZpZ3VyZUlubGluZUNv bnRyb2xzOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICB0aGlzLmNvbnRyb2xzLmlubGluZVBs YXliYWNrUGxhY2Vob2xkZXIuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy5pbmxpbmVQbGF5YmFj a1BsYWNlaG9sZGVyVGV4dCk7CisgICAgICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxheWJhY2tQ bGFjZWhvbGRlclRleHQuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy5pbmxpbmVQbGF5YmFja1Bs YWNlaG9sZGVyVGV4dFRvcCk7CisgICAgICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxheWJhY2tQ bGFjZWhvbGRlclRleHQuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy5pbmxpbmVQbGF5YmFja1Bs YWNlaG9sZGVyVGV4dEJvdHRvbSk7CiAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuYXBwZW5k Q2hpbGQodGhpcy5jb250cm9scy5wYW5lbEJhY2tncm91bmRDb250YWluZXIpOwogICAgICAgICB0 aGlzLmNvbnRyb2xzLnBhbmVsQmFja2dyb3VuZENvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLmNv bnRyb2xzLnBhbmVsQmFja2dyb3VuZCk7CiAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWxCYWNr Z3JvdW5kQ29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMucGFuZWxUaW50KTsKQEAg LTU0NCw2ICs1NTgsOSBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKIAogICAgIGNvbmZpZ3Vy ZUZ1bGxTY3JlZW5Db250cm9sczogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgdGhpcy5jb250 cm9scy5pbmxpbmVQbGF5YmFja1BsYWNlaG9sZGVyLmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMu aW5saW5lUGxheWJhY2tQbGFjZWhvbGRlclRleHQpOworICAgICAgICB0aGlzLmNvbnRyb2xzLmlu bGluZVBsYXliYWNrUGxhY2Vob2xkZXJUZXh0LmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMuaW5s aW5lUGxheWJhY2tQbGFjZWhvbGRlclRleHRUb3ApOworICAgICAgICB0aGlzLmNvbnRyb2xzLmlu bGluZVBsYXliYWNrUGxhY2Vob2xkZXJUZXh0LmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMuaW5s aW5lUGxheWJhY2tQbGFjZWhvbGRlclRleHRCb3R0b20pOwogICAgICAgICB0aGlzLmNvbnRyb2xz LnBhbmVsLmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMucGFuZWxCYWNrZ3JvdW5kKTsKICAgICAg ICAgdGhpcy5jb250cm9scy5wYW5lbC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLnBhbmVsVGlu dCk7CiAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9s cy52b2x1bWVCb3gpOwpAQCAtNTUzLDYgKzU3MCw3IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMu c2Vla0JhY2tCdXR0b24pOwogICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLmFwcGVuZENoaWxk KHRoaXMuY29udHJvbHMucGxheUJ1dHRvbik7CiAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwu YXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy5zZWVrRm9yd2FyZEJ1dHRvbik7CisgICAgICAgIHRo aXMuY29udHJvbHMucGFuZWwuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy53aXJlbGVzc1Rhcmdl dFBpY2tlcik7CiAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuYXBwZW5kQ2hpbGQodGhpcy5j b250cm9scy5jYXB0aW9uQnV0dG9uKTsKICAgICAgICAgaWYgKCF0aGlzLmlzQXVkaW8oKSkKICAg ICAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy5m dWxsc2NyZWVuQnV0dG9uKTsKQEAgLTcyMCw2ICs3MzgsNyBAQCBDb250cm9sbGVyLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMudXBkYXRlQmFzZSgpOwogICAgICAgICB0aGlzLnVw ZGF0ZUNvbnRyb2xzKCk7CisgICAgICAgIHRoaXMudXBkYXRlV2lyZWxlc3NQbGF5YmFja1N0YXR1 cygpOwogCiAgICAgICAgIGlmICh0aGlzLmlzRnVsbFNjcmVlbigpKSB7CiAgICAgICAgICAgICB0 aGlzLmNvbnRyb2xzLmZ1bGxzY3JlZW5CdXR0b24uY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFt ZXMuZXhpdCk7CkBAIC0xNzI0LDggKzE3NDMsNiBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsK IAogICAgIHVwZGF0ZVdpcmVsZXNzUGxheWJhY2tTdGF0dXM6IGZ1bmN0aW9uKCkgewogICAgICAg ICBpZiAodGhpcy5jdXJyZW50UGxheWJhY2tUYXJnZXRJc1dpcmVsZXNzKCkpIHsKLSAgICAgICAg ICAgIHZhciBiYWNrZ3JvdW5kSW1hZ2VTVkcgPSAidXJsKCciICsgQ29udHJvbGxlci5nV2lyZWxl c3NJbWFnZSArICInKSI7Ci0KICAgICAgICAgICAgIHZhciBkZXZpY2VOYW1lID0gIiI7CiAgICAg ICAgICAgICB2YXIgZGV2aWNlVHlwZSA9ICIiOwogICAgICAgICAgICAgdmFyIHR5cGUgPSB0aGlz Lmhvc3QuZXh0ZXJuYWxEZXZpY2VUeXBlOwpAQCAtMTczNiwxNSArMTc1MywyMSBAQCBDb250cm9s bGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBkZXZpY2VUeXBlID0gdGhpcy5VSVN0 cmluZygnIyNUVk9VVF9ERVZJQ0VfVFlQRSMjJyk7CiAgICAgICAgICAgICAgICAgZGV2aWNlTmFt ZSA9IHRoaXMuVUlTdHJpbmcoJyMjVFZPVVRfREVWSUNFX05BTUUjIycpOwogICAgICAgICAgICAg fQotCi0gICAgICAgICAgICBiYWNrZ3JvdW5kSW1hZ2VTVkcgPSBiYWNrZ3JvdW5kSW1hZ2VTVkcu cmVwbGFjZSgnIyNERVZJQ0VfVFlQRSMjJywgZGV2aWNlVHlwZSk7Ci0gICAgICAgICAgICBiYWNr Z3JvdW5kSW1hZ2VTVkcgPSBiYWNrZ3JvdW5kSW1hZ2VTVkcucmVwbGFjZSgnIyNERVZJQ0VfTkFN RSMjJywgZGV2aWNlTmFtZSk7Ci0KLSAgICAgICAgICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxh eWJhY2tQbGFjZWhvbGRlci5zdHlsZS5iYWNrZ3JvdW5kSW1hZ2UgPSBiYWNrZ3JvdW5kSW1hZ2VT Vkc7CisgICAgICAgIAorICAgICAgICBjb25zb2xlLmxvZyhkZXZpY2VOYW1lKTsKKyAgICAgICAg ICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxheWJhY2tQbGFjZWhvbGRlclRleHRCb3R0b20uaW5u ZXJUZXh0ID0gZGV2aWNlTmFtZTsKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxh eWJhY2tQbGFjZWhvbGRlci5zZXRBdHRyaWJ1dGUoJ2FyaWEtbGFiZWwnLCBkZXZpY2VUeXBlICsg IiwgIiArIGRldmljZU5hbWUpOwotCiAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLmlubGluZVBs YXliYWNrUGxhY2Vob2xkZXIuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMuaGlkZGVu KTsKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMud2lyZWxlc3NUYXJnZXRQaWNrZXIuY2xhc3NM aXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMucGxheWluZyk7CisgICAgICAgICAgICBpZiAoIXRoaXMu aXNGdWxsU2NyZWVuKCkgJiYgKHRoaXMudmlkZW8ub2Zmc2V0V2lkdGggPD0gMjUwIHx8IHRoaXMu dmlkZW8ub2Zmc2V0SGVpZ2h0IDw9IDIwMCkpIHsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRy b2xzLmlubGluZVBsYXliYWNrUGxhY2Vob2xkZXIuY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFt ZXMuc21hbGwpOworICAgICAgICAgICAgICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxheWJhY2tQ bGFjZWhvbGRlclRleHRUb3AuY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuc21hbGwpOwor ICAgICAgICAgICAgICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxheWJhY2tQbGFjZWhvbGRlclRl eHRCb3R0b20uY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuc21hbGwpOworICAgICAgICAg ICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLmlubGluZVBsYXliYWNr UGxhY2Vob2xkZXIuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMuc21hbGwpOworICAg ICAgICAgICAgICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxheWJhY2tQbGFjZWhvbGRlclRleHRU b3AuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMuc21hbGwpOworICAgICAgICAgICAg ICAgIHRoaXMuY29udHJvbHMuaW5saW5lUGxheWJhY2tQbGFjZWhvbGRlclRleHRCb3R0b20uY2xh c3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMuc21hbGwpOworICAgICAgICAgICAgfQogICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5jb250cm9scy5pbmxpbmVQbGF5YmFja1Bs YWNlaG9sZGVyLmNsYXNzTGlzdC5hZGQodGhpcy5DbGFzc05hbWVzLmhpZGRlbik7CiAgICAgICAg ICAgICB0aGlzLmNvbnRyb2xzLndpcmVsZXNzVGFyZ2V0UGlja2VyLmNsYXNzTGlzdC5yZW1vdmUo dGhpcy5DbGFzc05hbWVzLnBsYXlpbmcpOwo=