Li Li
2c02f91b4f
Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491
Change-Id: I450f0e8c71b619b8a905d9ce1e076328ba283b49
2021-07-17 01:08:40 +00:00
Li Li
2a4ff35621
Merge "Disable unnecessary freezer dbg msg" into sc-dev
2021-07-17 00:55:06 +00:00
Curtis Belmonte
30e41cff70
Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305883
Change-Id: I4ba7a2a5edce4cb6da38cd2f38cbf796d43ea8d6
2021-07-17 00:51:03 +00:00
Curtis Belmonte
0295c273bd
Merge "Require non-null HAT for fingerprint enrollment" into sc-dev
2021-07-17 00:47:14 +00:00
TreeHugger Robot
3c5ddcdcc8
Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15311059
Change-Id: Ib28eff621cd0fe1170a807983b4a724e1b958ab7
2021-07-17 00:46:04 +00:00
TreeHugger Robot
bf09a9fac0
Merge "Show the generic bouncer on remote input" into sc-dev
2021-07-17 00:11:25 +00:00
Winson Chung
b1eb8dabcb
Merge "Fix a couple more issues with canceling the recents animation w/ screenshots" into sc-dev am: 00d2556f71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302656
Change-Id: If6d0b3c81d19d8dc1ed60a58f6908e769eb1f9fb
2021-07-17 00:01:09 +00:00
Sergey Volnov
d8ca6d792d
Merge "speech: queryIntentService-AsUser-" into sc-dev am: c648d0f4b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301453
Change-Id: Id97e85ab0d8b54da7968db45d9a82ce4fa2e3226
2021-07-17 00:00:52 +00:00
Winson Chung
399543eef9
Merge "Account for recents animation when reporting client visibility" into sc-dev am: 5af8fe680b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245722
Change-Id: I5066a5f8e3c8839b2cc7ae0d86a5f5f2799a0dfa
2021-07-17 00:00:10 +00:00
Winson Chung
00d2556f71
Merge "Fix a couple more issues with canceling the recents animation w/ screenshots" into sc-dev
2021-07-16 23:47:27 +00:00
Sergey Volnov
c648d0f4b7
Merge "speech: queryIntentService-AsUser-" into sc-dev
2021-07-16 23:47:14 +00:00
Winson Chung
5af8fe680b
Merge "Account for recents animation when reporting client visibility" into sc-dev
2021-07-16 23:44:41 +00:00
Benedict Wong
1564d7c053
[automerger skipped] Merge "Limit VCNs to one running at a given time" into sc-dev am: dd6c887985 -s ours
...
am skip reason: Merged-In I8031fab7502880d38420058451df41f47567c458 with SHA-1 3433a8e5d9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315835
Change-Id: I5e5e6c9636feb57237ed4b01047170948018a110
2021-07-16 23:39:34 +00:00
Benedict Wong
dd6c887985
Merge "Limit VCNs to one running at a given time" into sc-dev
2021-07-16 23:23:09 +00:00
TreeHugger Robot
0733ab8a79
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d46444a65c -s ours am: c82b9ce1b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312127
Change-Id: I792c771a904bb5525ba19843882786a6211fe192
2021-07-16 22:35:16 +00:00
TreeHugger Robot
c82b9ce1b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d46444a65c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312127
Change-Id: I9ef4882b3be3f9b16606518eaadece4d3077794b
2021-07-16 22:31:21 +00:00
TreeHugger Robot
5b4da2fa28
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3529cbf6c6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314236
Change-Id: I66f46f6c48b22b118185afe9e3581d2f10648e00
2021-07-16 22:30:21 +00:00
TreeHugger Robot
975df532ca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 88d66e7869 -s ours am: 71436876c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314231
Change-Id: Iab0a71c47dd43abf0406a10d835f36b97ecdc29c
2021-07-16 22:30:04 +00:00
TreeHugger Robot
3529cbf6c6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-16 22:25:17 +00:00
Winson Chung
c4f76dd523
Account for recents animation when reporting client visibility
...
- While the current app is still resumed and running in overview, the
start of a new activity will trigger the current app to pause and be
added to the stopping list while the new app is passed to the
existing recents animation via onTaskAppeared() callback. We don't
actually process the stopping activities until the recents animation
is done, but pausing will trigger the report client visibility to
the app if the animation is complete (which triggers the SurfaceView
to destroy the surface). This check needs to also account for the
recents animation that is driving the launching app as well.
Fixes: 184211875
Test: Open an app with a SurfaceView in overview and then launch the
next app (repeat until you see a blank area where the SV is)
Change-Id: I35d1947795f529b701af22586b23441d5ac55313
Merged-In: I35d1947795f529b701af22586b23441d5ac55313
2021-07-16 22:17:56 +00:00
Rambo Wang
02adf2d91d
Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e am: 2e7d4fe98b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977
Change-Id: Iedefd178c03f988435e6fbf21a8744aefa3ae174
2021-07-16 22:16:53 +00:00
Benedict Wong
adcba0ef9c
Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" am: fc9e0c982f am: e98f254f96
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768623
Change-Id: I418557047f10b0224583f9e99770169356f07fa9
2021-07-16 22:16:36 +00:00
Treehugger Robot
bab0e519d7
[automerger skipped] Merge "Restrict all jobs when the device is too hot." am: 5a750a5aa1 am: a92fac686c -s ours
...
am skip reason: Merged-In Id8eed849dfeb26aca1c0743af974c9efadf7fb78 with SHA-1 b70c941f60 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1766505
Change-Id: I166dcf9aff5ec7349ca76e75e71fe3e1a949a9fe
2021-07-16 22:16:16 +00:00
Yabin Cui
c0e80b3048
Merge "idmap2: fix for compiler update." am: 0cb190e889 am: 951a22e80e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768613
Change-Id: I6a43049b33454a9fe615325d7812935de6eaea41
2021-07-16 22:15:48 +00:00
TreeHugger Robot
71436876c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 88d66e7869 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314231
Change-Id: Ic83b61c18684ce14f53f82a8fed4e7bd96e0d70c
2021-07-16 22:15:02 +00:00
TreeHugger Robot
d46444a65c
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-07-16 22:12:53 +00:00
Benedict Wong
e53cbf4df3
Limit VCNs to one running at a given time
...
This change ensures that there is only ever one VCN running at a given
point in time, and that if the device has switched to using a
subscription in a different subscription group, the VCN will immediately
tear down.
This ensures that when on a DSDS device, when the VCN-enabled
subscription is not the default/active subscription, the other
subscription's network will never be outscored by the VCN, and thus get
torn down.
Bug: 190761448
Test: atest FrameworksVcnTests
Test: Manual testing to ensure common functionality
Original-Change: https://android-review.googlesource.com/1767050
Merged-In: I8031fab7502880d38420058451df41f47567c458
Change-Id: I8031fab7502880d38420058451df41f47567c458
2021-07-16 22:03:37 +00:00
Rambo Wang
2e7d4fe98b
Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977
Change-Id: Ie42eb0ffc8d911249c59f83581f7a4060c1c2653
2021-07-16 22:01:20 +00:00
Kevin Chyn
03dc717219
Merge changes from topic "biometric-haptic" into sc-dev am: a7b91a1c27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305458
Change-Id: I213c668726be4277462bea2e77a5bbf1b5a61666
2021-07-16 22:00:50 +00:00
Benedict Wong
e98f254f96
Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" am: fc9e0c982f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768623
Change-Id: I867279a00129a89fa1efaf09878ed04f3f9936d7
2021-07-16 22:00:37 +00:00
Treehugger Robot
a92fac686c
Merge "Restrict all jobs when the device is too hot." am: 5a750a5aa1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1766505
Change-Id: Ifa4a464064ac71b26372a2afe760912c22431e76
2021-07-16 22:00:01 +00:00
TreeHugger Robot
8eb3cebd2e
Merge "In VuklanManager make sure we have a valid semaphore context before destroying it." into sc-dev am: f560a753fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301696
Change-Id: Ia4ab07afab6a5bf332c5aec6561b46760fb4b160
2021-07-16 21:59:34 +00:00
Kevin Chyn
a7b91a1c27
Merge changes from topic "biometric-haptic" into sc-dev
...
* changes:
2/n: Update fingerprint vibration logic
1/n: Move UDFPS enroll haptics back to system_server
2021-07-16 21:59:18 +00:00
TreeHugger Robot
88d66e7869
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-07-16 21:59:12 +00:00
Yabin Cui
951a22e80e
Merge "idmap2: fix for compiler update." am: 0cb190e889
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768613
Change-Id: I5a8c33c5c6c233663da241f390717c71881cf16d
2021-07-16 21:58:06 +00:00
Erik Wolsheimer
1aed08c2b8
Merge "Prevent fatal exception at AppOpsService$InProgressStartOpEvent#finish" into sc-dev am: defab5707c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302655
Change-Id: I837e751493b92cf214b66f80214a513c39f4372d
2021-07-16 21:57:56 +00:00
Jing Ji
8eb4a90dfb
Merge "Perform oomAdjUpdate prior to scheduling service transactions" into sc-dev am: 72a09019a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302846
Change-Id: I1482e17319f2d68cbf03d7649630fa7ef04432df
2021-07-16 21:57:33 +00:00
Kate Montgomery
817b295fa9
Merge "Do not specify a workSource when setting a delayed alarm so that the alarm can still wake the device up when the device is idle as the AlarmManager.FLAG_ALLOW_WHILE_IDLE_UNRESTRICTED flag indicates." into sc-dev am: 831f52e0d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15284032
Change-Id: Ic37d70b5a9762642db0eecce3f7d7384ed70c75a
2021-07-16 21:57:07 +00:00
Rambo Wang
7ad8aa929e
Merge "Support platform-compat-framework for TeleService"
2021-07-16 21:39:21 +00:00
Benedict Wong
fc9e0c982f
Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set"
2021-07-16 21:29:36 +00:00
TreeHugger Robot
f560a753fd
Merge "In VuklanManager make sure we have a valid semaphore context before destroying it." into sc-dev
2021-07-16 21:26:53 +00:00
Treehugger Robot
5a750a5aa1
Merge "Restrict all jobs when the device is too hot."
2021-07-16 21:25:54 +00:00
Erik Wolsheimer
defab5707c
Merge "Prevent fatal exception at AppOpsService$InProgressStartOpEvent#finish" into sc-dev
2021-07-16 21:20:45 +00:00
Jing Ji
72a09019a0
Merge "Perform oomAdjUpdate prior to scheduling service transactions" into sc-dev
2021-07-16 21:12:29 +00:00
Kate Montgomery
831f52e0d5
Merge "Do not specify a workSource when setting a delayed alarm so that the alarm can still wake the device up when the device is idle as the AlarmManager.FLAG_ALLOW_WHILE_IDLE_UNRESTRICTED flag indicates." into sc-dev
2021-07-16 20:36:18 +00:00
Yabin Cui
0cb190e889
Merge "idmap2: fix for compiler update."
2021-07-16 20:33:46 +00:00
TreeHugger Robot
6e38687fd2
Merge "Update kg lock icon logic" into sc-dev am: 91ec11ddad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15309789
Change-Id: Ibc3f017631f29730bd289563e57fb5316c1668ae
2021-07-16 20:23:15 +00:00
TreeHugger Robot
91ec11ddad
Merge "Update kg lock icon logic" into sc-dev
2021-07-16 20:06:22 +00:00
Beverly
126e94e2c2
Update kg lock icon logic
...
- don't animate fp => unlock unless udfps was enrolled
- show a static unlock icon if the device wasn't previously locked
Test: manual
- swipe to unlock
- face only
- fp only
- co-ex
- removing biometric auth => swipe to unlock
Bug: 193878791
Change-Id: I35d393383674acb03f06ea58fb8aabc2a820ad7c
2021-07-16 19:50:42 +00:00
Dave Mankoff
39625b3b0c
Merge "Use Provider for EdgeBackGestureHandler" into sc-dev am: 8981a5e756
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15303522
Change-Id: I6aae8bf8a33f8b94f72a8c3b4dcfdd720675b492
2021-07-16 19:34:56 +00:00