OSDN Git Service
Jaewan Kim [Tue, 24 May 2016 00:05:26 +0000 (00:05 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev
Erik Kline [Mon, 23 May 2016 23:19:03 +0000 (23:19 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 23:04:35 +0000 (23:04 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
Adrian Roos [Mon, 23 May 2016 20:56:15 +0000 (13:56 -0700)]
Deprecate unnecessairy Notification.Style constructors
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes:
28775574
TreeHugger Robot [Mon, 23 May 2016 20:51:39 +0000 (20:51 +0000)]
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
Jean-Michel Trivi [Mon, 23 May 2016 20:49:28 +0000 (20:49 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev
Jason Monk [Mon, 23 May 2016 19:58:48 +0000 (19:58 +0000)]
Merge "Make battery labels translatable." into nyc-dev
Sid Soundararajan [Mon, 23 May 2016 19:56:42 +0000 (19:56 +0000)]
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 19:46:48 +0000 (19:46 +0000)]
Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
Selim Cinek [Mon, 23 May 2016 19:26:22 +0000 (19:26 +0000)]
Merge "Fixed a flashing when the affordances were launched" into nyc-dev
Selim Cinek [Mon, 23 May 2016 19:25:55 +0000 (19:25 +0000)]
Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 19:21:56 +0000 (19:21 +0000)]
Merge "Fixed a crash with the autocancelling" into nyc-dev
Chong Zhang [Mon, 23 May 2016 18:59:03 +0000 (18:59 +0000)]
Merge "Don't include removed window when counting interesting windows" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev
Chong Zhang [Sat, 21 May 2016 16:23:55 +0000 (09:23 -0700)]
Don't include removed window when counting interesting windows
Also do not give input focus to window that's already marked for removal.
The input channel is already disposed and input manager will treat these
as null focus.
bug:
28797800
Change-Id: I3cb2d514a7286847f1ad6af3f629d04c303d3cbd
Jason Monk [Mon, 23 May 2016 18:42:23 +0000 (14:42 -0400)]
Make battery labels translatable.
Bug:
28829629
Change-Id: Id32587a4ad22aa79f7ec01f748466d6ff2394bcc
Victor Chang [Mon, 23 May 2016 18:42:08 +0000 (18:42 +0000)]
Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev
Joe Onorato [Thu, 19 May 2016 22:46:00 +0000 (15:46 -0700)]
Add data from /proc/pagetypeinfo to procstats.
This data tells us the number of pages of each type that
are available by page size. It is collected each time
the procstats snapshot is taken, and printed in the
checkin and verbose (dumpsys procstats -a) modes.
Change-Id: I14562eac15833617391c560638a9e7d239ef8db6
Philip P. Moltmann [Mon, 23 May 2016 18:27:13 +0000 (18:27 +0000)]
Merge "Correct height of add printer list separator" into nyc-dev
Winson [Sat, 21 May 2016 17:51:19 +0000 (10:51 -0700)]
Removing extra haptic feedback.
- ag/923796 changed the logic to always return true, so these extra
calls are no longer needed.
Bug:
28867314
Change-Id: I07a4f6ac772a1444bba1950b2f27aa4be58a8419
TreeHugger Robot [Mon, 23 May 2016 18:01:12 +0000 (18:01 +0000)]
Merge "Fixed flicker when docking task from recents." into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 17:57:49 +0000 (17:57 +0000)]
Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev
Selim Cinek [Mon, 23 May 2016 17:56:34 +0000 (10:56 -0700)]
Fixed a crash with the autocancelling
Change-Id: If9cb9cc89bafbc9e7e053b4758382239bac97adc
Fixes:
28878632
Fixes:
28898623
Wale Ogunwale [Mon, 23 May 2016 17:56:33 +0000 (10:56 -0700)]
Only resuming starting dontWaitForPause activity once
For a starting activity that doesn't wait for pause, we can resume it
when ensuring visible activities when pausing back stacks. If this
happens, there is no need to try to resume it again.
Bug:
28853615
Change-Id: Iee40b80eb13ab3fd65fdce0c100c4051e64f229f
Chris Wren [Mon, 23 May 2016 17:44:14 +0000 (17:44 +0000)]
Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
Sid Soundararajan [Wed, 11 May 2016 23:40:49 +0000 (16:40 -0700)]
Add a check to adjust thumbnail scaling for full screen shots on TV
This should let us get away with taking smaller bitmaps for TV.
BUG:
28371792
Change-Id: Ia5d43dd48c57c4dd519b46f0c0d0ec94df5f42a9
Tony Mak [Mon, 23 May 2016 17:17:26 +0000 (17:17 +0000)]
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
Winson [Sat, 21 May 2016 17:39:53 +0000 (10:39 -0700)]
Catching all exceptions when docking.
- Catch all exceptions thrown when docking an activity (similar to when
we start an activity) to allow us to gracefully handle the failure and
animate the task back into the stack.
Bug:
28867188
Change-Id: I3f80d261343c0161c5cbfd08a05a1fc6157f653e
Philip P. Moltmann [Mon, 23 May 2016 16:43:42 +0000 (09:43 -0700)]
Correct height of add printer list separator
Do not use listPreferredItemHeightSmall a height for list separator.
Fixes:
28907033
Change-Id: Ibe9744f28e7bd17fb5a298fa3cff0e3d403de10f
Jean-Michel Trivi [Thu, 19 May 2016 17:42:35 +0000 (10:42 -0700)]
Recording activity notification: return list of configuration
Use a list of configurations instead of an array
Bug
28819230
Change-Id: Ia4a3cdabf8337cfb98abe4d0055d497bcab8a5ee
Victor Chang [Mon, 23 May 2016 16:37:01 +0000 (17:37 +0100)]
Fix Certificate authority installed notification is gone when turning off and on the work mode.
cause: Work mode is turned on before entering USER_STOPPED state.
Thus, BOOT_COMPLETED broadcast is not sent, but the notification has been dismissed.
use USER_STARTED + USER_UNLOCKED because both are foreground.
Bug:
28864104
Change-Id: I4796b61586e194d8367b9e52a9c56f858cbcbe7d
Wale Ogunwale [Mon, 23 May 2016 16:10:24 +0000 (09:10 -0700)]
Fixed flicker when docking task from recents.
Regression introduced by ag/
1044640 where we don't want recents to the
visible if it's stack isn't fullscreen or focused. However, it is
possible for switching the home stack to not-fullscreen to prolonged
while transitioning to split-screen mode from recents. We now check
for if the docked stack exists which is a better indicator we are in
split-screen mode regardless of if the stask is fullscreen.
Bug:
28882948
Bug:
28246419
Change-Id: I54c02cc1486e7b5bf6a20dd0706c9bfe3f40a953
TreeHugger Robot [Mon, 23 May 2016 15:49:53 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 15:48:14 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 15:47:59 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 15:35:52 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Erik Kline [Tue, 26 Apr 2016 09:41:09 +0000 (18:41 +0900)]
Support DHCPv4 rebinding state
Bug:
24837343
Change-Id: Id49e1c12ec3b11fedba42bb28348a00cb0b11169
Bill Yi [Mon, 23 May 2016 13:21:44 +0000 (06:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a67ee6c7f1c034eaea3885f13884f6c7add477d
Auto-generated-cl: translation import
Victor Chang [Mon, 23 May 2016 11:51:54 +0000 (11:51 +0000)]
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 09:01:44 +0000 (09:01 +0000)]
Merge "Only actually log the DNS events we have." into nyc-dev
Bill Yi [Mon, 23 May 2016 08:53:03 +0000 (01:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I23d94944484c50e6fae32f95b34406055078299e
Auto-generated-cl: translation import
Bill Yi [Mon, 23 May 2016 08:42:41 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c447305120cc398cbd0e7a98b8226ee7c632059
Auto-generated-cl: translation import
Bill Yi [Mon, 23 May 2016 08:20:28 +0000 (01:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22fbf5ac36b91251a267bbf1863ca1b1e914d032
Auto-generated-cl: translation import
Lorenzo Colitti [Mon, 23 May 2016 05:10:19 +0000 (14:10 +0900)]
Only actually log the DNS events we have.
DnsEventListenerService#logAndClear was always logging 100 DNS
events regardless of how many were actually logged. The rest of
the events were either all zero or previously-recorded events.
Bug:
28204408
Change-Id: I9da3b07a2e7b7512397a3eb6568a877815eb3312
TreeHugger Robot [Mon, 23 May 2016 02:23:25 +0000 (02:23 +0000)]
Merge "Use an attribute for the network security config resource" into nyc-dev
Jaewan Kim [Fri, 20 May 2016 01:28:17 +0000 (10:28 +0900)]
PIP: Handle configuration changes
Bug:
28727532
Change-Id: I2a566082fa88984ef56d6ed8515c9bcd6a6ea868
Baligh Uddin [Sun, 22 May 2016 23:22:28 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:22:16 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:47 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:43 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:38 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:36 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:33 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:31 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:29 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:12:31 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 02:12:53 +0000 (19:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: If505e78ba6d78210fb4eba0ac8a57df26e860d03
Baligh Uddin [Sun, 22 May 2016 02:10:02 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: Ic64c474ffea820c8d329796bc6f84bb7b2704c2d
Baligh Uddin [Sun, 22 May 2016 01:43:19 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: Ia00d58694c7f42c901f10a3bd93bb6b3b2725400
Baligh Uddin [Sun, 22 May 2016 01:40:26 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I6d6dc4604209ca11ed6b05c582ee8c30705cd5b3
Baligh Uddin [Sun, 22 May 2016 01:32:50 +0000 (18:32 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I65276399d18300cfa46f8912ae1269b1655c7a2a
Baligh Uddin [Sun, 22 May 2016 01:24:43 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I2e883f6dd637c5cbd3bf17bb6f73946f8793fd44
Baligh Uddin [Sun, 22 May 2016 01:16:25 +0000 (18:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I99304991a57f64a31b07ca2ca85cf47e348d41c9
Baligh Uddin [Sun, 22 May 2016 01:13:37 +0000 (18:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I52cdbac273fbf9e3d30d67e82b539e469aed3b31
Baligh Uddin [Sun, 22 May 2016 01:10:37 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I57faba063381c76c11ea7530bef7ca455d9da4d5
Baligh Uddin [Sat, 21 May 2016 19:46:09 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I3e66f964402487321dd1923656d488b514bc68ba
Baligh Uddin [Sat, 21 May 2016 19:39:28 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: If486d4168089e018bea1f2acbdbccb2846ee9250
Hemal Patel [Sat, 21 May 2016 01:02:58 +0000 (01:02 +0000)]
Merge "Docs: Fixed a typo" into mnc-io-docs am:
31707f0185
am:
7f21500b1c
* commit '
7f21500b1c8fbd38fadb0bf10504b2c5fba9d7fa':
Docs: Fixed a typo
Change-Id: I115b647df4e3489e6fd47222b621f8b9c7cdfdf3
Hemal Patel [Sat, 21 May 2016 00:58:14 +0000 (00:58 +0000)]
Merge "Docs: Fixed a typo" into mnc-io-docs
am:
31707f0185
* commit '
31707f01851ab18ab7b60d8cd8a825b07e83e840':
Docs: Fixed a typo
Change-Id: Icdd5d354cedea96a70d74c0e63604e1c69eae370
Hemal Patel [Sat, 21 May 2016 00:49:46 +0000 (00:49 +0000)]
Merge "Docs: Fixed a typo" into mnc-io-docs
Chong Zhang [Sat, 21 May 2016 00:49:36 +0000 (00:49 +0000)]
Merge "Dispose HideNavInputEventReceiver on PhoneWindowManager's handler" into nyc-dev
Chong Zhang [Sat, 21 May 2016 00:03:08 +0000 (17:03 -0700)]
Dispose HideNavInputEventReceiver on PhoneWindowManager's handler
Disposal of input event receiver needs to happen on the handler
specified for receiving the inputs, otherwise nativeFinishInputEvent
could crash due to race with native dispose.
Instead of disposing mInputConsumer in beginLayoutLw(), post to
PhoneWindowManager's handler to dispose, and skip any input events
received after mInputConsumer is set to null by beginLayoutLw().
bug:
26927018
Change-Id: I094eb4472ea68f2c8bd6a428161d7edb11dc8900
Adam Lesinski [Sat, 21 May 2016 00:07:00 +0000 (00:07 +0000)]
Merge "Performance improvements in AssetManager" into nyc-dev
Suprabh Shukla [Fri, 20 May 2016 23:37:26 +0000 (16:37 -0700)]
Fixing isOpRestricted in AppOpsService
AppOpsService was returning false for a restricted operation if the
operation did not allow the system to bypass the restrictions on it.
Bug:
28860721
Change-Id: I487e23f1d3bf6ea602caee439fb500c058e7c8ff
TreeHugger Robot [Fri, 20 May 2016 22:56:46 +0000 (22:56 +0000)]
Merge "Correctly clear resizing drawable when nulling background." into nyc-dev
Brad Ebinger [Fri, 20 May 2016 22:53:26 +0000 (22:53 +0000)]
Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev
Adrian Roos [Fri, 20 May 2016 22:08:35 +0000 (22:08 +0000)]
Merge "Fix cut off actions in messaging style" into nyc-dev
Adam Lesinski [Fri, 20 May 2016 01:25:28 +0000 (18:25 -0700)]
Performance improvements in AssetManager
Change the implementation of getLocales() to iterate the set of
configurations using a templated method, instead of using the result
of getConfigurations().
Also remove the check for AndroidManifest.xml when adding an asset path.
This is unneccessary.
Bug:
28625993
Change-Id: I16de5da598d0c371421d1dc8eee054dce9baf53a
Jae Seo [Fri, 20 May 2016 20:53:01 +0000 (20:53 +0000)]
Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev
Brad Ebinger [Fri, 13 May 2016 01:05:17 +0000 (18:05 -0700)]
Add check for Vibration RingerMode in VibratorService
Add a check for whether or not the Phone is in the Vibrate RingerMode
when deciding whether or not to vibrate for an incoming call.
Bug:
28569078
Change-Id: Ib2e6243fd0b18c5426b5572c0806d67111a80a57
Tony Mak [Fri, 20 May 2016 17:22:38 +0000 (18:22 +0100)]
Remove PROPERTY_WORK_CALL
Bug:
28842878
Change-Id: I7fb28ec3b121f4546ea60d6b170c2c6d98ffcb8c
Jason Monk [Fri, 20 May 2016 19:42:39 +0000 (19:42 +0000)]
Merge "QS: Fix RTL animation" into nyc-dev
Roozbeh Pournader [Fri, 20 May 2016 19:42:30 +0000 (19:42 +0000)]
Merge "Clear locales without changing layout direction." into nyc-dev
Chris Wren [Fri, 20 May 2016 18:53:16 +0000 (14:53 -0400)]
Don't throw RemoteException from new NLS APIs
Bug:
28820058
Change-Id: If4a290ab7549aa999cee348bf0db85b70cb57553
Jason Monk [Fri, 20 May 2016 18:44:16 +0000 (14:44 -0400)]
QS: Fix RTL animation
Change-Id: I9de6e0891fa98ec2212abe28fa942779aa224056
Fixes:
28674500
TreeHugger Robot [Fri, 20 May 2016 18:32:09 +0000 (18:32 +0000)]
Merge "Fix notifications for USB PD enabled devices" into nyc-dev
Chris Wren [Thu, 12 May 2016 20:42:37 +0000 (16:42 -0400)]
Never fetch notification badges for USER_SYSTEM
This user never gets a badge, and secondary users will
see a security exception attempting to fetch it for
USER_ALL notifications, such as USB and battery state,
which are posted by USER_SYSTEM.
Bug:
28743335
Change-Id: I65aeb1cf2192811055f8cd94df0b7e292c5c1acf
Seigo Nonaka [Fri, 13 May 2016 06:11:37 +0000 (15:11 +0900)]
Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.
Bug:
28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
Siyamed Sinir [Fri, 20 May 2016 17:46:26 +0000 (17:46 +0000)]
Merge "setTransformationMethod should reset mTextDir" into nyc-dev
Paul Stewart [Fri, 20 May 2016 17:39:43 +0000 (17:39 +0000)]
Merge "Don't remove existing EAP configurations" into nyc-dev
Adam Lesinski [Fri, 20 May 2016 17:23:07 +0000 (17:23 +0000)]
Merge "Fix parsing of kernel wakelocks" into nyc-dev
TreeHugger Robot [Fri, 20 May 2016 17:15:58 +0000 (17:15 +0000)]
Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev
Chris Tate [Fri, 20 May 2016 17:05:37 +0000 (17:05 +0000)]
Merge "Back up / restore the 'mono audio' setting" into nyc-dev
TreeHugger Robot [Fri, 20 May 2016 16:52:19 +0000 (16:52 +0000)]
Merge "Nav bar: fix tablet density change issues" into nyc-dev
Winson [Thu, 19 May 2016 17:06:18 +0000 (10:06 -0700)]
Only broadcast screenshot error to the current user.
Bug:
28807226
Change-Id: I428ecc5572d7522580cdf38bded2fff9cf07abc2
TreeHugger Robot [Fri, 20 May 2016 16:04:48 +0000 (16:04 +0000)]
Merge "rate limit notification enqueues" into nyc-dev
Wale Ogunwale [Fri, 20 May 2016 15:50:15 +0000 (08:50 -0700)]
Put launch adjacent activity in a new task if the activity does exist
For the launch adjacent case we only want to put the activity in
an existing task if the activity already exists in the history.
Bug:
28828326
Change-Id: I1a6fdd6779cb20f8c0d9b7d94635b21718f4ac1b
Tony Mak [Thu, 19 May 2016 12:40:38 +0000 (13:40 +0100)]
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
TODO: After updating all places that use the SDK, remove/hide the old API
Bug:
28842878
Change-Id: I131be644439080dd0507cd10d8bd6618246ee7ad
Paul Stewart [Fri, 20 May 2016 15:14:30 +0000 (08:14 -0700)]
Don't remove existing EAP configurations
When merging backed-up configurations with the current supplicant
configuration, we read both configurations into a instance of
WifiNetworkSettings. No EAP configurations should be restored as
per b/
25725016, however existing EAP configurations that already
reside in wpa_supplicant.conf (presumably configured in SUW)
should not be removed in the process.
This CL adds a parameter to the "readNetworks" method to allow it
to select whether or not EAP configurations should be read in. It
is used to allow the "restoreWifiSupplicant" method to copy in EAP
configurations from the existing wpa_supplicant.conf, but not out
of the backup data.
BUG:
28873992
Change-Id: I8b3e0c1a6629b3f1ca5055b1b2190e6b3ca4c033
Jason Monk [Fri, 20 May 2016 15:21:59 +0000 (11:21 -0400)]
Nav bar: fix tablet density change issues
- Re-inflate the contents of the NavigationBarInflaterView
- Call up to parent to notify the contents has been reinflated
- Fix how default tunable is handled, so that the resource is
reloaded on density change
Change-Id: If25f68d01eedd3319b0c270e1cf80ac382eea637
Fixes:
27227522