OSDN Git Service
Jorim Jaggi [Wed, 6 Apr 2016 21:56:53 +0000 (21:56 +0000)]
Merge "Don't lock device when double tapping" into nyc-dev
Jorim Jaggi [Wed, 6 Apr 2016 04:41:06 +0000 (21:41 -0700)]
Don't lock device when double tapping
Bug:
24265204
Change-Id: Ia19e956def454604ed3f3e3e9815fc1872ef649a
Ruben Brunk [Wed, 6 Apr 2016 21:36:51 +0000 (21:36 +0000)]
Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev
Winson Chung [Wed, 6 Apr 2016 21:28:13 +0000 (21:28 +0000)]
Merge changes I0efc513b,Ibe45ba62 into nyc-dev
* changes:
Adding more logging of the state to the bug report.
Disable landscape aspect-scaled behavior for TV.
Jeff Sharkey [Wed, 6 Apr 2016 21:27:54 +0000 (21:27 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into nyc-dev
Jeff Sharkey [Wed, 6 Apr 2016 21:15:44 +0000 (15:15 -0600)]
Remove old FUSE bypass now that we have sdcardfs.
This forces everyone to go through sdcardfs, instead of letting them
around the back door.
Bug:
27992761
Change-Id: If1d4d5daa4b32bb3be7de10102bab24d63552b65
Hui Shu [Wed, 6 Apr 2016 21:26:22 +0000 (21:26 +0000)]
Merge "Disallow WebView provider packages lower version than Chrome Stable" into nyc-dev
Jim Miller [Wed, 6 Apr 2016 20:58:26 +0000 (20:58 +0000)]
Merge "Track userId independently from callback for fingerprint.remove()." into nyc-dev
Mady Mellor [Wed, 6 Apr 2016 20:54:43 +0000 (20:54 +0000)]
Merge "Adds security challenge when changing notification settings from lock screen" into nyc-dev
Selim Cinek [Wed, 6 Apr 2016 20:48:08 +0000 (20:48 +0000)]
Merge "Changed the default if the notification time is shown" into nyc-dev
Selim Cinek [Wed, 6 Apr 2016 20:47:44 +0000 (20:47 +0000)]
Merge "Fixed the contentinfo api usage in the bugreport" into nyc-dev
Selim Cinek [Wed, 6 Apr 2016 20:45:55 +0000 (20:45 +0000)]
Merge "Deprecated the contentinfo and the number" into nyc-dev
Selim Cinek [Wed, 6 Apr 2016 20:45:17 +0000 (20:45 +0000)]
Merge "Fixed a bug where the scrollrange was calculated wrong" into nyc-dev
Adam Lesinski [Wed, 6 Apr 2016 20:43:24 +0000 (20:43 +0000)]
Merge "AAPT2: Implement XmlActionExecutor to verify manifest" into nyc-dev
Alan Viverette [Wed, 6 Apr 2016 20:23:27 +0000 (20:23 +0000)]
Merge "Refresh views on DayPicker appearance changes" into nyc-dev
Jorim Jaggi [Wed, 6 Apr 2016 20:23:02 +0000 (20:23 +0000)]
Merge "Dynamic density change handling" into nyc-dev
Jeff Sharkey [Wed, 6 Apr 2016 20:12:51 +0000 (20:12 +0000)]
Merge "Send onUnlockUser() before PRE_BOOT broadcasts." into nyc-dev
Jeff Sharkey [Wed, 6 Apr 2016 20:07:09 +0000 (14:07 -0600)]
Send onUnlockUser() before PRE_BOOT broadcasts.
Before this change, a PRE_BOOT_COMPLETED receiver could try calling
back into the system to ask for AccountManager details, only to be
told the user wasn't unlocked yet. If the broadcast code was probing
in a loop, it would force us to wait around for the 60-second ANR
timeout. Since typical devices have ~7 PRE_BOOT receivers, this
would delay BOOT_COMPLETED and other operations, like mounting the
SD card, for up to 7 minutes.
Bug:
28024024
Change-Id: Ibf8611e6fe94b0deb5ae5715c86f897ff6779088
Evan Rosky [Wed, 6 Apr 2016 20:03:51 +0000 (20:03 +0000)]
Merge "Added padding and gravity support to PIN entry" into nyc-dev
Alan Viverette [Wed, 6 Apr 2016 20:01:00 +0000 (16:01 -0400)]
Refresh views on DayPicker appearance changes
Bug:
28023419
Change-Id: Ie64face1d2a1be7f7be5814b60ed6d803f82d1e9
Dianne Hackborn [Wed, 6 Apr 2016 19:38:49 +0000 (19:38 +0000)]
Merge "More work on issue #
26390151: Add new JobScheduler API..." into nyc-dev
Deepanshu Gupta [Wed, 6 Apr 2016 19:32:00 +0000 (19:32 +0000)]
Merge "Add missing setAccessible to Choreographer's threadInstance" into nyc-dev
Deepanshu Gupta [Wed, 6 Apr 2016 19:29:55 +0000 (12:29 -0700)]
Add missing setAccessible to Choreographer's threadInstance
Change-Id: I753660cf68ba5a9c375942222e32059d952739bb
Ruben Brunk [Sat, 2 Apr 2016 00:07:51 +0000 (17:07 -0700)]
Add VrManager AIDL interface for use by system apps.
Bug:
27884853
Change-Id: I6de0d291deafe5003070d60866c60d6599312e79
Selim Cinek [Wed, 6 Apr 2016 01:27:16 +0000 (18:27 -0700)]
Changed the default if the notification time is shown
By default the notification time is not shown anymore.
Bug:
27431551
Change-Id: I68f19450d0de795a51644e939a3fd64366c0abb6
Todd Kennedy [Wed, 6 Apr 2016 19:20:39 +0000 (19:20 +0000)]
Merge "Adjust javadoc for filter priority" into nyc-dev
Selim Cinek [Wed, 6 Apr 2016 00:13:37 +0000 (17:13 -0700)]
Fixed the contentinfo api usage in the bugreport
Removed the percentage shown in the header and
migrated the name to the subtext as contentinfo
was deprecated.
Change-Id: Ifd79a67cad8958049bd29b8eb4c9bcbb4822688b
Selim Cinek [Wed, 6 Apr 2016 00:03:40 +0000 (17:03 -0700)]
Deprecated the contentinfo and the number
It was mainly adding noise to the notification
rather than useful information.
Bug:
27431551
Change-Id: Ie22c9935d60eeac1cca5d9ce97239aadfac9b3cf
Robin Lee [Wed, 6 Apr 2016 19:12:42 +0000 (19:12 +0000)]
Merge "Disallow prepare()-ing over an always on VPN app" into nyc-dev
Jorim Jaggi [Wed, 6 Apr 2016 03:41:21 +0000 (20:41 -0700)]
Dynamic density change handling
- In PWM, make sure to read the height values after the new
configuration has been applied.
- Reset all navigation bar button icons when density changes.
- Adjust height of notification bar.
- Reload divider height values in SysUI and WM.
- Snap divider handle to a new position after loading the
new configuration, as the snap points change.
Bug:
26844819
Bug:
27450471
Bug:
27921696
Change-Id: I9e28f0c49f6367c5fcfac010e7a6e98a42e85996
Jorim Jaggi [Tue, 5 Apr 2016 03:25:41 +0000 (20:25 -0700)]
Fix dialog placement
When calculating the frame for non-fullscreen windows, we incorrectly
used the wrong bounds to calculate the frame, which lead to wrong
positioning.
To fix this, we use the inset bounds, which we consider the source
of truth for all layout related aspects, to calculate the frame,
and then offset everything by the difference between the inset bounds
and the task bounds to position them correctly.
Bug:
28012565
Bug:
27860956
Bug:
27441808
Change-Id: I90d45054e0bcce78d021ad2cd20e5ef7f79ded3d
Deepanshu Gupta [Wed, 6 Apr 2016 19:03:59 +0000 (19:03 +0000)]
Merge "Clear ThreadLocal storage from Choreographer" into nyc-dev
Alan Viverette [Wed, 6 Apr 2016 19:03:31 +0000 (19:03 +0000)]
Merge "Add scroll indicators to resolver list layouts" into nyc-dev
Gus Prevas [Wed, 6 Apr 2016 19:02:18 +0000 (19:02 +0000)]
Merge "Fixes typo in Wear window animation." into nyc-dev
Winson [Tue, 5 Apr 2016 22:33:35 +0000 (15:33 -0700)]
Adding more logging of the state to the bug report.
Bug:
28009206
Change-Id: I0efc513bb6fc5ea4c9724b0a411ca5d60a71f27e
Steve McKay [Wed, 6 Apr 2016 18:44:58 +0000 (18:44 +0000)]
Merge "Massage code to better support Files overlay." into nyc-dev
Selim Cinek [Tue, 5 Apr 2016 20:07:54 +0000 (13:07 -0700)]
Fixed a bug where the scrollrange was calculated wrong
First the scrollrange would allow the first element to be
collapsed which doesn't make sense now that it's scrolling
off. It could also be wrong if the notification was a group.
Then the scrollrange was also wrong because the bottomInset
was always added even though it shouldn't have done that.
Change-Id: I7184946c4406bc0b5796194af86155aa6ba68c8e
Fixes:
28015188
Tony Mak [Wed, 6 Apr 2016 18:39:20 +0000 (18:39 +0000)]
Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev
Adam Lesinski [Tue, 5 Apr 2016 19:41:07 +0000 (12:41 -0700)]
AAPT2: Implement XmlActionExecutor to verify manifest
Defines a set of actions to perform on XML elements defined by their
hierarchy, eg: manifest -> application -> activity.
This can be used to easily add rules to check more tags in AndroidManifest.xml
Change-Id: I76c6916a98b6403075a7e56e16230979dc6cbee1
Jason Monk [Wed, 6 Apr 2016 18:34:54 +0000 (18:34 +0000)]
Merge "Fix inability to add all tiles." into nyc-dev
Jason Monk [Wed, 6 Apr 2016 18:32:54 +0000 (14:32 -0400)]
Fix inability to add all tiles.
Change-Id: I1d6ea9825277c902e238a896580c96d509b459ef
Fixes:
27837813
Deepanshu Gupta [Wed, 6 Apr 2016 18:32:36 +0000 (11:32 -0700)]
Clear ThreadLocal storage from Choreographer
Change-Id: I5abb5c68a635e7808b0a036ba4d9971cd0139aa3
Winson [Wed, 6 Apr 2016 00:32:30 +0000 (17:32 -0700)]
Disable landscape aspect-scaled behavior for TV.
Bug:
27923205
Change-Id: Ibe45ba62a9de9c03480844235efc97e8b8299e61
Todd Kennedy [Wed, 6 Apr 2016 17:57:51 +0000 (10:57 -0700)]
Adjust javadoc for filter priority
This clarifies the usage of setPriority() for receiver filters.
Should also adjust the XML description of android:priority to
better describe the new behaviour for activity filters
Bug:
26417683
Change-Id: I96b2d90d71640041e232c401cf6e6838dbdbfeab
Winson Chung [Wed, 6 Apr 2016 17:50:29 +0000 (17:50 +0000)]
Merge changes I1bad66e2,Ibc93597e,Id985fc28 into nyc-dev
* changes:
Remove the highlight on the overview button in the screen pinning dialog
Fixing bad regression in alt-tab layout.
Workaround to ensure that a SystemUI process is always available.
Phil Weaver [Wed, 6 Apr 2016 17:49:46 +0000 (17:49 +0000)]
Merge "Eliminate deadlock in magnification." into nyc-dev
Alan Viverette [Wed, 6 Apr 2016 17:47:01 +0000 (13:47 -0400)]
Add scroll indicators to resolver list layouts
Also reformats XML for consistency.
Bug:
27431395
Change-Id: I468dd1582ddcabe360b8665b6f42b3248caa16a5
Lenka Trochtova [Wed, 6 Apr 2016 17:37:21 +0000 (17:37 +0000)]
Merge "Put disallow-safe-boot restriction to system settings to make it accessible during boot." into nyc-dev
Selim Cinek [Wed, 6 Apr 2016 02:02:37 +0000 (19:02 -0700)]
Fixed a bug where the height of the group was wrong
This lead to very visible bugs.
Bug:
24866646
Change-Id: I62bfbb2f3895a5a69eb4807d109643bdfdf95351
Jeff Sharkey [Wed, 6 Apr 2016 17:33:44 +0000 (17:33 +0000)]
Merge "Wrap logcat invocations with timeout." into nyc-dev
Russell Brenner [Wed, 6 Apr 2016 17:32:54 +0000 (17:32 +0000)]
Merge "Match SUW package after FBE reboot" into nyc-dev
Todd Kennedy [Wed, 6 Apr 2016 17:27:56 +0000 (17:27 +0000)]
Merge "Move cert tracing to PackageParser" into nyc-dev
Adam Powell [Wed, 6 Apr 2016 17:26:52 +0000 (17:26 +0000)]
Merge "Fragment#setUserVisibleHint guard" into nyc-dev
Todd Kennedy [Wed, 6 Apr 2016 14:46:13 +0000 (07:46 -0700)]
Move cert tracing to PackageParser
Tracing for cert collection in PackageManagerService was only
catching one of a couple usages. Move tracing lower in the
call stack to ensure tracing exists for all calls.
Also added a new tag to differentiate between verifying v1 & v2
signatures.
Bug:
27502465
Change-Id: Ie29f326e44f32cdbea1572714689c82f07ca12ba
Steve McKay [Mon, 4 Apr 2016 22:26:48 +0000 (15:26 -0700)]
Massage code to better support Files overlay.
Also, allow "productivity_mode" config to be enabled via intent extra
as a developement aide.
Bug:
28006206
Change-Id: I7be8d96a0e924f9ce8023347e051d28d69a0eec9
Chong Zhang [Wed, 6 Apr 2016 17:18:52 +0000 (17:18 +0000)]
Merge "Set up none transition for relaunching apps during screen freeze" into nyc-dev
Yohei Yukawa [Wed, 6 Apr 2016 17:15:46 +0000 (17:15 +0000)]
Merge "Add an overlayable config for IME switcher visibility." into nyc-dev
Robert Shih [Wed, 6 Apr 2016 17:13:22 +0000 (17:13 +0000)]
Merge "DrmInitData: prevent public constructor access" into nyc-dev
Lenka Trochtova [Thu, 24 Mar 2016 15:43:10 +0000 (16:43 +0100)]
Put disallow-safe-boot restriction to system settings
to make it accessible during boot.
BUG:
26251884
Change-Id: I1dee58dfc2aa746e0e97a6675c611c6e313ec91c
Bill Yi [Wed, 6 Apr 2016 17:10:26 +0000 (17:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 6 Apr 2016 17:03:20 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Robin Lee [Wed, 6 Apr 2016 17:01:23 +0000 (17:01 +0000)]
Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev
Jason Monk [Wed, 6 Apr 2016 16:57:43 +0000 (16:57 +0000)]
Merge "Make QS tile lifecycle tests less flaky (hopefully)" into nyc-dev
Adam Powell [Wed, 6 Apr 2016 16:57:40 +0000 (09:57 -0700)]
Fragment#setUserVisibleHint guard
Bug
28026606
Change-Id: I109bce6ecd35feaa045b61a7226b2a19344d2cda
Jason Monk [Wed, 6 Apr 2016 16:54:26 +0000 (12:54 -0400)]
Make QS tile lifecycle tests less flaky (hopefully)
Change-Id: I387c774267c076cf244d2870b051ad6d586d3564
Bill Yi [Wed, 6 Apr 2016 16:49:14 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Phil Weaver [Fri, 18 Mar 2016 00:26:24 +0000 (17:26 -0700)]
Eliminate deadlock in magnification.
Use the lock from AccessibilityManagerService in
MagnificationController, since the two services call each other with
locks held.
Bug:
27725795
Change-Id: Iaed6749bf217210457325c3912da0f7aa0f6319a
Abodunrinwa Toki [Wed, 6 Apr 2016 16:38:50 +0000 (16:38 +0000)]
Merge "FloatingToolbar: Include scroll indicators in overflow." into nyc-dev
Chris Wren [Wed, 6 Apr 2016 16:36:52 +0000 (16:36 +0000)]
Merge "don't pin ranking updates at the end of the queue." into nyc-dev
Evan Rosky [Fri, 1 Apr 2016 23:04:23 +0000 (16:04 -0700)]
Added padding and gravity support to PIN entry
Also made it more customizable via attributes
Bug:
25184308
Change-Id: I3cfd48b6bb964ea8db1539586ed70343fda5e40a
Jeff Sharkey [Wed, 6 Apr 2016 16:22:41 +0000 (10:22 -0600)]
Wrap logcat invocations with timeout.
We've seen evidence that the logcat binary can end up wedged, which
means we can eventually starve system_server for FDs. To mitigate
this, wrap logcat using the timeout utility to kill and clean up if
it takes too long to exit.
Bug:
27994717,
28021719,
28009200
Change-Id: Ieed1460d89598628a5db868645fd305d0e9054ed
Russell Brenner [Wed, 6 Apr 2016 16:18:59 +0000 (09:18 -0700)]
Match SUW package after FBE reboot
Add MATCH_DIRECT_BOOT_* flags when querying for SUW package.
Bug:
28027590
Change-Id: Ibd454340053ce24299f316e92cd6ec6b350d695e
Philip P. Moltmann [Wed, 6 Apr 2016 16:09:01 +0000 (16:09 +0000)]
Merge "Prefix printer description with service-label instead of package-label." into nyc-dev
Philip P. Moltmann [Wed, 6 Apr 2016 16:08:48 +0000 (16:08 +0000)]
Merge "Print Activity: Use a single (re-implemented) parsing logig for page ranges." into nyc-dev
Raph Levien [Wed, 6 Apr 2016 15:52:54 +0000 (15:52 +0000)]
Merge "Apply correct bottom padding to layouts" into nyc-dev
Julia Reynolds [Wed, 6 Apr 2016 15:34:08 +0000 (15:34 +0000)]
Merge "Documentation update for interruption filters." into nyc-dev
Robin Lee [Tue, 5 Apr 2016 15:27:15 +0000 (16:27 +0100)]
Remove bool return from setAlwaysOnVpnPackage
Bug:
27533151
Change-Id: I4c656488e69cb5247dbb9cfd62d6f6f7043f9a90
David Brazdil [Wed, 6 Apr 2016 15:21:22 +0000 (15:21 +0000)]
Merge "Re-enable Optimizing apps dialog" into nyc-dev
Chris Wren [Wed, 6 Apr 2016 15:12:02 +0000 (11:12 -0400)]
don't pin ranking updates at the end of the queue.
Apparently we schedule ranking updates all the time, so the job gets pulled
to the end of the queue, and can get starved. This change makes sure we
don't schedule multiple updates by leaving it in the queue. If a job in the
queue behind hte update request needs to send an update it will jsut
request one anyway, so we shouldn't miss updates.
Bug:
28015158
Change-Id: Id5b9d05ea6eb35e610ee34651e4cde8cddd4ae66
Yohei Yukawa [Wed, 6 Apr 2016 15:06:56 +0000 (15:06 +0000)]
Merge "Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling." into nyc-dev
Ben Kwa [Wed, 6 Apr 2016 15:02:02 +0000 (15:02 +0000)]
Merge "DocsUI: Update the drag shadow to meet UI spec." into nyc-dev
Jeff Sharkey [Wed, 6 Apr 2016 14:59:39 +0000 (14:59 +0000)]
Merge "Protect more broadcasts." into nyc-dev
Julia Reynolds [Wed, 6 Apr 2016 14:26:54 +0000 (10:26 -0400)]
Documentation update for interruption filters.
Bug:
27901142
Change-Id: I977f7dc4010dc826e06dfb01ad6db68380b80fde
Julia Reynolds [Wed, 6 Apr 2016 14:27:34 +0000 (14:27 +0000)]
Merge "Notify app op watchers when audio restrictions change." into nyc-dev
Andrei Stingaceanu [Wed, 6 Apr 2016 14:26:03 +0000 (14:26 +0000)]
Merge "Keyboard Shortcuts: protect against NPE in WindowManagerService" into nyc-dev
David Brazdil [Wed, 6 Apr 2016 14:05:04 +0000 (15:05 +0100)]
Re-enable Optimizing apps dialog
Bug:
27350503
Change-Id: I98ae03571817792265780c9283b395c323638e14
Andrei Stingaceanu [Wed, 6 Apr 2016 13:48:33 +0000 (14:48 +0100)]
Keyboard Shortcuts: protect against NPE in WindowManagerService
Using an unresponsive app [while (true) { Thread.sleep(1000) }]
produces NPE:
WindowManager: Window Manager Crash
WindowManager: java.lang.NullPointerException: Attempt to read
from field 'android.view.IWindow
com.android.server.wm.WindowState.mClient' on a
null object reference
WindowManager: at com.android.server.wm.WindowManagerService
.requestAppKeyboardShortcuts
(WindowManagerService.java:10628)
Which puts down SysUI (and requires restarting SysUI).
Protect against this by checking for nulls. The end result
is that the dialog is no longer shown for unresponsive apps
and SysUI does not break.
Bug:
27914463
Change-Id: I37f0b0d5980f6ddc50f3bb778582d23ee1c7e9c3
Abodunrinwa Toki [Wed, 6 Apr 2016 13:15:26 +0000 (14:15 +0100)]
FloatingToolbar: Include scroll indicators in overflow.
Bug:
27427333
Change-Id: I7480cfe5f75d04e04792d9443435a76ab6773c64
Rubin Xu [Wed, 6 Apr 2016 13:12:55 +0000 (13:12 +0000)]
Merge "Clear caller identity when calling createConfirmDeviceCredentialIntent" into nyc-dev
Jaesung Chung [Wed, 6 Apr 2016 12:50:30 +0000 (12:50 +0000)]
Merge "Fix build" into nyc-dev
Jaesung Chung [Wed, 6 Apr 2016 12:42:39 +0000 (21:42 +0900)]
Fix build
Change-Id: I38aa2f70fef3cb5b4a6fe42a3e4aa8e0a16e6fe0
Bill Yi [Wed, 6 Apr 2016 12:38:14 +0000 (05:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I856a941ac139b90d05f278db1023b96715211893
Auto-generated-cl: translation import
Benjamin Franz [Wed, 6 Apr 2016 12:17:25 +0000 (12:17 +0000)]
Merge "Document which APIs are callable on the parent instance" into nyc-dev
Benjamin Franz [Tue, 5 Apr 2016 18:12:39 +0000 (19:12 +0100)]
Document which APIs are callable on the parent instance
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.
Bug:
27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
Rubin Xu [Wed, 6 Apr 2016 10:54:59 +0000 (11:54 +0100)]
Clear caller identity when calling createConfirmDeviceCredentialIntent
Bug:
27893870
Change-Id: I9edcd170432f8a2bd852a5fa78ab868201093dcf
Bill Yi [Wed, 6 Apr 2016 10:28:47 +0000 (03:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6e780e155d307e6357040492e2007698ea8264a2
Auto-generated-cl: translation import
Bill Yi [Wed, 6 Apr 2016 10:03:10 +0000 (03:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8bf415a99ffc8de3e174c431149736dea2a321b8
Auto-generated-cl: translation import
Erik Kline [Wed, 6 Apr 2016 08:51:06 +0000 (08:51 +0000)]
Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev
Jaewan Kim [Wed, 6 Apr 2016 06:35:40 +0000 (06:35 +0000)]
Merge "PIP: Apply the latest Recents row animation when PIP control is focused" into nyc-dev
Jaewan Kim [Mon, 4 Apr 2016 18:15:17 +0000 (03:15 +0900)]
PIP: Apply the latest Recents row animation when PIP control is focused
Bug:
27540465
Change-Id: Ib3b40fb64953a175593eab789552db3c231f0227