204979 2019-12-07 00:03:55 -0800 The value of [AVPlayerViewController isPictureInPicturePossible] is NO in the first attempt to enter PiP 2020-04-05 21:02:50 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 benjamin cdumez cmarcelo darin ddkilzer eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1596527 0 peng.liu6 2019-12-07 00:03:55 -0800 The value of [AVPlayerViewControl isPictureInPicturePossible] is NO in the first attempt to enter PiP 1596528 1 peng.liu6 2019-12-07 00:04:39 -0800 <rdar://problem/57671139> 1596529 2 385086 peng.liu6 2019-12-07 00:37:17 -0800 Created attachment 385086 Patch 1596861 3 385160 peng.liu6 2019-12-09 09:44:56 -0800 Created attachment 385160 Patch (Updated to fix build failures) 1631029 4 393821 peng.liu6 2020-03-17 20:54:28 -0700 Created attachment 393821 Patch 1631159 5 393821 jer.noble 2020-03-18 08:34:11 -0700 Comment on attachment 393821 Patch r=me. Is there a radar on the weird PiP behavior here? If so, it would be great to have a "FIXME: remove this once XXX is fixed" comment in this area. 1631174 6 393821 eric.carlson 2020-03-18 08:48:32 -0700 Comment on attachment 393821 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393821&action=review > Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:1380 > + [m_playerViewController tryToStartPictureInPicture]; Won't this fail to enter PiP if @pictureInPicturePossible is already true and so doesn't change? Maybe something like this would be better? if ([m_playerViewController isPictureInPicturePossible]) [m_playerViewController startPictureInPicture]; else [m_playerViewController tryToStartPictureInPicture]; 1631203 7 peng.liu6 2020-03-18 09:43:09 -0700 (In reply to Jer Noble from comment #5) > Comment on attachment 393821 [details] > Patch > > r=me. Is there a radar on the weird PiP behavior here? If so, it would be > great to have a "FIXME: remove this once XXX is fixed" comment in this area. Thanks for the review. Yes, there is a radar for it, but not for this patch. This patch is a protection after AVKit fixed their issue. We won’t remove it. 1631210 8 393821 peng.liu6 2020-03-18 09:50:55 -0700 Comment on attachment 393821 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393821&action=review >> Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:1380 >> + [m_playerViewController tryToStartPictureInPicture]; > > Won't this fail to enter PiP if @pictureInPicturePossible is already true and so doesn't change? > > Maybe something like this would be better? > > if ([m_playerViewController isPictureInPicturePossible]) > [m_playerViewController startPictureInPicture]; > else > [m_playerViewController tryToStartPictureInPicture]; No it won't fail because of “includeInitialValue:YES”. The initial value is treated as a change for _avPlayerViewControllerObservationController as well. However, I think your suggestion is a great idea to simplify the logic for most cases. So I will update the patch. Thanks! 1631215 9 393874 peng.liu6 2020-03-18 10:02:21 -0700 Created attachment 393874 Patch for landing 1631289 10 ews-feeder 2020-03-18 12:18:43 -0700 Committed r258655: <https://trac.webkit.org/changeset/258655> All reviewed patches have been landed. Closing bug and clearing flags on attachment 393874. 1631291 11 393874 darin 2020-03-18 12:20:37 -0700 Comment on attachment 393874 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=393874&action=review > Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:577 > + _fullscreenInterface = nullptr; What does this line of code accomplish? 1631328 12 393874 peng.liu6 2020-03-18 13:23:24 -0700 Comment on attachment 393874 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=393874&action=review >> Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:577 >> + _fullscreenInterface = nullptr; > > What does this line of code accomplish? Oops, it does nothing useful. Will remove it in another patch. Probably we need a refactoring to replace it with a smart pointer. 1631401 13 peng.liu6 2020-03-18 15:57:33 -0700 Reopen this bug to fix a watch os build failure. 1631402 14 393912 peng.liu6 2020-03-18 16:06:13 -0700 Created attachment 393912 Patch to fix a watch OS build failure 1631452 15 393912 ddkilzer 2020-03-18 17:51:59 -0700 Comment on attachment 393912 Patch to fix a watch OS build failure View in context: https://bugs.webkit.org/attachment.cgi?id=393912&action=review > Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h:32 > +#if !PLATFORM(WATCHOS) > #import <AVKit/AVObservationController.h> > +#endif This header is also not present on macOS Mojave (build 18G103, for example). I just hit a build failure on that build of macOS: In file included from OpenSource/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:36: PAL/pal/spi/cocoa/AVKitSPI.h:30:9: fatal error: 'AVKit/AVObservationController.h' file not found #import <AVKit/AVObservationController.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. 1631454 16 393912 ddkilzer 2020-03-18 17:55:14 -0700 Comment on attachment 393912 Patch to fix a watch OS build failure View in context: https://bugs.webkit.org/attachment.cgi?id=393912&action=review >> Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h:32 >> +#endif > > This header is also not present on macOS Mojave (build 18G103, for example). I just hit a build failure on that build of macOS: > > In file included from OpenSource/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:36: > PAL/pal/spi/cocoa/AVKitSPI.h:30:9: fatal error: 'AVKit/AVObservationController.h' file not found > #import <AVKit/AVObservationController.h> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. Note that the AVObservationController class is available; the header just isn't there: $ nm /System/Library/Frameworks/AVKit.framework/AVKit | grep AVObservationController | grep OBJC_CLASS 0000000000144bd0 S _OBJC_CLASS_$_AVObservationController So maybe you can conditionally include the header here, and then just declare the classes/methods for Mojave in the USE(APPLE_INTERNAL_SDK) section? +@class AVKeyValueChange; + +@interface AVObservationController<Owner> : NSObject +- (instancetype)initWithOwner:(Owner)owner NS_DESIGNATED_INITIALIZER; +- (id)startObserving:(id)object keyPath:(NSString *)keyPath includeInitialValue:(BOOL)shouldIncludeInitialValue observationHandler:(void (^)(Owner owner, id observed, AVKeyValueChange *change))observationHandler; +- (void)stopAllObservation; +@end 1631464 17 393927 peng.liu6 2020-03-18 18:06:41 -0700 Created attachment 393927 patch to fix build failures 1631466 18 393928 peng.liu6 2020-03-18 18:08:47 -0700 Created attachment 393928 patch to fix build failures 1631482 19 393912 peng.liu6 2020-03-18 18:37:45 -0700 Comment on attachment 393912 Patch to fix a watch OS build failure View in context: https://bugs.webkit.org/attachment.cgi?id=393912&action=review >>> Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h:32 >>> +#endif >> >> This header is also not present on macOS Mojave (build 18G103, for example). I just hit a build failure on that build of macOS: >> >> In file included from OpenSource/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:36: >> PAL/pal/spi/cocoa/AVKitSPI.h:30:9: fatal error: 'AVKit/AVObservationController.h' file not found >> #import <AVKit/AVObservationController.h> >> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> 1 error generated. > > Note that the AVObservationController class is available; the header just isn't there: > > $ nm /System/Library/Frameworks/AVKit.framework/AVKit | grep AVObservationController | grep OBJC_CLASS > 0000000000144bd0 S _OBJC_CLASS_$_AVObservationController > > So maybe you can conditionally include the header here, and then just declare the classes/methods for Mojave in the USE(APPLE_INTERNAL_SDK) section? > > +@class AVKeyValueChange; > + > +@interface AVObservationController<Owner> : NSObject > +- (instancetype)initWithOwner:(Owner)owner NS_DESIGNATED_INITIALIZER; > +- (id)startObserving:(id)object keyPath:(NSString *)keyPath includeInitialValue:(BOOL)shouldIncludeInitialValue observationHandler:(void (^)(Owner owner, id observed, AVKeyValueChange *change))observationHandler; > +- (void)stopAllObservation; > +@end Sorry for the trouble and thanks for the investigation! I updated the patch to only use AVObservationController in iOS for now. 1631546 20 ews-feeder 2020-03-18 22:23:19 -0700 Committed r258682: <https://trac.webkit.org/changeset/258682> All reviewed patches have been landed. Closing bug and clearing flags on attachment 393928. 1637924 21 393928 darin 2020-04-05 11:08:29 -0700 Comment on attachment 393928 patch to fix build failures View in context: https://bugs.webkit.org/attachment.cgi?id=393928&action=review > Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h:57 > +#if HAVE(HAVE_AVOBSERVATIONCONTROLLER) This change turns off the code entirely, because it says HAVE(HAVE_xxx). To turn the code back on, we need to change it all to HAVE(AVOBSERVATIONCONTROLLER). This also shows we have no tests covering this, because they would all fail! 1637939 22 393928 peng.liu6 2020-04-05 13:33:53 -0700 Comment on attachment 393928 patch to fix build failures View in context: https://bugs.webkit.org/attachment.cgi?id=393928&action=review >> Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h:57 >> +#if HAVE(HAVE_AVOBSERVATIONCONTROLLER) > > This change turns off the code entirely, because it says HAVE(HAVE_xxx). > > To turn the code back on, we need to change it all to HAVE(AVOBSERVATIONCONTROLLER). > > This also shows we have no tests covering this, because they would all fail! Sorry for the stupid mistake. :-( Will upload a patch to fix it. The patch is to provide extra protection suggested by AVKit after they fixed the bug in AVPlayerViewController. With the current behavior of AVKit, WebKit works fine without this patch. 1637955 23 peng.liu6 2020-04-05 14:41:17 -0700 Reopen this bug to fix mistakes on the macro name. 1637958 24 395529 peng.liu6 2020-04-05 14:47:24 -0700 Created attachment 395529 A follow-up patch to fix mistakes on #if HAVE(HAVE_AVOBSERVATIONCONTROLLER) 1637963 25 395529 darin 2020-04-05 15:00:24 -0700 Comment on attachment 395529 A follow-up patch to fix mistakes on #if HAVE(HAVE_AVOBSERVATIONCONTROLLER) Any way to add a test for this? I caught it by code inspection, but that’s not a reliable way to check these things. 1637964 26 darin 2020-04-05 15:01:01 -0700 (In reply to Darin Adler from comment #25) > Any way to add a test for this? I caught it by code inspection, but that’s > not a reliable way to check these things. Oh, I see your comment now. No simple way to test for now. 1638004 27 395539 peng.liu6 2020-04-05 17:53:01 -0700 Created attachment 395539 Fix iOS build failures by adding NS_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_END 1638017 28 ews-feeder 2020-04-05 21:02:49 -0700 Committed r259561: <https://trac.webkit.org/changeset/259561> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395539. 385086 2019-12-07 00:37:17 -0800 2019-12-09 09:44:54 -0800 Patch bug-204979-20191207003717.patch text/plain 6776 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJhYmIwNjcwMzNjZmFk ZWNiMTAxMDYxMWJlZGUwZGVkYWExYTFkMS4uNjU1OGJjMmM3ZjhjMmMwOWE3MzdlNTdiNGZmMDY4 NmUzNzkwMjBmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTEyLTA3ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBs YXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0 aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNpbmNlIFtBVlBsYXllclZpZXdDb250cm9sIGlzUGljdHVy ZUluUGljdHVyZVBvc3NpYmxlXSBjYW4gYmUgTk8gZm9yIHNvbWUgcmVhc29uLCB3ZSBtYXkgZmFp bCB0byBlbnRlcgorICAgICAgICB0aGUgUGljdHVyZS1pbi1QaWN0dXJlIG1vZGUuCisgICAgICAg IFRoaXMgcGF0Y2ggaW1wbGVtZW50cyB0aGUgbWVjaGFuaXNtIHRvIG9ic2VydmUgW0FWUGxheWVy Vmlld0NvbnRyb2wgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2libGVdCisgICAgICAgIGFmdGVyIGEg dXNlciByZXF1ZXN0cyB0byBlbnRlciB0aGUgUGljdHVyZS1pbi1QaWN0dXJlIG1vZGUsIGFuZCBj YWxsIFtBVlBsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0UGljdHVyZUluUGljdHVyZV0KKyAgICAg ICAgd2hlbiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJs ZV0gY2hhbmdlcyB0byBZRVMuCisgICAgICAgIEEgdGltZXIgaXMgYWRkZWQgdG8gbW9uaXRvciB0 aGUgc3RhdHVzLiBJZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQ b3NzaWJsZV0gZG9lcyBub3QKKyAgICAgICAgY2hhbmdlIHRvIFlFUyBpbiAwLjUgc2Vjb25kLCB3 ZSB3aWxsIGdpdmUgdXAgdGhlIGF0dGVtcHQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgICgtW1dlYkFWUGxheWVyVmll d0NvbnRyb2xsZXIgaW5pdFdpdGhGdWxsc2NyZWVuSW50ZXJmYWNlOl0pOgorICAgICAgICAoLVtX ZWJBVlBsYXllclZpZXdDb250cm9sbGVyIGRlYWxsb2NdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5 ZXJWaWV3Q29udHJvbGxlciB0cnlUb1N0YXJ0UGljdHVyZUluUGljdHVyZV0pOgorICAgICAgICAo VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRvRW50ZXJGdWxsc2NyZWVuKToKKwogMjAx OS0xMi0wMiAgeW91ZW5uIGZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2lt cGxpZnkgUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlIGFuZCBSZWFsdGltZU91dGdvaW5nVmlk ZW9vU291cmNlIG9ic2VydmVTb3VyY2UvdW5vYnNlcnZlU291cmNlIHBhdHRlcm4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hh bmdlTG9nCmluZGV4IGJkMmZiNTM4NWRhNGZjZjliYjdlMTdkYTBiOGIwNDE1MWRlZjE2ODQuLmZh NzZjMWVhY2FiNTM0ZjI1NGU2MWYxZDQ0NmVkYmIwYWIwYTU4YzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTEyLTA3ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBs ZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBsYXllclZpZXdDb250cm9sbGVyIGlz UGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0aGUgZmlyc3QgYXR0ZW1wdCB0byBl bnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGltcG9ydCBBVktpdC9BVk9ic2VydmF0aW9uQ29udHJvbGxlci5oCisKKyAgICAgICAgKiBwYWwv c3BpL2NvY29hL0FWS2l0U1BJLmg6CisKIDIwMTktMTEtMjggIEZ1amlpIEhpcm9ub3JpICA8SGly b25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEVOQUJMRV9LRVlCT0FSRF9D T0RFX0FUVFJJQlVURSBhbmQgRU5BQkxFX0tFWUJPQVJEX0tFWV9BVFRSSUJVVEUgbWFjcm9zCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIv U291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQVZLaXRTUEkuaAppbmRleCAwOTQ2OThh MWJlZjMzMmFjMDBhMzlhMjIxM2M3Mzg3MTA0OGY1ZDdjLi5hNDk2NjM5ODlkOTQ4MGMzMjcxZDUw N2UwMWYzY2U5NTM0ZWRjZTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3Nw aS9jb2NvYS9BVktpdFNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29h L0FWS2l0U1BJLmgKQEAgLTM3LDYgKzM3LDcgQEAKICNpbXBvcnQgPEFWS2l0L0FWQmFja2dyb3Vu ZFZpZXcuaD4KICNlbmRpZgogCisjaW1wb3J0IDxBVktpdC9BVk9ic2VydmF0aW9uQ29udHJvbGxl ci5oPgogI2ltcG9ydCA8QVZLaXQvQVZQbGF5ZXJDb250cm9sbGVyLmg+CiBJR05PUkVfV0FSTklO R1NfQkVHSU4oIm9iamMtcHJvcGVydHktbm8tYXR0cmlidXRlIikKICNpbXBvcnQgPEFWS2l0L0FW UGxheWVyTGF5ZXJWaWV3Lmg+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggZmMwNWYxZmRj ZjE1MzlmY2RhZGFhYTY2NzExZGQ2ZjgwNWJkNGU3NC4uN2FmMTRjNWZiYjRjNGVjNGUwZGMxMGZj NDAwMzc5NmNhNWVjOTdmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAtNTksNiArNTks NyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKICNpbXBvcnQgPHBhbC9pb3MvVUlLaXRTb2Z0 TGluay5oPgogCiBTT0ZUTElOS19BVktJVF9GUkFNRVdPUksoKQorU09GVF9MSU5LX0NMQVNTX09Q VElPTkFMKEFWS2l0LCBBVk9ic2VydmF0aW9uQ29udHJvbGxlcikKIFNPRlRfTElOS19DTEFTU19P UFRJT05BTChBVktpdCwgQVZQaWN0dXJlSW5QaWN0dXJlQ29udHJvbGxlcikKIFNPRlRfTElOS19D TEFTU19PUFRJT05BTChBVktpdCwgQVZQbGF5ZXJWaWV3Q29udHJvbGxlcikKIFNPRlRfTElOS19D TEFTU19PUFRJT05BTChBVktpdCwgX19BVlBsYXllckxheWVyVmlldykKQEAgLTU0NSw2ICs1NDYs OCBAQCBOU19BU1NVTUVfTk9OTlVMTF9FTkQKICAgICBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VB VktpdCAqX2Z1bGxzY3JlZW5JbnRlcmZhY2U7CiAgICAgUmV0YWluUHRyPFVJVmlld0NvbnRyb2xs ZXI+IF9wcmVzZW50aW5nVmlld0NvbnRyb2xsZXI7CiAgICAgUmV0YWluUHRyPEFWUGxheWVyVmll d0NvbnRyb2xsZXI+IF9hdlBsYXllclZpZXdDb250cm9sbGVyOworICAgIE5TVGltZXIgKl9zdGFy dFBpY3R1cmVJblBpY3R1cmVUaW1lcjsKKyAgICBBVk9ic2VydmF0aW9uQ29udHJvbGxlciAqX2F2 UGxheWVyVmlld0NvbnRyb2xsZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXI7CiAgICAgaWQ8QVZQbGF5 ZXJWaWV3Q29udHJvbGxlckRlbGVnYXRlX1dlYktpdE9ubHk+IF9kZWxlZ2F0ZTsKIH0KIApAQCAt NTU2LDYgKzU1OSw3IEBAIE5TX0FTU1VNRV9OT05OVUxMX0VORAogICAgIF9mdWxsc2NyZWVuSW50 ZXJmYWNlID0gaW50ZXJmYWNlOwogICAgIF9hdlBsYXllclZpZXdDb250cm9sbGVyID0gYWRvcHRO UyhbYWxsb2NBVlBsYXllclZpZXdDb250cm9sbGVySW5zdGFuY2UoKSBpbml0V2l0aFBsYXllckxh eWVyVmlldzppbnRlcmZhY2UtPnBsYXllckxheWVyVmlldygpXSk7CiAgICAgX2F2UGxheWVyVmll d0NvbnRyb2xsZXIuZ2V0KCkubW9kYWxQcmVzZW50YXRpb25TdHlsZSA9IFVJTW9kYWxQcmVzZW50 YXRpb25PdmVyRnVsbFNjcmVlbjsKKyAgICBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0 aW9uQ29udHJvbGxlciA9IFthbGxvY0FWT2JzZXJ2YXRpb25Db250cm9sbGVySW5zdGFuY2UoKSBp bml0V2l0aE93bmVyOl9hdlBsYXllclZpZXdDb250cm9sbGVyLmdldCgpXTsKICNpZiBQTEFURk9S TShXQVRDSE9TKQogICAgIF9hdlBsYXllclZpZXdDb250cm9sbGVyLmdldCgpLmRlbGVnYXRlID0g c2VsZjsKICNlbmRpZgpAQCAtNTYzLDYgKzU2NywxNyBAQCBOU19BU1NVTUVfTk9OTlVMTF9FTkQK ICAgICByZXR1cm4gc2VsZjsKIH0KIAorLSAodm9pZClkZWFsbG9jCit7CisgICAgW19zdGFydFBp Y3R1cmVJblBpY3R1cmVUaW1lciBpbnZhbGlkYXRlXTsKKyAgICBfc3RhcnRQaWN0dXJlSW5QaWN0 dXJlVGltZXIgPSBuaWw7CisgICAgW19hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25D b250cm9sbGVyIHN0b3BBbGxPYnNlcnZhdGlvbl07CisgICAgX2F2UGxheWVyVmlld0NvbnRyb2xs ZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXIgPSBuaWw7CisKKyAgICBfZnVsbHNjcmVlbkludGVyZmFj ZSA9IG51bGxwdHI7CisgICAgW3N1cGVyIGRlYWxsb2NdOworfQorCiAtIChCT09MKXBsYXllclZp ZXdDb250cm9sbGVyU2hvdWxkSGFuZGxlRG9uZUJ1dHRvblRhcDooQVZQbGF5ZXJWaWV3Q29udHJv bGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyCiB7CiAgICAgQVNTRVJUKHBsYXllclZpZXdDb250 cm9sbGVyID09IF9hdlBsYXllclZpZXdDb250cm9sbGVyLmdldCgpKTsKQEAgLTYxNyw2ICs2MzIs MjUgQEAgTlNfQVNTVU1FX05PTk5VTExfRU5ECiAjZGVmaW5lIE1ZX05PX1JFVFVSTgogI2VuZGlm CiAKKy0gKHZvaWQpdHJ5VG9TdGFydFBpY3R1cmVJblBpY3R1cmUgTVlfTk9fUkVUVVJOCit7Cisg ICAgX3N0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVyID0gW05TVGltZXIgc2NoZWR1bGVkVGltZXJX aXRoVGltZUludGVydmFsOjAuNSByZXBlYXRzOk5PIGJsb2NrOl4oTlNUaW1lciAqIF9Ob25udWxs KSB7CisgICAgICAgIFtfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0aW9uQ29udHJvbGxl ciBzdG9wQWxsT2JzZXJ2YXRpb25dOworICAgICAgICBfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGlt ZXIgPSBuaWw7CisgICAgICAgIGlmIChfZnVsbHNjcmVlbkludGVyZmFjZSkKKyAgICAgICAgICAg IF9mdWxsc2NyZWVuSW50ZXJmYWNlLT5mYWlsZWRUb1N0YXJ0UGljdHVyZUluUGljdHVyZSgpOwor ICAgIH1dOworCisgICAgW19hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9s bGVyIHN0YXJ0T2JzZXJ2aW5nOl9hdlBsYXllclZpZXdDb250cm9sbGVyLmdldCgpIGtleVBhdGg6 QCJwaWN0dXJlSW5QaWN0dXJlUG9zc2libGUiIGluY2x1ZGVJbml0aWFsVmFsdWU6WUVTIG9ic2Vy dmF0aW9uSGFuZGxlcjpeKGlkIF9Ob25udWxsLCBpZCBfTm9ubnVsbCwgaWQgX05vbm51bGwpIHsK KyAgICAgICAgaWYgKFtzZWxmIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSAmJiBfc3RhcnRQ aWN0dXJlSW5QaWN0dXJlVGltZXIpIHsKKyAgICAgICAgICAgIFtfYXZQbGF5ZXJWaWV3Q29udHJv bGxlck9ic2VydmF0aW9uQ29udHJvbGxlciBzdG9wQWxsT2JzZXJ2YXRpb25dOworICAgICAgICAg ICAgW19zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lciBpbnZhbGlkYXRlXTsKKyAgICAgICAgICAg IF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lciA9IG5pbDsKKyAgICAgICAgICAgIFtzZWxmIHN0 YXJ0UGljdHVyZUluUGljdHVyZV07CisgICAgICAgIH0KKyAgICB9XTsKK30KKwogLSAodm9pZClz dGFydFBpY3R1cmVJblBpY3R1cmUgTVlfTk9fUkVUVVJOCiB7CiAjaWYgUExBVEZPUk0oV0FUQ0hP UykKQEAgLTEzMjQsMTAgKzEzNTgsNyBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0Ojpkb0VudGVyRnVsbHNjcmVlbigpCiAKICAgICBpZiAobV90YXJnZXRNb2RlLmhhc1BpY3R1 cmVJblBpY3R1cmUoKSAmJiAhbV9jdXJyZW50TW9kZS5oYXNQaWN0dXJlSW5QaWN0dXJlKCkpIHsK ICAgICAgICAgbV9lbnRlckZ1bGxzY3JlZW5OZWVkc0VudGVyUGljdHVyZUluUGljdHVyZSA9IHRy dWU7Ci0gICAgICAgIGlmIChbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1 cmVQb3NzaWJsZV0pCi0gICAgICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBzdGFydFBp Y3R1cmVJblBpY3R1cmVdOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBmYWlsZWRUb1N0YXJ0 UGljdHVyZUluUGljdHVyZSgpOworICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB0cnlU b1N0YXJ0UGljdHVyZUluUGljdHVyZV07CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgbV9l bnRlckZ1bGxzY3JlZW5OZWVkc0VudGVyUGljdHVyZUluUGljdHVyZSA9IGZhbHNlOwo= 385160 2019-12-09 09:44:56 -0800 2020-03-17 20:54:26 -0700 Patch (Updated to fix build failures) bug-204979-20191209094455.patch text/plain 7413 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJhYmIwNjcwMzNjZmFk ZWNiMTAxMDYxMWJlZGUwZGVkYWExYTFkMS4uNjU1OGJjMmM3ZjhjMmMwOWE3MzdlNTdiNGZmMDY4 NmUzNzkwMjBmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTEyLTA3ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBs YXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0 aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNpbmNlIFtBVlBsYXllclZpZXdDb250cm9sIGlzUGljdHVy ZUluUGljdHVyZVBvc3NpYmxlXSBjYW4gYmUgTk8gZm9yIHNvbWUgcmVhc29uLCB3ZSBtYXkgZmFp bCB0byBlbnRlcgorICAgICAgICB0aGUgUGljdHVyZS1pbi1QaWN0dXJlIG1vZGUuCisgICAgICAg IFRoaXMgcGF0Y2ggaW1wbGVtZW50cyB0aGUgbWVjaGFuaXNtIHRvIG9ic2VydmUgW0FWUGxheWVy Vmlld0NvbnRyb2wgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2libGVdCisgICAgICAgIGFmdGVyIGEg dXNlciByZXF1ZXN0cyB0byBlbnRlciB0aGUgUGljdHVyZS1pbi1QaWN0dXJlIG1vZGUsIGFuZCBj YWxsIFtBVlBsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0UGljdHVyZUluUGljdHVyZV0KKyAgICAg ICAgd2hlbiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJs ZV0gY2hhbmdlcyB0byBZRVMuCisgICAgICAgIEEgdGltZXIgaXMgYWRkZWQgdG8gbW9uaXRvciB0 aGUgc3RhdHVzLiBJZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQ b3NzaWJsZV0gZG9lcyBub3QKKyAgICAgICAgY2hhbmdlIHRvIFlFUyBpbiAwLjUgc2Vjb25kLCB3 ZSB3aWxsIGdpdmUgdXAgdGhlIGF0dGVtcHQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgICgtW1dlYkFWUGxheWVyVmll d0NvbnRyb2xsZXIgaW5pdFdpdGhGdWxsc2NyZWVuSW50ZXJmYWNlOl0pOgorICAgICAgICAoLVtX ZWJBVlBsYXllclZpZXdDb250cm9sbGVyIGRlYWxsb2NdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5 ZXJWaWV3Q29udHJvbGxlciB0cnlUb1N0YXJ0UGljdHVyZUluUGljdHVyZV0pOgorICAgICAgICAo VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRvRW50ZXJGdWxsc2NyZWVuKToKKwogMjAx OS0xMi0wMiAgeW91ZW5uIGZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2lt cGxpZnkgUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlIGFuZCBSZWFsdGltZU91dGdvaW5nVmlk ZW9vU291cmNlIG9ic2VydmVTb3VyY2UvdW5vYnNlcnZlU291cmNlIHBhdHRlcm4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hh bmdlTG9nCmluZGV4IGJkMmZiNTM4NWRhNGZjZjliYjdlMTdkYTBiOGIwNDE1MWRlZjE2ODQuLmZh NzZjMWVhY2FiNTM0ZjI1NGU2MWYxZDQ0NmVkYmIwYWIwYTU4YzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTEyLTA3ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBs ZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBsYXllclZpZXdDb250cm9sbGVyIGlz UGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0aGUgZmlyc3QgYXR0ZW1wdCB0byBl bnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGltcG9ydCBBVktpdC9BVk9ic2VydmF0aW9uQ29udHJvbGxlci5oCisKKyAgICAgICAgKiBwYWwv c3BpL2NvY29hL0FWS2l0U1BJLmg6CisKIDIwMTktMTEtMjggIEZ1amlpIEhpcm9ub3JpICA8SGly b25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEVOQUJMRV9LRVlCT0FSRF9D T0RFX0FUVFJJQlVURSBhbmQgRU5BQkxFX0tFWUJPQVJEX0tFWV9BVFRSSUJVVEUgbWFjcm9zCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIv U291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQVZLaXRTUEkuaAppbmRleCAwOTQ2OThh MWJlZjMzMmFjMDBhMzlhMjIxM2M3Mzg3MTA0OGY1ZDdjLi5jYzkzNDBiZjY4ODIxYjdjYzUwOGM2 MmJkOTYxODFjNzI1YjA5M2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3Nw aS9jb2NvYS9BVktpdFNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29h L0FWS2l0U1BJLmgKQEAgLTM3LDYgKzM3LDcgQEAKICNpbXBvcnQgPEFWS2l0L0FWQmFja2dyb3Vu ZFZpZXcuaD4KICNlbmRpZgogCisjaW1wb3J0IDxBVktpdC9BVk9ic2VydmF0aW9uQ29udHJvbGxl ci5oPgogI2ltcG9ydCA8QVZLaXQvQVZQbGF5ZXJDb250cm9sbGVyLmg+CiBJR05PUkVfV0FSTklO R1NfQkVHSU4oIm9iamMtcHJvcGVydHktbm8tYXR0cmlidXRlIikKICNpbXBvcnQgPEFWS2l0L0FW UGxheWVyTGF5ZXJWaWV3Lmg+CkBAIC0xMDIsNiArMTAzLDE0IEBAIE5TX0FTU1VNRV9OT05OVUxM X0VORAogCiBOU19BU1NVTUVfTk9OTlVMTF9CRUdJTgogCitAY2xhc3MgQVZLZXlWYWx1ZUNoYW5n ZTsKKworQGludGVyZmFjZSBBVk9ic2VydmF0aW9uQ29udHJvbGxlcjxPd25lcj4gOiBOU09iamVj dAorLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoT3duZXI6KE93bmVyKW93bmVyIE5TX0RFU0lHTkFU RURfSU5JVElBTElaRVI7CistIChpZClzdGFydE9ic2VydmluZzooaWQpb2JqZWN0IGtleVBhdGg6 KE5TU3RyaW5nICopa2V5UGF0aCBpbmNsdWRlSW5pdGlhbFZhbHVlOihCT09MKXNob3VsZEluY2x1 ZGVJbml0aWFsVmFsdWUgb2JzZXJ2YXRpb25IYW5kbGVyOih2b2lkICheKShPd25lciBvd25lciwg aWQgb2JzZXJ2ZWQsIEFWS2V5VmFsdWVDaGFuZ2UgKmNoYW5nZSkpb2JzZXJ2YXRpb25IYW5kbGVy OworLSAodm9pZClzdG9wQWxsT2JzZXJ2YXRpb247CitAZW5kCisKIEBpbnRlcmZhY2UgQVZCYWNr Z3JvdW5kVmlldyA6IFVJVmlldwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgYXV0b21hdGlj YWxseURyYXdzUm91bmRlZENvcm5lcnM7CiB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBBVkJh Y2tncm91bmRWaWV3TWF0ZXJpYWxTdHlsZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4 IGZjMDVmMWZkY2YxNTM5ZmNkYWRhYWE2NjcxMWRkNmY4MDViZDRlNzQuLjdhZjE0YzVmYmI0YzRl YzRlMGRjMTBmYzQwMDM3OTZjYTVlYzk3ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAg LTU5LDYgKzU5LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAjaW1wb3J0IDxwYWwvaW9z L1VJS2l0U29mdExpbmsuaD4KIAogU09GVExJTktfQVZLSVRfRlJBTUVXT1JLKCkKK1NPRlRfTElO S19DTEFTU19PUFRJT05BTChBVktpdCwgQVZPYnNlcnZhdGlvbkNvbnRyb2xsZXIpCiBTT0ZUX0xJ TktfQ0xBU1NfT1BUSU9OQUwoQVZLaXQsIEFWUGljdHVyZUluUGljdHVyZUNvbnRyb2xsZXIpCiBT T0ZUX0xJTktfQ0xBU1NfT1BUSU9OQUwoQVZLaXQsIEFWUGxheWVyVmlld0NvbnRyb2xsZXIpCiBT T0ZUX0xJTktfQ0xBU1NfT1BUSU9OQUwoQVZLaXQsIF9fQVZQbGF5ZXJMYXllclZpZXcpCkBAIC01 NDUsNiArNTQ2LDggQEAgTlNfQVNTVU1FX05PTk5VTExfRU5ECiAgICAgVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQgKl9mdWxsc2NyZWVuSW50ZXJmYWNlOwogICAgIFJldGFpblB0cjxVSVZp ZXdDb250cm9sbGVyPiBfcHJlc2VudGluZ1ZpZXdDb250cm9sbGVyOwogICAgIFJldGFpblB0cjxB VlBsYXllclZpZXdDb250cm9sbGVyPiBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlcjsKKyAgICBOU1Rp bWVyICpfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXI7CisgICAgQVZPYnNlcnZhdGlvbkNvbnRy b2xsZXIgKl9hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVyOwogICAg IGlkPEFWUGxheWVyVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZV9XZWJLaXRPbmx5PiBfZGVsZWdhdGU7 CiB9CiAKQEAgLTU1Niw2ICs1NTksNyBAQCBOU19BU1NVTUVfTk9OTlVMTF9FTkQKICAgICBfZnVs bHNjcmVlbkludGVyZmFjZSA9IGludGVyZmFjZTsKICAgICBfYXZQbGF5ZXJWaWV3Q29udHJvbGxl ciA9IGFkb3B0TlMoW2FsbG9jQVZQbGF5ZXJWaWV3Q29udHJvbGxlckluc3RhbmNlKCkgaW5pdFdp dGhQbGF5ZXJMYXllclZpZXc6aW50ZXJmYWNlLT5wbGF5ZXJMYXllclZpZXcoKV0pOwogICAgIF9h dlBsYXllclZpZXdDb250cm9sbGVyLmdldCgpLm1vZGFsUHJlc2VudGF0aW9uU3R5bGUgPSBVSU1v ZGFsUHJlc2VudGF0aW9uT3ZlckZ1bGxTY3JlZW47CisgICAgX2F2UGxheWVyVmlld0NvbnRyb2xs ZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXIgPSBbYWxsb2NBVk9ic2VydmF0aW9uQ29udHJvbGxlcklu c3RhbmNlKCkgaW5pdFdpdGhPd25lcjpfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKV07CiAj aWYgUExBVEZPUk0oV0FUQ0hPUykKICAgICBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKS5k ZWxlZ2F0ZSA9IHNlbGY7CiAjZW5kaWYKQEAgLTU2Myw2ICs1NjcsMTcgQEAgTlNfQVNTVU1FX05P Tk5VTExfRU5ECiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKKy0gKHZvaWQpZGVhbGxvYworeworICAg IFtfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXIgaW52YWxpZGF0ZV07CisgICAgX3N0YXJ0UGlj dHVyZUluUGljdHVyZVRpbWVyID0gbmlsOworICAgIFtfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9i c2VydmF0aW9uQ29udHJvbGxlciBzdG9wQWxsT2JzZXJ2YXRpb25dOworICAgIF9hdlBsYXllclZp ZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVyID0gbmlsOworCisgICAgX2Z1bGxzY3Jl ZW5JbnRlcmZhY2UgPSBudWxscHRyOworICAgIFtzdXBlciBkZWFsbG9jXTsKK30KKwogLSAoQk9P TClwbGF5ZXJWaWV3Q29udHJvbGxlclNob3VsZEhhbmRsZURvbmVCdXR0b25UYXA6KEFWUGxheWVy Vmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlcgogewogICAgIEFTU0VSVChwbGF5 ZXJWaWV3Q29udHJvbGxlciA9PSBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKSk7CkBAIC02 MTcsNiArNjMyLDI1IEBAIE5TX0FTU1VNRV9OT05OVUxMX0VORAogI2RlZmluZSBNWV9OT19SRVRV Uk4KICNlbmRpZgogCistICh2b2lkKXRyeVRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlIE1ZX05PX1JF VFVSTgoreworICAgIF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lciA9IFtOU1RpbWVyIHNjaGVk dWxlZFRpbWVyV2l0aFRpbWVJbnRlcnZhbDowLjUgcmVwZWF0czpOTyBibG9jazpeKE5TVGltZXIg KiBfTm9ubnVsbCkgeworICAgICAgICBbX2F2UGxheWVyVmlld0NvbnRyb2xsZXJPYnNlcnZhdGlv bkNvbnRyb2xsZXIgc3RvcEFsbE9ic2VydmF0aW9uXTsKKyAgICAgICAgX3N0YXJ0UGljdHVyZUlu UGljdHVyZVRpbWVyID0gbmlsOworICAgICAgICBpZiAoX2Z1bGxzY3JlZW5JbnRlcmZhY2UpCisg ICAgICAgICAgICBfZnVsbHNjcmVlbkludGVyZmFjZS0+ZmFpbGVkVG9TdGFydFBpY3R1cmVJblBp Y3R1cmUoKTsKKyAgICB9XTsKKworICAgIFtfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0 aW9uQ29udHJvbGxlciBzdGFydE9ic2VydmluZzpfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQo KSBrZXlQYXRoOkAicGljdHVyZUluUGljdHVyZVBvc3NpYmxlIiBpbmNsdWRlSW5pdGlhbFZhbHVl OllFUyBvYnNlcnZhdGlvbkhhbmRsZXI6XihpZCBfTm9ubnVsbCwgaWQgX05vbm51bGwsIGlkIF9O b25udWxsKSB7CisgICAgICAgIGlmIChbc2VsZiBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJsZV0g JiYgX3N0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVyKSB7CisgICAgICAgICAgICBbX2F2UGxheWVy Vmlld0NvbnRyb2xsZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXIgc3RvcEFsbE9ic2VydmF0aW9uXTsK KyAgICAgICAgICAgIFtfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXIgaW52YWxpZGF0ZV07Cisg ICAgICAgICAgICBfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXIgPSBuaWw7CisgICAgICAgICAg ICBbc2VsZiBzdGFydFBpY3R1cmVJblBpY3R1cmVdOworICAgICAgICB9CisgICAgfV07Cit9CisK IC0gKHZvaWQpc3RhcnRQaWN0dXJlSW5QaWN0dXJlIE1ZX05PX1JFVFVSTgogewogI2lmIFBMQVRG T1JNKFdBVENIT1MpCkBAIC0xMzI0LDEwICsxMzU4LDcgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdDo6ZG9FbnRlckZ1bGxzY3JlZW4oKQogCiAgICAgaWYgKG1fdGFyZ2V0TW9k ZS5oYXNQaWN0dXJlSW5QaWN0dXJlKCkgJiYgIW1fY3VycmVudE1vZGUuaGFzUGljdHVyZUluUGlj dHVyZSgpKSB7CiAgICAgICAgIG1fZW50ZXJGdWxsc2NyZWVuTmVlZHNFbnRlclBpY3R1cmVJblBp Y3R1cmUgPSB0cnVlOwotICAgICAgICBpZiAoW21fcGxheWVyVmlld0NvbnRyb2xsZXIgaXNQaWN0 dXJlSW5QaWN0dXJlUG9zc2libGVdKQotICAgICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xs ZXIgc3RhcnRQaWN0dXJlSW5QaWN0dXJlXTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgZmFp bGVkVG9TdGFydFBpY3R1cmVJblBpY3R1cmUoKTsKKyAgICAgICAgW21fcGxheWVyVmlld0NvbnRy b2xsZXIgdHJ5VG9TdGFydFBpY3R1cmVJblBpY3R1cmVdOwogICAgICAgICByZXR1cm47CiAgICAg fQogICAgIG1fZW50ZXJGdWxsc2NyZWVuTmVlZHNFbnRlclBpY3R1cmVJblBpY3R1cmUgPSBmYWxz ZTsK 393821 2020-03-17 20:54:28 -0700 2020-03-18 08:34:11 -0700 Patch bug-204979-20200317205427.patch text/plain 7675 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjU1MDEwYzlmYTdhMDRj MjcwYWY0NDQxOGY5NGJmOWZlZTNiYjIwMS4uMzJkNzY2NjkyMzM1ZDE5YjRjZjNlZjIxMjBmM2Iz MzUwMDgyYmZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAzLTE3ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBs YXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0 aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNpbmNlIFtBVlBsYXllclZpZXdDb250cm9sIGlzUGljdHVy ZUluUGljdHVyZVBvc3NpYmxlXSBjYW4gYmUgTk8gZm9yIHNvbWUgcmVhc29uLCB3ZSBtYXkgZmFp bCB0byBlbnRlcgorICAgICAgICB0aGUgUGljdHVyZS1pbi1QaWN0dXJlIG1vZGUuCisgICAgICAg IFRoaXMgcGF0Y2ggaW1wbGVtZW50cyB0aGUgbWVjaGFuaXNtIHRvIG9ic2VydmUgW0FWUGxheWVy Vmlld0NvbnRyb2wgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2libGVdCisgICAgICAgIGFmdGVyIGEg dXNlciByZXF1ZXN0cyB0byBlbnRlciB0aGUgUGljdHVyZS1pbi1QaWN0dXJlIG1vZGUsIGFuZCBj YWxsIFtBVlBsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0UGljdHVyZUluUGljdHVyZV0KKyAgICAg ICAgd2hlbiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJs ZV0gY2hhbmdlcyB0byBZRVMuCisgICAgICAgIEEgdGltZXIgaXMgYWRkZWQgdG8gbW9uaXRvciB0 aGUgc3RhdHVzLiBJZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQ b3NzaWJsZV0gZG9lcyBub3QKKyAgICAgICAgY2hhbmdlIHRvIFlFUyBpbiAwLjUgc2Vjb25kLCB3 ZSB3aWxsIGdpdmUgdXAgdGhlIGF0dGVtcHQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgICgtW1dlYkFWUGxheWVyVmll d0NvbnRyb2xsZXIgaW5pdFdpdGhGdWxsc2NyZWVuSW50ZXJmYWNlOl0pOgorICAgICAgICAoLVtX ZWJBVlBsYXllclZpZXdDb250cm9sbGVyIGRlYWxsb2NdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5 ZXJWaWV3Q29udHJvbGxlciBNWV9OT19SRVRVUk5dKToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Ojpkb0VudGVyRnVsbHNjcmVlbik6CisKIDIwMjAtMDMtMTcgIEZ1amlp IEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgU2VyaWFsaXpl ZFNjcmlwdFZhbHVlOjpkZWNvZGUgc2hvdWxkIGNoZWNrIGJ1ZmZlcklzTGFyZ2VFbm91Z2hUb0Nv bnRhaW4gYmVmb3JlIGFsbG9jYXRpbmcgYSBidWZmZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IDdm ODVhMGNmYTgwYzllMDdmMmRjMjJlMTQ2MmM0YzhjOGUwM2MzYWQuLmUzNDgyYWZkNTc0NzhiYWIz ZmFhZjJiYWE1ZDBhMTg2YTVjNTc5YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIwLTAzLTE3ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAg ICAgVGhlIHZhbHVlIG9mIFtBVlBsYXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVy ZVBvc3NpYmxlXSBpcyBOTyBpbiB0aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGltcG9ydCBBVktpdC9B Vk9ic2VydmF0aW9uQ29udHJvbGxlci5oCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL0FWS2l0 U1BJLmg6CisKIDIwMjAtMDMtMTYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBCdWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY29jb2EvQVZLaXRTUEkuaAppbmRleCAxNWJhMTM4NTI5NzFjMTVlZTQzNDhkOTQzNzlmNDRm MTE3YTYwODJiLi4yMzQ1ZGZhZjlkMDkzZTFmN2FmNDA0N2JlMmIzNDRkOTBkNDM0MDIxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0FWS2l0U1BJLmgKQEAgLTI3LDYgKzI3 LDcgQEAKICNpbXBvcnQgPHd0Zi9Tb2Z0TGlua2luZy5oPgogCiAjaWYgVVNFKEFQUExFX0lOVEVS TkFMX1NESykKKyNpbXBvcnQgPEFWS2l0L0FWT2JzZXJ2YXRpb25Db250cm9sbGVyLmg+CiAjaW1w b3J0IDxBVktpdC9BVlBsYXllckNvbnRyb2xsZXIuaD4KICNlbHNlCiAjaWYgUExBVEZPUk0oSU9T X0ZBTUlMWSkKQEAgLTEyOSw2ICsxMzAsMTQgQEAgTlNfQVNTVU1FX05PTk5VTExfRU5ECiAKIE5T X0FTU1VNRV9OT05OVUxMX0JFR0lOCiAKK0BjbGFzcyBBVktleVZhbHVlQ2hhbmdlOworCitAaW50 ZXJmYWNlIEFWT2JzZXJ2YXRpb25Db250cm9sbGVyPE93bmVyPiA6IE5TT2JqZWN0CistIChpbnN0 YW5jZXR5cGUpaW5pdFdpdGhPd25lcjooT3duZXIpb3duZXIgTlNfREVTSUdOQVRFRF9JTklUSUFM SVpFUjsKKy0gKGlkKXN0YXJ0T2JzZXJ2aW5nOihpZClvYmplY3Qga2V5UGF0aDooTlNTdHJpbmcg KilrZXlQYXRoIGluY2x1ZGVJbml0aWFsVmFsdWU6KEJPT0wpc2hvdWxkSW5jbHVkZUluaXRpYWxW YWx1ZSBvYnNlcnZhdGlvbkhhbmRsZXI6KHZvaWQgKF4pKE93bmVyIG93bmVyLCBpZCBvYnNlcnZl ZCwgQVZLZXlWYWx1ZUNoYW5nZSAqY2hhbmdlKSlvYnNlcnZhdGlvbkhhbmRsZXI7CistICh2b2lk KXN0b3BBbGxPYnNlcnZhdGlvbjsKK0BlbmQKKwogQGludGVyZmFjZSBBVkJhY2tncm91bmRWaWV3 IDogVUlWaWV3CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBhdXRvbWF0aWNhbGx5RHJhd3NS b3VuZGVkQ29ybmVyczsKIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIEFWQmFja2dyb3VuZFZp ZXdNYXRlcmlhbFN0eWxlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggMDc1ZjMzNzRi NTJmM2E3ZjYxYWVjZjRiMTFjZDcyNGQ1ZTVkODkwZS4uMWQyYWU4ODIzNjA0YzQwM2Y2ZmNiMDI5 NjU0NWYwZjJmYTA4NTkzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAtNTksNiArNTks NyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKICNpbXBvcnQgPHBhbC9pb3MvVUlLaXRTb2Z0 TGluay5oPgogCiBTT0ZUTElOS19BVktJVF9GUkFNRVdPUksoKQorU09GVF9MSU5LX0NMQVNTX09Q VElPTkFMKEFWS2l0LCBBVk9ic2VydmF0aW9uQ29udHJvbGxlcikKIFNPRlRfTElOS19DTEFTU19P UFRJT05BTChBVktpdCwgQVZQaWN0dXJlSW5QaWN0dXJlQ29udHJvbGxlcikKIFNPRlRfTElOS19D TEFTU19PUFRJT05BTChBVktpdCwgQVZQbGF5ZXJWaWV3Q29udHJvbGxlcikKIFNPRlRfTElOS19D TEFTU19PUFRJT05BTChBVktpdCwgX19BVlBsYXllckxheWVyVmlldykKQEAgLTU0NSw2ICs1NDYs OCBAQCBAaW1wbGVtZW50YXRpb24gV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlciB7CiAgICAgVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQgKl9mdWxsc2NyZWVuSW50ZXJmYWNlOwogICAgIFJl dGFpblB0cjxVSVZpZXdDb250cm9sbGVyPiBfcHJlc2VudGluZ1ZpZXdDb250cm9sbGVyOwogICAg IFJldGFpblB0cjxBVlBsYXllclZpZXdDb250cm9sbGVyPiBfYXZQbGF5ZXJWaWV3Q29udHJvbGxl cjsKKyAgICBSZXRhaW5QdHI8TlNUaW1lcj4gX3N0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVyOwor ICAgIFJldGFpblB0cjxBVk9ic2VydmF0aW9uQ29udHJvbGxlcj4gX2F2UGxheWVyVmlld0NvbnRy b2xsZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXI7CiAgICAgaWQ8QVZQbGF5ZXJWaWV3Q29udHJvbGxl ckRlbGVnYXRlX1dlYktpdE9ubHk+IF9kZWxlZ2F0ZTsKIH0KIApAQCAtNTU2LDYgKzU1OSw3IEBA IC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZ1bGxzY3JlZW5JbnRlcmZhY2U6KFZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0ICopaW50CiAgICAgX2Z1bGxzY3JlZW5JbnRlcmZhY2UgPSBpbnRl cmZhY2U7CiAgICAgX2F2UGxheWVyVmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFthbGxvY0FWUGxh eWVyVmlld0NvbnRyb2xsZXJJbnN0YW5jZSgpIGluaXRXaXRoUGxheWVyTGF5ZXJWaWV3OmludGVy ZmFjZS0+cGxheWVyTGF5ZXJWaWV3KCldKTsKICAgICBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5n ZXQoKS5tb2RhbFByZXNlbnRhdGlvblN0eWxlID0gVUlNb2RhbFByZXNlbnRhdGlvbk92ZXJGdWxs U2NyZWVuOworICAgIF9hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVy ID0gYWRvcHROUyhbYWxsb2NBVk9ic2VydmF0aW9uQ29udHJvbGxlckluc3RhbmNlKCkgaW5pdFdp dGhPd25lcjpfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKV0pOwogI2lmIFBMQVRGT1JNKFdB VENIT1MpCiAgICAgX2F2UGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkuZGVsZWdhdGUgPSBzZWxm OwogI2VuZGlmCkBAIC01NjMsNiArNTY3LDE3IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZ1 bGxzY3JlZW5JbnRlcmZhY2U6KFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0ICopaW50CiAg ICAgcmV0dXJuIHNlbGY7CiB9CiAKKy0gKHZvaWQpZGVhbGxvYworeworICAgIFtfc3RhcnRQaWN0 dXJlSW5QaWN0dXJlVGltZXIgaW52YWxpZGF0ZV07CisgICAgX3N0YXJ0UGljdHVyZUluUGljdHVy ZVRpbWVyID0gbmlsOworICAgIFtfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0aW9uQ29u dHJvbGxlciBzdG9wQWxsT2JzZXJ2YXRpb25dOworICAgIF9hdlBsYXllclZpZXdDb250cm9sbGVy T2JzZXJ2YXRpb25Db250cm9sbGVyID0gbmlsOworCisgICAgX2Z1bGxzY3JlZW5JbnRlcmZhY2Ug PSBudWxscHRyOworICAgIFtzdXBlciBkZWFsbG9jXTsKK30KKwogLSAoQk9PTClwbGF5ZXJWaWV3 Q29udHJvbGxlclNob3VsZEhhbmRsZURvbmVCdXR0b25UYXA6KEFWUGxheWVyVmlld0NvbnRyb2xs ZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlcgogewogICAgIEFTU0VSVChwbGF5ZXJWaWV3Q29udHJv bGxlciA9PSBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKSk7CkBAIC02MTcsNiArNjMyLDMw IEBAIC0gKHZvaWQpZXhpdEZ1bGxTY3JlZW5BbmltYXRlZDooQk9PTClhbmltYXRlZCBjb21wbGV0 aW9uSGFuZGxlcjoodm9pZCAoXikoQk9PTCBzCiAjZGVmaW5lIE1ZX05PX1JFVFVSTgogI2VuZGlm CiAKK3N0YXRpYyBjb25zdCBOU1RpbWVJbnRlcnZhbCBzdGFydFBpY3R1cmVJblBpY3R1cmVUaW1l SW50ZXJ2YWwgPSAwLjU7CisKKy0gKHZvaWQpdHJ5VG9TdGFydFBpY3R1cmVJblBpY3R1cmUgTVlf Tk9fUkVUVVJOCit7CisgICAgaWYgKF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lcikKKyAgICAg ICAgcmV0dXJuOworCisgICAgX3N0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVyID0gW05TVGltZXIg c2NoZWR1bGVkVGltZXJXaXRoVGltZUludGVydmFsOnN0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVJ bnRlcnZhbCByZXBlYXRzOk5PIGJsb2NrOl4oTlNUaW1lciAqX05vbm51bGwpIHsKKyAgICAgICAg W19hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVyIHN0b3BBbGxPYnNl cnZhdGlvbl07CisgICAgICAgIF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lciA9IG5pbDsKKyAg ICAgICAgaWYgKF9mdWxsc2NyZWVuSW50ZXJmYWNlKQorICAgICAgICAgICAgX2Z1bGxzY3JlZW5J bnRlcmZhY2UtPmZhaWxlZFRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCk7CisgICAgfV07CisKKyAg ICBbX2F2UGxheWVyVmlld0NvbnRyb2xsZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXIgc3RhcnRPYnNl cnZpbmc6X2F2UGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkga2V5UGF0aDpAInBpY3R1cmVJblBp Y3R1cmVQb3NzaWJsZSIgaW5jbHVkZUluaXRpYWxWYWx1ZTpZRVMgb2JzZXJ2YXRpb25IYW5kbGVy Ol4oaWQgX05vbm51bGwsIGlkIF9Ob25udWxsLCBpZCBfTm9ubnVsbCkgeworICAgICAgICBpZiAo W3NlbGYgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2libGVdICYmIF9zdGFydFBpY3R1cmVJblBpY3R1 cmVUaW1lcikgeworICAgICAgICAgICAgW19hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRp b25Db250cm9sbGVyIHN0b3BBbGxPYnNlcnZhdGlvbl07CisgICAgICAgICAgICBbX3N0YXJ0UGlj dHVyZUluUGljdHVyZVRpbWVyIGludmFsaWRhdGVdOworICAgICAgICAgICAgX3N0YXJ0UGljdHVy ZUluUGljdHVyZVRpbWVyID0gbmlsOworICAgICAgICAgICAgW3NlbGYgc3RhcnRQaWN0dXJlSW5Q aWN0dXJlXTsKKyAgICAgICAgfQorICAgIH1dOworfQorCiAtICh2b2lkKXN0YXJ0UGljdHVyZUlu UGljdHVyZSBNWV9OT19SRVRVUk4KIHsKICNpZiBQTEFURk9STShXQVRDSE9TKQpAQCAtMTMzOCwx MCArMTM3Nyw3IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRvRW50ZXJG dWxsc2NyZWVuKCkKIAogICAgIGlmIChtX3RhcmdldE1vZGUuaGFzUGljdHVyZUluUGljdHVyZSgp ICYmICFtX2N1cnJlbnRNb2RlLmhhc1BpY3R1cmVJblBpY3R1cmUoKSkgewogICAgICAgICBtX2Vu dGVyRnVsbHNjcmVlbk5lZWRzRW50ZXJQaWN0dXJlSW5QaWN0dXJlID0gdHJ1ZTsKLSAgICAgICAg aWYgKFttX3BsYXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSkK LSAgICAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0UGljdHVyZUluUGljdHVy ZV07Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGZhaWxlZFRvU3RhcnRQaWN0dXJlSW5QaWN0 dXJlKCk7CisgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHRyeVRvU3RhcnRQaWN0dXJl SW5QaWN0dXJlXTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBtX2VudGVyRnVsbHNjcmVl bk5lZWRzRW50ZXJQaWN0dXJlSW5QaWN0dXJlID0gZmFsc2U7Cg== 393874 2020-03-18 10:02:21 -0700 2020-03-18 12:18:43 -0700 Patch for landing bug-204979-20200318100221.patch text/plain 7516 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjU1MDEwYzlmYTdhMDRj MjcwYWY0NDQxOGY5NGJmOWZlZTNiYjIwMS4uMGY4Y2ExZDRhOGZmYTM1NDk1OTE3ZDcwMWJhZDRh NjBhOGQwNTRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAzLTE3ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBs YXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0 aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IEplciBO b2JsZS4KKworICAgICAgICBTaW5jZSBbQVZQbGF5ZXJWaWV3Q29udHJvbCBpc1BpY3R1cmVJblBp Y3R1cmVQb3NzaWJsZV0gY2FuIGJlIE5PIGluaXRpYWxseSwgd2UgbWF5IGZhaWwgdG8gZW50ZXIK KyAgICAgICAgdGhlIFBpY3R1cmUtaW4tUGljdHVyZSBtb2RlLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggaW1wbGVtZW50cyB0aGUgbWVjaGFuaXNtIHRvIG9ic2VydmUgW0FWUGxheWVyVmlld0NvbnRy b2wgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2libGVdIGFmdGVyCisgICAgICAgIGEgdXNlciByZXF1 ZXN0cyB0byBlbnRlciB0aGUgUGljdHVyZS1pbi1QaWN0dXJlIG1vZGUsIGFuZCBjYWxsIFtBVlBs YXllclZpZXdDb250cm9sbGVyIHN0YXJ0UGljdHVyZUluUGljdHVyZV0KKyAgICAgICAgd2hlbiBb QVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJsZV0gY2hhbmdl cyB0byBZRVMuCisgICAgICAgIEEgdGltZXIgaXMgYWRkZWQgdG8gbW9uaXRvciB0aGUgc3RhdHVz LiBJZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJsZV0g ZG9lcyBub3QKKyAgICAgICAgY2hhbmdlIHRvIFlFUyBpbiAwLjUgc2Vjb25kLCB3ZSB3aWxsIGdp dmUgdXAgdGhlIGF0dGVtcHQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgICgtW1dlYkFWUGxheWVyVmlld0NvbnRyb2xs ZXIgaW5pdFdpdGhGdWxsc2NyZWVuSW50ZXJmYWNlOl0pOgorICAgICAgICAoLVtXZWJBVlBsYXll clZpZXdDb250cm9sbGVyIGRlYWxsb2NdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJWaWV3Q29u dHJvbGxlciBNWV9OT19SRVRVUk5dKToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZUFWS2l0Ojpkb0VudGVyRnVsbHNjcmVlbik6CisKIDIwMjAtMDMtMTcgIEZ1amlpIEhpcm9ub3Jp ICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgU2VyaWFsaXplZFNjcmlwdFZh bHVlOjpkZWNvZGUgc2hvdWxkIGNoZWNrIGJ1ZmZlcklzTGFyZ2VFbm91Z2hUb0NvbnRhaW4gYmVm b3JlIGFsbG9jYXRpbmcgYSBidWZmZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IDdmODVhMGNmYTgw YzllMDdmMmRjMjJlMTQ2MmM0YzhjOGUwM2MzYWQuLjk5OGQ4YTQ4ZWUxNGFjYTc5YWUzNTBhZjc5 OTY5ZTFkNzM2NGQ2NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIw LTAzLTE3ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHZh bHVlIG9mIFtBVlBsYXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxl XSBpcyBOTyBpbiB0aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAgICAgIFJldmll d2VkIGJ5IEplciBOb2JsZS4KKworICAgICAgICBpbXBvcnQgQVZLaXQvQVZPYnNlcnZhdGlvbkNv bnRyb2xsZXIuaAorCisgICAgICAgICogcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oOgorCiAyMDIw LTAzLTE2ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgQnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkv Y29jb2EvQVZLaXRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0FWS2l0 U1BJLmgKaW5kZXggMTViYTEzODUyOTcxYzE1ZWU0MzQ4ZDk0Mzc5ZjQ0ZjExN2E2MDgyYi4uMjM0 NWRmYWY5ZDA5M2UxZjdhZjQwNDdiZTJiMzQ0ZDkwZDQzNDAyMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQVZLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oCkBAIC0yNyw2ICsyNyw3IEBACiAjaW1wb3J0 IDx3dGYvU29mdExpbmtpbmcuaD4KIAogI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW1w b3J0IDxBVktpdC9BVk9ic2VydmF0aW9uQ29udHJvbGxlci5oPgogI2ltcG9ydCA8QVZLaXQvQVZQ bGF5ZXJDb250cm9sbGVyLmg+CiAjZWxzZQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC0x MjksNiArMTMwLDE0IEBAIE5TX0FTU1VNRV9OT05OVUxMX0VORAogCiBOU19BU1NVTUVfTk9OTlVM TF9CRUdJTgogCitAY2xhc3MgQVZLZXlWYWx1ZUNoYW5nZTsKKworQGludGVyZmFjZSBBVk9ic2Vy dmF0aW9uQ29udHJvbGxlcjxPd25lcj4gOiBOU09iamVjdAorLSAoaW5zdGFuY2V0eXBlKWluaXRX aXRoT3duZXI6KE93bmVyKW93bmVyIE5TX0RFU0lHTkFURURfSU5JVElBTElaRVI7CistIChpZClz dGFydE9ic2VydmluZzooaWQpb2JqZWN0IGtleVBhdGg6KE5TU3RyaW5nICopa2V5UGF0aCBpbmNs dWRlSW5pdGlhbFZhbHVlOihCT09MKXNob3VsZEluY2x1ZGVJbml0aWFsVmFsdWUgb2JzZXJ2YXRp b25IYW5kbGVyOih2b2lkICheKShPd25lciBvd25lciwgaWQgb2JzZXJ2ZWQsIEFWS2V5VmFsdWVD aGFuZ2UgKmNoYW5nZSkpb2JzZXJ2YXRpb25IYW5kbGVyOworLSAodm9pZClzdG9wQWxsT2JzZXJ2 YXRpb247CitAZW5kCisKIEBpbnRlcmZhY2UgQVZCYWNrZ3JvdW5kVmlldyA6IFVJVmlldwogQHBy b3BlcnR5IChub25hdG9taWMpIEJPT0wgYXV0b21hdGljYWxseURyYXdzUm91bmRlZENvcm5lcnM7 CiB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBBVkJhY2tncm91bmRWaWV3TWF0ZXJpYWxTdHls ZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IDA3NWYzMzc0YjUyZjNhN2Y2MWFlY2Y0 YjExY2Q3MjRkNWU1ZDg5MGUuLjZkODIyNGNiYWQwM2IxMjMyZDhjNTU5MTgzYTJjY2Q3ZGNkZjU4 YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTU5LDYgKzU5LDcgQEAgdXNpbmcgbmFt ZXNwYWNlIFdlYkNvcmU7CiAjaW1wb3J0IDxwYWwvaW9zL1VJS2l0U29mdExpbmsuaD4KIAogU09G VExJTktfQVZLSVRfRlJBTUVXT1JLKCkKK1NPRlRfTElOS19DTEFTU19PUFRJT05BTChBVktpdCwg QVZPYnNlcnZhdGlvbkNvbnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1NfT1BUSU9OQUwoQVZLaXQs IEFWUGljdHVyZUluUGljdHVyZUNvbnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1NfT1BUSU9OQUwo QVZLaXQsIEFWUGxheWVyVmlld0NvbnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1NfT1BUSU9OQUwo QVZLaXQsIF9fQVZQbGF5ZXJMYXllclZpZXcpCkBAIC01NDUsNiArNTQ2LDggQEAgQGltcGxlbWVu dGF0aW9uIFdlYkFWUGxheWVyVmlld0NvbnRyb2xsZXIgewogICAgIFZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZUFWS2l0ICpfZnVsbHNjcmVlbkludGVyZmFjZTsKICAgICBSZXRhaW5QdHI8VUlWaWV3 Q29udHJvbGxlcj4gX3ByZXNlbnRpbmdWaWV3Q29udHJvbGxlcjsKICAgICBSZXRhaW5QdHI8QVZQ bGF5ZXJWaWV3Q29udHJvbGxlcj4gX2F2UGxheWVyVmlld0NvbnRyb2xsZXI7CisgICAgUmV0YWlu UHRyPE5TVGltZXI+IF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lcjsKKyAgICBSZXRhaW5QdHI8 QVZPYnNlcnZhdGlvbkNvbnRyb2xsZXI+IF9hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRp b25Db250cm9sbGVyOwogICAgIGlkPEFWUGxheWVyVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZV9XZWJL aXRPbmx5PiBfZGVsZWdhdGU7CiB9CiAKQEAgLTU1Niw2ICs1NTksNyBAQCAtIChpbnN0YW5jZXR5 cGUpaW5pdFdpdGhGdWxsc2NyZWVuSW50ZXJmYWNlOihWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VB VktpdCAqKWludAogICAgIF9mdWxsc2NyZWVuSW50ZXJmYWNlID0gaW50ZXJmYWNlOwogICAgIF9h dlBsYXllclZpZXdDb250cm9sbGVyID0gYWRvcHROUyhbYWxsb2NBVlBsYXllclZpZXdDb250cm9s bGVySW5zdGFuY2UoKSBpbml0V2l0aFBsYXllckxheWVyVmlldzppbnRlcmZhY2UtPnBsYXllckxh eWVyVmlldygpXSk7CiAgICAgX2F2UGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkubW9kYWxQcmVz ZW50YXRpb25TdHlsZSA9IFVJTW9kYWxQcmVzZW50YXRpb25PdmVyRnVsbFNjcmVlbjsKKyAgICBf YXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0aW9uQ29udHJvbGxlciA9IGFkb3B0TlMoW2Fs bG9jQVZPYnNlcnZhdGlvbkNvbnRyb2xsZXJJbnN0YW5jZSgpIGluaXRXaXRoT3duZXI6X2F2UGxh eWVyVmlld0NvbnRyb2xsZXIuZ2V0KCldKTsKICNpZiBQTEFURk9STShXQVRDSE9TKQogICAgIF9h dlBsYXllclZpZXdDb250cm9sbGVyLmdldCgpLmRlbGVnYXRlID0gc2VsZjsKICNlbmRpZgpAQCAt NTYzLDYgKzU2NywxNyBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhGdWxsc2NyZWVuSW50ZXJm YWNlOihWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdCAqKWludAogICAgIHJldHVybiBzZWxm OwogfQogCistICh2b2lkKWRlYWxsb2MKK3sKKyAgICBbX3N0YXJ0UGljdHVyZUluUGljdHVyZVRp bWVyIGludmFsaWRhdGVdOworICAgIF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lciA9IG5pbDsK KyAgICBbX2F2UGxheWVyVmlld0NvbnRyb2xsZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXIgc3RvcEFs bE9ic2VydmF0aW9uXTsKKyAgICBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0aW9uQ29u dHJvbGxlciA9IG5pbDsKKworICAgIF9mdWxsc2NyZWVuSW50ZXJmYWNlID0gbnVsbHB0cjsKKyAg ICBbc3VwZXIgZGVhbGxvY107Cit9CisKIC0gKEJPT0wpcGxheWVyVmlld0NvbnRyb2xsZXJTaG91 bGRIYW5kbGVEb25lQnV0dG9uVGFwOihBVlBsYXllclZpZXdDb250cm9sbGVyICopcGxheWVyVmll d0NvbnRyb2xsZXIKIHsKICAgICBBU1NFUlQocGxheWVyVmlld0NvbnRyb2xsZXIgPT0gX2F2UGxh eWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkpOwpAQCAtNjE3LDYgKzYzMiwzMCBAQCAtICh2b2lkKWV4 aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6KEJPT0wpYW5pbWF0ZWQgY29tcGxldGlvbkhhbmRsZXI6KHZv aWQgKF4pKEJPT0wgcwogI2RlZmluZSBNWV9OT19SRVRVUk4KICNlbmRpZgogCitzdGF0aWMgY29u c3QgTlNUaW1lSW50ZXJ2YWwgc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZUludGVydmFsID0gMC41 OworCistICh2b2lkKXRyeVRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlIE1ZX05PX1JFVFVSTgorewor ICAgIGlmIChfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXIpCisgICAgICAgIHJldHVybjsKKwor ICAgIF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lciA9IFtOU1RpbWVyIHNjaGVkdWxlZFRpbWVy V2l0aFRpbWVJbnRlcnZhbDpzdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lSW50ZXJ2YWwgcmVwZWF0 czpOTyBibG9jazpeKE5TVGltZXIgKl9Ob25udWxsKSB7CisgICAgICAgIFtfYXZQbGF5ZXJWaWV3 Q29udHJvbGxlck9ic2VydmF0aW9uQ29udHJvbGxlciBzdG9wQWxsT2JzZXJ2YXRpb25dOworICAg ICAgICBfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXIgPSBuaWw7CisgICAgICAgIGlmIChfZnVs bHNjcmVlbkludGVyZmFjZSkKKyAgICAgICAgICAgIF9mdWxsc2NyZWVuSW50ZXJmYWNlLT5mYWls ZWRUb1N0YXJ0UGljdHVyZUluUGljdHVyZSgpOworICAgIH1dOworCisgICAgW19hdlBsYXllclZp ZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVyIHN0YXJ0T2JzZXJ2aW5nOl9hdlBsYXll clZpZXdDb250cm9sbGVyLmdldCgpIGtleVBhdGg6QCJwaWN0dXJlSW5QaWN0dXJlUG9zc2libGUi IGluY2x1ZGVJbml0aWFsVmFsdWU6WUVTIG9ic2VydmF0aW9uSGFuZGxlcjpeKGlkIF9Ob25udWxs LCBpZCBfTm9ubnVsbCwgaWQgX05vbm51bGwpIHsKKyAgICAgICAgaWYgKFtzZWxmIGlzUGljdHVy ZUluUGljdHVyZVBvc3NpYmxlXSAmJiBfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXIpIHsKKyAg ICAgICAgICAgIFtfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0aW9uQ29udHJvbGxlciBz dG9wQWxsT2JzZXJ2YXRpb25dOworICAgICAgICAgICAgW19zdGFydFBpY3R1cmVJblBpY3R1cmVU aW1lciBpbnZhbGlkYXRlXTsKKyAgICAgICAgICAgIF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1l ciA9IG5pbDsKKyAgICAgICAgICAgIFtzZWxmIHN0YXJ0UGljdHVyZUluUGljdHVyZV07CisgICAg ICAgIH0KKyAgICB9XTsKK30KKwogLSAodm9pZClzdGFydFBpY3R1cmVJblBpY3R1cmUgTVlfTk9f UkVUVVJOCiB7CiAjaWYgUExBVEZPUk0oV0FUQ0hPUykKQEAgLTEzNDEsNyArMTM4MCw4IEBAIHZv aWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRvRW50ZXJGdWxsc2NyZWVuKCkKICAg ICAgICAgaWYgKFttX3BsYXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3Np YmxlXSkKICAgICAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0UGljdHVyZUlu UGljdHVyZV07CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGZhaWxlZFRvU3RhcnRQaWN0dXJl SW5QaWN0dXJlKCk7CisgICAgICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB0cnlUb1N0 YXJ0UGljdHVyZUluUGljdHVyZV07CisKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBtX2Vu dGVyRnVsbHNjcmVlbk5lZWRzRW50ZXJQaWN0dXJlSW5QaWN0dXJlID0gZmFsc2U7Cg== 393912 2020-03-18 16:06:13 -0700 2020-03-18 18:07:02 -0700 Patch to fix a watch OS build failure bug-204979-20200318160613.patch text/plain 6185 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTFmNjc3Yzc2M2U2ZjM1 ODg3OTA3ZDgxMTVhYWNlZTU4NGQzODM3NS4uMTcxZTQ4MGNjNTgxN2UwZjEwMzMyOTI0M2RmZjNk OGMxMWY5YTBkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAzLTE4ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBs YXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0 aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEEgZm9sbG93LXVwIHBhdGNoIHRvIGZpeCBhIHdhdGNoIE9T IGJ1aWxkIGZhaWx1cmUuCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyByZW1vdmVzIGEgbWVhbmlu Z2xlc3MgbGluZSBpbiB0aGUgZGVhbGxvYyBvZiBXZWJBVlBsYXllclZpZXdDb250cm9sbGVyLgor CisgICAgICAgICogcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1t OgorICAgICAgICAoLVtXZWJBVlBsYXllclZpZXdDb250cm9sbGVyIGluaXRXaXRoRnVsbHNjcmVl bkludGVyZmFjZTpdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBkZWFs bG9jXSk6CisgICAgICAgIChWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZG9FbnRlckZ1 bGxzY3JlZW4pOgorCiAyMDIwLTAzLTE4ICBFdWdlbmUgQnV0ICA8ZXVnZW5lYnV0QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBGaXggUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6Okluc2VydGVkTm9k ZXM6OndpbGxSZW1vdmVOb2RlUHJlc2VydmluZ0NoaWxkcmVuIGNyYXNoCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxv ZwppbmRleCBmZGQzYzNjOGUwYWVmODkyYTA0ZTI3NTczY2Q2NjdmZjhmMzA1YTc2Li5mMTkxYzNl MjUwYzU0NjgyOGQzM2MxNDU0OWEyMmI4ZmMyNTM5Njc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAyMC0wMy0xOCAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29t PgorCisgICAgICAgIFRoZSB2YWx1ZSBvZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1 cmVJblBpY3R1cmVQb3NzaWJsZV0gaXMgTk8gaW4gdGhlIGZpcnN0IGF0dGVtcHQgdG8gZW50ZXIg UGlQCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ5 NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBIGZv bGxvdy11cCBwYXRjaCB0byBmaXggYSB3YXRjaCBPUyBidWlsZCBmYWlsdXJlLgorCisgICAgICAg ICogcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oOgorCiAyMDIwLTAzLTE4ICBQZW5nIExpdSAgPHBl bmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBsYXllclZpZXdD b250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0aGUgZmlyc3Qg YXR0ZW1wdCB0byBlbnRlciBQaVAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwv c3BpL2NvY29hL0FWS2l0U1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9B VktpdFNQSS5oCmluZGV4IDIzNDVkZmFmOWQwOTNlMWY3YWY0MDQ3YmUyYjM0NGQ5MGQ0MzQwMjEu LjkxNDgwM2RhZTAzYjMxOTA2N2VmMGUyZjQyN2UwNTNjMDZjMTIyNzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0FWS2l0U1BJLmgKKysrIGIvU291cmNlL1dl YkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQVZLaXRTUEkuaApAQCAtMjcsNyArMjcsOSBAQAogI2lt cG9ydCA8d3RmL1NvZnRMaW5raW5nLmg+CiAKICNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQor I2lmICFQTEFURk9STShXQVRDSE9TKQogI2ltcG9ydCA8QVZLaXQvQVZPYnNlcnZhdGlvbkNvbnRy b2xsZXIuaD4KKyNlbmRpZgogI2ltcG9ydCA8QVZLaXQvQVZQbGF5ZXJDb250cm9sbGVyLmg+CiAj ZWxzZQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC0xMzAsNiArMTMyLDcgQEAgTlNfQVNT VU1FX05PTk5VTExfRU5ECiAKIE5TX0FTU1VNRV9OT05OVUxMX0JFR0lOCiAKKyNpZiAhUExBVEZP Uk0oV0FUQ0hPUykKIEBjbGFzcyBBVktleVZhbHVlQ2hhbmdlOwogCiBAaW50ZXJmYWNlIEFWT2Jz ZXJ2YXRpb25Db250cm9sbGVyPE93bmVyPiA6IE5TT2JqZWN0CkBAIC0xMzcsNiArMTQwLDcgQEAg TlNfQVNTVU1FX05PTk5VTExfQkVHSU4KIC0gKGlkKXN0YXJ0T2JzZXJ2aW5nOihpZClvYmplY3Qg a2V5UGF0aDooTlNTdHJpbmcgKilrZXlQYXRoIGluY2x1ZGVJbml0aWFsVmFsdWU6KEJPT0wpc2hv dWxkSW5jbHVkZUluaXRpYWxWYWx1ZSBvYnNlcnZhdGlvbkhhbmRsZXI6KHZvaWQgKF4pKE93bmVy IG93bmVyLCBpZCBvYnNlcnZlZCwgQVZLZXlWYWx1ZUNoYW5nZSAqY2hhbmdlKSlvYnNlcnZhdGlv bkhhbmRsZXI7CiAtICh2b2lkKXN0b3BBbGxPYnNlcnZhdGlvbjsKIEBlbmQKKyNlbmRpZgogCiBA aW50ZXJmYWNlIEFWQmFja2dyb3VuZFZpZXcgOiBVSVZpZXcKIEBwcm9wZXJ0eSAobm9uYXRvbWlj KSBCT09MIGF1dG9tYXRpY2FsbHlEcmF3c1JvdW5kZWRDb3JuZXJzOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1t IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0Lm1tCmluZGV4IDZkODIyNGNiYWQwM2IxMjMyZDhjNTU5MTgzYTJjY2Q3ZGNkZjU4YzkuLjUz MDUwZDkwZDNiOWI2ZmY5ZjNlMjAyMDFkNjM5MWIwNGM0M2RhOTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQubW0KQEAgLTU5LDcgKzU5LDkgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAjaW1w b3J0IDxwYWwvaW9zL1VJS2l0U29mdExpbmsuaD4KIAogU09GVExJTktfQVZLSVRfRlJBTUVXT1JL KCkKKyNpZiAhUExBVEZPUk0oV0FUQ0hPUykKIFNPRlRfTElOS19DTEFTU19PUFRJT05BTChBVktp dCwgQVZPYnNlcnZhdGlvbkNvbnRyb2xsZXIpCisjZW5kaWYKIFNPRlRfTElOS19DTEFTU19PUFRJ T05BTChBVktpdCwgQVZQaWN0dXJlSW5QaWN0dXJlQ29udHJvbGxlcikKIFNPRlRfTElOS19DTEFT U19PUFRJT05BTChBVktpdCwgQVZQbGF5ZXJWaWV3Q29udHJvbGxlcikKIFNPRlRfTElOS19DTEFT U19PUFRJT05BTChBVktpdCwgX19BVlBsYXllckxheWVyVmlldykKQEAgLTU0Niw4ICs1NDgsMTAg QEAgQGltcGxlbWVudGF0aW9uIFdlYkFWUGxheWVyVmlld0NvbnRyb2xsZXIgewogICAgIFZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0ICpfZnVsbHNjcmVlbkludGVyZmFjZTsKICAgICBSZXRh aW5QdHI8VUlWaWV3Q29udHJvbGxlcj4gX3ByZXNlbnRpbmdWaWV3Q29udHJvbGxlcjsKICAgICBS ZXRhaW5QdHI8QVZQbGF5ZXJWaWV3Q29udHJvbGxlcj4gX2F2UGxheWVyVmlld0NvbnRyb2xsZXI7 CisjaWYgIVBMQVRGT1JNKFdBVENIT1MpCiAgICAgUmV0YWluUHRyPE5TVGltZXI+IF9zdGFydFBp Y3R1cmVJblBpY3R1cmVUaW1lcjsKICAgICBSZXRhaW5QdHI8QVZPYnNlcnZhdGlvbkNvbnRyb2xs ZXI+IF9hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVyOworI2VuZGlm CiAgICAgaWQ8QVZQbGF5ZXJWaWV3Q29udHJvbGxlckRlbGVnYXRlX1dlYktpdE9ubHk+IF9kZWxl Z2F0ZTsKIH0KIApAQCAtNTU5LDcgKzU2Myw5IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZ1 bGxzY3JlZW5JbnRlcmZhY2U6KFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0ICopaW50CiAg ICAgX2Z1bGxzY3JlZW5JbnRlcmZhY2UgPSBpbnRlcmZhY2U7CiAgICAgX2F2UGxheWVyVmlld0Nv bnRyb2xsZXIgPSBhZG9wdE5TKFthbGxvY0FWUGxheWVyVmlld0NvbnRyb2xsZXJJbnN0YW5jZSgp IGluaXRXaXRoUGxheWVyTGF5ZXJWaWV3OmludGVyZmFjZS0+cGxheWVyTGF5ZXJWaWV3KCldKTsK ICAgICBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKS5tb2RhbFByZXNlbnRhdGlvblN0eWxl ID0gVUlNb2RhbFByZXNlbnRhdGlvbk92ZXJGdWxsU2NyZWVuOworI2lmICFQTEFURk9STShXQVRD SE9TKQogICAgIF9hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVyID0g YWRvcHROUyhbYWxsb2NBVk9ic2VydmF0aW9uQ29udHJvbGxlckluc3RhbmNlKCkgaW5pdFdpdGhP d25lcjpfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKV0pOworI2VuZGlmCiAjaWYgUExBVEZP Uk0oV0FUQ0hPUykKICAgICBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKS5kZWxlZ2F0ZSA9 IHNlbGY7CiAjZW5kaWYKQEAgLTU2Nyw2ICs1NzMsNyBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdp dGhGdWxsc2NyZWVuSW50ZXJmYWNlOihWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdCAqKWlu dAogICAgIHJldHVybiBzZWxmOwogfQogCisjaWYgIVBMQVRGT1JNKFdBVENIT1MpCiAtICh2b2lk KWRlYWxsb2MKIHsKICAgICBbX3N0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVyIGludmFsaWRhdGVd OwpAQCAtNTc0LDkgKzU4MSw5IEBAIC0gKHZvaWQpZGVhbGxvYwogICAgIFtfYXZQbGF5ZXJWaWV3 Q29udHJvbGxlck9ic2VydmF0aW9uQ29udHJvbGxlciBzdG9wQWxsT2JzZXJ2YXRpb25dOwogICAg IF9hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVyID0gbmlsOwogCi0g ICAgX2Z1bGxzY3JlZW5JbnRlcmZhY2UgPSBudWxscHRyOwogICAgIFtzdXBlciBkZWFsbG9jXTsK IH0KKyNlbmRpZgogCiAtIChCT09MKXBsYXllclZpZXdDb250cm9sbGVyU2hvdWxkSGFuZGxlRG9u ZUJ1dHRvblRhcDooQVZQbGF5ZXJWaWV3Q29udHJvbGxlciAqKXBsYXllclZpZXdDb250cm9sbGVy CiB7CkBAIC02MzIsNiArNjM5LDcgQEAgLSAodm9pZClleGl0RnVsbFNjcmVlbkFuaW1hdGVkOihC T09MKWFuaW1hdGVkIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShCT09MIHMKICNkZWZpbmUg TVlfTk9fUkVUVVJOCiAjZW5kaWYKIAorI2lmICFQTEFURk9STShXQVRDSE9TKQogc3RhdGljIGNv bnN0IE5TVGltZUludGVydmFsIHN0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVJbnRlcnZhbCA9IDAu NTsKIAogLSAodm9pZCl0cnlUb1N0YXJ0UGljdHVyZUluUGljdHVyZSBNWV9OT19SRVRVUk4KQEAg LTY1NSw2ICs2NjMsNyBAQCAtICh2b2lkKXRyeVRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlIE1ZX05P X1JFVFVSTgogICAgICAgICB9CiAgICAgfV07CiB9CisjZW5kaWYKIAogLSAodm9pZClzdGFydFBp Y3R1cmVJblBpY3R1cmUgTVlfTk9fUkVUVVJOCiB7CkBAIC0xMzgwLDcgKzEzODksMTEgQEAgdm9p ZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZG9FbnRlckZ1bGxzY3JlZW4oKQogICAg ICAgICBpZiAoW21fcGxheWVyVmlld0NvbnRyb2xsZXIgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2li bGVdKQogICAgICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc3RhcnRQaWN0dXJlSW5Q aWN0dXJlXTsKICAgICAgICAgZWxzZQorI2lmICFQTEFURk9STShXQVRDSE9TKQogICAgICAgICAg ICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdHJ5VG9TdGFydFBpY3R1cmVJblBpY3R1cmVdOwor I2Vsc2UKKyAgICAgICAgICAgIGZhaWxlZFRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCk7CisjZW5k aWYKIAogICAgICAgICByZXR1cm47CiAgICAgfQo= 393927 2020-03-18 18:06:41 -0700 2020-03-18 18:09:14 -0700 patch to fix build failures bug-204979-20200318180640.patch text/plain 8365 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDVjYmQzNjA5MTZjOTE1ODdjYmE3MjNl ZDhiMGZjZWEzZTAxMTI3ODUuLmIwNjljYTdhYTZjYTI4OGVlMjBiMzZkZDI4NzY2MjQ2NTE4Mzc1 ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDMtMTggIFBlbmcgTGl1ICA8cGVuZy5saXU2 QGFwcGxlLmNvbT4KKworICAgICAgICBUaGUgdmFsdWUgb2YgW0FWUGxheWVyVmlld0NvbnRyb2xs ZXIgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2libGVdIGlzIE5PIGluIHRoZSBmaXJzdCBhdHRlbXB0 IHRvIGVudGVyIFBpUAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA0OTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQSBmb2xsb3ctdXAgcGF0Y2ggdG8gZml4IGJ1aWxkIGZhaWx1cmVzLgorCisgICAgICAg ICogd3RmL1BsYXRmb3JtSGF2ZS5oOgorCiAyMDIwLTAzLTE4ICBNeWxlcyBDLiBNYXhmaWVsZCAg PG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjU0Mzg5KTogQ29y ZG92YSB0aHJvd3MgYW4gZXhjZXB0aW9uIGJlY2F1c2UgaXQgZXhwZWN0cyBhIGh5cGhlbiBpbnNp ZGUgbmF2aWdhdG9yLmxvY2FsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGUxZjY3N2M3NjNlNmYzNTg4NzkwN2Q4 MTE1YWFjZWU1ODRkMzgzNzUuLmViZmNhMTU0NjFiYmMzNjkwYjViZWJkMTVjNThkMDViMjJmOTcz YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMC0wMy0xOCAgUGVuZyBMaXUgIDxw ZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIFRoZSB2YWx1ZSBvZiBbQVZQbGF5ZXJWaWV3 Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJsZV0gaXMgTk8gaW4gdGhlIGZpcnN0 IGF0dGVtcHQgdG8gZW50ZXIgUGlQCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDQ5NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBIGZvbGxvdy11cCBwYXRjaCB0byBmaXggYnVpbGQgZmFpbHVyZXMuCisg ICAgICAgIFRoaXMgcGF0Y2ggYWxzbyByZW1vdmVzIGEgbWVhbmluZ2xlc3MgbGluZSBpbiB0aGUg ZGVhbGxvYyBvZiBXZWJBVlBsYXllclZpZXdDb250cm9sbGVyLgorCisgICAgICAgICogcGxhdGZv cm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoLVtXZWJB VlBsYXllclZpZXdDb250cm9sbGVyIGluaXRXaXRoRnVsbHNjcmVlbkludGVyZmFjZTpdKToKKyAg ICAgICAgKC1bV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBkZWFsbG9jXSk6CisgICAgICAgIChW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZG9FbnRlckZ1bGxzY3JlZW4pOgorCiAyMDIw LTAzLTE4ICBFdWdlbmUgQnV0ICA8ZXVnZW5lYnV0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBG aXggUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6Okluc2VydGVkTm9kZXM6OndpbGxSZW1vdmVOb2Rl UHJlc2VydmluZ0NoaWxkcmVuIGNyYXNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBmZGQzYzNjOGUw YWVmODkyYTA0ZTI3NTczY2Q2NjdmZjhmMzA1YTc2Li43NDk4NjRkY2JkMTMyNzQ1YTMwYzE0MjY4 NzExYmVkMGZkYzU0YzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAy MC0wMy0xOCAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIFRoZSB2 YWx1ZSBvZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJs ZV0gaXMgTk8gaW4gdGhlIGZpcnN0IGF0dGVtcHQgdG8gZW50ZXIgUGlQCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ5NzkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBIGZvbGxvdy11cCBwYXRjaCB0byBm aXggYnVpbGQgZmFpbHVyZXMuCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL0FWS2l0U1BJLmg6 CisKIDIwMjAtMDMtMTggIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAg ICBUaGUgdmFsdWUgb2YgW0FWUGxheWVyVmlld0NvbnRyb2xsZXIgaXNQaWN0dXJlSW5QaWN0dXJl UG9zc2libGVdIGlzIE5PIGluIHRoZSBmaXJzdCBhdHRlbXB0IHRvIGVudGVyIFBpUApkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0 Zm9ybUhhdmUuaAppbmRleCBlODQ0YjI2OTc1NjI4ZjM0NGE2ZGE0OTU3NmQxMmJjMWUwZTE3ZWY5 Li4zMGZkOWQ5NjE1NWM5MTY4NmQ1MTBmNTg4YWMwMzVjODk4MDBmZDFjIDEwMDY0NAotLS0gYS9T b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bUhhdmUuaApAQCAtNjE0LDMgKzYxNCw3IEBACiAjaWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNf T1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE2MDApIHx8IChQTEFURk9STShJT1NfRkFN SUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCiAjZGVm aW5lIEhBVkVfU1lTVEVNX0ZFQVRVUkVfRkxBR1MgMQogI2VuZGlmCisKKyNpZiAoUExBVEZPUk0o SU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMzAwMDApCisjZGVm aW5lIEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIgMQorI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIvU291cmNlL1dlYkNv cmUvUEFML3BhbC9zcGkvY29jb2EvQVZLaXRTUEkuaAppbmRleCAyMzQ1ZGZhZjlkMDkzZTFmN2Fm NDA0N2JlMmIzNDRkOTBkNDM0MDIxLi5kN2VhNzdhOWVkNmQ1YjE3YmQzM2QxYzBiZmE5Zjg0MGJi NzEwZTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktp dFNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0FWS2l0U1BJLmgK QEAgLTI3LDcgKzI3LDYgQEAKICNpbXBvcnQgPHd0Zi9Tb2Z0TGlua2luZy5oPgogCiAjaWYgVVNF KEFQUExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQgPEFWS2l0L0FWT2JzZXJ2YXRpb25Db250cm9s bGVyLmg+CiAjaW1wb3J0IDxBVktpdC9BVlBsYXllckNvbnRyb2xsZXIuaD4KICNlbHNlCiAjaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTU1LDYgKzU0LDIwIEBAIHR5cGVkZWYgTlNfRU5VTShO U0ludGVnZXIsIEFWUGxheWVyQ29udHJvbGxlckV4dGVybmFsUGxheWJhY2tUeXBlKSB7CiBAZW5k CiAjZW5kaWYgLy8gVVNFKEFQUExFX0lOVEVSTkFMX1NESykKIAorI2lmIEhBVkUoSEFWRV9BVk9C U0VSVkFUSU9OQ09OVFJPTExFUikKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorI2ltcG9y dCA8QVZLaXQvQVZPYnNlcnZhdGlvbkNvbnRyb2xsZXIuaD4KKyNlbHNlCitAY2xhc3MgQVZLZXlW YWx1ZUNoYW5nZTsKKworQGludGVyZmFjZSBBVk9ic2VydmF0aW9uQ29udHJvbGxlcjxPd25lcj4g OiBOU09iamVjdAorLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoT3duZXI6KE93bmVyKW93bmVyIE5T X0RFU0lHTkFURURfSU5JVElBTElaRVI7CistIChpZClzdGFydE9ic2VydmluZzooaWQpb2JqZWN0 IGtleVBhdGg6KE5TU3RyaW5nICopa2V5UGF0aCBpbmNsdWRlSW5pdGlhbFZhbHVlOihCT09MKXNo b3VsZEluY2x1ZGVJbml0aWFsVmFsdWUgb2JzZXJ2YXRpb25IYW5kbGVyOih2b2lkICheKShPd25l ciBvd25lciwgaWQgb2JzZXJ2ZWQsIEFWS2V5VmFsdWVDaGFuZ2UgKmNoYW5nZSkpb2JzZXJ2YXRp b25IYW5kbGVyOworLSAodm9pZClzdG9wQWxsT2JzZXJ2YXRpb247CitAZW5kCisjZW5kaWYKKyNl bmRpZiAvLyBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKICNpbXBvcnQgPEFWS2l0L0FWS2l0Lmg+CiAjaW1wb3J0IDxRdWFydHpDb3JlL1F1YXJ0ekNv cmUuaD4KQEAgLTEzMCwxNCArMTQzLDYgQEAgTlNfQVNTVU1FX05PTk5VTExfRU5ECiAKIE5TX0FT U1VNRV9OT05OVUxMX0JFR0lOCiAKLUBjbGFzcyBBVktleVZhbHVlQ2hhbmdlOwotCi1AaW50ZXJm YWNlIEFWT2JzZXJ2YXRpb25Db250cm9sbGVyPE93bmVyPiA6IE5TT2JqZWN0Ci0tIChpbnN0YW5j ZXR5cGUpaW5pdFdpdGhPd25lcjooT3duZXIpb3duZXIgTlNfREVTSUdOQVRFRF9JTklUSUFMSVpF UjsKLS0gKGlkKXN0YXJ0T2JzZXJ2aW5nOihpZClvYmplY3Qga2V5UGF0aDooTlNTdHJpbmcgKilr ZXlQYXRoIGluY2x1ZGVJbml0aWFsVmFsdWU6KEJPT0wpc2hvdWxkSW5jbHVkZUluaXRpYWxWYWx1 ZSBvYnNlcnZhdGlvbkhhbmRsZXI6KHZvaWQgKF4pKE93bmVyIG93bmVyLCBpZCBvYnNlcnZlZCwg QVZLZXlWYWx1ZUNoYW5nZSAqY2hhbmdlKSlvYnNlcnZhdGlvbkhhbmRsZXI7Ci0tICh2b2lkKXN0 b3BBbGxPYnNlcnZhdGlvbjsKLUBlbmQKLQogQGludGVyZmFjZSBBVkJhY2tncm91bmRWaWV3IDog VUlWaWV3CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBhdXRvbWF0aWNhbGx5RHJhd3NSb3Vu ZGVkQ29ybmVyczsKIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIEFWQmFja2dyb3VuZFZpZXdN YXRlcmlhbFN0eWxlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggNmQ4MjI0Y2JhZDAz YjEyMzJkOGM1NTkxODNhMmNjZDdkY2RmNThjOS4uZjM4YmVjOTQxYzBiMzJkMWYyM2NlMDUyMjNh MTBjYjhkNzdmNzY0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Zp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAtNTksNyArNTksOSBA QCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKICNpbXBvcnQgPHBhbC9pb3MvVUlLaXRTb2Z0TGlu ay5oPgogCiBTT0ZUTElOS19BVktJVF9GUkFNRVdPUksoKQorI2lmIEhBVkUoSEFWRV9BVk9CU0VS VkFUSU9OQ09OVFJPTExFUikKIFNPRlRfTElOS19DTEFTU19PUFRJT05BTChBVktpdCwgQVZPYnNl cnZhdGlvbkNvbnRyb2xsZXIpCisjZW5kaWYKIFNPRlRfTElOS19DTEFTU19PUFRJT05BTChBVktp dCwgQVZQaWN0dXJlSW5QaWN0dXJlQ29udHJvbGxlcikKIFNPRlRfTElOS19DTEFTU19PUFRJT05B TChBVktpdCwgQVZQbGF5ZXJWaWV3Q29udHJvbGxlcikKIFNPRlRfTElOS19DTEFTU19PUFRJT05B TChBVktpdCwgX19BVlBsYXllckxheWVyVmlldykKQEAgLTU0Niw4ICs1NDgsMTAgQEAgQGltcGxl bWVudGF0aW9uIFdlYkFWUGxheWVyVmlld0NvbnRyb2xsZXIgewogICAgIFZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0ICpfZnVsbHNjcmVlbkludGVyZmFjZTsKICAgICBSZXRhaW5QdHI8VUlW aWV3Q29udHJvbGxlcj4gX3ByZXNlbnRpbmdWaWV3Q29udHJvbGxlcjsKICAgICBSZXRhaW5QdHI8 QVZQbGF5ZXJWaWV3Q29udHJvbGxlcj4gX2F2UGxheWVyVmlld0NvbnRyb2xsZXI7CisjaWYgSEFW RShIQVZFX0FWT0JTRVJWQVRJT05DT05UUk9MTEVSKQogICAgIFJldGFpblB0cjxOU1RpbWVyPiBf c3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXI7CiAgICAgUmV0YWluUHRyPEFWT2JzZXJ2YXRpb25D b250cm9sbGVyPiBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0aW9uQ29udHJvbGxlcjsK KyNlbmRpZgogICAgIGlkPEFWUGxheWVyVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZV9XZWJLaXRPbmx5 PiBfZGVsZWdhdGU7CiB9CiAKQEAgLTU1OSw3ICs1NjMsOSBAQCAtIChpbnN0YW5jZXR5cGUpaW5p dFdpdGhGdWxsc2NyZWVuSW50ZXJmYWNlOihWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdCAq KWludAogICAgIF9mdWxsc2NyZWVuSW50ZXJmYWNlID0gaW50ZXJmYWNlOwogICAgIF9hdlBsYXll clZpZXdDb250cm9sbGVyID0gYWRvcHROUyhbYWxsb2NBVlBsYXllclZpZXdDb250cm9sbGVySW5z dGFuY2UoKSBpbml0V2l0aFBsYXllckxheWVyVmlldzppbnRlcmZhY2UtPnBsYXllckxheWVyVmll dygpXSk7CiAgICAgX2F2UGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkubW9kYWxQcmVzZW50YXRp b25TdHlsZSA9IFVJTW9kYWxQcmVzZW50YXRpb25PdmVyRnVsbFNjcmVlbjsKKyNpZiBIQVZFKEhB VkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCiAgICAgX2F2UGxheWVyVmlld0NvbnRyb2xsZXJP YnNlcnZhdGlvbkNvbnRyb2xsZXIgPSBhZG9wdE5TKFthbGxvY0FWT2JzZXJ2YXRpb25Db250cm9s bGVySW5zdGFuY2UoKSBpbml0V2l0aE93bmVyOl9hdlBsYXllclZpZXdDb250cm9sbGVyLmdldCgp XSk7CisjZW5kaWYKICNpZiBQTEFURk9STShXQVRDSE9TKQogICAgIF9hdlBsYXllclZpZXdDb250 cm9sbGVyLmdldCgpLmRlbGVnYXRlID0gc2VsZjsKICNlbmRpZgpAQCAtNTY3LDYgKzU3Myw3IEBA IC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZ1bGxzY3JlZW5JbnRlcmZhY2U6KFZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0ICopaW50CiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKKyNpZiBIQVZF KEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCiAtICh2b2lkKWRlYWxsb2MKIHsKICAgICBb X3N0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVyIGludmFsaWRhdGVdOwpAQCAtNTc0LDkgKzU4MSw5 IEBAIC0gKHZvaWQpZGVhbGxvYwogICAgIFtfYXZQbGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0 aW9uQ29udHJvbGxlciBzdG9wQWxsT2JzZXJ2YXRpb25dOwogICAgIF9hdlBsYXllclZpZXdDb250 cm9sbGVyT2JzZXJ2YXRpb25Db250cm9sbGVyID0gbmlsOwogCi0gICAgX2Z1bGxzY3JlZW5JbnRl cmZhY2UgPSBudWxscHRyOwogICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KKyNlbmRpZgogCiAtIChC T09MKXBsYXllclZpZXdDb250cm9sbGVyU2hvdWxkSGFuZGxlRG9uZUJ1dHRvblRhcDooQVZQbGF5 ZXJWaWV3Q29udHJvbGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyCiB7CkBAIC02MzIsNiArNjM5 LDcgQEAgLSAodm9pZClleGl0RnVsbFNjcmVlbkFuaW1hdGVkOihCT09MKWFuaW1hdGVkIGNvbXBs ZXRpb25IYW5kbGVyOih2b2lkICheKShCT09MIHMKICNkZWZpbmUgTVlfTk9fUkVUVVJOCiAjZW5k aWYKIAorI2lmIEhBVkUoSEFWRV9BVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKIHN0YXRpYyBjb25z dCBOU1RpbWVJbnRlcnZhbCBzdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lSW50ZXJ2YWwgPSAwLjU7 CiAKIC0gKHZvaWQpdHJ5VG9TdGFydFBpY3R1cmVJblBpY3R1cmUgTVlfTk9fUkVUVVJOCkBAIC02 NTUsNiArNjYzLDcgQEAgLSAodm9pZCl0cnlUb1N0YXJ0UGljdHVyZUluUGljdHVyZSBNWV9OT19S RVRVUk4KICAgICAgICAgfQogICAgIH1dOwogfQorI2VuZGlmCiAKIC0gKHZvaWQpc3RhcnRQaWN0 dXJlSW5QaWN0dXJlIE1ZX05PX1JFVFVSTgogewpAQCAtMTM4MCw3ICsxMzg5LDExIEBAIHZvaWQg VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRvRW50ZXJGdWxsc2NyZWVuKCkKICAgICAg ICAgaWYgKFttX3BsYXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxl XSkKICAgICAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0UGljdHVyZUluUGlj dHVyZV07CiAgICAgICAgIGVsc2UKKyNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xM RVIpCiAgICAgICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB0cnlUb1N0YXJ0UGljdHVy ZUluUGljdHVyZV07CisjZWxzZQorICAgICAgICAgICAgZmFpbGVkVG9TdGFydFBpY3R1cmVJblBp Y3R1cmUoKTsKKyNlbmRpZgogCiAgICAgICAgIHJldHVybjsKICAgICB9Cg== 393928 2020-03-18 18:08:47 -0700 2020-03-18 22:23:20 -0700 patch to fix build failures bug-204979-20200318180847.patch text/plain 8376 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDVjYmQzNjA5MTZjOTE1ODdjYmE3MjNl ZDhiMGZjZWEzZTAxMTI3ODUuLmIwNjljYTdhYTZjYTI4OGVlMjBiMzZkZDI4NzY2MjQ2NTE4Mzc1 ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDMtMTggIFBlbmcgTGl1ICA8cGVuZy5saXU2 QGFwcGxlLmNvbT4KKworICAgICAgICBUaGUgdmFsdWUgb2YgW0FWUGxheWVyVmlld0NvbnRyb2xs ZXIgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2libGVdIGlzIE5PIGluIHRoZSBmaXJzdCBhdHRlbXB0 IHRvIGVudGVyIFBpUAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA0OTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQSBmb2xsb3ctdXAgcGF0Y2ggdG8gZml4IGJ1aWxkIGZhaWx1cmVzLgorCisgICAgICAg ICogd3RmL1BsYXRmb3JtSGF2ZS5oOgorCiAyMDIwLTAzLTE4ICBNeWxlcyBDLiBNYXhmaWVsZCAg PG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjU0Mzg5KTogQ29y ZG92YSB0aHJvd3MgYW4gZXhjZXB0aW9uIGJlY2F1c2UgaXQgZXhwZWN0cyBhIGh5cGhlbiBpbnNp ZGUgbmF2aWdhdG9yLmxvY2FsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGUxZjY3N2M3NjNlNmYzNTg4NzkwN2Q4 MTE1YWFjZWU1ODRkMzgzNzUuLmViZmNhMTU0NjFiYmMzNjkwYjViZWJkMTVjNThkMDViMjJmOTcz YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMC0wMy0xOCAgUGVuZyBMaXUgIDxw ZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIFRoZSB2YWx1ZSBvZiBbQVZQbGF5ZXJWaWV3 Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJsZV0gaXMgTk8gaW4gdGhlIGZpcnN0 IGF0dGVtcHQgdG8gZW50ZXIgUGlQCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDQ5NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBIGZvbGxvdy11cCBwYXRjaCB0byBmaXggYnVpbGQgZmFpbHVyZXMuCisg ICAgICAgIFRoaXMgcGF0Y2ggYWxzbyByZW1vdmVzIGEgbWVhbmluZ2xlc3MgbGluZSBpbiB0aGUg ZGVhbGxvYyBvZiBXZWJBVlBsYXllclZpZXdDb250cm9sbGVyLgorCisgICAgICAgICogcGxhdGZv cm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoLVtXZWJB VlBsYXllclZpZXdDb250cm9sbGVyIGluaXRXaXRoRnVsbHNjcmVlbkludGVyZmFjZTpdKToKKyAg ICAgICAgKC1bV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBkZWFsbG9jXSk6CisgICAgICAgIChW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZG9FbnRlckZ1bGxzY3JlZW4pOgorCiAyMDIw LTAzLTE4ICBFdWdlbmUgQnV0ICA8ZXVnZW5lYnV0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBG aXggUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6Okluc2VydGVkTm9kZXM6OndpbGxSZW1vdmVOb2Rl UHJlc2VydmluZ0NoaWxkcmVuIGNyYXNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBmZGQzYzNjOGUw YWVmODkyYTA0ZTI3NTczY2Q2NjdmZjhmMzA1YTc2Li43NDk4NjRkY2JkMTMyNzQ1YTMwYzE0MjY4 NzExYmVkMGZkYzU0YzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAy MC0wMy0xOCAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIFRoZSB2 YWx1ZSBvZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1cmVJblBpY3R1cmVQb3NzaWJs ZV0gaXMgTk8gaW4gdGhlIGZpcnN0IGF0dGVtcHQgdG8gZW50ZXIgUGlQCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ5NzkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBIGZvbGxvdy11cCBwYXRjaCB0byBm aXggYnVpbGQgZmFpbHVyZXMuCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL0FWS2l0U1BJLmg6 CisKIDIwMjAtMDMtMTggIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAg ICBUaGUgdmFsdWUgb2YgW0FWUGxheWVyVmlld0NvbnRyb2xsZXIgaXNQaWN0dXJlSW5QaWN0dXJl UG9zc2libGVdIGlzIE5PIGluIHRoZSBmaXJzdCBhdHRlbXB0IHRvIGVudGVyIFBpUApkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0 Zm9ybUhhdmUuaAppbmRleCBlODQ0YjI2OTc1NjI4ZjM0NGE2ZGE0OTU3NmQxMmJjMWUwZTE3ZWY5 Li4zMGZkOWQ5NjE1NWM5MTY4NmQ1MTBmNTg4YWMwMzVjODk4MDBmZDFjIDEwMDY0NAotLS0gYS9T b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bUhhdmUuaApAQCAtNjE0LDMgKzYxNCw3IEBACiAjaWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNf T1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE2MDApIHx8IChQTEFURk9STShJT1NfRkFN SUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCiAjZGVm aW5lIEhBVkVfU1lTVEVNX0ZFQVRVUkVfRkxBR1MgMQogI2VuZGlmCisKKyNpZiAoUExBVEZPUk0o SU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMzAwMDApCisjZGVm aW5lIEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIgMQorI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIvU291cmNlL1dlYkNv cmUvUEFML3BhbC9zcGkvY29jb2EvQVZLaXRTUEkuaAppbmRleCAyMzQ1ZGZhZjlkMDkzZTFmN2Fm NDA0N2JlMmIzNDRkOTBkNDM0MDIxLi5lNzZiMTAzNzgwZGM5MzIzMTBhODZiMjc1MTMyMWJmMzU2 OTllMzczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9BVktp dFNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0FWS2l0U1BJLmgK QEAgLTI3LDcgKzI3LDYgQEAKICNpbXBvcnQgPHd0Zi9Tb2Z0TGlua2luZy5oPgogCiAjaWYgVVNF KEFQUExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQgPEFWS2l0L0FWT2JzZXJ2YXRpb25Db250cm9s bGVyLmg+CiAjaW1wb3J0IDxBVktpdC9BVlBsYXllckNvbnRyb2xsZXIuaD4KICNlbHNlCiAjaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTU1LDYgKzU0LDIwIEBAIHR5cGVkZWYgTlNfRU5VTShO U0ludGVnZXIsIEFWUGxheWVyQ29udHJvbGxlckV4dGVybmFsUGxheWJhY2tUeXBlKSB7CiBAZW5k CiAjZW5kaWYgLy8gVVNFKEFQUExFX0lOVEVSTkFMX1NESykKIAorI2lmIEhBVkUoSEFWRV9BVk9C U0VSVkFUSU9OQ09OVFJPTExFUikKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorI2ltcG9y dCA8QVZLaXQvQVZPYnNlcnZhdGlvbkNvbnRyb2xsZXIuaD4KKyNlbHNlCitAY2xhc3MgQVZLZXlW YWx1ZUNoYW5nZTsKKworQGludGVyZmFjZSBBVk9ic2VydmF0aW9uQ29udHJvbGxlcjxPd25lcj4g OiBOU09iamVjdAorLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoT3duZXI6KE93bmVyKW93bmVyIE5T X0RFU0lHTkFURURfSU5JVElBTElaRVI7CistIChpZClzdGFydE9ic2VydmluZzooaWQpb2JqZWN0 IGtleVBhdGg6KE5TU3RyaW5nICopa2V5UGF0aCBpbmNsdWRlSW5pdGlhbFZhbHVlOihCT09MKXNo b3VsZEluY2x1ZGVJbml0aWFsVmFsdWUgb2JzZXJ2YXRpb25IYW5kbGVyOih2b2lkICheKShPd25l ciBvd25lciwgaWQgb2JzZXJ2ZWQsIEFWS2V5VmFsdWVDaGFuZ2UgKmNoYW5nZSkpb2JzZXJ2YXRp b25IYW5kbGVyOworLSAodm9pZClzdG9wQWxsT2JzZXJ2YXRpb247CitAZW5kCisjZW5kaWYKKyNl bmRpZiAvLyBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCisKICNpZiBQTEFURk9S TShJT1NfRkFNSUxZKQogI2ltcG9ydCA8QVZLaXQvQVZLaXQuaD4KICNpbXBvcnQgPFF1YXJ0ekNv cmUvUXVhcnR6Q29yZS5oPgpAQCAtMTMwLDE0ICsxNDMsNiBAQCBOU19BU1NVTUVfTk9OTlVMTF9F TkQKIAogTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KIAotQGNsYXNzIEFWS2V5VmFsdWVDaGFuZ2U7 Ci0KLUBpbnRlcmZhY2UgQVZPYnNlcnZhdGlvbkNvbnRyb2xsZXI8T3duZXI+IDogTlNPYmplY3QK LS0gKGluc3RhbmNldHlwZSlpbml0V2l0aE93bmVyOihPd25lcilvd25lciBOU19ERVNJR05BVEVE X0lOSVRJQUxJWkVSOwotLSAoaWQpc3RhcnRPYnNlcnZpbmc6KGlkKW9iamVjdCBrZXlQYXRoOihO U1N0cmluZyAqKWtleVBhdGggaW5jbHVkZUluaXRpYWxWYWx1ZTooQk9PTClzaG91bGRJbmNsdWRl SW5pdGlhbFZhbHVlIG9ic2VydmF0aW9uSGFuZGxlcjoodm9pZCAoXikoT3duZXIgb3duZXIsIGlk IG9ic2VydmVkLCBBVktleVZhbHVlQ2hhbmdlICpjaGFuZ2UpKW9ic2VydmF0aW9uSGFuZGxlcjsK LS0gKHZvaWQpc3RvcEFsbE9ic2VydmF0aW9uOwotQGVuZAotCiBAaW50ZXJmYWNlIEFWQmFja2dy b3VuZFZpZXcgOiBVSVZpZXcKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGF1dG9tYXRpY2Fs bHlEcmF3c1JvdW5kZWRDb3JuZXJzOwogdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgQVZCYWNr Z3JvdW5kVmlld01hdGVyaWFsU3R5bGUpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQppbmRleCA2 ZDgyMjRjYmFkMDNiMTIzMmQ4YzU1OTE4M2EyY2NkN2RjZGY1OGM5Li5mMzhiZWM5NDFjMGIzMmQx ZjIzY2UwNTIyM2ExMGNiOGQ3N2Y3NjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC01 OSw3ICs1OSw5IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogI2ltcG9ydCA8cGFsL2lvcy9V SUtpdFNvZnRMaW5rLmg+CiAKIFNPRlRMSU5LX0FWS0lUX0ZSQU1FV09SSygpCisjaWYgSEFWRShI QVZFX0FWT0JTRVJWQVRJT05DT05UUk9MTEVSKQogU09GVF9MSU5LX0NMQVNTX09QVElPTkFMKEFW S2l0LCBBVk9ic2VydmF0aW9uQ29udHJvbGxlcikKKyNlbmRpZgogU09GVF9MSU5LX0NMQVNTX09Q VElPTkFMKEFWS2l0LCBBVlBpY3R1cmVJblBpY3R1cmVDb250cm9sbGVyKQogU09GVF9MSU5LX0NM QVNTX09QVElPTkFMKEFWS2l0LCBBVlBsYXllclZpZXdDb250cm9sbGVyKQogU09GVF9MSU5LX0NM QVNTX09QVElPTkFMKEFWS2l0LCBfX0FWUGxheWVyTGF5ZXJWaWV3KQpAQCAtNTQ2LDggKzU0OCwx MCBAQCBAaW1wbGVtZW50YXRpb24gV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlciB7CiAgICAgVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQgKl9mdWxsc2NyZWVuSW50ZXJmYWNlOwogICAgIFJl dGFpblB0cjxVSVZpZXdDb250cm9sbGVyPiBfcHJlc2VudGluZ1ZpZXdDb250cm9sbGVyOwogICAg IFJldGFpblB0cjxBVlBsYXllclZpZXdDb250cm9sbGVyPiBfYXZQbGF5ZXJWaWV3Q29udHJvbGxl cjsKKyNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCiAgICAgUmV0YWluUHRy PE5TVGltZXI+IF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lcjsKICAgICBSZXRhaW5QdHI8QVZP YnNlcnZhdGlvbkNvbnRyb2xsZXI+IF9hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25D b250cm9sbGVyOworI2VuZGlmCiAgICAgaWQ8QVZQbGF5ZXJWaWV3Q29udHJvbGxlckRlbGVnYXRl X1dlYktpdE9ubHk+IF9kZWxlZ2F0ZTsKIH0KIApAQCAtNTU5LDcgKzU2Myw5IEBAIC0gKGluc3Rh bmNldHlwZSlpbml0V2l0aEZ1bGxzY3JlZW5JbnRlcmZhY2U6KFZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0ICopaW50CiAgICAgX2Z1bGxzY3JlZW5JbnRlcmZhY2UgPSBpbnRlcmZhY2U7CiAg ICAgX2F2UGxheWVyVmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFthbGxvY0FWUGxheWVyVmlld0Nv bnRyb2xsZXJJbnN0YW5jZSgpIGluaXRXaXRoUGxheWVyTGF5ZXJWaWV3OmludGVyZmFjZS0+cGxh eWVyTGF5ZXJWaWV3KCldKTsKICAgICBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKS5tb2Rh bFByZXNlbnRhdGlvblN0eWxlID0gVUlNb2RhbFByZXNlbnRhdGlvbk92ZXJGdWxsU2NyZWVuOwor I2lmIEhBVkUoSEFWRV9BVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKICAgICBfYXZQbGF5ZXJWaWV3 Q29udHJvbGxlck9ic2VydmF0aW9uQ29udHJvbGxlciA9IGFkb3B0TlMoW2FsbG9jQVZPYnNlcnZh dGlvbkNvbnRyb2xsZXJJbnN0YW5jZSgpIGluaXRXaXRoT3duZXI6X2F2UGxheWVyVmlld0NvbnRy b2xsZXIuZ2V0KCldKTsKKyNlbmRpZgogI2lmIFBMQVRGT1JNKFdBVENIT1MpCiAgICAgX2F2UGxh eWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkuZGVsZWdhdGUgPSBzZWxmOwogI2VuZGlmCkBAIC01Njcs NiArNTczLDcgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRnVsbHNjcmVlbkludGVyZmFjZToo VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQgKilpbnQKICAgICByZXR1cm4gc2VsZjsKIH0K IAorI2lmIEhBVkUoSEFWRV9BVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKIC0gKHZvaWQpZGVhbGxv YwogewogICAgIFtfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXIgaW52YWxpZGF0ZV07CkBAIC01 NzQsOSArNTgxLDkgQEAgLSAodm9pZClkZWFsbG9jCiAgICAgW19hdlBsYXllclZpZXdDb250cm9s bGVyT2JzZXJ2YXRpb25Db250cm9sbGVyIHN0b3BBbGxPYnNlcnZhdGlvbl07CiAgICAgX2F2UGxh eWVyVmlld0NvbnRyb2xsZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXIgPSBuaWw7CiAKLSAgICBfZnVs bHNjcmVlbkludGVyZmFjZSA9IG51bGxwdHI7CiAgICAgW3N1cGVyIGRlYWxsb2NdOwogfQorI2Vu ZGlmCiAKIC0gKEJPT0wpcGxheWVyVmlld0NvbnRyb2xsZXJTaG91bGRIYW5kbGVEb25lQnV0dG9u VGFwOihBVlBsYXllclZpZXdDb250cm9sbGVyICopcGxheWVyVmlld0NvbnRyb2xsZXIKIHsKQEAg LTYzMiw2ICs2MzksNyBAQCAtICh2b2lkKWV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6KEJPT0wpYW5p bWF0ZWQgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKEJPT0wgcwogI2RlZmluZSBNWV9OT19S RVRVUk4KICNlbmRpZgogCisjaWYgSEFWRShIQVZFX0FWT0JTRVJWQVRJT05DT05UUk9MTEVSKQog c3RhdGljIGNvbnN0IE5TVGltZUludGVydmFsIHN0YXJ0UGljdHVyZUluUGljdHVyZVRpbWVJbnRl cnZhbCA9IDAuNTsKIAogLSAodm9pZCl0cnlUb1N0YXJ0UGljdHVyZUluUGljdHVyZSBNWV9OT19S RVRVUk4KQEAgLTY1NSw2ICs2NjMsNyBAQCAtICh2b2lkKXRyeVRvU3RhcnRQaWN0dXJlSW5QaWN0 dXJlIE1ZX05PX1JFVFVSTgogICAgICAgICB9CiAgICAgfV07CiB9CisjZW5kaWYKIAogLSAodm9p ZClzdGFydFBpY3R1cmVJblBpY3R1cmUgTVlfTk9fUkVUVVJOCiB7CkBAIC0xMzgwLDcgKzEzODks MTEgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZG9FbnRlckZ1bGxzY3Jl ZW4oKQogICAgICAgICBpZiAoW21fcGxheWVyVmlld0NvbnRyb2xsZXIgaXNQaWN0dXJlSW5QaWN0 dXJlUG9zc2libGVdKQogICAgICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc3RhcnRQ aWN0dXJlSW5QaWN0dXJlXTsKICAgICAgICAgZWxzZQorI2lmIEhBVkUoSEFWRV9BVk9CU0VSVkFU SU9OQ09OVFJPTExFUikKICAgICAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHRyeVRv U3RhcnRQaWN0dXJlSW5QaWN0dXJlXTsKKyNlbHNlCisgICAgICAgICAgICBmYWlsZWRUb1N0YXJ0 UGljdHVyZUluUGljdHVyZSgpOworI2VuZGlmCiAKICAgICAgICAgcmV0dXJuOwogICAgIH0K 395529 2020-04-05 14:47:24 -0700 2020-04-05 15:00:24 -0700 A follow-up patch to fix mistakes on #if HAVE(HAVE_AVOBSERVATIONCONTROLLER) bug-204979-20200405144723.patch text/plain 5405 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWViNTIwNzZjYzgzZWE4 ZDg4YmFmMjE0NDJlMDM4NTg2Mjc5MjkyNy4uMTQ5MDFjNWQzMTdlZjJiZDg2Y2U1YWVlZDg4ZTQy M2M2YjNhYzYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTA1ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBs YXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0 aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlIHNob3VsZCB1c2UgIiNpZiBIQVZFKEFWT0JTRVJWQVRJ T05DT05UUk9MTEVSKSIgaW5zdGVhZCBvZgorICAgICAgICAiI2lmIEhBVkUoSEFWRV9BVk9CU0VS VkFUSU9OQ09OVFJPTExFUikiLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoLVtXZWJBVlBsYXllclZpZXdDb250cm9s bGVyIGluaXRXaXRoRnVsbHNjcmVlbkludGVyZmFjZTpdKToKKyAgICAgICAgKFZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Ojpkb0VudGVyRnVsbHNjcmVlbik6CisKIDIwMjAtMDQtMDQgIERv dWcgS2VsbHkgIDxkb3Vna0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkaXRpb25hbCBzYW5pdHkg Y2hlY2tzIGluIGNvbXBhcmVBbmltYXRpb25zQnlDb21wb3NpdGVPcmRlcigpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5n ZUxvZwppbmRleCA1OGUyNDMzMWRlNTg5MDcwYjg4YzM2NTViNDU5MmEwZTgxMWVhYWE0Li5lODhk NGFjOWM3ODY1YTNmY2E4NzdjNDE1NWI0OWY2M2NmZGUxNDM1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9QQUwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNSBAQAorMjAyMC0wNC0wNSAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUu Y29tPgorCisgICAgICAgIFRoZSB2YWx1ZSBvZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1Bp Y3R1cmVJblBpY3R1cmVQb3NzaWJsZV0gaXMgTk8gaW4gdGhlIGZpcnN0IGF0dGVtcHQgdG8gZW50 ZXIgUGlQCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDQ5NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZSBzaG91bGQgdXNlICIjaWYgSEFWRShBVk9CU0VSVkFUSU9OQ09OVFJPTExFUikiIGluc3RlYWQg b2YKKyAgICAgICAgIiNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpIi4KKwor ICAgICAgICAqIHBhbC9zcGkvY29jb2EvQVZLaXRTUEkuaDoKKwogMjAyMC0wNC0wMyAgRGF2aWQg S2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtYY29kZV0gUmVwbGFjZSBB U0FOX09USEVSX0NGTEFHUyBhbmQgQVNBTl9PVEhFUl9DUExVU1BMVVNGTEFHUyB3aXRoICQoaW5o ZXJpdGVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQVZL aXRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0FWS2l0U1BJLmgKaW5k ZXggZTc2YjEwMzc4MGRjOTMyMzEwYTg2YjI3NTEzMjFiZjM1Njk5ZTM3My4uNmY1MTk0MWU3YzQ4 Y2I0MWVjYzdjYzZlZGJkNDBlMzA4YWQ4ZmYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv UEFML3BhbC9zcGkvY29jb2EvQVZLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L3NwaS9jb2NvYS9BVktpdFNQSS5oCkBAIC01NCw3ICs1NCw3IEBAIHR5cGVkZWYgTlNfRU5VTShO U0ludGVnZXIsIEFWUGxheWVyQ29udHJvbGxlckV4dGVybmFsUGxheWJhY2tUeXBlKSB7CiBAZW5k CiAjZW5kaWYgLy8gVVNFKEFQUExFX0lOVEVSTkFMX1NESykKIAotI2lmIEhBVkUoSEFWRV9BVk9C U0VSVkFUSU9OQ09OVFJPTExFUikKKyNpZiBIQVZFKEFWT0JTRVJWQVRJT05DT05UUk9MTEVSKQog I2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW1wb3J0IDxBVktpdC9BVk9ic2VydmF0aW9u Q29udHJvbGxlci5oPgogI2Vsc2UKQEAgLTY2LDcgKzY2LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5T SW50ZWdlciwgQVZQbGF5ZXJDb250cm9sbGVyRXh0ZXJuYWxQbGF5YmFja1R5cGUpIHsKIC0gKHZv aWQpc3RvcEFsbE9ic2VydmF0aW9uOwogQGVuZAogI2VuZGlmCi0jZW5kaWYgLy8gSEFWRShIQVZF X0FWT0JTRVJWQVRJT05DT05UUk9MTEVSKQorI2VuZGlmIC8vIEhBVkUoQVZPQlNFUlZBVElPTkNP TlRST0xMRVIpCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogI2ltcG9ydCA8QVZLaXQvQVZL aXQuaD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQppbmRleCA1YTY5M2I3ZThjMTNkNmU3N2FkNWFl ZWQyMTZkZmE5YmZlNWFlMjRiLi42YzM4MGU4ZDhhN2E2NjI1OWRkMTEzMGJhNmI0Yzk4MTM4MjNl MDUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Zp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC01OSw3ICs1OSw3IEBAIHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOwogI2ltcG9ydCA8cGFsL2lvcy9VSUtpdFNvZnRMaW5rLmg+CiAKIFNP RlRMSU5LX0FWS0lUX0ZSQU1FV09SSygpCi0jaWYgSEFWRShIQVZFX0FWT0JTRVJWQVRJT05DT05U Uk9MTEVSKQorI2lmIEhBVkUoQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCiBTT0ZUX0xJTktfQ0xB U1NfT1BUSU9OQUwoQVZLaXQsIEFWT2JzZXJ2YXRpb25Db250cm9sbGVyKQogI2VuZGlmCiBTT0ZU X0xJTktfQ0xBU1NfT1BUSU9OQUwoQVZLaXQsIEFWUGljdHVyZUluUGljdHVyZUNvbnRyb2xsZXIp CkBAIC01NDUsNyArNTQ1LDcgQEAgQGltcGxlbWVudGF0aW9uIFdlYkFWUGxheWVyVmlld0NvbnRy b2xsZXIgewogICAgIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0ICpfZnVsbHNjcmVlbklu dGVyZmFjZTsKICAgICBSZXRhaW5QdHI8VUlWaWV3Q29udHJvbGxlcj4gX3ByZXNlbnRpbmdWaWV3 Q29udHJvbGxlcjsKICAgICBSZXRhaW5QdHI8QVZQbGF5ZXJWaWV3Q29udHJvbGxlcj4gX2F2UGxh eWVyVmlld0NvbnRyb2xsZXI7Ci0jaWYgSEFWRShIQVZFX0FWT0JTRVJWQVRJT05DT05UUk9MTEVS KQorI2lmIEhBVkUoQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCiAgICAgUmV0YWluUHRyPE5TVGlt ZXI+IF9zdGFydFBpY3R1cmVJblBpY3R1cmVUaW1lcjsKICAgICBSZXRhaW5QdHI8QVZPYnNlcnZh dGlvbkNvbnRyb2xsZXI+IF9hdlBsYXllclZpZXdDb250cm9sbGVyT2JzZXJ2YXRpb25Db250cm9s bGVyOwogI2VuZGlmCkBAIC01NjAsNyArNTYwLDcgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRo RnVsbHNjcmVlbkludGVyZmFjZTooVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQgKilpbnQK ICAgICBfZnVsbHNjcmVlbkludGVyZmFjZSA9IGludGVyZmFjZTsKICAgICBfYXZQbGF5ZXJWaWV3 Q29udHJvbGxlciA9IGFkb3B0TlMoW2FsbG9jQVZQbGF5ZXJWaWV3Q29udHJvbGxlckluc3RhbmNl KCkgaW5pdFdpdGhQbGF5ZXJMYXllclZpZXc6aW50ZXJmYWNlLT5wbGF5ZXJMYXllclZpZXcoKV0p OwogICAgIF9hdlBsYXllclZpZXdDb250cm9sbGVyLmdldCgpLm1vZGFsUHJlc2VudGF0aW9uU3R5 bGUgPSBVSU1vZGFsUHJlc2VudGF0aW9uT3ZlckZ1bGxTY3JlZW47Ci0jaWYgSEFWRShIQVZFX0FW T0JTRVJWQVRJT05DT05UUk9MTEVSKQorI2lmIEhBVkUoQVZPQlNFUlZBVElPTkNPTlRST0xMRVIp CiAgICAgX2F2UGxheWVyVmlld0NvbnRyb2xsZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXIgPSBhZG9w dE5TKFthbGxvY0FWT2JzZXJ2YXRpb25Db250cm9sbGVySW5zdGFuY2UoKSBpbml0V2l0aE93bmVy Ol9hdlBsYXllclZpZXdDb250cm9sbGVyLmdldCgpXSk7CiAjZW5kaWYKICNpZiBQTEFURk9STShX QVRDSE9TKQpAQCAtNTcwLDcgKzU3MCw3IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZ1bGxz Y3JlZW5JbnRlcmZhY2U6KFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0ICopaW50CiAgICAg cmV0dXJuIHNlbGY7CiB9CiAKLSNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIp CisjaWYgSEFWRShBVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKIC0gKHZvaWQpZGVhbGxvYwogewog ICAgIFtfc3RhcnRQaWN0dXJlSW5QaWN0dXJlVGltZXIgaW52YWxpZGF0ZV07CkBAIC02MzYsNyAr NjM2LDcgQEAgLSAodm9pZClleGl0RnVsbFNjcmVlbkFuaW1hdGVkOihCT09MKWFuaW1hdGVkIGNv bXBsZXRpb25IYW5kbGVyOih2b2lkICheKShCT09MIHMKICNkZWZpbmUgTVlfTk9fUkVUVVJOCiAj ZW5kaWYKIAotI2lmIEhBVkUoSEFWRV9BVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKKyNpZiBIQVZF KEFWT0JTRVJWQVRJT05DT05UUk9MTEVSKQogc3RhdGljIGNvbnN0IE5TVGltZUludGVydmFsIHN0 YXJ0UGljdHVyZUluUGljdHVyZVRpbWVJbnRlcnZhbCA9IDAuNTsKIAogLSAodm9pZCl0cnlUb1N0 YXJ0UGljdHVyZUluUGljdHVyZSBNWV9OT19SRVRVUk4KQEAgLTEzODYsNyArMTM4Niw3IEBAIHZv aWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRvRW50ZXJGdWxsc2NyZWVuKCkKICAg ICAgICAgaWYgKFttX3BsYXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3Np YmxlXSkKICAgICAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0UGljdHVyZUlu UGljdHVyZV07CiAgICAgICAgIGVsc2UKLSNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRS T0xMRVIpCisjaWYgSEFWRShBVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKICAgICAgICAgICAgIFtt X3BsYXllclZpZXdDb250cm9sbGVyIHRyeVRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlXTsKICNlbHNl CiAgICAgICAgICAgICBmYWlsZWRUb1N0YXJ0UGljdHVyZUluUGljdHVyZSgpOwo= 395539 2020-04-05 17:53:01 -0700 2020-04-05 21:02:49 -0700 Fix iOS build failures by adding NS_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_END bug-204979-20200405175300.patch text/plain 5737 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWViNTIwNzZjYzgzZWE4 ZDg4YmFmMjE0NDJlMDM4NTg2Mjc5MjkyNy4uNGJjN2FmYjUwYTBlNGQ0NDc4ZDM5MmYyYTUwOTFm NWQ5OWI4MzZiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTA1ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHZhbHVlIG9mIFtBVlBs YXllclZpZXdDb250cm9sbGVyIGlzUGljdHVyZUluUGljdHVyZVBvc3NpYmxlXSBpcyBOTyBpbiB0 aGUgZmlyc3QgYXR0ZW1wdCB0byBlbnRlciBQaVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgorCisgICAgICAgIFdlIHNob3VsZCB1c2UgIiNpZiBIQVZFKEFWT0JTRVJWQVRJT05D T05UUk9MTEVSKSIgaW5zdGVhZCBvZgorICAgICAgICAiI2lmIEhBVkUoSEFWRV9BVk9CU0VSVkFU SU9OQ09OVFJPTExFUikiLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoLVtXZWJBVlBsYXllclZpZXdDb250cm9sbGVy IGluaXRXaXRoRnVsbHNjcmVlbkludGVyZmFjZTpdKToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Ojpkb0VudGVyRnVsbHNjcmVlbik6CisKIDIwMjAtMDQtMDQgIERvdWcg S2VsbHkgIDxkb3Vna0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkaXRpb25hbCBzYW5pdHkgY2hl Y2tzIGluIGNvbXBhcmVBbmltYXRpb25zQnlDb21wb3NpdGVPcmRlcigpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxv ZwppbmRleCA1OGUyNDMzMWRlNTg5MDcwYjg4YzM2NTViNDU5MmEwZTgxMWVhYWE0Li5mYTU0MzNj MmVjY2YwMzE5Mjc4NGRiOTcwOTlkZTFkNTc1OWFiOWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAyMC0wNC0wNSAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29t PgorCisgICAgICAgIFRoZSB2YWx1ZSBvZiBbQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBpc1BpY3R1 cmVJblBpY3R1cmVQb3NzaWJsZV0gaXMgTk8gaW4gdGhlIGZpcnN0IGF0dGVtcHQgdG8gZW50ZXIg UGlQCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ5 NzkKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBXZSBzaG91 bGQgdXNlICIjaWYgSEFWRShBVk9CU0VSVkFUSU9OQ09OVFJPTExFUikiIGluc3RlYWQgb2YKKyAg ICAgICAgIiNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpIi4KKworICAgICAg ICAqIHBhbC9zcGkvY29jb2EvQVZLaXRTUEkuaDoKKwogMjAyMC0wNC0wMyAgRGF2aWQgS2lsemVy ICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtYY29kZV0gUmVwbGFjZSBBU0FOX09U SEVSX0NGTEFHUyBhbmQgQVNBTl9PVEhFUl9DUExVU1BMVVNGTEFHUyB3aXRoICQoaW5oZXJpdGVk KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQVZLaXRTUEku aCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0FWS2l0U1BJLmgKaW5kZXggZTc2 YjEwMzc4MGRjOTMyMzEwYTg2YjI3NTEzMjFiZjM1Njk5ZTM3My4uZjc3ZjYwMjU0YTE1MjgzNWE1 MDk1Y2M2NDdmOTNiNmIwYjRmMDYzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3Bh bC9zcGkvY29jb2EvQVZLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9j b2NvYS9BVktpdFNQSS5oCkBAIC01NCwxOSArNTQsMjUgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50 ZWdlciwgQVZQbGF5ZXJDb250cm9sbGVyRXh0ZXJuYWxQbGF5YmFja1R5cGUpIHsKIEBlbmQKICNl bmRpZiAvLyBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogCi0jaWYgSEFWRShIQVZFX0FWT0JTRVJW QVRJT05DT05UUk9MTEVSKQorI2lmIEhBVkUoQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCiAjaWYg VVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBvcnQgPEFWS2l0L0FWT2JzZXJ2YXRpb25Db250 cm9sbGVyLmg+CiAjZWxzZQorCiBAY2xhc3MgQVZLZXlWYWx1ZUNoYW5nZTsKIAorTlNfQVNTVU1F X05PTk5VTExfQkVHSU4KKwogQGludGVyZmFjZSBBVk9ic2VydmF0aW9uQ29udHJvbGxlcjxPd25l cj4gOiBOU09iamVjdAogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoT3duZXI6KE93bmVyKW93bmVy IE5TX0RFU0lHTkFURURfSU5JVElBTElaRVI7CiAtIChpZClzdGFydE9ic2VydmluZzooaWQpb2Jq ZWN0IGtleVBhdGg6KE5TU3RyaW5nICopa2V5UGF0aCBpbmNsdWRlSW5pdGlhbFZhbHVlOihCT09M KXNob3VsZEluY2x1ZGVJbml0aWFsVmFsdWUgb2JzZXJ2YXRpb25IYW5kbGVyOih2b2lkICheKShP d25lciBvd25lciwgaWQgb2JzZXJ2ZWQsIEFWS2V5VmFsdWVDaGFuZ2UgKmNoYW5nZSkpb2JzZXJ2 YXRpb25IYW5kbGVyOwogLSAodm9pZClzdG9wQWxsT2JzZXJ2YXRpb247CiBAZW5kCisKK05TX0FT U1VNRV9OT05OVUxMX0VORAorCiAjZW5kaWYKLSNlbmRpZiAvLyBIQVZFKEhBVkVfQVZPQlNFUlZB VElPTkNPTlRST0xMRVIpCisjZW5kaWYgLy8gSEFWRShBVk9CU0VSVkFUSU9OQ09OVFJPTExFUikK IAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAjaW1wb3J0IDxBVktpdC9BVktpdC5oPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IDVhNjkzYjdlOGMxM2Q2ZTc3YWQ1YWVlZDIxNmRmYTli ZmU1YWUyNGIuLjZjMzgwZThkOGE3YTY2MjU5ZGQxMTMwYmE2YjRjOTgxMzgyM2UwNTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTU5LDcgKzU5LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAjaW1wb3J0IDxwYWwvaW9zL1VJS2l0U29mdExpbmsuaD4KIAogU09GVExJTktfQVZL SVRfRlJBTUVXT1JLKCkKLSNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCisj aWYgSEFWRShBVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKIFNPRlRfTElOS19DTEFTU19PUFRJT05B TChBVktpdCwgQVZPYnNlcnZhdGlvbkNvbnRyb2xsZXIpCiAjZW5kaWYKIFNPRlRfTElOS19DTEFT U19PUFRJT05BTChBVktpdCwgQVZQaWN0dXJlSW5QaWN0dXJlQ29udHJvbGxlcikKQEAgLTU0NSw3 ICs1NDUsNyBAQCBAaW1wbGVtZW50YXRpb24gV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlciB7CiAg ICAgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQgKl9mdWxsc2NyZWVuSW50ZXJmYWNlOwog ICAgIFJldGFpblB0cjxVSVZpZXdDb250cm9sbGVyPiBfcHJlc2VudGluZ1ZpZXdDb250cm9sbGVy OwogICAgIFJldGFpblB0cjxBVlBsYXllclZpZXdDb250cm9sbGVyPiBfYXZQbGF5ZXJWaWV3Q29u dHJvbGxlcjsKLSNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElPTkNPTlRST0xMRVIpCisjaWYgSEFW RShBVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKICAgICBSZXRhaW5QdHI8TlNUaW1lcj4gX3N0YXJ0 UGljdHVyZUluUGljdHVyZVRpbWVyOwogICAgIFJldGFpblB0cjxBVk9ic2VydmF0aW9uQ29udHJv bGxlcj4gX2F2UGxheWVyVmlld0NvbnRyb2xsZXJPYnNlcnZhdGlvbkNvbnRyb2xsZXI7CiAjZW5k aWYKQEAgLTU2MCw3ICs1NjAsNyBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhGdWxsc2NyZWVu SW50ZXJmYWNlOihWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdCAqKWludAogICAgIF9mdWxs c2NyZWVuSW50ZXJmYWNlID0gaW50ZXJmYWNlOwogICAgIF9hdlBsYXllclZpZXdDb250cm9sbGVy ID0gYWRvcHROUyhbYWxsb2NBVlBsYXllclZpZXdDb250cm9sbGVySW5zdGFuY2UoKSBpbml0V2l0 aFBsYXllckxheWVyVmlldzppbnRlcmZhY2UtPnBsYXllckxheWVyVmlldygpXSk7CiAgICAgX2F2 UGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkubW9kYWxQcmVzZW50YXRpb25TdHlsZSA9IFVJTW9k YWxQcmVzZW50YXRpb25PdmVyRnVsbFNjcmVlbjsKLSNpZiBIQVZFKEhBVkVfQVZPQlNFUlZBVElP TkNPTlRST0xMRVIpCisjaWYgSEFWRShBVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKICAgICBfYXZQ bGF5ZXJWaWV3Q29udHJvbGxlck9ic2VydmF0aW9uQ29udHJvbGxlciA9IGFkb3B0TlMoW2FsbG9j QVZPYnNlcnZhdGlvbkNvbnRyb2xsZXJJbnN0YW5jZSgpIGluaXRXaXRoT3duZXI6X2F2UGxheWVy Vmlld0NvbnRyb2xsZXIuZ2V0KCldKTsKICNlbmRpZgogI2lmIFBMQVRGT1JNKFdBVENIT1MpCkBA IC01NzAsNyArNTcwLDcgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRnVsbHNjcmVlbkludGVy ZmFjZTooVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQgKilpbnQKICAgICByZXR1cm4gc2Vs ZjsKIH0KIAotI2lmIEhBVkUoSEFWRV9BVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKKyNpZiBIQVZF KEFWT0JTRVJWQVRJT05DT05UUk9MTEVSKQogLSAodm9pZClkZWFsbG9jCiB7CiAgICAgW19zdGFy dFBpY3R1cmVJblBpY3R1cmVUaW1lciBpbnZhbGlkYXRlXTsKQEAgLTYzNiw3ICs2MzYsNyBAQCAt ICh2b2lkKWV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6KEJPT0wpYW5pbWF0ZWQgY29tcGxldGlvbkhh bmRsZXI6KHZvaWQgKF4pKEJPT0wgcwogI2RlZmluZSBNWV9OT19SRVRVUk4KICNlbmRpZgogCi0j aWYgSEFWRShIQVZFX0FWT0JTRVJWQVRJT05DT05UUk9MTEVSKQorI2lmIEhBVkUoQVZPQlNFUlZB VElPTkNPTlRST0xMRVIpCiBzdGF0aWMgY29uc3QgTlNUaW1lSW50ZXJ2YWwgc3RhcnRQaWN0dXJl SW5QaWN0dXJlVGltZUludGVydmFsID0gMC41OwogCiAtICh2b2lkKXRyeVRvU3RhcnRQaWN0dXJl SW5QaWN0dXJlIE1ZX05PX1JFVFVSTgpAQCAtMTM4Niw3ICsxMzg2LDcgQEAgdm9pZCBWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZG9FbnRlckZ1bGxzY3JlZW4oKQogICAgICAgICBpZiAo W21fcGxheWVyVmlld0NvbnRyb2xsZXIgaXNQaWN0dXJlSW5QaWN0dXJlUG9zc2libGVdKQogICAg ICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc3RhcnRQaWN0dXJlSW5QaWN0dXJlXTsK ICAgICAgICAgZWxzZQotI2lmIEhBVkUoSEFWRV9BVk9CU0VSVkFUSU9OQ09OVFJPTExFUikKKyNp ZiBIQVZFKEFWT0JTRVJWQVRJT05DT05UUk9MTEVSKQogICAgICAgICAgICAgW21fcGxheWVyVmll d0NvbnRyb2xsZXIgdHJ5VG9TdGFydFBpY3R1cmVJblBpY3R1cmVdOwogI2Vsc2UKICAgICAgICAg ICAgIGZhaWxlZFRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCk7Cg==