Kevin Chyn
7a707810e7
9/n: Add BiometricScheduler proto dump
...
1) Adds biometrics.proto definition for BaseClientMonitor subtypes
2) Adds BiometricScheduler proto dump
When dumping the scheduler, the caller may request for the recent
operation queue to be cleared after dumping or not.
Note that we don't need BiometricScheduler.Operation#STATE_*
in the dump, since (for now) we just want to know what operations
have been run.
We can always add additional state, success/failure, etc in the
future if needed.
Bug: 159667191
Test: atest com.android.server.biometrics
Test: atest CtsBiometricsTestCases
Change-Id: I7d2350f00aaeef03ab7d74013b476af053240320
2021-01-21 16:59:59 -08:00
Chiachang Wang
6d6a948994
Merge "Address naming nit for local variable"
2021-01-22 00:23:16 +00:00
Joshua Mccloskey
177d104ec3
Merge "Allow unknown statsclient for biometric logging."
2021-01-22 00:14:38 +00:00
Tianjie Xu
097aabdbef
Merge "Check slot in reboot function" am: 70127316bf am: 4635bad13b am: 3720d381a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504110
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9f3568bf1c225ed9b9e498c0ea792804d8623f56
2021-01-21 23:55:39 +00:00
Yu-Han Yang
e829559741
[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours am: 691ae7772d am: 3e7e30265b am: 557954f553 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b7669b701641bb79964a13037289348b9c9489d
2021-01-21 23:55:17 +00:00
Sarah Chin
60ddcd208c
[automerger skipped] Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14 am: 90b6c9def0 am: 871566afab -s ours
...
am skip reason: Change-Id Ia59efcf68c77d79be1a223f9fd6cbf3ec333478a with SHA-1 b4be4c8be3 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3840d17e28b911856f05f093a6e91e8cca2cc674
2021-01-21 23:54:15 +00:00
Tianjie Xu
3720d381a9
Merge "Check slot in reboot function" am: 70127316bf am: 4635bad13b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504110
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8185a0947f715091f3190a016d5ed126dbb49fff
2021-01-21 23:54:01 +00:00
Yu-Han Yang
557954f553
[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours am: 691ae7772d am: 3e7e30265b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4faf0e64d3fd57823b6472ee52ca3b8fa2946c1
2021-01-21 23:53:04 +00:00
Yu-Han Yang
c21c984019
[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours am: 691ae7772d am: a74aab775e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I90002657f1c7cab23dc91717d5afd9f469583a3b
2021-01-21 23:53:00 +00:00
Nate Myren
0aa69a623a
Merge "Do not hard code camera/mic icons to enabled, but default to enabled"
2021-01-21 23:43:02 +00:00
Yu-Han Yang
a74aab775e
[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours am: 691ae7772d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I21e8188ec6d70c88e1997f78f997bbfb653d92cd
2021-01-21 23:34:31 +00:00
Sarah Chin
871566afab
Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14 am: 90b6c9def0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9e12f5e374fd29601182e8b99250a91933a2556
2021-01-21 23:34:25 +00:00
Yu-Han Yang
3e7e30265b
[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours am: 691ae7772d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I204a77fcaa890c1bbf86f6eef05f875b7a114831
2021-01-21 23:34:12 +00:00
Tianjie Xu
4635bad13b
Merge "Check slot in reboot function" am: 70127316bf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504110
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I89c908bb931c25521b9c7bd8faf4d57c31882143
2021-01-21 23:29:32 +00:00
Yu-Han Yang
579e5e37bc
[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: e8212659b9 am: 9c2a7887f8 am: faec4dfefd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358221
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9dfaa07e8f50b941dab620539391d1c55b4cab90
2021-01-21 23:26:42 +00:00
Automerger Merge Worker
c7f5e2f7ae
Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc3759c" into rvc-qpr-dev-plus-aosp am: 935f1287e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13385165
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8e1ccb378cb8293b55bd2dc32ea49934a12ac297
2021-01-21 23:26:19 +00:00
Jeff Sharkey
1ae7f40466
Merge "Update AppWidget owners" am: 8c9bf65b8b am: ea29396752 am: 0cfbc863f7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556378
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I051e300cf34545ce632f64ef1dc7711f97c84599
2021-01-21 23:25:37 +00:00
Alisher Alikhodjaev
ad8dbc5d65
Merge "Correct OMAPI OWNERS" am: 2046b3f187 am: 7d825375a1 am: e11bf049a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552054
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1c495be9a5825a502b83f53d35c677d406ef70b
2021-01-21 23:25:17 +00:00
Automerger Merge Worker
9a5d6145e2
Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into rvc-qpr-dev-plus-aosp am: b8349d34c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52809a50094c12e3f6fd8b0e5b17b09cddf04273
2021-01-21 23:24:47 +00:00
TreeHugger Robot
4c84ba2518
[automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8 am: 7a606738dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib060b5bf5ea1653dba84ca0a010465ef087f6b12
2021-01-21 23:24:32 +00:00
Benedict Wong
ea0eddd478
Merge "Add base states with exception catching and utility functions" am: 4d06114362 am: c048e78913 am: f8e1ebb616
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530783
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5375dd28f5f89807b8b1ea64a1253ac85a2c1863
2021-01-21 23:23:40 +00:00
Mitch Phillips
75ab8ce370
Merge "[MTE] Add SYNC compat feature & disable for system apps." am: 284195e759 am: 6d521a4b8c am: 493aea7495
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548867
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26428109fd75ab0ea2bf6091970949e3daa11d84
2021-01-21 23:22:36 +00:00
Yu-Han Yang
8a65eef577
[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: e8212659b9 am: abb3d56c70 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358221
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b273d441c52022077f37d9a617b50eb3a9f9d2d
2021-01-21 23:21:42 +00:00
Yu-Han Yang
691ae7772d
[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie57557ba29ac8a8ca7827ed039817b6c75c1b0d6
2021-01-21 23:21:39 +00:00
Tianjie Xu
70127316bf
Merge "Check slot in reboot function"
2021-01-21 23:18:55 +00:00
Sarah Chin
90b6c9def0
Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa3747cf505974fa1faea05589b981fd687d0109
2021-01-21 23:10:20 +00:00
Yu-Han Yang
faec4dfefd
DO NOT MERGE: Do not inject mock location to chipset am: e8212659b9 am: 9c2a7887f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358221
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e6828c71c216c14e95dc7ab921ec84c70779d36
2021-01-21 23:09:20 +00:00
Automerger Merge Worker
935f1287e8
Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc3759c" into rvc-qpr-dev-plus-aosp
2021-01-21 23:09:17 +00:00
Jeff Sharkey
0cfbc863f7
Merge "Update AppWidget owners" am: 8c9bf65b8b am: ea29396752
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556378
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I742b341c6d3c6a5ca7912c59e0c5cebfb279791f
2021-01-21 23:09:09 +00:00
Marco Ballesio
aa838b8c30
Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc3759c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13385165
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1fdd76e3579e47ea62ef133e3934fd7277883a6f
2021-01-21 23:09:08 +00:00
Alisher Alikhodjaev
e11bf049a9
Merge "Correct OMAPI OWNERS" am: 2046b3f187 am: 7d825375a1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552054
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide1c94afe872365d69f34bd62200e6990b10c585
2021-01-21 23:08:57 +00:00
Automerger Merge Worker
b8349d34c2
Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8
DO NOT MERGE: Do not inject mock location to chipset am: abccd8f7bc
2021-01-21 23:08:41 +00:00
TreeHugger Robot
7a606738dc
Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf337d347c30f5b34bac2fe86fd55a142d2a3647
2021-01-21 23:08:26 +00:00
Benedict Wong
f8e1ebb616
Merge "Add base states with exception catching and utility functions" am: 4d06114362 am: c048e78913
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530783
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36687edcbbe2cd6165e02b924372c0d666daacfb
2021-01-21 23:08:14 +00:00
Mitch Phillips
493aea7495
Merge "[MTE] Add SYNC compat feature & disable for system apps." am: 284195e759 am: 6d521a4b8c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548867
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibba6138e7e5d0dcfdb6fdd3fab9d9cb8ee8f8b0a
2021-01-21 23:07:59 +00:00
Yu-Han Yang
d0fb2a7aef
DO NOT MERGE: Do not inject mock location to chipset am: abccd8f7bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1472c4aa1300628e60a4012bb7579018ea37609f
2021-01-21 23:07:04 +00:00
Yu-Han Yang
abb3d56c70
DO NOT MERGE: Do not inject mock location to chipset am: e8212659b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358221
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46b2627101dc0de2637f82d8607ace8f110600e1
2021-01-21 23:06:57 +00:00
Yu-Han Yang
77fa00f38f
DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia56381d103931a932e1a3e08d6baa949d2ee864f
2021-01-21 23:06:21 +00:00
Yu-Han Yang
9c2a7887f8
DO NOT MERGE: Do not inject mock location to chipset am: e8212659b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358221
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bb77c57675a0e96e90b6ec86a33f804fc695e75
2021-01-21 23:06:07 +00:00
Marco Ballesio
821bc3759c
Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev
2021-01-21 22:51:50 +00:00
Sarah Chin
a906fd5e14
Merge "Update TelephonyDisplayInfo docs"
2021-01-21 22:43:15 +00:00
Jean-Michel Trivi
5bc618b5ea
Merge "AudioService: correct BT A2DP abs volume curve for low levels"
2021-01-21 22:33:56 +00:00
Chavi Weingarten
c2225b451c
Merge "[ImpressionAttestation] Updated Impression Attestation APIs"
2021-01-21 22:24:17 +00:00
Jiachen Zhao
174d83e335
Merge "Create the ResumeOnRebootService."
2021-01-21 22:21:16 +00:00
Jeff Sharkey
ea29396752
Merge "Update AppWidget owners" am: 8c9bf65b8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556378
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4c3d3946257281f8e5da45d28ae73b2d0336e78
2021-01-21 22:14:47 +00:00
Alisher Alikhodjaev
7d825375a1
Merge "Correct OMAPI OWNERS" am: 2046b3f187
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552054
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic5077575ad0cfd8cb7d6ac453ccd29690cffb833
2021-01-21 22:09:10 +00:00
Jeff Sharkey
8c9bf65b8b
Merge "Update AppWidget owners"
2021-01-21 22:07:33 +00:00
Benedict Wong
c048e78913
Merge "Add base states with exception catching and utility functions" am: 4d06114362
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530783
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9304bd61b7d20a6fa3d3144aec855ba0fecaa28a
2021-01-21 22:00:51 +00:00
Sunny Goyal
ce8c2017c1
Update AppWidget owners
...
Change-Id: I89d2fa5339a37c64e76698ed1aa3825d27f88097
Test: manual
2021-01-21 21:56:08 +00:00
Wale Ogunwale
91464139ff
Merge "drag-n-drop support for main/side stage split-screen"
2021-01-21 21:33:05 +00:00