Treehugger Robot
78a4e25fb3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:34:53 +00:00
Treehugger Robot
c01f0709a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:34:53 +00:00
Treehugger Robot
781dd48cf3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:34:53 +00:00
Treehugger Robot
c347fcb851
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:34:53 +00:00
Treehugger Robot
1ee935c54e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:34:53 +00:00
Treehugger Robot
bee63f09c9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:34:53 +00:00
Treehugger Robot
d577552bd6
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:34:53 +00:00
Treehugger Robot
978ea9a083
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:34:53 +00:00
Kevin Chyn
4aa81f113d
Merge "Do not use Map.Entry outside of lock" into udc-dev
2023-06-14 03:30:46 +00:00
Chandru S
2bd021f914
Merge "Provide an option in KeyguardIndicationTextView to always announce the text being displayed" into udc-dev
2023-06-14 03:16:36 +00:00
Kevin Chyn
2d447169a3
Do not use Map.Entry outside of lock
...
Map.Entry returned from Map#entrySet are tied to the backing map.
A change to the map is reflected to the Map.Entry. This causes
undefined behavior (including NPE) if we try to use them outside of
the lock. If a client removes their callback after we exit the lock
but before we invoke the client callbacks, we run into NPE. Instead,
lets copy the callback and executor into a separate data structure.
Fixes: 286512746
Test: atest DeviceStateControllerTests
Change-Id: I8ed29cf6e27f5c8020f120c3968896f627573a35
2023-06-14 01:12:44 +00:00
Jerry Chang
66204956db
Merge "Fix swipe-to-home not enter pip from split properly" into udc-dev
2023-06-14 00:42:26 +00:00
Chandru S
381c6361d3
Provide an option in KeyguardIndicationTextView to always announce the text being displayed
...
Fixes: 281765653
Test: verified manually
1. flip the flag on
2. enroll face and fp
3. enable talkback on
4. go to lockscreen
5. try incorrect fingerprint
6. cover face and try face unlock
7. plug in charger and unplug charger
8. try incorrect face
9. face unlock unsuccessfully
10.slightly touch udfps to show the press firmly on sensor message
11.all the messages in the keyguard indication area must be read out loud even if it happens within a period of 30seconds.
Change-Id: I8e8328cc133ca126c3eb40c0623e1dfc0eafbb04
Merged-In: I8e8328cc133ca126c3eb40c0623e1dfc0eafbb04
2023-06-13 23:39:29 +00:00
Chandru S
b96e63953f
Merge "Add new strings that are shown when the user is asked to enter pin/pattern/password instead of biometrics" into udc-dev
2023-06-13 23:16:29 +00:00
Beth Thibodeau
0665ff26a9
[automerger skipped] Merge "[DO NOT MERGE] Add placeholder when media control title is blank" into tm-qpr-dev am: 6e265c083d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23517237
Change-Id: Ife3553f33799beb4dd82b433a1bc70fee994faa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 22:19:31 +00:00
Beth Thibodeau
eaa8390101
[automerger skipped] [DO NOT MERGE] Add placeholder when media control title is blank am: 965e514614 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23517237
Change-Id: Icde49eb68d4716cbdec0be1d8763015e10755236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 22:19:02 +00:00
Beth Thibodeau
6e265c083d
Merge "[DO NOT MERGE] Add placeholder when media control title is blank" into tm-qpr-dev
2023-06-13 21:41:20 +00:00
Treehugger Robot
d037387c28
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 40b67b96e4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667494
Change-Id: Ia9870dd7d0f314f8fd915f30fee58eb48ffa67e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:28:59 +00:00
Bill Yi
232b7a49b8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e9828f3d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667494
Change-Id: I35e2438ce4056c6fee98adc9471a7c7494b60ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:28:34 +00:00
Hongwei Wang
29668d515f
Merge "Fix NPE in PipTaskOrganizer#setPipVisible" into udc-dev
2023-06-13 20:10:45 +00:00
Winson Chung
996ae43573
Merge "Fix NPE from accessing pausing tasks" into udc-dev
2023-06-13 20:01:08 +00:00
Winson Chung
a554a02f30
Fix NPE from accessing pausing tasks
...
- It's possible for mPausingTasks to be unset between
startRecentsTransition() and startAnimation(), and in these cases
canceling with a screenshot can not take the snapshots as we have no
leashes of the tasks in the animation itself. For now, just cancel
the transition without the snapshots.
Fixes: 286874048
Test: Just adding an NPE check
Change-Id: Ie1315d8f6451cfb9b2ee2782c7d89db3cbb36aac
2023-06-13 20:01:03 +00:00
Treehugger Robot
40b67b96e4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-06-13 19:32:41 +00:00
Sudheer Shanka
0bd2ce4eb7
Merge "Retry manifest bcast delivery if the receiver dies as part of unfreezing." into udc-dev
2023-06-13 19:05:21 +00:00
Mady Mellor
021e9f1a71
Merge "Don't merge task view transitions in UnfoldTransitionHandler" into udc-dev
2023-06-13 18:34:19 +00:00
Automerger Merge Worker
4bf08f4c26
Merge changes from topic "am-eda0d966ad2c44ed98fdb85d1555b595" into udc-dev
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 6190c9b061 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2dbe6f48e -s ours
2023-06-13 18:08:53 +00:00
Treehugger Robot
2d752c5a0a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c99cee6e60 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667599
Change-Id: I43202e842da3f1aaadc6147ac555454c1982b802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:30 +00:00
Treehugger Robot
a290fb9dee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 6190c9b061 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667949
Change-Id: I2c280fac9db51bd1c23b9bdff6348cc56fb951c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:21 +00:00
Bill Yi
4ea4b754c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9dbd2c4a1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667599
Change-Id: I664816bee8ad7e9262790870e3039474cc288c2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:16 +00:00
Bill Yi
6e3b5408fe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2dbe6f48e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667949
Change-Id: I9699df58912eef33378780449d11eac38e046f4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:05 +00:00
Automerger Merge Worker
8e65786778
Merge changes from topic "am-f41ce26583ca44729c5d6c2e1dcadaae" into udc-dev
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 02768bcf3b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f2e5db18d -s ours
2023-06-13 18:07:43 +00:00
Treehugger Robot
9dd47f01d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 02768bcf3b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667249
Change-Id: I8b37ce6dcfc699dd720f265af346508f0122af8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:07:24 +00:00
Bill Yi
626eac4fe6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f2e5db18d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667249
Change-Id: I879a5a9712ca96d2e1b3eefd5d832880026554b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:07:11 +00:00
TreeHugger Robot
ca23dbf7cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5b885d049b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667501
Change-Id: I6b15c4c2d3ebdaed0db685a55d38d98efe627674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:07:06 +00:00
Bill Yi
e8465de1c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d8c95887b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667501
Change-Id: I3155f7408a471cfe641a88dc51288eef25b30ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:06:52 +00:00
Automerger Merge Worker
3ea6b91cd3
Merge changes from topic "am-ca006b49c781433a98b70cd175d5cbd7" into udc-dev
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b9c02a920b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5939bf1e8 -s ours
2023-06-13 18:06:40 +00:00
Treehugger Robot
7b0656ed02
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b9c02a920b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667434
Change-Id: Id59a8c1645b169252a0f18f06d08a9de7297841c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:06:20 +00:00
Automerger Merge Worker
fae2b9f865
Merge changes from topic "am-73bb4c2bdb294c428b32f2fd74a86ef4" into udc-dev
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 94df684f61 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e543dfc98 -s ours
2023-06-13 18:05:39 +00:00
Bill Yi
dcee6e7439
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5939bf1e8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667434
Change-Id: Ia10edea35ef7d267aa173261a4d83220a27f917e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:05:39 +00:00
TreeHugger Robot
00d587d03f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 94df684f61 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23665937
Change-Id: I7972d6687cb6fc884eb8f07af1e22b1b34426d13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:05:17 +00:00
Bill Yi
68a2081451
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e543dfc98 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23665937
Change-Id: I7a902cf13c2e5d325d7c1f3934b450a79c432df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:05:01 +00:00
Riddle Hsu
02fdef0599
Reset factory of TaskPositioner in test am: 823bf01687
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23666668
Change-Id: I33308ee5a7e345dec458eff2bb91650c45e5877b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:04:52 +00:00
Bill Yi
dfb99babe5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e51080d0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667737
Change-Id: I4a63d38ed4a24e0defed058a943b2afbc2a93b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:03:04 +00:00
Patrick Williams
f6a5990dd1
Merge "ScreenCaptureListenerWrapper - hold weak ref" into udc-dev
2023-06-13 17:41:26 +00:00
Behnam Heydarshahi
c8d3d7a5e3
Merge "Revert "Revert "Revert "Ringer mode button state a11y"""" into udc-dev
2023-06-13 17:27:43 +00:00
Treehugger Robot
6190c9b061
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-06-13 17:24:23 +00:00
TreeHugger Robot
5b885d049b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-06-13 17:24:16 +00:00
Treehugger Robot
c99cee6e60
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-06-13 17:22:11 +00:00
Chandru S
8a6b5edaf6
Add new strings that are shown when the user is asked to enter pin/pattern/password instead of biometrics
...
Test: NA, string change
Bug: 285956229
Bug: 285578578
Change-Id: I934699aac3714079b9aa67f54f2ae4105f5c7300
2023-06-13 10:21:07 -07:00
Treehugger Robot
02768bcf3b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-06-13 17:20:43 +00:00