Sharon Su
ebe89c5cef
Merge "Ensure service info is updated so that checking for remote service uid returns the correct value." into tm-dev am: 31b9a4cb5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18235796
Change-Id: Ibb00e638b94078b115fe3327e9e85ab1827704b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:34:46 +00:00
Aaron Liu
3984cdb32d
Merge "[Bouncer] Move reset logic to end event." into tm-dev am: 277f9b3b76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18585068
Change-Id: Ic610b9d7c0ff10179685f4501d4c81cd51327752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:34:24 +00:00
TreeHugger Robot
806fc48d20
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2636332305 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590407
Change-Id: I2544c9351abb85182a536d949ff262bd80b8ba19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:33:45 +00:00
Bill Yi
d546f235a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1dac2324b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590407
Change-Id: Ie686bf0a1bf30e9c1a74bb0197e61e252dde7b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:33:39 +00:00
Sharon Su
31b9a4cb5f
Merge "Ensure service info is updated so that checking for remote service uid returns the correct value." into tm-dev
2022-05-25 20:23:03 +00:00
Aaron Liu
277f9b3b76
Merge "[Bouncer] Move reset logic to end event." into tm-dev
2022-05-25 20:20:11 +00:00
TreeHugger Robot
2636332305
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 20:05:09 +00:00
Bill Yi
7127857543
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 112906ba38 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590146
Change-Id: I176b83ea109f2acda4b58ebce2995734f4d9521a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:05 +00:00
Bill Yi
2dd065a131
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24b4bb88a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590146
Change-Id: I80790794c71d5f1728fe43ea2f4ca5d44b014bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:03 +00:00
Bill Yi
cd6d8ace4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: cb04464570 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590035
Change-Id: I09934b41f4d4929e3451e078625fee82665df8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:54 +00:00
Bill Yi
687c788edb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92926fb5db -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590035
Change-Id: Iaea593f1670e72c55793c11dd0da77d97fe1746e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:53 +00:00
Bill Yi
018f42138f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3d1fe219c6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18587798
Change-Id: I5e9b8722adfd0b620a7e9f855103284ea72ffbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:50 +00:00
Bill Yi
4fe64d0258
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8eacc71a03 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18587798
Change-Id: I5a006aa86745e3159f88cc995bf72be9746e7737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:42 +00:00
Bill Yi
7bc057fcfe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55f2848df8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18587791
Change-Id: Iff81ea86ae975df4f173a4426eba59ee346371a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:34 +00:00
Bill Yi
f9efc3c0c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1fcc3c8fa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18587791
Change-Id: I9b5b8a2cd315612fa026cc824311d88aea137975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:28 +00:00
Bill Yi
0eeb7f1b5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ac994c6b0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18585030
Change-Id: I0349891ca28e1ed6f4b39e7fdf0976d89c7e1815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:16 +00:00
Bill Yi
d1dd671163
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e48ec156f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18585030
Change-Id: I0a68139fcb46e991b86cea3001276beb5d4d3533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:05:54 +00:00
Bill Yi
112906ba38
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Bill Yi
cb04464570
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Bill Yi
3d1fe219c6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Bill Yi
55f2848df8
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Bill Yi
0ac994c6b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
TreeHugger Robot
240b4e7b47
Merge "Catch when telecom isn't ready yet" into tm-dev am: 5a633e1b99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577095
Change-Id: I66548101306b1c2a3d6b93108abf826b9b21b795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 18:16:40 +00:00
Songchun Fan
6170b6514a
Merge "[pm] update shared libraries if the old package used it" into tm-dev am: f77a4fd308
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589115
Change-Id: I06e66549bb8937085a03636fe3f7a945473a1b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 18:16:19 +00:00
Andrii Kulian
a15c08cb85
Merge "Synchronize SplitController" into tm-dev am: d4d0fee814
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18418602
Change-Id: I8580f43a7225000ad124c790a2a3351cef42f6c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 18:15:50 +00:00
TreeHugger Robot
5a633e1b99
Merge "Catch when telecom isn't ready yet" into tm-dev
2022-05-25 18:13:06 +00:00
Songchun Fan
f77a4fd308
Merge "[pm] update shared libraries if the old package used it" into tm-dev
2022-05-25 17:52:36 +00:00
Andrii Kulian
d4d0fee814
Merge "Synchronize SplitController" into tm-dev
2022-05-25 17:48:24 +00:00
Mateusz Cicheński
b2cd9af9c5
Merge "Check for null mLeash before setting alpha." into tm-dev am: 1f9afd727a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18585595
Change-Id: I5dcb324bbdd9028b7fe4cf56c0d43383b4fb567a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 17:02:57 +00:00
Aaron Liu
7a980119f6
[Bouncer] Move reset logic to end event.
...
Move reset logic to end event. Looking at the logs, we see
OpenGLRenderer: endAllStagingAnimators on 0xb40000779658e860 (KeyguardPINView)
We are still seeing the pin pad is disappearing. It's likely that we
need to capture the end event.
Bug: 228886154
Test: Manual on device
Change-Id: Ife8683c1e1668924859da3b648c5211a44ed7e7c
2022-05-25 16:44:39 +00:00
Mateusz Cicheński
1f9afd727a
Merge "Check for null mLeash before setting alpha." into tm-dev
2022-05-25 16:35:38 +00:00
Jack Yu
ccda49065b
Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567917
Change-Id: I12accca49ced1a57b037ac62c470a6e9737f8b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 16:09:16 +00:00
Jack Yu
e55b0a1f17
Merge "Traffic descriptor only data profile should be enabled" into tm-dev
2022-05-25 15:46:25 +00:00
Jeff DeCew
b3d48b82bb
Revert suppression of recalculation to fix jump after aod->ls animation am: c003cb8785
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581099
Change-Id: Ie49d9b3fe6cf62f8a27bcc07b267510528dc898f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:58:24 +00:00
Jeff DeCew
c003cb8785
Revert suppression of recalculation to fix jump after aod->ls animation
...
The change I6575f733b17d6c8905150c0a7854d752dd0a5cfe suppressed recalculation of the number of notifications whenever dozeAmount != 0. However, this meant that from the time the device was locked to the time it finished the screen on animation, the number of notifications that fit on the device was never updated. In cases where notifications changed while on aod, this meant the number could be completely wrong. But even without that, this meant that when locking the device and then unlocking, the count would be based on the height of the notifications given their non-keyguard expansion state (i.e. first notification expanded) which meant that we almost always showed too few notifications during the aod->ls transition.
I am unable to reproduce b/229882633 (which that CL was fixing) until I also revert I139d25e2bb57257a18f18f6288f3e18b7a1b72d1 which landed a week later.
Bug: 229882633
Fixes: 232079794
Test: atest NotificationPanelViewControllerTest
Test: numerous failed attempts to reproduce b/229882633#comment2
Test: unlock; screen off (to aod); screen on (to ls); observe no jumps
Test: post notify notifications with "no text" ; slow animations; lock; aod -> ls; post notifications via shell during animation; observe no jumps during or at end of animation
Change-Id: Ib3a3c6377a71cc4c1a1b06eb652237a5493a56d0
2022-05-25 10:59:29 +00:00
Lucas Lin
ef0cdab0bb
Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 0b2c39c7b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18114464
Change-Id: I23eff6c22c463f782094f06ebeac60aa61608edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:42:25 +00:00
lucaslin
8ababe764e
Send VPN manager event when VPN always-on status is changed am: 52f9de422d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18112116
Change-Id: I371bd0fc5db8c576a721fbd02333dbd9acc17ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:42:23 +00:00
Lucas Lin
0b2c39c7b2
Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev
...
* changes:
Send VPN manager event when VPN is deactivated
Send VPN manager event when VPN always-on status is changed
2022-05-25 10:20:18 +00:00
TreeHugger Robot
e4e4c11cb3
Merge "Do not get portInfo if physical address is 0x0000" into tm-dev am: 054f5c15c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570258
Change-Id: I80f92b7efa46fd421b80aa6c2cea991ec5eee12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:09:09 +00:00
TreeHugger Robot
054f5c15c9
Merge "Do not get portInfo if physical address is 0x0000" into tm-dev
2022-05-25 09:50:05 +00:00
Sudheer Shanka
0589c6cc20
Merge "Allow shell uid without checking the package name." into tm-dev am: 5caf3932af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18584744
Change-Id: I228915f8299e68c160e170f9ea8d8448e54b20fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:30:11 +00:00
Sudheer Shanka
5caf3932af
Merge "Allow shell uid without checking the package name." into tm-dev
2022-05-25 08:13:54 +00:00
Tony Huang
d155710371
Merge "Fix NPE if draging again while animating" into tm-dev am: a876e7b2d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570244
Change-Id: I50e7b59f716fb979f96bce9ab63b5f99ceee5363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:10:48 +00:00
Calvin Pan
8a677d4a0d
Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18579445
Change-Id: I89b8165445d37174356f0d06da38bfd139324a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:09:13 +00:00
Tony Huang
a876e7b2d0
Merge "Fix NPE if draging again while animating" into tm-dev
2022-05-25 06:53:54 +00:00
Calvin Pan
fa264b81be
Merge "Fix using incorrect view in app language selection" into tm-dev
2022-05-25 06:51:35 +00:00
TreeHugger Robot
b17d87fc21
Merge "Use max height attr as backup for device config" into tm-dev am: 248de47fe1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18529605
Change-Id: Ie2f1b0b1c3d82ace9b4f517fb0ce0f6bea537933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:54:20 +00:00
Andrii Kulian
40a67faae4
Synchronize SplitController
...
Adding synchronization to the public methods in SplitController,
as they might be called on different threads and cause a
ConcurrentModificationException.
Bug: 228201646
Test: atest CtsWindowManagerJetpackTestCases --iterations 100
Change-Id: I2db9ccb5e9829487eae7aa85eff5f6153721cc04
2022-05-25 03:32:54 +00:00
TreeHugger Robot
248de47fe1
Merge "Use max height attr as backup for device config" into tm-dev
2022-05-25 03:26:37 +00:00
Calvin Pan
5f8fa45e80
Fix using incorrect view in app language selection
...
Bug: 233175025
Test: By manual
Change-Id: Idd5b277cdfb737acf9262ff5efbeca93afaa100f
2022-05-25 03:15:19 +00:00