OSDN Git Service
Tim Murray [Thu, 14 Apr 2016 23:48:15 +0000 (23:48 +0000)]
Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev
Jack Yu [Thu, 14 Apr 2016 23:32:42 +0000 (23:32 +0000)]
Merge "Removed the unused RIL constant" into nyc-dev
Chong Zhang [Thu, 14 Apr 2016 23:02:56 +0000 (16:02 -0700)]
Disable starting window for Recents
When using a starting window, transition could start early before
real app window is drawn. We don't want this with Recents, so disable
it explicitly.
bug:
27812497
Change-Id: I648b2de3f91923978ef8b3d4f2629f0f73321b98
Chong Zhang [Thu, 14 Apr 2016 23:21:27 +0000 (23:21 +0000)]
Merge "Fix crash due to null uri in ContentObserver.onChange" into nyc-dev
Chong Zhang [Thu, 14 Apr 2016 21:58:53 +0000 (14:58 -0700)]
Fix crash due to null uri in ContentObserver.onChange
Also make sure we don't respond to unrecognized changes.
bug:
27291666
Change-Id: I110445231d15427e1fe9e225ed0520af262f740e
Tim Murray [Thu, 14 Apr 2016 22:44:35 +0000 (15:44 -0700)]
Revert "Optimize ResTable::getLocales() to improve bindApplication performance"
This reverts commit
5520581b5f043fb858b5b2044ff33ad8545a6d38.
bug
28189634
Change-Id: I2d2b859f6d9bd44434fa901cce990583f514980c
Sriram Viswanathan [Thu, 14 Apr 2016 22:05:11 +0000 (22:05 +0000)]
Merge "Disable recents button in carmode inside of NavigationBarView, instead of doing it from PhoneWindowManager, which doesnt maintain the mUiMode properly and in sync with that in the UiModeManager. In addition the re-layout / modifications in the content of the navigation bar in care mode are better consolidated in one place instead of many places." into nyc-dev
Dongwon Kang [Thu, 14 Apr 2016 21:38:10 +0000 (21:38 +0000)]
Merge "PipManager: Revisit the logic for PIP close for TV app case" into nyc-dev
Sriram Viswanathan [Tue, 22 Mar 2016 20:11:50 +0000 (13:11 -0700)]
Disable recents button in carmode inside of NavigationBarView,
instead of doing it from PhoneWindowManager, which doesnt maintain
the mUiMode properly and in sync with that in the UiModeManager.
In addition the re-layout / modifications in the content of the
navigation bar in care mode are better consolidated in one place
instead of many places.
Bug:
27313462
Change-Id: I1bdc2324f649f19f879b71c695381587561498e9
Joe Onorato [Thu, 14 Apr 2016 21:10:14 +0000 (21:10 +0000)]
Merge "Add support for null tag names from apps." into nyc-dev
Sudheer Shanka [Thu, 14 Apr 2016 21:05:24 +0000 (21:05 +0000)]
Merge "Update RestrictedSwitchPreference to have an additional summary." into nyc-dev
Muyuan Li [Thu, 14 Apr 2016 20:50:38 +0000 (20:50 +0000)]
Merge "Fixes a bug in shortcut key." into nyc-dev
Chad Brubaker [Thu, 14 Apr 2016 20:48:52 +0000 (20:48 +0000)]
Merge "Fix isUserAddedCertificate" into nyc-dev
Muyuan Li [Thu, 14 Apr 2016 20:22:20 +0000 (13:22 -0700)]
Fixes a bug in shortcut key.
All shortcut keys that are dispatched to listeners will be checked
against user provisioning status. Only if user setup is complete will
the listeners receive shortcut keys.
Bug:
28192375
Change-Id: Iecc5a21a40d07bdc4f71d1a36187cca4a5b30bde
(cherry picked from commit
f0667f077f66ba3e58387f7570dd82a26aaed7b8)
Andy Hung [Thu, 14 Apr 2016 20:47:23 +0000 (20:47 +0000)]
Merge "Unify dumped native stack traces" into nyc-dev
Oren Blasberg [Thu, 14 Apr 2016 20:34:52 +0000 (20:34 +0000)]
Merge "Don't show icons in overlay popup menus." into nyc-dev
Dongwon Kang [Thu, 14 Apr 2016 20:13:57 +0000 (20:13 +0000)]
Merge "TIF: Add Programs.COLUMN_RECORDING_PROHIBITED" into nyc-dev
Sid Soundararajan [Thu, 14 Apr 2016 20:02:28 +0000 (20:02 +0000)]
Merge "Add a null check to prevent NPE" into nyc-dev
Arunesh Mishra [Thu, 14 Apr 2016 19:59:58 +0000 (19:59 +0000)]
Merge "SoundTriggerHelper: Add ability to manage multiple voice models." into nyc-dev
Hui Shu [Thu, 14 Apr 2016 19:53:12 +0000 (19:53 +0000)]
Merge "Cache the parsed result of WebView provider config xml" into nyc-dev
Felipe Leme [Thu, 14 Apr 2016 19:50:09 +0000 (19:50 +0000)]
Merge "Fixed initial metered state of new policy." into nyc-dev
Felipe Leme [Thu, 14 Apr 2016 19:46:09 +0000 (12:46 -0700)]
Fixed initial metered state of new policy.
BUG:
27808364
Change-Id: I33d45a971c66623bcd94ebe95e84fb852308d8ea
Deepanshu Gupta [Thu, 14 Apr 2016 19:42:15 +0000 (19:42 +0000)]
Merge "Return complete properties map instead of per view" into nyc-dev
Deepanshu Gupta [Thu, 14 Apr 2016 19:38:23 +0000 (12:38 -0700)]
Return complete properties map instead of per view
Change-Id: Ib7c71606d1bf43bbaa80f5601a8508d7aa49d953
Jae Seo [Thu, 14 Apr 2016 19:28:48 +0000 (19:28 +0000)]
Merge "TIF: Update documentation on time shifting start/current position" into nyc-dev
Rob Carr [Thu, 14 Apr 2016 19:28:41 +0000 (19:28 +0000)]
Merge "PopupWindow. Don't use -1 width/height for calculations." into nyc-dev
Sudheer Shanka [Wed, 13 Apr 2016 17:13:26 +0000 (10:13 -0700)]
Update RestrictedSwitchPreference to have an additional summary.
Bug:
27659072
Change-Id: Idfefe16f709d092355ce9cfbd820aacf12b95692
Arunesh Mishra [Mon, 11 Apr 2016 03:35:16 +0000 (20:35 -0700)]
SoundTriggerHelper: Add ability to manage multiple voice models.
This CL adds the ability in STH to manage multiple voice models indexed by
keyphrase ID, which is an integer.
Bug:
28104190
Change-Id: I8e10cca05ed8b4b8414cae7fffc26c132d4b7cbd
Amith Yamasani [Thu, 14 Apr 2016 19:06:39 +0000 (19:06 +0000)]
Merge "Multi-window assist callback" into nyc-dev
Jaewan Kim [Thu, 14 Apr 2016 19:04:09 +0000 (19:04 +0000)]
Merge "PIP: Fix regressions" into nyc-dev
Steve McKay [Thu, 14 Apr 2016 19:00:48 +0000 (19:00 +0000)]
Merge "Deal gracefully with empty srcs." into nyc-dev
Alan Viverette [Thu, 14 Apr 2016 18:59:21 +0000 (18:59 +0000)]
Merge "Make number picker styles public" into nyc-dev
Joe Onorato [Wed, 13 Apr 2016 00:06:47 +0000 (17:06 -0700)]
Add support for null tag names from apps.
For Wakelocks and syncs there is no requirement that an app actually
supply a tag/name. Jobs will always have system-supplied tags.
Bug:
26276001
Change-Id: Ie3b8e48a395de1506a2f15d5b9c9eab726bc6d0a
Steve McKay [Thu, 14 Apr 2016 18:44:23 +0000 (18:44 +0000)]
Merge "Guard against null clipdata objects." into nyc-dev
Sid Soundararajan [Thu, 14 Apr 2016 18:36:42 +0000 (11:36 -0700)]
Add a null check to prevent NPE
Rare case where the rect returned from a View is null.
BUG:
28118236
Change-Id: Ie95b082c92c110f753152a50399c188b19d14e4b
Alex Klyubin [Thu, 14 Apr 2016 18:30:41 +0000 (18:30 +0000)]
Merge "Clarify how to replace cert generated by Android Keystore." into nyc-dev
Oren Blasberg [Thu, 14 Apr 2016 18:14:09 +0000 (11:14 -0700)]
Don't show icons in overlay popup menus.
This was a "regression" in CascadingMenuPopup specifically.
We now check for the overflow case and don't show icons.
This preserves the behavior from Marshmallow.
Bug:
28026351
Change-Id: Ifbc9a20b0dadd19ef7b727023b1b0cfa45ebf993
Dongwon Kang [Sun, 10 Apr 2016 00:24:12 +0000 (17:24 -0700)]
TIF: Add Programs.COLUMN_RECORDING_PROHIBITED
Bug:
28039913
Change-Id: I30897f164113ceb422c8c5a16448b8b296a5a68a
Hui Shu [Fri, 8 Apr 2016 20:25:26 +0000 (13:25 -0700)]
Cache the parsed result of WebView provider config xml
BUG:
27736084
Change-Id: I3665a5fd4777d22c6f217b358195edbeaad3bb1d
Winson Chung [Thu, 14 Apr 2016 17:51:52 +0000 (17:51 +0000)]
Merge "Fixing various layout issues when docking" into nyc-dev
Winson [Wed, 13 Apr 2016 21:02:18 +0000 (14:02 -0700)]
Fixing various layout issues when docking
- Fixing regression where we were scrolling to front immediately on
dragging-to-dock a task, we should only scroll to the front on
configuration change.
- Accounting for the inset when calculating the final stack bounds
(similar to b/
27921362)
- Fixing issue with task views being clipped as user drags a view due
to the bounds of the view changing. We manually now set the frame on
the view to the current stack task bounds.
- Simplifying calls to animate the task view bounds
- Removing old instance state code
Change-Id: I17d3e33e159ff250c11a504ef87558051926a974
John Reck [Thu, 14 Apr 2016 17:40:50 +0000 (17:40 +0000)]
Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev
John Reck [Wed, 13 Apr 2016 17:24:06 +0000 (10:24 -0700)]
Revert "Revert "Make stopped state a first-class thing""
This reverts commit
eab3f2658aa41d37c3b05d49a2ce4e3f4ed85399.
Fixes first-frame issue, mReportNextDraw needs to override
mStopped
Fixes:
28118961
Fixes:
27286867
Change-Id: I5c811759637d08ba9f3b342016d1b3006986d5a2
Steve McKay [Thu, 14 Apr 2016 16:58:41 +0000 (09:58 -0700)]
Deal gracefully with empty srcs.
Bug:
28184194,
28173827
Change-Id: I6794b147a7e3d3aba73600a87d565bfffe4a4b93
Gustav Sennton [Thu, 14 Apr 2016 17:30:57 +0000 (17:30 +0000)]
Merge "Fix the behaviour for explicitly switching WebView provider" into nyc-dev
Alan Viverette [Thu, 14 Apr 2016 17:28:10 +0000 (17:28 +0000)]
Merge "Basic documentation for custom drawables" into nyc-dev
Jaewan Kim [Thu, 14 Apr 2016 17:21:38 +0000 (17:21 +0000)]
Merge "PIP: Implement new onboarding spec" into nyc-dev
Doug Felt [Thu, 14 Apr 2016 17:20:16 +0000 (17:20 +0000)]
Merge "Update fonts.xml file for new noto fonts." into nyc-dev
Pavel Zhamaitsiak [Thu, 14 Apr 2016 17:16:40 +0000 (17:16 +0000)]
Merge "Consolidate WiFi Calling string resources" into nyc-dev
Chris Craik [Thu, 14 Apr 2016 17:12:17 +0000 (17:12 +0000)]
Merge "Avoid reentrance on ClipArea APIs" into nyc-dev
Chris Craik [Thu, 14 Apr 2016 17:07:33 +0000 (17:07 +0000)]
Merge "Destroy drawing cache when switching layer type" into nyc-dev
Alan Viverette [Thu, 14 Apr 2016 17:01:41 +0000 (13:01 -0400)]
Make number picker styles public
Bug:
28189144
Change-Id: Ic1825c211bf76ea8b063996895f4a273ac0c7fd4
Jaewan Kim [Thu, 14 Apr 2016 02:36:48 +0000 (11:36 +0900)]
PIP: Update the focusability of recents row whenever Recents is shown
Bug:
28175628
Change-Id: I39da6ca3a8d379b85cea2341b3b61f93bf8cada4
Jaewan Kim [Mon, 11 Apr 2016 06:43:36 +0000 (15:43 +0900)]
PIP: Fix regressions
This includes following fixes
- Press back key to go to Home from Recents
- Do not show Recents when an activity is PIPed immediately after moved
to fullscreen.
These regressions are caused by
c81082b Improve Animation Calculations to remove Jank
Bug:
28107787
Change-Id: I3078a5d8a9505c8d03cceee329e5d740efae7feb
Alan Viverette [Thu, 14 Apr 2016 16:27:32 +0000 (16:27 +0000)]
Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev
Rob Carr [Thu, 14 Apr 2016 16:23:22 +0000 (16:23 +0000)]
Merge "Add WindowManager side timeout for toasts." into nyc-dev
Jaewan Kim [Thu, 14 Apr 2016 13:49:23 +0000 (22:49 +0900)]
PIP: Implement new onboarding spec
Bug:
27954437
Change-Id: Ib939a4ca5f304821036a43971ae7f45b7802ed8a
Gustav Sennton [Thu, 14 Apr 2016 14:07:09 +0000 (15:07 +0100)]
Fix the behaviour for explicitly switching WebView provider
Before this CL when we tried to change WebView provider through the Dev
setting and failed we would then have the setting point to the provider
used before the change. With this CL we instead let the setting point to
the intended target but also switch to the package which the
WebViewUpdateService see as most fit (rather than just reverting back to
the original choice).
Add unit tests to verify we kill processes depending on WebView
packages when switching WebView provider.
Add unit tests to ensure we can recover from trying to change provider
when there are no providers available.
Bug:
27673076
Bug:
27635535
Change-Id: Ie7bb6afdf8acf4344cfb363947929c0b492775fb
Andrei Stingaceanu [Thu, 14 Apr 2016 15:40:47 +0000 (15:40 +0000)]
Merge "Keyboard shortcuts: one instance refactor" into nyc-dev
Andrei Stingaceanu [Tue, 12 Apr 2016 14:29:25 +0000 (15:29 +0100)]
Keyboard shortcuts: one instance refactor
Make all the instance public methods private
and add static methods to control the behavior:
* show
* dismiss
* toggle
Make sure we only deal with one instance of the
KeyboardShortcuts (previously both the
KeyboardShortcutsReceiver and BaseStatusBar were
creating instances).
Makes sure the instance is destroyed when dismissing
and when showing it either creates a new one if none
exists or reuses the existing one.
Also fixes an existing nasty issue where in order
to dismiss the dialog from BaseStatusBar we were
always first creating a new instance.
Bug:
28012198
Change-Id: I207553dd45ae535edc64b6292a472fa0899029b0
Calin Juravle [Thu, 14 Apr 2016 15:24:10 +0000 (15:24 +0000)]
Merge "Handle dalvik.vm.jitprithreadweight property" into nyc-dev
Alan Viverette [Thu, 14 Apr 2016 15:22:44 +0000 (11:22 -0400)]
Basic documentation for custom drawables
Bug:
23621364
Change-Id: Ia292433ebd40d4c85ff6974def3d1f4b26926b52
Sid Soundararajan [Thu, 14 Apr 2016 15:19:22 +0000 (15:19 +0000)]
Merge "Add a fall back for when the thumbnail is not generated for a task" into nyc-dev
Jason Monk [Thu, 14 Apr 2016 14:57:43 +0000 (14:57 +0000)]
Merge "QS Edit: Fix drag to add tiles going away" into nyc-dev
Jason Monk [Thu, 14 Apr 2016 14:53:42 +0000 (10:53 -0400)]
QS Edit: Fix drag to add tiles going away
Change-Id: I421717066e6effde6dade7ef498877aa8834abdd
Fixes:
28153092
TreeHugger Robot [Thu, 14 Apr 2016 14:44:59 +0000 (14:44 +0000)]
Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev
Julia Reynolds [Thu, 14 Apr 2016 14:42:52 +0000 (14:42 +0000)]
Merge changes I6b52e378,I1699e6bf into nyc-dev
* changes:
Phone call vibrate should obey user preference.
Adjustment bundles are defusable.
Alan Viverette [Thu, 14 Apr 2016 14:15:04 +0000 (10:15 -0400)]
Update day of week labels when setting month params in SimpleMonthView
Bug:
27310206
Change-Id: I40c09fb5dddb202a17ac9c6ecee1d6f40644d9e6
Daniel Sandler [Thu, 14 Apr 2016 13:53:18 +0000 (13:53 +0000)]
Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
Dan Sandler [Tue, 12 Apr 2016 18:20:32 +0000 (14:20 -0400)]
Allow system apps to substitute a different app name in notifications.
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.
The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).
Fixes:
26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
Julia Reynolds [Thu, 14 Apr 2016 13:37:08 +0000 (09:37 -0400)]
Phone call vibrate should obey user preference.
Bug:
27353237
Change-Id: I6b52e378c9e664600720025af30596be09aeb19d
Gustav Sennton [Thu, 14 Apr 2016 08:58:36 +0000 (09:58 +0100)]
Verify WebView package info before loading WebView
To ensure that the package we are using to load WebView is a valid
provider we need to verify this before loading WebView - not only when
choosing what package to use.
Bug:
27900925
Change-Id: If57ca32a7a3fa08735a3b8ea9ed268c1bb1b8ede
Julia Reynolds [Thu, 14 Apr 2016 12:54:45 +0000 (08:54 -0400)]
Adjustment bundles are defusable.
Bug:
28168811
Change-Id: I1699e6bfd03a5f117cc89585c03e235fe6a99456
Niels Egberts [Thu, 14 Apr 2016 12:33:03 +0000 (12:33 +0000)]
Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev
Gustav Sennton [Thu, 14 Apr 2016 10:58:40 +0000 (10:58 +0000)]
Merge "Update persistent WebView packages setting only when user changes it." into nyc-dev
Gustav Sennton [Thu, 14 Apr 2016 10:25:13 +0000 (10:25 +0000)]
Merge "Ensure at least one default-available webview package is a non-fallback" into nyc-dev
TreeHugger Robot [Thu, 14 Apr 2016 10:14:19 +0000 (10:14 +0000)]
Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev
Clara Bayarri [Thu, 14 Apr 2016 10:05:34 +0000 (10:05 +0000)]
Merge "Provide startIntentSenderForResult for fragments" into nyc-dev
Bernard Chau [Thu, 14 Apr 2016 09:39:59 +0000 (09:39 +0000)]
Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev
TreeHugger Robot [Thu, 14 Apr 2016 09:32:19 +0000 (09:32 +0000)]
Merge "Filter out ACTION_UP events in onKey() listener." into nyc-dev
Erik Kline [Thu, 14 Apr 2016 08:30:59 +0000 (17:30 +0900)]
Also log IPv4 and IPv6 connectivity of any previous default network
Change-Id: I07595c0a131fea21914f524949cd64af87403b88
Hugo Benichi [Thu, 14 Apr 2016 08:01:29 +0000 (08:01 +0000)]
Merge "Add DHCP error event class and record DHCP errors." into nyc-dev
Daichi Hirono [Thu, 14 Apr 2016 05:40:47 +0000 (14:40 +0900)]
Filter out ACTION_UP events in onKey() listener.
Previously we invokes performeSave both for ACTION_DOWN and ACTION_UP,
thus it creates two documents.
Change-Id: I7fc2a62c34fc239c2bf3ca6c71122e360d589727
Fixes:
28179791
Pierre Imai [Thu, 14 Apr 2016 07:25:33 +0000 (07:25 +0000)]
Merge changes Ia71865a9,I40b6de54 into nyc-dev
* changes:
Log an event whenever we lose the default network.
Record the transport types for connectivity events.
Hugo Benichi [Wed, 13 Apr 2016 01:13:32 +0000 (10:13 +0900)]
Add DHCP error event class and record DHCP errors.
This patch adds an event class derived from IpConnectivityEvent that
records parsing errors of DHCP response packets.
Change-Id: I19516cf05e3419c4262e3236899e52987e5f2264
Pierre Imai [Tue, 12 Apr 2016 09:02:58 +0000 (18:02 +0900)]
Log an event whenever we lose the default network.
Change-Id: Ia71865a90b2db5dc0d3ad627563a6b1f99686f04
Pierre Imai [Thu, 7 Apr 2016 03:21:05 +0000 (12:21 +0900)]
Record the transport types for connectivity events.
BUG:
25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
Jaewan Kim [Thu, 14 Apr 2016 06:28:56 +0000 (06:28 +0000)]
Merge "PIP: Fix runtime crash in System UI" into nyc-dev
Jaewan Kim [Thu, 14 Apr 2016 06:17:36 +0000 (15:17 +0900)]
PIP: Fix runtime crash in System UI
Bug:
27677096
Change-Id: I182e29962b5da8355f729287a4abde1e73e66e42
Zhijun He [Thu, 14 Apr 2016 05:20:44 +0000 (05:20 +0000)]
Merge "Camera: clarify lens shading map" into nyc-dev
Dongwon Kang [Thu, 14 Apr 2016 04:55:22 +0000 (21:55 -0700)]
PipManager: Revisit the logic for PIP close for TV app case
Bug:
26644185
Change-Id: I566f965796bc5a50b4e2ecf08b7217c6565cb163
Hugo Benichi [Thu, 14 Apr 2016 04:19:49 +0000 (04:19 +0000)]
Merge "Add volatile qualifier to boolean variable" into nyc-dev
Yuki Awano [Thu, 14 Apr 2016 02:53:10 +0000 (11:53 +0900)]
Do not update accessibilityTitle in
LayoutParams.setTitle
Bug:
28126629
Change-Id: Idfd8c0210d32e1a0e9c16272cfbb35ef6065e805
Dianne Hackborn [Thu, 14 Apr 2016 04:16:09 +0000 (04:16 +0000)]
Merge "Fix issue #
28156248: Receiving connectivity receiver..." into nyc-dev
TreeHugger Robot [Thu, 14 Apr 2016 03:56:20 +0000 (03:56 +0000)]
Merge "Limit don't dispatch when non-interactive and the display is off to watches" into nyc-dev
Winson [Wed, 13 Apr 2016 00:02:26 +0000 (17:02 -0700)]
Reducing work on configuration change (Part 1)
- Don’t reinflate the header bar and dummy stack view
- Only update the header bar layout params when values change
Change-Id: I47bb699e35b10caea2ab8640be8d3f9a3d445c58
Doug Felt [Thu, 14 Apr 2016 02:10:35 +0000 (19:10 -0700)]
Update fonts.xml file for new noto fonts.
- Tibetan Bold, Symbols-Regular-Subsetted2.
Bug:
27531263
Bug:
26862061
Change-Id: I356bdf438748f29a6fbb5e199902fa574dd08da8
TreeHugger Robot [Thu, 14 Apr 2016 03:20:38 +0000 (03:20 +0000)]
Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev
Andy Hung [Thu, 14 Apr 2016 02:27:43 +0000 (19:27 -0700)]
Unify dumped native stack traces
Bug:
28179196
Change-Id: I96a8c0c2ec1a7d4c569a8788e1f6f8ac6a6a1bcc
Wale Ogunwale [Mon, 4 Apr 2016 14:28:27 +0000 (07:28 -0700)]
Limit don't dispatch when non-interactive and the display is off to watches
We still want to dispatch input for non-watch devices when the non-interactive
and the display is off.
Bug:
26277593
Change-Id: I38023b3494e46c63578dd3162e2b9aa0a213862d