Kevin Chyn
c8a47e1e78
Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989fd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972615
Change-Id: I6cdcee2228ea48f8d36af6b42e4afc6c6e6c0fdd
2021-06-16 06:33:50 +00:00
Kevin Chyn
ffc5989fd3
Merge "Move non-settings-specific logic to frameworks/base" into sc-dev
2021-06-16 06:13:17 +00:00
Minche Li
2ad334461c
Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev am: 70aaf815b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921895
Change-Id: Id9848497346417660cac743d4a8217792fb07202
2021-06-16 05:24:19 +00:00
Minche Li
70aaf815b6
Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev
2021-06-16 04:58:37 +00:00
Jacky Kao
c54cf1ce11
[automerger skipped] Merge "Eliminate potential deadlock in AccessibilityCache" am: e6510baf3b am: 0d21e173f9 -s ours
...
am skip reason: Merged-In I27e4e64f778ae1c2a348e16cf8739f7a5596e0fc with SHA-1 1427156afc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1736248
Change-Id: I33f5c0149a1ce5865cba08e826632761a4efc4e3
2021-06-16 04:23:19 +00:00
Lucas Lin
035d2579c3
Merge "Set legacy type for VPN" am: e19a7da47f am: 49082c0065
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733495
Change-Id: Ic6c3f0db93ddef11ca0bea3c0dda3f5101f69be3
2021-06-16 04:22:38 +00:00
TreeHugger Robot
a2a9378638
Merge "Limit marquee in QS tiles to 1" into sc-dev am: 014c064431
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982226
Change-Id: I90989668229298cda91b13bffcfdbccd7d8b89f9
2021-06-16 04:18:57 +00:00
TreeHugger Robot
d05a6224dd
Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev am: 8a39e97d7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14966792
Change-Id: I8beeb1372180731c9257effa877ff2c39b153f56
2021-06-16 04:17:53 +00:00
Jacky Kao
0d21e173f9
Merge "Eliminate potential deadlock in AccessibilityCache" am: e6510baf3b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1736248
Change-Id: Ic2c767c140ba4961caa63c574e805e70a69f3e63
2021-06-16 04:11:45 +00:00
TreeHugger Robot
014c064431
Merge "Limit marquee in QS tiles to 1" into sc-dev
2021-06-16 04:01:09 +00:00
TreeHugger Robot
8a39e97d7e
Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev
2021-06-16 04:00:25 +00:00
Lucas Lin
49082c0065
Merge "Set legacy type for VPN" am: e19a7da47f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733495
Change-Id: I30a234ade5efe99fb5ba7b5b916a1de9920bdbab
2021-06-16 04:00:13 +00:00
Jacky Kao
e6510baf3b
Merge "Eliminate potential deadlock in AccessibilityCache"
2021-06-16 03:14:27 +00:00
Lucas Lin
e19a7da47f
Merge "Set legacy type for VPN"
2021-06-16 02:22:45 +00:00
Colin Cross
d8d461402c
Merge "Revert "Revert "HULK SMASH! We've gotta declare REL.""" into sc-dev am: 5c80e3491d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14991077
Change-Id: Ib6d5ba46ada533cbb903c52eb3531f6a854d4236
2021-06-16 02:11:59 +00:00
mincheli
5c8b13c47f
Calculates the window height fraction on screen by the draggable bounds for magnification switch button
...
In the previous change ag/14776093, the window height fraction used
"windowHeightFraction = (float) mParams.y / mWindowHeight;". And it
causes the Y-position deviated after the rotation is changed.
To correct this, we used the draggable bounds to calculate the window
height fraction.
See b/189715285#comment3
Bug: 189715285
Test: atest MagnificationModeSwitchTest
Change-Id: I1adcea12f0a96c64c9c6e386dc2feb8e3a9ffcf3
2021-06-16 01:59:16 +00:00
Colin Cross
5c80e3491d
Merge "Revert "Revert "HULK SMASH! We've gotta declare REL.""" into sc-dev
2021-06-16 01:55:36 +00:00
Colin Cross
67f28e7448
Revert "Revert "HULK SMASH! We've gotta declare REL.""
...
This reverts commit 30bb1d09eb .
Reason for revert: b/191191441
Bug: 171506470
Bug: 191191441
Change-Id: I698709a27f3b09e5e02143efd7a71157b5ecf75a
2021-06-16 01:54:59 +00:00
Sally
fed928bb1f
Eliminate potential deadlock in AccessibilityCache
...
The cache calls out with its lock to the app main thread when refreshing
nodes. This opens the door for a deadlock, and causes a slowdown for
non-main threads.
Bug: 180957109, 189786298
Test: atest CtsAccessibilityServiceTestCases CtsAccessibilityTestCases
CtsUiAutomationTestCases
FrameworksServicesTests:com.android.server.accessibility
FrameworksCoreTests:com.android.internal.accessibility
FrameworksCoreTests:android.view.accessibility
Merged-In: I27e4e64f778ae1c2a348e16cf8739f7a5596e0fc
Change-Id: I27e4e64f778ae1c2a348e16cf8739f7a5596e0fc
2021-06-16 00:58:13 +00:00
Alexander Dorokhine
635238984b
Merge "Update framework from jetpack." into sc-dev am: ad37babc9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14834284
Change-Id: Ibede3baae5e89b4fdfbcbed09339136a7529ff3b
2021-06-15 23:34:39 +00:00
Treehugger Robot
411bde0932
[automerger skipped] Merge "Update nullability checks to use Objects#requireNonNull instead of deprecated method in Preconditions class" am: a9d6e01b6e am: 41fbab4970 -s ours
...
am skip reason: Merged-In Ie7f7282b89c13f587fdfe1bf3288eb4a3c7dcc6e with SHA-1 710f462a5f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734494
Change-Id: I1d6314d0b1d5ae96d01fc4d694474d912562d317
2021-06-15 23:25:09 +00:00
Alexander Dorokhine
ad37babc9f
Merge "Update framework from jetpack." into sc-dev
2021-06-15 23:20:43 +00:00
Treehugger Robot
41fbab4970
Merge "Update nullability checks to use Objects#requireNonNull instead of deprecated method in Preconditions class" am: a9d6e01b6e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734494
Change-Id: I9d5a89f006cb164a48d5678c42b13210cf0f63bc
2021-06-15 23:06:20 +00:00
Treehugger Robot
a9d6e01b6e
Merge "Update nullability checks to use Objects#requireNonNull instead of deprecated method in Preconditions class"
2021-06-15 22:45:39 +00:00
Jing Ji
ee6c97ca0f
[automerger skipped] Validate the ServiceRecord state while handling misbehaving FGS am: ae5a219b95 -s ours am: a388d2533d -s ours
...
am skip reason: Merged-In If18e1d7ba88aef693349b82dc6e70f7d98c68665 with SHA-1 e9b096473f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14984596
Change-Id: Id9b22a7684088e06089bcd5275ed4c996eeec181
2021-06-15 22:38:11 +00:00
Jing Ji
a388d2533d
[automerger skipped] Validate the ServiceRecord state while handling misbehaving FGS am: ae5a219b95 -s ours
...
am skip reason: Merged-In If18e1d7ba88aef693349b82dc6e70f7d98c68665 with SHA-1 e9b096473f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14984596
Change-Id: I64138221dba7defd84c31b64fa84b6aea7c1d09b
2021-06-15 22:19:10 +00:00
Siarhei Vishniakou
b1fd52b3eb
Merge "Remove FLAG_INPUTFILTER_TRUSTED in MotionEventInjector" into sc-dev am: 5d552869af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676739
Change-Id: I71f585c65c9aebe080a0f497168ea084e942ffbf
2021-06-15 21:54:52 +00:00
TreeHugger Robot
6da906128a
Merge "Improved implementation of VoiceInteractionManagerService.setDisabled()" into sc-dev am: 50bbe88967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940217
Change-Id: I40a09af3eda2b79363927c2ca82146bef902cf12
2021-06-15 21:54:30 +00:00
Siarhei Vishniakou
5d552869af
Merge "Remove FLAG_INPUTFILTER_TRUSTED in MotionEventInjector" into sc-dev
2021-06-15 21:50:35 +00:00
TreeHugger Robot
50bbe88967
Merge "Improved implementation of VoiceInteractionManagerService.setDisabled()" into sc-dev
2021-06-15 21:45:38 +00:00
TreeHugger Robot
a17a93ccea
Merge "Make inline suggestions tooltip is not magnified" into sc-dev am: cac7ab9c5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14514105
Change-Id: I5ed34a3dacd098be66e030143e8fc4af41292bca
2021-06-15 21:37:19 +00:00
Ilya Matyukhin
be453c5d47
Merge "Add traces for touch events and fix trace naming" into sc-dev am: 825555290f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14977408
Change-Id: I493c85c5501597a139b2e775e3dd13b3388dab5b
2021-06-15 21:37:10 +00:00
Jeff Sharkey
7084489ea9
Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev am: a56beb126d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14973563
Change-Id: Ieae4615f2d4f3cfc17838bd8a5cb7b0e9a08cdad
2021-06-15 21:36:59 +00:00
Nikita Ioffe
fcd0907652
Merge "Allow holders of INSTALL_PACKAGE_UPDATES permission to update APEXes" into sc-dev am: 4173c5a51a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965611
Change-Id: I63407d38a3f80db3adb2cfd7b993a939c4cb113c
2021-06-15 21:36:39 +00:00
TreeHugger Robot
d24125d42a
Merge "Use PWLE for waveforms and add ramp down to zero" into sc-dev am: 5bb0024e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14734461
Change-Id: Ib2a1e73464ef90a7faa87b0ea6b476a04654b493
2021-06-15 21:36:13 +00:00
Tom Natan
f5664a2cc2
[automerger skipped] Merge "Avoid locking mChanges when not necessary" am: 6d66e48e52 am: 4f007c932a -s ours
...
am skip reason: Merged-In I193c8f0ce2659b89469bb21e505a6da382b64703 with SHA-1 58865c7183 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737094
Change-Id: I27e93e6e1cc0c97b7a709d7a0e802e6e32608124
2021-06-15 21:22:53 +00:00
Ryan Prichard
f3c96b232c
Merge "Stop exporting symbols from app_process" am: c6bd7008f8 am: 8dd59dbacf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727416
Change-Id: I92f7607c39944f62e94f09ddd6c891a7aa25ed88
2021-06-15 21:22:16 +00:00
TreeHugger Robot
cac7ab9c5c
Merge "Make inline suggestions tooltip is not magnified" into sc-dev
2021-06-15 21:22:09 +00:00
TreeHugger Robot
74637cf19c
Merge "Refresh the call indicators whenever carrier config is changed" into sc-dev am: 7f848ec12a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982365
Change-Id: Ifed7bf0c8c4419d15a59fe830c9d71080c13af2a
2021-06-15 21:22:03 +00:00
Ilya Matyukhin
825555290f
Merge "Add traces for touch events and fix trace naming" into sc-dev
2021-06-15 21:07:54 +00:00
Jeff Sharkey
a56beb126d
Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev
2021-06-15 21:03:41 +00:00
Nikita Ioffe
4173c5a51a
Merge "Allow holders of INSTALL_PACKAGE_UPDATES permission to update APEXes" into sc-dev
2021-06-15 21:03:05 +00:00
Tom Natan
4f007c932a
Merge "Avoid locking mChanges when not necessary" am: 6d66e48e52
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737094
Change-Id: If06752f62f3a8c6b3cc32caf27a38b1a338e1b9e
2021-06-15 20:59:55 +00:00
TreeHugger Robot
5bb0024e1f
Merge "Use PWLE for waveforms and add ramp down to zero" into sc-dev
2021-06-15 20:50:45 +00:00
Ryan Prichard
8dd59dbacf
Merge "Stop exporting symbols from app_process" am: c6bd7008f8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727416
Change-Id: I41f975c9fbb6ba390afc8bbbbaf45529647ec96d
2021-06-15 20:49:18 +00:00
TreeHugger Robot
7f848ec12a
Merge "Refresh the call indicators whenever carrier config is changed" into sc-dev
2021-06-15 20:47:45 +00:00
TreeHugger Robot
7d5909112c
Merge "Need to call resetFgsRestrictionLocked() before calling setFgsRestrictionLocked() again." into sc-dev am: d26ab5ef57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14981904
Change-Id: I0c7c68286c68cecc589fee0bfb6ab497a833a127
2021-06-15 20:29:41 +00:00
TreeHugger Robot
d26ab5ef57
Merge "Need to call resetFgsRestrictionLocked() before calling setFgsRestrictionLocked() again." into sc-dev
2021-06-15 20:28:15 +00:00
Miranda Kephart
2ee9f11c79
Merge "Make Markup fade in from screenshots" into sc-dev am: f34c9ede73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969136
Change-Id: I85f4fa6852ce5ba6cc2cc5a4bff3c095955117cc
2021-06-15 20:19:05 +00:00
Tom Natan
6d66e48e52
Merge "Avoid locking mChanges when not necessary"
2021-06-15 20:08:28 +00:00