Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
702,051 Commits 3 Branches 0 Tags
fe0d080a64cf2794cb95badee4e8b03c1b073373
Commit Graph

702051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
fe0d080a64 [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 -s ours am: 0f9858962d -s ours am: 187536ab53 -s ours 
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: Iaa3420f8a8fa52c1e151b9dff33c2c64aaf5f78f
 2021-07-17 03:40:48 +00:00
Benedict Wong
08802b2a28 [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 am: ff3a9bf309 -s ours am: eeeadc8c6a -s ours 
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I7950928e5c0678d8b7f2487dcf20223a8fafe2bd
 2021-07-17 03:40:23 +00:00
Benedict Wong
187536ab53 [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 -s ours am: 0f9858962d -s ours 
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I9fc4292073858353ff931b6fc9fbb71ed93fd53f
 2021-07-17 03:26:18 +00:00
Benedict Wong
eeeadc8c6a [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 am: ff3a9bf309 -s ours 
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: Iac4f98f73ed494f49ef43dec96bdd836c47a485a
 2021-07-17 03:26:07 +00:00
Benedict Wong
f2293b6095 [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 am: e3bd8db4b0 -s ours 
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I8a49e6f3befffd9d9e99110f29de01de4fdb22c4
 2021-07-17 03:25:41 +00:00
Benedict Wong
ff3a9bf309 Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I151b67855b705197cb832caa32c91cc746569b56
 2021-07-17 03:15:31 +00:00
Benedict Wong
e3bd8db4b0 Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I0b1e3351139267820cecc01b2e6c1f499863590e
 2021-07-17 03:14:37 +00:00
Benedict Wong
0f9858962d [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 -s ours 
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I4f2c4ebf109d48477f8acbeb2e34d3686b556d27
 2021-07-17 03:13:39 +00:00
Benedict Wong
0df66631c0 Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev 2021-07-17 02:52:32 +00:00
TreeHugger Robot
b813e85856 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: abc1fb02ba am: 696d65e99c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I9b68deebfcf728770deb4e9926c878fdef05efb8
 2021-07-17 02:23:53 +00:00
TreeHugger Robot
a218993d3c Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: 584fa3e8b4 am: ea7d74a270 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I487c3bbcc8a1f83346e966110d146ad447c2bd0b
 2021-07-17 02:23:33 +00:00
Sally Qi
11addb2abe Merge "Migrate HWUI logs from SkDebugf to ALOGD" 2021-07-17 02:10:07 +00:00
TreeHugger Robot
696d65e99c Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: abc1fb02ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I2477f6c2f69092dfa52b512966cea2b60bd7db37
 2021-07-17 02:09:27 +00:00
TreeHugger Robot
ea7d74a270 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: 584fa3e8b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I37cb99d03770a19d9b54798fec9ab588a81ce68e
 2021-07-17 02:09:07 +00:00
TreeHugger Robot
56685c88b0 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: 955c0a799c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: Ie7859fd24ee48136b8f36e773586772f75760ddd
 2021-07-17 02:09:01 +00:00
TreeHugger Robot
584fa3e8b4 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I4338b8db488e2aa35293bd1fbb7f5e225b7cb3ef
 2021-07-17 01:56:18 +00:00
TreeHugger Robot
955c0a799c Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: If2850e102d85b1b86b22cf8a14031ce367a68739
 2021-07-17 01:55:49 +00:00
TreeHugger Robot
abc1fb02ba Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: Ifc8b19042d6fd6b04d11c570b66bcae40421dc80
 2021-07-17 01:55:28 +00:00
TreeHugger Robot
a687e13ff3 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev 2021-07-17 01:40:25 +00:00
Li Li
7b29c795f9 Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 2c02f91b4f am: 69e0fd3dee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: Ie7f31dbed51dfb0b4a4ba788e87715256ac43809
 2021-07-17 01:32:18 +00:00
Li Li
69e0fd3dee Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 2c02f91b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: If04e89d462575ba394eb9391a727e356c99b7912
 2021-07-17 01:23:14 +00:00
Li Li
ad1076b6f6 Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 8f317f24e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: I1eee46fbc5afa3c54f0b28120856edc1c5451c0d
 2021-07-17 01:22:27 +00:00
Li Li
7bc45ec816 Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 7fd05db338 am: bef8b4dc0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: Ieba3dfa123c4767fdd980f70a18baae752b67389
 2021-07-17 01:16:03 +00:00
Automerger Merge Worker
4a9418e594 Merge "Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 1c21f45b75" into sc-v2-dev-plus-aosp am: 6159b3d033 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305883

Change-Id: I249a80e45b17a5f11d83950c8a805e5931d143e8
 2021-07-17 01:15:50 +00:00
Curtis Belmonte
099c270224 Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 30e41cff70 am: ca87664c31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305883

Change-Id: If3060bd17dea8c953a03647564b8bbd7b90aea2e
 2021-07-17 01:15:11 +00:00
Automerger Merge Worker
f44b11c650 Merge "Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0 am: 3c5ddcdcc8" into sc-v2-dev-plus-aosp am: d6b61378ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15311059

Change-Id: I47e2bb26e97406bd227f864821e6912aa80a1fe3
 2021-07-17 01:14:43 +00:00
TreeHugger Robot
bda9b228bf Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0 am: bce70652d7 am: 66e16c89f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15311059

Change-Id: Ibe320f63d7592216a9568f25090eafd8e78ecc08
 2021-07-17 01:14:14 +00:00
Li Li
8f317f24e5 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: I6560f637fd45f0d2d2625993bb05ca529be34e6c
 2021-07-17 01:08:44 +00:00
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
bef8b4dc0a Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 7fd05db338 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: Ib359dca0e88c41ec3b72daf7ba1d1601dbe2861e
 2021-07-17 00:57:56 +00:00
Automerger Merge Worker
6159b3d033 Merge "Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 1c21f45b75" into sc-v2-dev-plus-aosp 2021-07-17 00:57:45 +00:00
Curtis Belmonte
9bca21b817 Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 328a97c099 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305883

Change-Id: Iac3a74ed36a2101e2de9d3ff939db667dc9e9fb7
 2021-07-17 00:57:33 +00:00
Curtis Belmonte
ca87664c31 Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 30e41cff70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305883

Change-Id: Iab5be47185b865ea298879c413b66780764163b0
 2021-07-17 00:57:21 +00:00
Curtis Belmonte
cc3394d0fa Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 1c21f45b75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305883

Change-Id: I425a431744c501184754760a37f1ccac03b23f6e
 2021-07-17 00:57:19 +00:00
Automerger Merge Worker
d6b61378ce Merge "Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0 am: 3c5ddcdcc8" into sc-v2-dev-plus-aosp 2021-07-17 00:57:07 +00:00
TreeHugger Robot
66e16c89f9 Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0 am: bce70652d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15311059

Change-Id: Ia6437b2422e3b482f432ac573ba5bbe7734a89ee
 2021-07-17 00:56:58 +00:00
TreeHugger Robot
2338fa622b Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0 am: d6415d20aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15311059

Change-Id: I9750d0b7cae7b54bfe94270e856877968086fc14
 2021-07-17 00:56:57 +00:00
Li Li
7fd05db338 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: If259dbdeb4df5f03c35d32fee70c22114b901447
 2021-07-17 00:56:51 +00:00
TreeHugger Robot
b2e545932c Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0 am: 3c5ddcdcc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15311059

Change-Id: I9acd2e0dc3f2e07d05c1f82948c751675397fa1e
 2021-07-17 00:56:51 +00:00
Li Li
2a4ff35621 Merge "Disable unnecessary freezer dbg msg" into sc-dev 2021-07-17 00:55:06 +00:00
Curtis Belmonte
1c21f45b75 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: I93851639799814d45aaeb6a16fd89f308eaebae7
 2021-07-17 00:52:49 +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
328a97c099 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: I9567ab19fa4c097355a85a99cc4f63214df26871
 2021-07-17 00:51:00 +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
bce70652d7 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: I27506d8db1204231dc4b69a311e22adca0393ff3
 2021-07-17 00:46:54 +00:00
TreeHugger Robot
d6415d20aa 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: Ifbb39efa8ca9cab869498a9f301bdd5868f084c0
 2021-07-17 00:46:16 +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
Winson Chung
68b02b8c52 Merge "Fix a couple more issues with canceling the recents animation w/ screenshots" into sc-dev am: 00d2556f71 am: b1eb8dabcb am: e6f0295908 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302656

Change-Id: I1f8a45f7a639f6c2a513cb74633a95f2329ef24e
 2021-07-17 00:15:34 +00:00
Automerger Merge Worker
c1b6adb7bf Merge "Merge "speech: queryIntentService-AsUser-" into sc-dev am: c648d0f4b7 am: d8ca6d792d" into sc-v2-dev-plus-aosp am: d0038d9401 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301453

Change-Id: I11587ff6fc18ca7043d776ed8bb778be230091d8
 2021-07-17 00:15:23 +00:00
Winson Chung
ff6111ffe4 Merge "Fix a couple more issues with canceling the recents animation w/ screenshots" into sc-dev am: 00d2556f71 am: 584679daaf am: eb636b8213 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302656

Change-Id: I1f07d25cb5ef071544dd22221c173e087f09b75c
 2021-07-17 00:15:07 +00:00