OSDN Git Service
Derek Sollenberger [Wed, 9 Aug 2017 22:50:12 +0000 (22:50 +0000)]
Merge "Support copying from index8 into another index8." into oc-dr1-dev
am:
f112fde96d -s ours
Change-Id: I28e0f5b34ea30d1a8edaa3858b2bb569612a57e5
TreeHugger Robot [Wed, 9 Aug 2017 22:33:34 +0000 (22:33 +0000)]
Merge "Support copying from index8 into another index8." into oc-dr1-dev
Rebecca Silberstein [Wed, 9 Aug 2017 22:33:00 +0000 (22:33 +0000)]
Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev
am:
54233f96d7
Change-Id: I47400de6e07c228e48c1467060a2179af9e4b4d9
TreeHugger Robot [Wed, 9 Aug 2017 22:23:14 +0000 (22:23 +0000)]
Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev
Paul Mclean [Wed, 9 Aug 2017 22:13:48 +0000 (22:13 +0000)]
Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev
am:
75384f617d
Change-Id: I693a3cf37c55085eee470091edf5fff0bc62ece8
Paul Mclean [Wed, 9 Aug 2017 21:59:55 +0000 (21:59 +0000)]
Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev
Vinay Kalia [Wed, 9 Aug 2017 21:23:16 +0000 (21:23 +0000)]
Merge "Fix BLE scan leaks" into oc-dev am:
6e749c392b
am:
3e832cf58e
Change-Id: I4edafeb10fcb2dabffe2b139893ae18139930656
Selim Cinek [Wed, 9 Aug 2017 21:17:14 +0000 (21:17 +0000)]
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
am:
f89e462bc7
Change-Id: Iead3762d5064362fbc37be960d744d68b9f7b31d
Vinay Kalia [Wed, 9 Aug 2017 21:11:53 +0000 (21:11 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
am:
6e749c392b
Change-Id: I35705a81a45d2c7fd48f021a5e0e93e1709c6876
TreeHugger Robot [Wed, 9 Aug 2017 21:05:32 +0000 (21:05 +0000)]
Merge "Light alarm activity tracing" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 21:03:15 +0000 (21:03 +0000)]
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
Vinay Kalia [Wed, 9 Aug 2017 21:02:32 +0000 (21:02 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
TreeHugger Robot [Wed, 9 Aug 2017 20:52:13 +0000 (20:52 +0000)]
Merge "Fixes recents from disappearing when split and restarted" into oc-mr1-dev
Jason Monk [Wed, 9 Aug 2017 20:45:50 +0000 (20:45 +0000)]
Merge "Make rounded corners handle color inversion" into oc-dr1-dev
am:
ca91e6cecd
Change-Id: I9d701444957cae9395f23537df63a76498ede87b
TreeHugger Robot [Wed, 9 Aug 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Make rounded corners handle color inversion" into oc-dr1-dev
Bryce Lee [Wed, 9 Aug 2017 20:34:57 +0000 (20:34 +0000)]
Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev
am:
0a3684eb45
Change-Id: Ic1be6d9c3336fe78d1a7beb06d712fd88fa2e9ed
Bryce Lee [Wed, 9 Aug 2017 20:21:03 +0000 (20:21 +0000)]
Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev
Christine Franks [Wed, 9 Aug 2017 20:15:33 +0000 (20:15 +0000)]
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
am:
4387d3a523
Change-Id: I163963c15c009eaf70907203cf941e182409eafc
TreeHugger Robot [Wed, 9 Aug 2017 20:07:48 +0000 (20:07 +0000)]
Merge "Rate limit notifyColorsChanged()" into oc-mr1-dev
Christine Franks [Wed, 9 Aug 2017 20:06:35 +0000 (20:06 +0000)]
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
Erik Kline [Wed, 9 Aug 2017 19:40:47 +0000 (19:40 +0000)]
Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
am:
15fbf9786d
Change-Id: Ic924639baa940363f5a29161bebc74f33b97165d
Lucas Dupin [Wed, 9 Aug 2017 19:37:56 +0000 (19:37 +0000)]
Merge "Fix race condition in binder thread" into oc-dr1-dev
am:
33e014b9bc
Change-Id: I5e98f321a23a5c99b321c10c59bbbc55b308bbf9
TreeHugger Robot [Wed, 9 Aug 2017 19:28:49 +0000 (19:28 +0000)]
Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:24:16 +0000 (19:24 +0000)]
Merge "Fix race condition in binder thread" into oc-dr1-dev
Paul McLean [Fri, 4 Aug 2017 17:12:19 +0000 (11:12 -0600)]
Update isWiredHeadsetOn() to support USB headsets.
Bug:
64250808
Test: Manual from an App (UsbDescriptors app)
Change-Id: Ic979636025e871d69853a7460befce4e1b1a6ed8
Winson Chung [Wed, 9 Aug 2017 19:01:50 +0000 (19:01 +0000)]
Merge changes I52152223,I49db5cab into oc-dr1-dev
am:
fc596b1cf6
Change-Id: I53f12c1d0854d56ad0e700bf028fd68b47917e1f
Winson Chung [Wed, 9 Aug 2017 18:52:42 +0000 (18:52 +0000)]
Merge changes I52152223,I49db5cab into oc-dr1-dev
* changes:
Ensure that we register the media session listener for the current user.
Fix issue with PiP callbacks not being handled for secondary users.
Derek Sollenberger [Fri, 4 Aug 2017 18:13:57 +0000 (14:13 -0400)]
Support copying from index8 into another index8.
Both bitmap's must share the same color table as we essentially
memcopy the pixel data between the buffers.
Bug:
64112829
Test: CtsGraphicsTestCases
Merged-In: I317e3a814dbd102925fe412d2e19111b0af3af38
Change-Id: I5d99627fe7dd0639bb47a2eb8790510beebe6c6f
Zheng Zhang [Wed, 9 Aug 2017 18:40:30 +0000 (18:40 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am:
9468b48565 -s ours am:
4542686e42 am:
c915b7f703
am:
54ad8c1f15
Change-Id: Ic9d8b66343523750a562954a8be60b0663b833d5
Wei Wang [Wed, 9 Aug 2017 18:39:20 +0000 (18:39 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am:
2ed0166808 -s ours am:
5d60709dc3 am:
17669d31df
am:
5043ac7af3
Change-Id: If0a08d8818160d9dd7ea60dd932c00320feb7654
TreeHugger Robot [Wed, 9 Aug 2017 18:35:01 +0000 (18:35 +0000)]
Merge "Optimize filterByLanguage by caching locale objects" into oc-mr1-dev
Matthew Ng [Thu, 27 Jul 2017 22:41:01 +0000 (15:41 -0700)]
Fixes recents from disappearing when split and restarted
The launch flags are interpreted incorrectly when minimized causing
Recents to start an entrance animation by moving off screen and being
invisible when Recents is destroyed and shown again by density or font
system changes. When recents is restarted, reset the flags to ignore the
entrance animation from moving them off screen.
Fixes:
62195106
Test: Open settings, go to page to change font size, dock by holding
recents button, with at least one task in Recents, change density. Also
can minimize and unminimize and changing density would also get fixed.
Change-Id: I519f59faf5e98c9d116bf66297f033c7f5fb7138
TreeHugger Robot [Wed, 9 Aug 2017 18:26:04 +0000 (18:26 +0000)]
Merge "Dismiss recents after switching users" into oc-mr1-dev
Zheng Zhang [Wed, 9 Aug 2017 18:24:15 +0000 (18:24 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am:
9468b48565 -s ours am:
4542686e42
am:
c915b7f703
Change-Id: If08c8029ad5054f947ada0c5f4923f62761bf47c
Wei Wang [Wed, 9 Aug 2017 18:23:00 +0000 (18:23 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am:
2ed0166808 -s ours am:
5d60709dc3
am:
17669d31df
Change-Id: I7e5b94c6adf57ff19c64fe508f7f3cc6d6a9c1c7
Zheng Zhang [Wed, 9 Aug 2017 18:09:48 +0000 (18:09 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am:
9468b48565 -s ours
am:
4542686e42
Change-Id: Id140fee89f552999522f3116854761c14265ef04
Wei Wang [Wed, 9 Aug 2017 18:08:52 +0000 (18:08 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am:
2ed0166808 -s ours
am:
5d60709dc3
Change-Id: I10a42eee839da98af9434d1f7530335dfa732632
Justin Klaassen [Wed, 9 Aug 2017 17:59:04 +0000 (17:59 +0000)]
Merge "Grant default ringtone picker storage permissions" into oc-dr1-dev
am:
8039ac418f
Change-Id: I8c3575d974a5266b62d560508df1253ba80fb0e4
Zheng Zhang [Wed, 9 Aug 2017 17:58:18 +0000 (17:58 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
am:
9468b48565 -s ours
Change-Id: Ia1c10a46771ff4602a1005a3bf0bddaf6f1a70b6
Wei Wang [Wed, 9 Aug 2017 17:57:17 +0000 (17:57 +0000)]
Fix Wakelock underlock in GnssLocationProvider.
am:
2ed0166808 -s ours
Change-Id: I965a5b57ffbc2adcde3a83a95793a3dc29673641
Selim Cinek [Tue, 8 Aug 2017 17:58:32 +0000 (10:58 -0700)]
Worked around a bug where the a group child could be leaked
It may happen that a group entry could be leaked, if an
entry is inserted again after it was removed. We now added
logging to detect it better and worked around the issue.
Change-Id: Iaa6dfedddf5bafe0697bd0411b2e5f24982b1160
Fixes:
63717947
Test: add groups and remove / hun children
TreeHugger Robot [Wed, 9 Aug 2017 17:43:58 +0000 (17:43 +0000)]
Merge "Grant default ringtone picker storage permissions" into oc-dr1-dev
Christofer Ã…kersten [Wed, 9 Aug 2017 17:40:53 +0000 (17:40 +0000)]
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev
am:
8cbb5ffd5b -s ours
Change-Id: I83c849172c9beb92132f925184b43f62d307405a
TreeHugger Robot [Wed, 9 Aug 2017 17:31:48 +0000 (17:31 +0000)]
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev
Christine Franks [Wed, 9 Aug 2017 17:06:43 +0000 (10:06 -0700)]
Allow SMS and calling for demo users
Bug:
62712426
Test: manual - restrictions are unset in demo mode
Change-Id: I151fbfb8222e768403a7e5ba1fcf868ba35a1f22
Lucas Dupin [Wed, 9 Aug 2017 17:11:06 +0000 (17:11 +0000)]
Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev
am:
94f8143129
Change-Id: I6d7be5a8e2702d655548944c739f8d8d90451efe
Android Build Merger (Role) [Wed, 9 Aug 2017 17:05:04 +0000 (17:05 +0000)]
Merge "Merge "AOD: Fix janky pulse out animation" into oc-dr1-dev am:
d72954af31" into oc-mr1-dev
Adrian Roos [Wed, 9 Aug 2017 17:02:06 +0000 (17:02 +0000)]
Merge "AOD: Fix janky pulse out animation" into oc-dr1-dev
am:
d72954af31
Change-Id: I7e1307c5209920326139a60c3aaeb9af6d57d825
Android Build Merger (Role) [Wed, 9 Aug 2017 17:00:27 +0000 (17:00 +0000)]
Merge "Merge "Ensure we leave the orientation changing state." into oc-dr1-dev am:
1eee2b4994" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:59:24 +0000 (16:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Lucas Dupin [Wed, 9 Aug 2017 16:58:44 +0000 (16:58 +0000)]
Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev
Rob Carr [Wed, 9 Aug 2017 16:58:29 +0000 (16:58 +0000)]
Merge "Ensure we leave the orientation changing state." into oc-dr1-dev
am:
1eee2b4994
Change-Id: I72e920090a147053bf7e6e61adb720c908bcd9c4
Android Build Merger (Role) [Wed, 9 Aug 2017 16:54:28 +0000 (16:54 +0000)]
Merge "Merge "LockIcon: update content description when config changes" into oc-dr1-dev am:
f79068637a" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:51:52 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Adrian Roos [Wed, 9 Aug 2017 16:51:16 +0000 (16:51 +0000)]
Merge "LockIcon: update content description when config changes" into oc-dr1-dev
am:
f79068637a
Change-Id: I81db081bbc793246ed0e6b7fa2551512c9758ff0
Adrian Roos [Wed, 9 Aug 2017 16:47:19 +0000 (16:47 +0000)]
Merge "AOD: Fix janky pulse out animation" into oc-dr1-dev
Christofer Ã…kersten [Wed, 9 Aug 2017 16:45:51 +0000 (16:45 +0000)]
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:45:34 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Rob Carr [Wed, 9 Aug 2017 16:45:24 +0000 (16:45 +0000)]
Merge "Ensure we leave the orientation changing state." into oc-dr1-dev
Winson Chung [Tue, 8 Aug 2017 19:58:11 +0000 (12:58 -0700)]
Ensure that we register the media session listener for the current user.
- Use the per-user calls when fetching/responding to media session events
otherwise it will fallback to using the process user.
Bug:
64315017
Test: Launch secondary user, enter PiP with media session and no custom
actions. Ensure the media session buttons show.
Change-Id: I52152223e91f0256ac4135616694e2a293947e3e
Adrian Roos [Wed, 9 Aug 2017 16:37:30 +0000 (16:37 +0000)]
Merge "BrightnessMirror: When reinflating, notify QSPanel" into oc-dr1-dev
am:
1273dd6b86
Change-Id: I0c561af8d1d7a9213b4f14fcf29d3550672cc92c
TreeHugger Robot [Wed, 9 Aug 2017 16:34:47 +0000 (16:34 +0000)]
Merge "LockIcon: update content description when config changes" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:22:29 +0000 (16:22 +0000)]
Merge "BrightnessMirror: When reinflating, notify QSPanel" into oc-dr1-dev
Jorim Jaggi [Wed, 9 Aug 2017 16:15:53 +0000 (16:15 +0000)]
Merge "Fix out-of-order transactions (1/2)" into oc-dr1-dev
am:
cadfccbc13
Change-Id: Ia4c62e890f007c43b7fa0fd557b583ee455a1e3b
The Android Open Source Project [Wed, 9 Aug 2017 16:12:53 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9dbd07ef32 -s ours
Change-Id: Icec15bf6ba22bcc99d67be38e3967e6f6a227daf
Jorim Jaggi [Wed, 9 Aug 2017 16:10:35 +0000 (16:10 +0000)]
Merge "Fix out-of-order transactions (1/2)" into oc-dr1-dev
Vinay Kalia [Fri, 28 Jul 2017 22:09:57 +0000 (15:09 -0700)]
Fix BLE scan leaks
If an app starts multiple scans with same callback then
there is a collision in mLeScanClients hash map which
results in leaking first scan. This change fixes it by
not allowing the second scan with same callback.
BUG:
62389939
BUG:
38198694
Test: Tested applications which started multiple scans with
same callback.
Change-Id: I569069a40b6f8b4b8bb070731225e732c6b23ec8
(cherry picked from commit
9722971cb4a79e37165f636f9dd057707d2e620a)
TreeHugger Robot [Wed, 9 Aug 2017 15:59:32 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Tony Mak [Mon, 7 Aug 2017 14:15:57 +0000 (15:15 +0100)]
Optimize filterByLanguage by caching locale objects
According to traceview, most of the time spent in filterByLanguage
is calling getLocaleObject to create java.util.Locale objects.
The solution is to cache the object to save the cost. Note that both
mSubtypeLangugageTag and mSubtypeLocale are final, so it is fine to
cache the locale object.
Test: bit FrameworksCoreTests:android.view.inputmethod.InputMethodSubtypeTest
Test: bit FrameworksCoreTests:com.android.internal.inputmethod.LocaleUtilsTest
Test: Try to switch user back and forth, and tap a textview to show IME.
Bug:
37647204
Fix:
37647213
Change-Id: Ib6ff7e97b17fc547c8109af8177f05fc3ea41b08
TreeHugger Robot [Wed, 9 Aug 2017 14:55:09 +0000 (14:55 +0000)]
Merge "Allow applications to define failure handlers" into oc-mr1-dev
Jason Monk [Wed, 9 Aug 2017 14:45:05 +0000 (10:45 -0400)]
Make rounded corners handle color inversion
Test: visual
Change-Id: I99284b9f24340a453d39aafe6937454892e1383d
Fixes:
64210958
Evan Laird [Wed, 9 Aug 2017 14:24:39 +0000 (14:24 +0000)]
Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev
am:
6b0c1604a6
Change-Id: I400f6c493469bc775bce9ef903fd496a33524a74
TreeHugger Robot [Wed, 9 Aug 2017 14:13:15 +0000 (14:13 +0000)]
Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev
Lucas Dupin [Tue, 8 Aug 2017 18:17:30 +0000 (14:17 -0400)]
Fix race condition in binder thread
Changing wallpapers too quickly could cause a race condition where
RemoteCallbackList#beginBroadcast would be called twice without
the corresponding call to end the broadcast.
Change-Id: I2e63df69ff4ffde76a0b91a2ad46f03d044d95b7
Test: Set breakpoint to pause thread and cause race condition.
Bug:
64391687
Adrian Roos [Wed, 9 Aug 2017 13:50:00 +0000 (15:50 +0200)]
LockIcon: update content description when config changes
Fixes a stale content description after a configuration change.
Change-Id: Ie666d405417ce47cc0fc550b79a948425565162d
Fixes:
64234917
Test: Change language, verify content description of lock icon is updated.
TreeHugger Robot [Wed, 9 Aug 2017 13:28:07 +0000 (13:28 +0000)]
Merge "Add logging for what listener canceled notif" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 13:27:31 +0000 (13:27 +0000)]
Merge "dismiss the volume shade if the a11y stream goes away" into oc-mr1-dev
Pavel Grafov [Wed, 9 Aug 2017 13:22:29 +0000 (13:22 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev
am:
56385a796e -s ours
Change-Id: I8214883676ad022933becca76a704340558abcb1
Erik Kline [Wed, 9 Aug 2017 13:17:25 +0000 (13:17 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev
am:
07df171ac6
Change-Id: I5958635d612a2c23e8d96e38e75eff2f29ff5e28
yinxu [Wed, 9 Aug 2017 13:15:12 +0000 (13:15 +0000)]
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
am:
669f560338
Change-Id: Ia5f2a3273a09fe457ef913fb8c0d37791b52bf68
Geoffrey Pitsch [Wed, 9 Aug 2017 13:10:55 +0000 (13:10 +0000)]
Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev
am:
a68ecbfdee
Change-Id: Id98f4e550b90c128765c0ca014eda925b3507110
Andrew Sapperstein [Wed, 9 Aug 2017 13:06:21 +0000 (13:06 +0000)]
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
am:
3108a06656
Change-Id: Ic37ee35914b714144228b77b192edf835bf9627e
Adrian Roos [Wed, 9 Aug 2017 12:34:55 +0000 (14:34 +0200)]
BrightnessMirror: When reinflating, notify QSPanel
Fixes an issue where after reinflating the brightness mirror,
the QSPanel was not notified.
Change-Id: I3974f31c2d3c67b5a283b10690cb103ca13fff6a
Fixes:
64460731
Test: Change to white / black wallpaper (opposite of current); verify brightness slider works.
Lucas Dupin [Wed, 9 Aug 2017 13:03:29 +0000 (13:03 +0000)]
Merge "User avatar didn't have enough contrast" into oc-dr1-dev
am:
4cef646e6a
Change-Id: Ic5b812965d239de88c98beab411ea5752ec38252
Andrii Kulian [Wed, 9 Aug 2017 12:59:51 +0000 (12:59 +0000)]
Merge "Round animation progress for computing size for background" into oc-dr1-dev
am:
75176be75a
Change-Id: I7c018b5eadc66db0d91542e089899123a85a8877
Glen Kuhne [Wed, 9 Aug 2017 12:56:05 +0000 (12:56 +0000)]
Merge "WifiMetrics: add histogram of connectable networks" into oc-dr1-dev
am:
3edc463902
Change-Id: I575446562bfb560ace060300afb828fc52c4201d
Wei Wang [Wed, 9 Aug 2017 12:53:13 +0000 (12:53 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-dr1-dev
am:
043e60f5e4
Change-Id: I51722b281ab9badaefd705500aa9a36d2e2d6f91
Jason Monk [Wed, 9 Aug 2017 12:47:07 +0000 (12:47 +0000)]
Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev
am:
127a4c9014
Change-Id: I943db8a557e311d845b9550a52dda8d286864cf6
Sundeep Ghuman [Wed, 9 Aug 2017 12:41:25 +0000 (12:41 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev
am:
e14d59a656 -s ours
Change-Id: I18e7f77e4a58ed8abe288aa04b762d112ae495b2
Andrii Kulian [Wed, 9 Aug 2017 12:38:54 +0000 (12:38 +0000)]
Merge "Rotate only VR secondary display" into oc-dr1-dev
am:
425784eef2
Change-Id: I2a5acd51bd9ea588823844cd6a49716181e717a9
Jorim Jaggi [Tue, 8 Aug 2017 13:12:20 +0000 (15:12 +0200)]
Fix out-of-order transactions (1/2)
The following sequence of order may happen which cause wrong
surface positions:
- WA.animate updates surfaces properties to S
- WA.animate closes the surface transaction
- Since the previous animation transaction wasn't commited yet,
closeSurfaceTransaction blocks and updating the surface properties
on SF side is deferred.
- In the meantime, since we are not holding WM lock, we have
another thread updating surfaces properties to S'
- Closing the transaction in this thread completes immediately
because it's not a synchronous transaction or animation
transaction.
- After a frame has been processed S gets applied on SF side as
the other transaction is done waiting for the frame to complete.
The issue here is that properties are now set to S instead of S'.
Sad!
We originally started calling closeTransaction without the WM
lock being held because it lead to thread starvation (b/
38192114).
However, that fix has this big flaw as described above.
To fix this, we create an empty animation transaction before
updating the animation properties to simulate the back-pressuring
behavior of animation transactions without the WM lock being held.
If that transaction arrives out of order, it doesn't matter at all
because it is empty.
After that, we perform the animation udpate in a transaction that
is not marked as an animation transaction, and thus will not
block, which avoids the starvation issue.
Part of this change is also a change in SF to allow executing
empty animation transactions.
Test: go/wm-smoke
Test: Open VideoPlayer from VRCore, close it, observe no wrong
positiioning of surfaces.
Test: Inspect traces while animating. Ensure back pressuring still
works.
Change-Id: Ie545463e71e0d1bc73439d14381077a290d2f959
Fixes:
63905190
Bug:
38192114
Dan Sandler [Wed, 9 Aug 2017 12:33:07 +0000 (12:33 +0000)]
Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev
am:
ad75ef4c3b
Change-Id: I53055ed426d65a6214d19ef11b6f6540c7f6d94c
Felipe Leme [Wed, 9 Aug 2017 12:30:16 +0000 (12:30 +0000)]
Clarifies autofill lifecycle. am:
744976e298
am:
af40bb0dc4
Change-Id: I48f797f62c120b352045cb93e5067ee20c3154d3
Jason Monk [Wed, 9 Aug 2017 12:15:19 +0000 (12:15 +0000)]
Merge "resolve merge conflicts of
de0c539dd4f1 to oc-mr1-dev" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 10:17:09 +0000 (10:17 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev
Adrian Roos [Wed, 9 Aug 2017 09:54:22 +0000 (09:54 +0000)]
Merge "FRP: Fix crash after lockout" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 09:19:15 +0000 (09:19 +0000)]
Merge "FRP: Use verifyChallenge instead of verify" into oc-mr1-dev
Pavel Grafov [Tue, 8 Aug 2017 15:53:32 +0000 (16:53 +0100)]
Mark profile password key as critical.
Currently it is erased when keystore for user 0 is cleared, e.g.
when the user clears data for Settings app.
Bug:
35929605
Bug:
64467610
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
Merged-In: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
The Android Open Source Project [Wed, 9 Aug 2017 07:54:18 +0000 (00:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I02e4b572c91641f5d61321bd3248081723ad65ab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
The Android Open Source Project [Wed, 9 Aug 2017 07:34:40 +0000 (00:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8097c0abf78190a193cc4b5974d81b9be2b33642
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import