184373 2018-04-06 16:21:01 -0700 MediaSessionManageriOS should defer creation of MPVolumeView until it needs to monitor AirPlay routes 2018-05-23 23:20:18 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson fred.wang webkit-bug-importer oldest_to_newest 1412509 0 jeremyj-wk 2018-04-06 16:21:01 -0700 MediaSessionManageriOS should defer creation of MPVolumeView until it needs to monitor AirPlay routes 1412512 1 jeremyj-wk 2018-04-06 16:29:15 -0700 rdar://problem/35177606 1412513 2 337402 jeremyj-wk 2018-04-06 16:30:12 -0700 Created attachment 337402 Patch 1412555 3 337402 eric.carlson 2018-04-06 19:56:59 -0700 Comment on attachment 337402 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337402&action=review > Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:429 > + BEGIN_BLOCK_OBJC_EXCEPTIONS > + [routingController setDiscoveryMode:MPRouteDiscoveryModeDisabled]; > + volumeView.clear(); > + routingController.clear(); > + END_BLOCK_OBJC_EXCEPTIONS This is the same as the block in -dealloc, can they be shared? 1412900 4 jeremyj-wk 2018-04-09 09:44:41 -0700 (In reply to Eric Carlson from comment #3) > Comment on attachment 337402 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=337402&action=review > > > Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:429 > > + BEGIN_BLOCK_OBJC_EXCEPTIONS > > + [routingController setDiscoveryMode:MPRouteDiscoveryModeDisabled]; > > + volumeView.clear(); > > + routingController.clear(); > > + END_BLOCK_OBJC_EXCEPTIONS > > This is the same as the block in -dealloc, can they be shared? I can actually share it in three places. 1412907 5 337506 jeremyj-wk 2018-04-09 10:04:56 -0700 Created attachment 337506 Patch for landing 1413365 6 337506 commit-queue 2018-04-10 13:31:07 -0700 Comment on attachment 337506 Patch for landing Clearing flags on attachment: 337506 Committed r230490: <https://trac.webkit.org/changeset/230490> 337402 2018-04-06 16:30:12 -0700 2018-04-06 19:56:59 -0700 Patch bug-184373-20180406163011.patch text/plain 10391 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTNlODE4Mzc1MzUwYjc0 Y2M3ZmNkNGU5Mzk3MDc1ODVkMjcwMGQwNS4uZmY3MGNkYzkyZjE0MGI4OTZhMDBhMzY3OGRlYjE5 YzMwZmNmN2I0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTA0LTA2ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVNlc3Npb25NYW5h Z2VyaU9TIHNob3VsZCBkZWZlciBjcmVhdGlvbiBvZiBNUFZvbHVtZVZpZXcgdW50aWwgaXQgbmVl ZHMgdG8gbW9uaXRvciBBaXJQbGF5IHJvdXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0MzczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTE3 NzYwNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAgICAgICAgVGhpcyBkZWxheXMgdGhlIGNyZWF0aW9u IG9mIE1QVm9sdW1lVmlldyB1bnRpbCBhaXJwbGF5IHJvdXRlcyBhcmUgbW9uaXRvcmVkLgorICAg ICAgICBNUFZvbHVtZVZpZXcgaXMgbm93IGFsc28gcmVsZWFzZWQgd2hlbiBtb25pdG9yaW5nIGVu ZHMuIAorICAgICAgICBUaGlzIG1ha2VzIHN1cmUgdGhlIE1QKiBvYmplY3RzIGFyZSBvbmx5IGFj Y2Vzc2VkIGZyb20gYSBVSSBzYWZlIHRocmVhZC4gV2ViQ29yZSdzICJNYWluVGhyZWFkIiBtYXkg YmUgZGlmZmVyZW50IHRoYXQgdGhlIFVJIHRocmVhZC4KKyAgICAgICAgU2luY2UgdGhpcyBzdGF0 ZSBjaGFuZ2UgaXMgbmVjZXNzYXJpbHkgYXN5bmNocm9ub3VzLCBzdGFydGluZyBhbmQgc3RvcHBp bmcgbXVzdCBwcmV2ZW50IHJhY2VzIHRvIGtlZXAgc3RhdGUgY29oZXJlbnQuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbToKKyAgICAgICAg KC1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIGluaXRXaXRoQ2FsbGJhY2s6XSk6CisgICAgICAgICgt W1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBkZWFsbG9jXSk6CisgICAgICAgICgtW1dlYk1lZGlhU2Vz c2lvbkhlbHBlciBzdGFydE1vbml0b3JpbmdBaXJQbGF5Um91dGVzXSk6CisgICAgICAgICgtW1dl Yk1lZGlhU2Vzc2lvbkhlbHBlciBzdG9wTW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNdKToKKyAgICAg ICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIGFsbG9jYXRlVm9sdW1lVmlld10pOiBEZWxldGVk LgorICAgICAgICAoLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgc2V0Vm9sdW1lVmlldzpdKTogRGVs ZXRlZC4KKwogMjAxOC0wNC0wNCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAK ICAgICAgICAgSW50cm9kdWNlIGEgVGhyZWFkU2FmZVJlZkNvdW50ZWQgcGFyYW1ldGVyIHRvIGVu c3VyZSBiZWluZyBkZXN0cm95ZWQgb24gdGhlIG1haW4gdGhyZWFkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9T Lm1tCmluZGV4IDhhYTUwMTU3ZTY2ZGIyYjJlZDBmMWVlNmViMzI2YTUzNzU0MmFjMWYuLmQyY2Q3 ZGJjYTM4ZTAxZTU0MjNlZTgyZTRhNTBjNDQ4MmExODhlMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9TLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9T Lm1tCkBAIC0xMDYsMTYgKzEwNiwxMyBAQCBAaW50ZXJmYWNlIFdlYk1lZGlhU2Vzc2lvbkhlbHBl ciA6IE5TT2JqZWN0IHsKICNpZiBIQVZFKE1FRElBX1BMQVlFUikKICAgICBSZXRhaW5QdHI8TVBW b2x1bWVWaWV3PiBfdm9sdW1lVmlldzsKICAgICBSZXRhaW5QdHI8TVBBVlJvdXRpbmdDb250cm9s bGVyPiBfYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXI7CisgICAgYm9vbCBfbW9uaXRv cmluZ0FpclBsYXlSb3V0ZXM7CisgICAgYm9vbCBfc3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRl c1BlbmRpbmc7CiAjZW5kaWYKIH0KIAogLSAoaWQpaW5pdFdpdGhDYWxsYmFjazooTWVkaWFTZXNz aW9uTWFuYWdlcmlPUyopY2FsbGJhY2s7CiAKLSNpZiBIQVZFKE1FRElBX1BMQVlFUikKLS0gKHZv aWQpYWxsb2NhdGVWb2x1bWVWaWV3OwotLSAodm9pZClzZXRWb2x1bWVWaWV3OihSZXRhaW5QdHI8 TVBWb2x1bWVWaWV3Pil2b2x1bWVWaWV3OwotI2VuZGlmCi0KIC0gKHZvaWQpY2xlYXJDYWxsYmFj azsKIC0gKHZvaWQpaW50ZXJydXB0aW9uOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbjsK IC0gKHZvaWQpYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kOihOU05vdGlmaWNhdGlvbiAq KW5vdGlmaWNhdGlvbjsKQEAgLTMyNSwzOSArMzIyLDYgQEAgdm9pZCBNZWRpYVNlc3Npb25NYW5h Z2VyaU9TOjpleHRlcm5hbE91dHB1dERldmljZUF2YWlsYWJsZURpZENoYW5nZSgpCiAKIEBpbXBs ZW1lbnRhdGlvbiBXZWJNZWRpYVNlc3Npb25IZWxwZXIKIAotI2lmIEhBVkUoTUVESUFfUExBWUVS KQotLSAodm9pZClhbGxvY2F0ZVZvbHVtZVZpZXcKLXsKLSAgICBpZiAocHRocmVhZF9tYWluX25w KCkpIHsKLSAgICAgICAgW3NlbGYgc2V0Vm9sdW1lVmlldzphZG9wdE5TKFthbGxvY01QVm9sdW1l Vmlld0luc3RhbmNlKCkgaW5pdF0pXTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIFJl dGFpblB0cjxXZWJNZWRpYVNlc3Npb25IZWxwZXI+IHN0cm9uZ1NlbGYgPSBzZWxmOwotICAgIGRp c3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFtzdHJvbmdTZWxmXSgpIHsK LSAgICAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TCi0gICAgICAgIFJldGFpblB0cjxN UFZvbHVtZVZpZXc+IHZvbHVtZVZpZXcgPSBhZG9wdE5TKFthbGxvY01QVm9sdW1lVmlld0luc3Rh bmNlKCkgaW5pdF0pOwotICAgICAgICBjYWxsT25XZWJUaHJlYWRPckRpc3BhdGNoQXN5bmNPbk1h aW5UaHJlYWQoW3N0cm9uZ1NlbGYsIHZvbHVtZVZpZXddKCkgewotICAgICAgICAgICAgQkVHSU5f QkxPQ0tfT0JKQ19FWENFUFRJT05TCi0gICAgICAgICAgICBbc3Ryb25nU2VsZiBzZXRWb2x1bWVW aWV3OnZvbHVtZVZpZXddOwotICAgICAgICAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUwot ICAgICAgICB9KTsKLSAgICAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUwotICAgIH0pOwot fQotCi0tICh2b2lkKXNldFZvbHVtZVZpZXc6KFJldGFpblB0cjxNUFZvbHVtZVZpZXc+KXZvbHVt ZVZpZXcKLXsKLSAgICBpZiAoX3ZvbHVtZVZpZXcpCi0gICAgICAgIFtbTlNOb3RpZmljYXRpb25D ZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBuYW1lOk1QVm9sdW1lVmll d1dpcmVsZXNzUm91dGVzQXZhaWxhYmxlRGlkQ2hhbmdlTm90aWZpY2F0aW9uIG9iamVjdDpfdm9s dW1lVmlldy5nZXQoKV07Ci0KLSAgICBfdm9sdW1lVmlldyA9IHZvbHVtZVZpZXc7Ci0KLSAgICBp ZiAoX3ZvbHVtZVZpZXcpCi0gICAgICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENl bnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3Iod2lyZWxlc3NSb3V0ZXNB dmFpbGFibGVEaWRDaGFuZ2U6KSBuYW1lOk1QVm9sdW1lVmlld1dpcmVsZXNzUm91dGVzQXZhaWxh YmxlRGlkQ2hhbmdlTm90aWZpY2F0aW9uIG9iamVjdDpfdm9sdW1lVmlldy5nZXQoKV07Ci19Ci0j ZW5kaWYKLQogLSAoaWQpaW5pdFdpdGhDYWxsYmFjazooTWVkaWFTZXNzaW9uTWFuYWdlcmlPUyop Y2FsbGJhY2sKIHsKICAgICBMT0coTWVkaWEsICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBpbml0 V2l0aENhbGxiYWNrXSIpOwpAQCAtMzc5LDEwICszNDMsNiBAQCAtIChpZClpbml0V2l0aENhbGxi YWNrOihNZWRpYVNlc3Npb25NYW5hZ2VyaU9TKiljYWxsYmFjawogICAgIFtjZW50ZXIgYWRkT2Jz ZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoYXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91 bmQ6KSBuYW1lOlVJQXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmROb3RpZmljYXRpb24gb2Jq ZWN0Om5pbF07CiAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rv cihhcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZDopIG5hbWU6V2ViVUlBcHBsaWNhdGlvbkRp ZEVudGVyQmFja2dyb3VuZE5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKIAotI2lmIEhBVkUoTUVE SUFfUExBWUVSKQotICAgIFtzZWxmIGFsbG9jYXRlVm9sdW1lVmlld107Ci0jZW5kaWYKLQogICAg IC8vIE5vdyBwbGF5aW5nIHdvbid0IHdvcmsgdW5sZXNzIHdlIHR1cm4gb24gdGhlIGRlbGl2ZXJ5 IG9mIHJlbW90ZSBjb250cm9sIGV2ZW50cy4KICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpLCBeIHsKICAgICAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05T CkBAIC0zOTgsMTggKzM1OCwxNyBAQCAtICh2b2lkKWRlYWxsb2MKICAgICBMT0coTWVkaWEsICIt W1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBkZWFsbG9jXSIpOwogCiAjaWYgSEFWRShNRURJQV9QTEFZ RVIpCi0gICAgaWYgKCFpc01haW5UaHJlYWQoKSkgewotICAgICAgICBjYWxsT25NYWluVGhyZWFk KFt2b2x1bWVWaWV3ID0gV1RGTW92ZShfdm9sdW1lVmlldyksIHJvdXRpbmdDb250cm9sbGVyID0g V1RGTW92ZShfYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIpXSAoKSBtdXRhYmxlIHsK LSAgICAgICAgICAgIExPRyhNZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIGRlYWxsb2Nd IC0gZGlwYXRjaGVkIHRvIE1haW5UaHJlYWQiKTsKLQotICAgICAgICAgICAgdm9sdW1lVmlldy5j bGVhcigpOwotCi0gICAgICAgICAgICBpZiAoIXJvdXRpbmdDb250cm9sbGVyKQotICAgICAgICAg ICAgICAgIHJldHVybjsKLQorICAgIGlmICghcHRocmVhZF9tYWluX25wKCkpIHsKKyAgICAgICAg ZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3ZvbHVtZVZpZXcgPSBX VEZNb3ZlKF92b2x1bWVWaWV3KSwgcm91dGluZ0NvbnRyb2xsZXIgPSBXVEZNb3ZlKF9haXJQbGF5 UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlcildICgpIG11dGFibGUgeworICAgICAgICAgICAgTE9H KE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgZGVhbGxvY10gLSBkaXBhdGNoZWQgdG8g VUkgdGhyZWFkLiIpOworICAgICAgICAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TCiAg ICAgICAgICAgICBbcm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpNUFJvdXRlRGlz Y292ZXJ5TW9kZURpc2FibGVkXTsKKyAgICAgICAgICAgIHZvbHVtZVZpZXcuY2xlYXIoKTsKICAg ICAgICAgICAgIHJvdXRpbmdDb250cm9sbGVyLmNsZWFyKCk7CisgICAgICAgICAgICBFTkRfQkxP Q0tfT0JKQ19FWENFUFRJT05TCiAgICAgICAgIH0pOworICAgIH0gZWxzZSB7CisgICAgICAgIFtf YWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpNUFJvdXRl RGlzY292ZXJ5TW9kZURpc2FibGVkXTsKICAgICB9CiAjZW5kaWYKIApAQCAtNDM2LDM3ICszOTUs NzYgQEAgLSAoQk9PTCloYXNXaXJlbGVzc1RhcmdldHNBdmFpbGFibGUKICNpZiBIQVZFKE1FRElB X1BMQVlFUikKIC0gKHZvaWQpc3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRlcwogewotICAgIGlm IChfYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIpCisgICAgaWYgKF9tb25pdG9yaW5n QWlyUGxheVJvdXRlcykKICAgICAgICAgcmV0dXJuOwogCisgICAgX21vbml0b3JpbmdBaXJQbGF5 Um91dGVzID0gdHJ1ZTsKKworICAgIGlmIChfc3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRlc1Bl bmRpbmcpCisgICAgICAgIHJldHVybjsKKworICAgIF9zdGFydE1vbml0b3JpbmdBaXJQbGF5Um91 dGVzUGVuZGluZyA9IHRydWU7CisKICAgICBMT0coTWVkaWEsICItW1dlYk1lZGlhU2Vzc2lvbkhl bHBlciBzdGFydE1vbml0b3JpbmdBaXJQbGF5Um91dGVzXSIpOwogCi0gICAgY2FsbE9uTWFpblRo cmVhZChbcHJvdGVjdGVkU2VsZiA9IFJldGFpblB0cjxXZWJNZWRpYVNlc3Npb25IZWxwZXI+KHNl bGYpXSAoKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIHN0 YXJ0TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNdIC0gZGlwYXRjaGVkIHRvIE1haW5UaHJlYWQiKTsK KyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbcHJvdGVjdGVk U2VsZiA9IFJldGFpblB0cjxXZWJNZWRpYVNlc3Npb25IZWxwZXI+KHNlbGYpXSAoKSBtdXRhYmxl IHsKKyAgICAgICAgTE9HKE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgc3RhcnRNb25p dG9yaW5nQWlyUGxheVJvdXRlc10gLSBkaXBhdGNoZWQgdG8gbWFpbiBxdWV1ZSIpOwogCi0gICAg ICAgIGlmIChwcm90ZWN0ZWRTZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIp Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9O UworICAgICAgICBSZXRhaW5QdHI8TVBWb2x1bWVWaWV3PiB2b2x1bWVWaWV3ID0gYWRvcHROUyhb YWxsb2NNUFZvbHVtZVZpZXdJbnN0YW5jZSgpIGluaXRdKTsKKyAgICAgICAgUmV0YWluUHRyPE1Q QVZSb3V0aW5nQ29udHJvbGxlcj4gcm91dGluZ0NvbnRyb2xsZXIgPSBhZG9wdE5TKFthbGxvY01Q QVZSb3V0aW5nQ29udHJvbGxlckluc3RhbmNlKCkgaW5pdFdpdGhOYW1lOkAiV2ViQ29yZSAtIEhU TUwgbWVkaWEgZWxlbWVudCBjaGVja2luZyBmb3IgQWlyUGxheSByb3V0ZSBwcmVzZW5jZSJdKTsK KworICAgICAgICBbcm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpNUFJvdXRlRGlz Y292ZXJ5TW9kZVByZXNlbmNlXTsKKworICAgICAgICBjYWxsT25XZWJUaHJlYWRPckRpc3BhdGNo QXN5bmNPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFNlbGYgPSBXVEZNb3ZlKHByb3RlY3RlZFNlbGYp LCB2b2x1bWVWaWV3ID0gV1RGTW92ZSh2b2x1bWVWaWV3KSwgcm91dGluZ0NvbnRyb2xsZXIgPSBX VEZNb3ZlKHJvdXRpbmdDb250cm9sbGVyKV0oKSBtdXRhYmxlIHsKKworICAgICAgICAgICAgcHJv dGVjdGVkU2VsZi0+X3N0YXJ0TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNQZW5kaW5nID0gZmFsc2U7 CisKKyAgICAgICAgICAgIGlmICghcHJvdGVjdGVkU2VsZi0+X21vbml0b3JpbmdBaXJQbGF5Um91 dGVzKSB7CisgICAgICAgICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5f cXVldWUoKSwgW3ZvbHVtZVZpZXcgPSBXVEZNb3ZlKHZvbHVtZVZpZXcpLCByb3V0aW5nQ29udHJv bGxlciA9IFdURk1vdmUocm91dGluZ0NvbnRyb2xsZXIpXSgpIG11dGFibGUgeworICAgICAgICAg ICAgICAgICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKKyAgICAgICAgICAgICAgICAg ICAgW3JvdXRpbmdDb250cm9sbGVyIHNldERpc2NvdmVyeU1vZGU6TVBSb3V0ZURpc2NvdmVyeU1v ZGVEaXNhYmxlZF07CisgICAgICAgICAgICAgICAgICAgIHZvbHVtZVZpZXcuY2xlYXIoKTsKKyAg ICAgICAgICAgICAgICAgICAgcm91dGluZ0NvbnRyb2xsZXIuY2xlYXIoKTsKKyAgICAgICAgICAg ICAgICAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUworICAgICAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgQVNT RVJUKCFwcm90ZWN0ZWRTZWxmLT5fdm9sdW1lVmlldyk7CisgICAgICAgICAgICBwcm90ZWN0ZWRT ZWxmLT5fdm9sdW1lVmlldyA9IHZvbHVtZVZpZXc7CisKKyAgICAgICAgICAgIFtbTlNOb3RpZmlj YXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6cHJvdGVjdGVkU2VsZi5nZXQo KSBzZWxlY3RvcjpAc2VsZWN0b3Iod2lyZWxlc3NSb3V0ZXNBdmFpbGFibGVEaWRDaGFuZ2U6KSBu YW1lOk1QVm9sdW1lVmlld1dpcmVsZXNzUm91dGVzQXZhaWxhYmxlRGlkQ2hhbmdlTm90aWZpY2F0 aW9uIG9iamVjdDp2b2x1bWVWaWV3LmdldCgpXTsKKworICAgICAgICAgICAgQVNTRVJUKCFwcm90 ZWN0ZWRTZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIpOworICAgICAgICAg ICAgcHJvdGVjdGVkU2VsZi0+X2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyID0gcm91 dGluZ0NvbnRyb2xsZXI7CisgICAgICAgIH0pOworICAgICAgICBFTkRfQkxPQ0tfT0JKQ19FWENF UFRJT05TCiAKLSAgICAgICAgcHJvdGVjdGVkU2VsZi0+X2FpclBsYXlQcmVzZW5jZVJvdXRpbmdD b250cm9sbGVyID0gYWRvcHROUyhbYWxsb2NNUEFWUm91dGluZ0NvbnRyb2xsZXJJbnN0YW5jZSgp IGluaXRXaXRoTmFtZTpAIldlYkNvcmUgLSBIVE1MIG1lZGlhIGVsZW1lbnQgY2hlY2tpbmcgZm9y IEFpclBsYXkgcm91dGUgcHJlc2VuY2UiXSk7Ci0gICAgICAgIFtwcm90ZWN0ZWRTZWxmLT5fYWly UGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpNUFJvdXRlRGlz Y292ZXJ5TW9kZVByZXNlbmNlXTsKICAgICB9KTsKIH0KIAogLSAodm9pZClzdG9wTW9uaXRvcmlu Z0FpclBsYXlSb3V0ZXMKIHsKLSAgICBpZiAoIV9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJv bGxlcikKKyAgICBpZiAoIV9tb25pdG9yaW5nQWlyUGxheVJvdXRlcykKICAgICAgICAgcmV0dXJu OwogCisgICAgX21vbml0b3JpbmdBaXJQbGF5Um91dGVzID0gZmFsc2U7CisKICAgICBMT0coTWVk aWEsICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBzdG9wTW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNd Iik7CiAKLSAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRTZWxmID0gUmV0YWluUHRyPFdl Yk1lZGlhU2Vzc2lvbkhlbHBlcj4oc2VsZildICgpIHsKLSAgICAgICAgTE9HKE1lZGlhLCAiLVtX ZWJNZWRpYVNlc3Npb25IZWxwZXIgc3RvcE1vbml0b3JpbmdBaXJQbGF5Um91dGVzXSAtIGRpcGF0 Y2hlZCB0byBNYWluVGhyZWFkIik7CisgICAgUmV0YWluUHRyPE1QVm9sdW1lVmlldz4gdm9sdW1l VmlldyA9IF92b2x1bWVWaWV3OworICAgIFJldGFpblB0cjxNUEFWUm91dGluZ0NvbnRyb2xsZXI+ IGFpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyID0gX2FpclBsYXlQcmVzZW5jZVJvdXRp bmdDb250cm9sbGVyOwogCi0gICAgICAgIGlmICghcHJvdGVjdGVkU2VsZi0+X2FpclBsYXlQcmVz ZW5jZVJvdXRpbmdDb250cm9sbGVyKQotICAgICAgICAgICAgcmV0dXJuOworICAgIF92b2x1bWVW aWV3LmNsZWFyKCk7CisgICAgX2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyLmNsZWFy KCk7CiAKLSAgICAgICAgW3Byb3RlY3RlZFNlbGYtPl9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29u dHJvbGxlciBzZXREaXNjb3ZlcnlNb2RlOk1QUm91dGVEaXNjb3ZlcnlNb2RlRGlzYWJsZWRdOwot ICAgICAgICBwcm90ZWN0ZWRTZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIg PSBuaWw7CisgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3By b3RlY3RlZFNlbGYgPSBSZXRhaW5QdHI8V2ViTWVkaWFTZXNzaW9uSGVscGVyPihzZWxmKSwgdm9s dW1lVmlldyA9IFdURk1vdmUodm9sdW1lVmlldyksIHJvdXRpbmdDb250cm9sbGVyID0gV1RGTW92 ZShhaXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlcildICgpIG11dGFibGUgeworICAgICAg ICBMT0coTWVkaWEsICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBzdG9wTW9uaXRvcmluZ0FpclBs YXlSb3V0ZXNdIC0gZGlwYXRjaGVkIHRvIG1haW4gcXVldWUuIik7CisKKyAgICAgICAgaWYgKHZv bHVtZVZpZXcpCisgICAgICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50 ZXJdIHJlbW92ZU9ic2VydmVyOnByb3RlY3RlZFNlbGYuZ2V0KCkgbmFtZTpNUFZvbHVtZVZpZXdX aXJlbGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZU5vdGlmaWNhdGlvbiBvYmplY3Q6dm9sdW1l Vmlldy5nZXQoKV07CisgICAgICAgIFtyb3V0aW5nQ29udHJvbGxlciBzZXREaXNjb3ZlcnlNb2Rl Ok1QUm91dGVEaXNjb3ZlcnlNb2RlRGlzYWJsZWRdOwogICAgIH0pOwogfQogI2VuZGlmIC8vIEhB VkUoTUVESUFfUExBWUVSKQo= 337506 2018-04-09 10:04:56 -0700 2018-04-10 13:31:07 -0700 Patch for landing bug-184373-20180409100455.patch text/plain 10149 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTNlODE4Mzc1MzUwYjc0 Y2M3ZmNkNGU5Mzk3MDc1ODVkMjcwMGQwNS4uMmIxYTAyY2I5OGY4ZDI1YjFhNzU4YzJjNDU2ZTVi OWMwNTg2Y2FjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTA0LTA2ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVNlc3Npb25NYW5h Z2VyaU9TIHNob3VsZCBkZWZlciBjcmVhdGlvbiBvZiBNUFZvbHVtZVZpZXcgdW50aWwgaXQgbmVl ZHMgdG8gbW9uaXRvciBBaXJQbGF5IHJvdXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0MzczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTE3 NzYwNj4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgTm8g Y2hhbmdlIG9mIGJlaGF2aW9yLgorCisgICAgICAgIFRoaXMgZGVsYXlzIHRoZSBjcmVhdGlvbiBv ZiBNUFZvbHVtZVZpZXcgdW50aWwgYWlycGxheSByb3V0ZXMgYXJlIG1vbml0b3JlZC4KKyAgICAg ICAgTVBWb2x1bWVWaWV3IGlzIG5vdyBhbHNvIHJlbGVhc2VkIHdoZW4gbW9uaXRvcmluZyBlbmRz LiAKKyAgICAgICAgVGhpcyBtYWtlcyBzdXJlIHRoZSBNUCogb2JqZWN0cyBhcmUgb25seSBhY2Nl c3NlZCBmcm9tIGEgVUkgc2FmZSB0aHJlYWQuIFdlYkNvcmUncyAiTWFpblRocmVhZCIgbWF5IGJl IGRpZmZlcmVudCB0aGF0IHRoZSBVSSB0aHJlYWQuCisgICAgICAgIFNpbmNlIHRoaXMgc3RhdGUg Y2hhbmdlIGlzIG5lY2Vzc2FyaWx5IGFzeW5jaHJvbm91cywgc3RhcnRpbmcgYW5kIHN0b3BwaW5n IG11c3QgcHJldmVudCByYWNlcyB0byBrZWVwIHN0YXRlIGNvaGVyZW50LgorCisgICAgICAgICog cGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lvbk1hbmFnZXJJT1MubW06CisgICAgICAgICgt W1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBpbml0V2l0aENhbGxiYWNrOl0pOgorICAgICAgICAoLVtX ZWJNZWRpYVNlc3Npb25IZWxwZXIgZGVhbGxvY10pOgorICAgICAgICAoLVtXZWJNZWRpYVNlc3Np b25IZWxwZXIgc3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRlc10pOgorICAgICAgICAoLVtXZWJN ZWRpYVNlc3Npb25IZWxwZXIgc3RvcE1vbml0b3JpbmdBaXJQbGF5Um91dGVzXSk6CisgICAgICAg ICgtW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBhbGxvY2F0ZVZvbHVtZVZpZXddKTogRGVsZXRlZC4K KyAgICAgICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIHNldFZvbHVtZVZpZXc6XSk6IERlbGV0 ZWQuCisKIDIwMTgtMDQtMDQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAg ICAgICAgIEludHJvZHVjZSBhIFRocmVhZFNhZmVSZWZDb3VudGVkIHBhcmFtZXRlciB0byBlbnN1 cmUgYmVpbmcgZGVzdHJveWVkIG9uIHRoZSBtYWluIHRocmVhZApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lvbk1hbmFnZXJJT1MubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5t bQppbmRleCA4YWE1MDE1N2U2NmRiMmIyZWQwZjFlZTZlYjMyNmE1Mzc1NDJhYzFmLi5jOGY0MzVm NDlhMmNlMjJmN2I3YzZkNDA1MjU3NmUxMDRhNWI0OGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5t bQpAQCAtMTA2LDE2ICsxMDYsMTMgQEAgQGludGVyZmFjZSBXZWJNZWRpYVNlc3Npb25IZWxwZXIg OiBOU09iamVjdCB7CiAjaWYgSEFWRShNRURJQV9QTEFZRVIpCiAgICAgUmV0YWluUHRyPE1QVm9s dW1lVmlldz4gX3ZvbHVtZVZpZXc7CiAgICAgUmV0YWluUHRyPE1QQVZSb3V0aW5nQ29udHJvbGxl cj4gX2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyOworICAgIGJvb2wgX21vbml0b3Jp bmdBaXJQbGF5Um91dGVzOworICAgIGJvb2wgX3N0YXJ0TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNQ ZW5kaW5nOwogI2VuZGlmCiB9CiAKIC0gKGlkKWluaXRXaXRoQ2FsbGJhY2s6KE1lZGlhU2Vzc2lv bk1hbmFnZXJpT1MqKWNhbGxiYWNrOwogCi0jaWYgSEFWRShNRURJQV9QTEFZRVIpCi0tICh2b2lk KWFsbG9jYXRlVm9sdW1lVmlldzsKLS0gKHZvaWQpc2V0Vm9sdW1lVmlldzooUmV0YWluUHRyPE1Q Vm9sdW1lVmlldz4pdm9sdW1lVmlldzsKLSNlbmRpZgotCiAtICh2b2lkKWNsZWFyQ2FsbGJhY2s7 CiAtICh2b2lkKWludGVycnVwdGlvbjooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb247CiAt ICh2b2lkKWFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZDooTlNOb3RpZmljYXRpb24gKilu b3RpZmljYXRpb247CkBAIC0zMjUsMzkgKzMyMiw2IEBAIHZvaWQgTWVkaWFTZXNzaW9uTWFuYWdl cmlPUzo6ZXh0ZXJuYWxPdXRwdXREZXZpY2VBdmFpbGFibGVEaWRDaGFuZ2UoKQogCiBAaW1wbGVt ZW50YXRpb24gV2ViTWVkaWFTZXNzaW9uSGVscGVyCiAKLSNpZiBIQVZFKE1FRElBX1BMQVlFUikK LS0gKHZvaWQpYWxsb2NhdGVWb2x1bWVWaWV3Ci17Ci0gICAgaWYgKHB0aHJlYWRfbWFpbl9ucCgp KSB7Ci0gICAgICAgIFtzZWxmIHNldFZvbHVtZVZpZXc6YWRvcHROUyhbYWxsb2NNUFZvbHVtZVZp ZXdJbnN0YW5jZSgpIGluaXRdKV07Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBSZXRh aW5QdHI8V2ViTWVkaWFTZXNzaW9uSGVscGVyPiBzdHJvbmdTZWxmID0gc2VsZjsKLSAgICBkaXNw YXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbc3Ryb25nU2VsZl0oKSB7Ci0g ICAgICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUwotICAgICAgICBSZXRhaW5QdHI8TVBW b2x1bWVWaWV3PiB2b2x1bWVWaWV3ID0gYWRvcHROUyhbYWxsb2NNUFZvbHVtZVZpZXdJbnN0YW5j ZSgpIGluaXRdKTsKLSAgICAgICAgY2FsbE9uV2ViVGhyZWFkT3JEaXNwYXRjaEFzeW5jT25NYWlu VGhyZWFkKFtzdHJvbmdTZWxmLCB2b2x1bWVWaWV3XSgpIHsKLSAgICAgICAgICAgIEJFR0lOX0JM T0NLX09CSkNfRVhDRVBUSU9OUwotICAgICAgICAgICAgW3N0cm9uZ1NlbGYgc2V0Vm9sdW1lVmll dzp2b2x1bWVWaWV3XTsKLSAgICAgICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlMKLSAg ICAgICAgfSk7Ci0gICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlMKLSAgICB9KTsKLX0K LQotLSAodm9pZClzZXRWb2x1bWVWaWV3OihSZXRhaW5QdHI8TVBWb2x1bWVWaWV3Pil2b2x1bWVW aWV3Ci17Ci0gICAgaWYgKF92b2x1bWVWaWV3KQotICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2Vu dGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpNUFZvbHVtZVZpZXdX aXJlbGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZU5vdGlmaWNhdGlvbiBvYmplY3Q6X3ZvbHVt ZVZpZXcuZ2V0KCldOwotCi0gICAgX3ZvbHVtZVZpZXcgPSB2b2x1bWVWaWV3OwotCi0gICAgaWYg KF92b2x1bWVWaWV3KQotICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50 ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKHdpcmVsZXNzUm91dGVzQXZh aWxhYmxlRGlkQ2hhbmdlOikgbmFtZTpNUFZvbHVtZVZpZXdXaXJlbGVzc1JvdXRlc0F2YWlsYWJs ZURpZENoYW5nZU5vdGlmaWNhdGlvbiBvYmplY3Q6X3ZvbHVtZVZpZXcuZ2V0KCldOwotfQotI2Vu ZGlmCi0KIC0gKGlkKWluaXRXaXRoQ2FsbGJhY2s6KE1lZGlhU2Vzc2lvbk1hbmFnZXJpT1MqKWNh bGxiYWNrCiB7CiAgICAgTE9HKE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgaW5pdFdp dGhDYWxsYmFja10iKTsKQEAgLTM3OSwxMCArMzQzLDYgQEAgLSAoaWQpaW5pdFdpdGhDYWxsYmFj azooTWVkaWFTZXNzaW9uTWFuYWdlcmlPUyopY2FsbGJhY2sKICAgICBbY2VudGVyIGFkZE9ic2Vy dmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5k OikgbmFtZTpVSUFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kTm90aWZpY2F0aW9uIG9iamVj dDpuaWxdOwogICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3Io YXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQ6KSBuYW1lOldlYlVJQXBwbGljYXRpb25EaWRF bnRlckJhY2tncm91bmROb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiAKLSNpZiBIQVZFKE1FRElB X1BMQVlFUikKLSAgICBbc2VsZiBhbGxvY2F0ZVZvbHVtZVZpZXddOwotI2VuZGlmCi0KICAgICAv LyBOb3cgcGxheWluZyB3b24ndCB3b3JrIHVubGVzcyB3ZSB0dXJuIG9uIHRoZSBkZWxpdmVyeSBv ZiByZW1vdGUgY29udHJvbCBldmVudHMuCiAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0 X21haW5fcXVldWUoKSwgXiB7CiAgICAgICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUwpA QCAtMzkzLDI0ICszNTMsMjkgQEAgLSAoaWQpaW5pdFdpdGhDYWxsYmFjazooTWVkaWFTZXNzaW9u TWFuYWdlcmlPUyopY2FsbGJhY2sKICAgICByZXR1cm4gc2VsZjsKIH0KIAorI2lmIEhBVkUoTUVE SUFfUExBWUVSKQorc3RhdGljIHZvaWQgc2FmZWx5VGVhckRvd24oUmV0YWluUHRyPE1QVm9sdW1l Vmlldz4gdm9sdW1lVmlldywgUmV0YWluUHRyPE1QQVZSb3V0aW5nQ29udHJvbGxlcj4gcm91dGlu Z0NvbnRyb2xsZXIpCit7CisgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVl dWUoKSwgW3ZvbHVtZVZpZXcgPSBXVEZNb3ZlKHZvbHVtZVZpZXcpLCByb3V0aW5nQ29udHJvbGxl ciA9IFdURk1vdmUocm91dGluZ0NvbnRyb2xsZXIpXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgTE9H KE1lZGlhLCAic2FmZWx5VGVhckRvd24gLSBkaXBhdGNoZWQgdG8gVUkgdGhyZWFkLiIpOworICAg ICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKKyAgICAgICAgW3JvdXRpbmdDb250cm9s bGVyIHNldERpc2NvdmVyeU1vZGU6TVBSb3V0ZURpc2NvdmVyeU1vZGVEaXNhYmxlZF07CisgICAg ICAgIHZvbHVtZVZpZXcuY2xlYXIoKTsKKyAgICAgICAgcm91dGluZ0NvbnRyb2xsZXIuY2xlYXIo KTsKKyAgICAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUworICAgIH0pOworfQorI2VuZGlm CisKIC0gKHZvaWQpZGVhbGxvYwogewogICAgIExPRyhNZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9u SGVscGVyIGRlYWxsb2NdIik7CiAKICNpZiBIQVZFKE1FRElBX1BMQVlFUikKLSAgICBpZiAoIWlz TWFpblRocmVhZCgpKSB7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3ZvbHVtZVZpZXcgPSBX VEZNb3ZlKF92b2x1bWVWaWV3KSwgcm91dGluZ0NvbnRyb2xsZXIgPSBXVEZNb3ZlKF9haXJQbGF5 UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlcildICgpIG11dGFibGUgewotICAgICAgICAgICAgTE9H KE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgZGVhbGxvY10gLSBkaXBhdGNoZWQgdG8g TWFpblRocmVhZCIpOwotCi0gICAgICAgICAgICB2b2x1bWVWaWV3LmNsZWFyKCk7Ci0KLSAgICAg ICAgICAgIGlmICghcm91dGluZ0NvbnRyb2xsZXIpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgICAgICBbcm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpNUFJvdXRl RGlzY292ZXJ5TW9kZURpc2FibGVkXTsKLSAgICAgICAgICAgIHJvdXRpbmdDb250cm9sbGVyLmNs ZWFyKCk7Ci0gICAgICAgIH0pOwotICAgIH0KKyAgICBpZiAoIXB0aHJlYWRfbWFpbl9ucCgpKQor ICAgICAgICBzYWZlbHlUZWFyRG93bihXVEZNb3ZlKF92b2x1bWVWaWV3KSwgV1RGTW92ZShfYWly UGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIpKTsKKyAgICBlbHNlCisgICAgICAgIFtfYWly UGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpNUFJvdXRlRGlz Y292ZXJ5TW9kZURpc2FibGVkXTsKICNlbmRpZgogCiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRl ciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmXTsKQEAgLTQzNiwzOCArNDAxLDY4 IEBAIC0gKEJPT0wpaGFzV2lyZWxlc3NUYXJnZXRzQXZhaWxhYmxlCiAjaWYgSEFWRShNRURJQV9Q TEFZRVIpCiAtICh2b2lkKXN0YXJ0TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXMKIHsKLSAgICBpZiAo X2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyKQorICAgIGlmIChfbW9uaXRvcmluZ0Fp clBsYXlSb3V0ZXMpCiAgICAgICAgIHJldHVybjsKIAorICAgIF9tb25pdG9yaW5nQWlyUGxheVJv dXRlcyA9IHRydWU7CisKKyAgICBpZiAoX3N0YXJ0TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNQZW5k aW5nKQorICAgICAgICByZXR1cm47CisKKyAgICBfc3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRl c1BlbmRpbmcgPSB0cnVlOworCiAgICAgTE9HKE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxw ZXIgc3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRlc10iKTsKIAotICAgIGNhbGxPbk1haW5UaHJl YWQoW3Byb3RlY3RlZFNlbGYgPSBSZXRhaW5QdHI8V2ViTWVkaWFTZXNzaW9uSGVscGVyPihzZWxm KV0gKCkgewotICAgICAgICBMT0coTWVkaWEsICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBzdGFy dE1vbml0b3JpbmdBaXJQbGF5Um91dGVzXSAtIGRpcGF0Y2hlZCB0byBNYWluVGhyZWFkIik7Cisg ICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3Byb3RlY3RlZFNl bGYgPSBSZXRhaW5QdHI8V2ViTWVkaWFTZXNzaW9uSGVscGVyPihzZWxmKV0gKCkgbXV0YWJsZSB7 CisgICAgICAgIExPRyhNZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIHN0YXJ0TW9uaXRv cmluZ0FpclBsYXlSb3V0ZXNdIC0gZGlwYXRjaGVkIHRvIG1haW4gcXVldWUiKTsKIAotICAgICAg ICBpZiAocHJvdGVjdGVkU2VsZi0+X2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyKQot ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMK KyAgICAgICAgUmV0YWluUHRyPE1QVm9sdW1lVmlldz4gdm9sdW1lVmlldyA9IGFkb3B0TlMoW2Fs bG9jTVBWb2x1bWVWaWV3SW5zdGFuY2UoKSBpbml0XSk7CisgICAgICAgIFJldGFpblB0cjxNUEFW Um91dGluZ0NvbnRyb2xsZXI+IHJvdXRpbmdDb250cm9sbGVyID0gYWRvcHROUyhbYWxsb2NNUEFW Um91dGluZ0NvbnRyb2xsZXJJbnN0YW5jZSgpIGluaXRXaXRoTmFtZTpAIldlYkNvcmUgLSBIVE1M IG1lZGlhIGVsZW1lbnQgY2hlY2tpbmcgZm9yIEFpclBsYXkgcm91dGUgcHJlc2VuY2UiXSk7CisK KyAgICAgICAgW3JvdXRpbmdDb250cm9sbGVyIHNldERpc2NvdmVyeU1vZGU6TVBSb3V0ZURpc2Nv dmVyeU1vZGVQcmVzZW5jZV07CisKKyAgICAgICAgY2FsbE9uV2ViVGhyZWFkT3JEaXNwYXRjaEFz eW5jT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRTZWxmID0gV1RGTW92ZShwcm90ZWN0ZWRTZWxmKSwg dm9sdW1lVmlldyA9IFdURk1vdmUodm9sdW1lVmlldyksIHJvdXRpbmdDb250cm9sbGVyID0gV1RG TW92ZShyb3V0aW5nQ29udHJvbGxlcildKCkgbXV0YWJsZSB7CisKKyAgICAgICAgICAgIHByb3Rl Y3RlZFNlbGYtPl9zdGFydE1vbml0b3JpbmdBaXJQbGF5Um91dGVzUGVuZGluZyA9IGZhbHNlOwor CisgICAgICAgICAgICBpZiAoIXByb3RlY3RlZFNlbGYtPl9tb25pdG9yaW5nQWlyUGxheVJvdXRl cykgeworICAgICAgICAgICAgICAgIHNhZmVseVRlYXJEb3duKFdURk1vdmUodm9sdW1lVmlldyks IFdURk1vdmUocm91dGluZ0NvbnRyb2xsZXIpKTsKKyAgICAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgIEFTU0VSVCghcHJvdGVjdGVkU2VsZi0+X3ZvbHVt ZVZpZXcpOworICAgICAgICAgICAgcHJvdGVjdGVkU2VsZi0+X3ZvbHVtZVZpZXcgPSB2b2x1bWVW aWV3OworCisgICAgICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd IGFkZE9ic2VydmVyOnByb3RlY3RlZFNlbGYuZ2V0KCkgc2VsZWN0b3I6QHNlbGVjdG9yKHdpcmVs ZXNzUm91dGVzQXZhaWxhYmxlRGlkQ2hhbmdlOikgbmFtZTpNUFZvbHVtZVZpZXdXaXJlbGVzc1Jv dXRlc0F2YWlsYWJsZURpZENoYW5nZU5vdGlmaWNhdGlvbiBvYmplY3Q6dm9sdW1lVmlldy5nZXQo KV07CisKKyAgICAgICAgICAgIEFTU0VSVCghcHJvdGVjdGVkU2VsZi0+X2FpclBsYXlQcmVzZW5j ZVJvdXRpbmdDb250cm9sbGVyKTsKKyAgICAgICAgICAgIHByb3RlY3RlZFNlbGYtPl9haXJQbGF5 UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlciA9IHJvdXRpbmdDb250cm9sbGVyOworICAgICAgICB9 KTsKKyAgICAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUwogCi0gICAgICAgIHByb3RlY3Rl ZFNlbGYtPl9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlciA9IGFkb3B0TlMoW2FsbG9j TVBBVlJvdXRpbmdDb250cm9sbGVySW5zdGFuY2UoKSBpbml0V2l0aE5hbWU6QCJXZWJDb3JlIC0g SFRNTCBtZWRpYSBlbGVtZW50IGNoZWNraW5nIGZvciBBaXJQbGF5IHJvdXRlIHByZXNlbmNlIl0p OwotICAgICAgICBbcHJvdGVjdGVkU2VsZi0+X2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9s bGVyIHNldERpc2NvdmVyeU1vZGU6TVBSb3V0ZURpc2NvdmVyeU1vZGVQcmVzZW5jZV07CiAgICAg fSk7CiB9CiAKIC0gKHZvaWQpc3RvcE1vbml0b3JpbmdBaXJQbGF5Um91dGVzCiB7Ci0gICAgaWYg KCFfYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIpCisgICAgaWYgKCFfbW9uaXRvcmlu Z0FpclBsYXlSb3V0ZXMpCiAgICAgICAgIHJldHVybjsKIAorICAgIF9tb25pdG9yaW5nQWlyUGxh eVJvdXRlcyA9IGZhbHNlOworCiAgICAgTE9HKE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxw ZXIgc3RvcE1vbml0b3JpbmdBaXJQbGF5Um91dGVzXSIpOwogCi0gICAgY2FsbE9uTWFpblRocmVh ZChbcHJvdGVjdGVkU2VsZiA9IFJldGFpblB0cjxXZWJNZWRpYVNlc3Npb25IZWxwZXI+KHNlbGYp XSAoKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIHN0b3BN b25pdG9yaW5nQWlyUGxheVJvdXRlc10gLSBkaXBhdGNoZWQgdG8gTWFpblRocmVhZCIpOworICAg IFJldGFpblB0cjxNUFZvbHVtZVZpZXc+IHZvbHVtZVZpZXcgPSBfdm9sdW1lVmlldzsKKyAgICBS ZXRhaW5QdHI8TVBBVlJvdXRpbmdDb250cm9sbGVyPiBhaXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29u dHJvbGxlciA9IF9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlcjsKIAotICAgICAgICBp ZiAoIXByb3RlY3RlZFNlbGYtPl9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlcikKLSAg ICAgICAgICAgIHJldHVybjsKKyAgICBfdm9sdW1lVmlldy5jbGVhcigpOworICAgIF9haXJQbGF5 UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlci5jbGVhcigpOwogCi0gICAgICAgIFtwcm90ZWN0ZWRT ZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpN UFJvdXRlRGlzY292ZXJ5TW9kZURpc2FibGVkXTsKLSAgICAgICAgcHJvdGVjdGVkU2VsZi0+X2Fp clBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyID0gbmlsOwotICAgIH0pOworICAgIGlmICh2 b2x1bWVWaWV3KQorICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd IHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpNUFZvbHVtZVZpZXdXaXJlbGVzc1JvdXRlc0F2YWls YWJsZURpZENoYW5nZU5vdGlmaWNhdGlvbiBvYmplY3Q6dm9sdW1lVmlldy5nZXQoKV07CisKKyAg ICBzYWZlbHlUZWFyRG93bihXVEZNb3ZlKHZvbHVtZVZpZXcpLCBXVEZNb3ZlKGFpclBsYXlQcmVz ZW5jZVJvdXRpbmdDb250cm9sbGVyKSk7CiB9CiAjZW5kaWYgLy8gSEFWRShNRURJQV9QTEFZRVIp CiAK