Eun-Jeong Shin
bb5603d69c
Merge "Handling exception when per-use prompt cannot be generated" into tm-dev am: aa070915bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17575366
Change-Id: I24be94309fe586cfa73f8a89e015acd3e8d50a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 04:37:22 +00:00
David Anderson
536bb7c398
Merge "Optimize EROFS detection code." into tm-dev am: 0cd984fbad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17546797
Change-Id: I0269da88c9efc68f20f069c2fbadd192d62dde87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 04:36:13 +00:00
Eun-Jeong Shin
aa070915bf
Merge "Handling exception when per-use prompt cannot be generated" into tm-dev
2022-04-07 04:19:31 +00:00
Eun-Jeong Shin
0207a743b7
Merge changes from topic "presubmit-am-eaed8ad228db4e0992b91a3d0667fb78" into tm-mainline-prod
...
* changes:
[automerge] Handling exception when per-use prompt cannot be generated 2p: f41f0dea68
Handling exception when per-use prompt cannot be generated
2022-04-07 04:19:31 +00:00
David Anderson
0cd984fbad
Merge "Optimize EROFS detection code." into tm-dev
2022-04-07 04:17:17 +00:00
David Anderson
12670f2bca
Merge changes from topic "presubmit-am-2355cba6040b4ac28f66e83feb674a33" into tm-mainline-prod
...
* changes:
[automerge] Optimize EROFS detection code. 2p: 135ac09990
Optimize EROFS detection code.
2022-04-07 04:17:16 +00:00
Ilya Matyukhin
cd11bad9fe
Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev am: dd14aed4ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878
Change-Id: I97b8cbf13877319c5066b0152a1e373b04cf4218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:17:20 +00:00
Riddle Hsu
ce25c60e69
Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev am: 4479d98a43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536786
Change-Id: Ia1000725421230687d0016e588fd90331f31c786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:16:15 +00:00
Ilya Matyukhin
dd14aed4ad
Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev
2022-04-07 03:14:01 +00:00
Ilya Matyukhin
d2d6180ce8
Merge changes from topic "presubmit-am-a097d19b46714d919133992650772d7d" into tm-mainline-prod
...
* changes:
[automerge] Tighten the scope of ACTION_UDFPS_ILLUMINATE 2p: 78ac57b034
Tighten the scope of ACTION_UDFPS_ILLUMINATE
2022-04-07 03:14:01 +00:00
Riddle Hsu
4479d98a43
Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev
2022-04-07 03:01:45 +00:00
Tyler Gunn
8f926b72ee
[automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours am: 3c3d2c00bc -s ours
...
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Ib97ab7416660a181a76bdadff7c0dd6c6d78f3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:43:24 +00:00
Jerry Chang
19fea39701
Merge "Fix weird animation when switching back to split pair from recents" into tm-dev am: ecbc9712eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523303
Change-Id: Ie585f588a7b68a1610156dc1a736efd11d3271f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:41:33 +00:00
Tyler Gunn
3c3d2c00bc
[automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours
...
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Ie00a8343b9466c3a92601a06550de5683cf3cef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:41:08 +00:00
Jerry Chang
ecbc9712eb
Merge "Fix weird animation when switching back to split pair from recents" into tm-dev
2022-04-07 02:31:12 +00:00
Tiger Huang
34df8d94c9
Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607661
Change-Id: I5887a772bf3475a321dcdc0202ce9bff101090eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:25:03 +00:00
Tiger Huang
88fdb7aa46
Merge "Update touch mode regardless of mStopped" into tm-dev
2022-04-07 02:17:08 +00:00
Sudheer Shanka
6341dca18d
Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803 am: b869ffc44c am: b153a4191b am: 451854f66f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049523
Change-Id: I97e5dec930cca2c4243ed8e2e256a47b2dd47112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:11:18 +00:00
Jinyoung Jeong
3a228e59b2
Merge "Logged Euicc eid in UiccController" into tm-dev am: 247a9e5d53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518070
Change-Id: I0efce7d34bb53d9c48b645456cb0a3104cd79d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:10:44 +00:00
Tyler Gunn
55d000f62c
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Ibf4807763da204c162015da29468328bb1a7e5a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:10:25 +00:00
Tyler Gunn
717aadeaf7
[automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: cee2a1fd34 -s ours am: 43e8b1793f -s ours
...
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 e041621587 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Ifd0c6a079f6ccd5323220dd2027498f52af44f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:10:25 +00:00
Sudheer Shanka
451854f66f
Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803 am: b869ffc44c am: b153a4191b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049523
Change-Id: I8f970075d782e06b80d6ca41d4438f0fb5f3025d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:02:00 +00:00
Jinyoung Jeong
247a9e5d53
Merge "Logged Euicc eid in UiccController" into tm-dev
2022-04-07 01:57:52 +00:00
Jinyoung Jeong
7a366fba0e
Merge changes from topic "pii_eid_log-tm-dev" into tm-mainline-prod
...
* changes:
[automerge] Logged Euicc eid in UiccController 2p: d0aabe4264
Logged Euicc eid in UiccController
2022-04-07 01:57:52 +00:00
Tyler Gunn
d4e7e2336a
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Icd89bfbe997fd18e8b8bfcddd5c198ad34d8d8c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:48:40 +00:00
Tyler Gunn
43e8b1793f
[automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: cee2a1fd34 -s ours
...
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 e041621587 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: I4c4f4c212b7d28c9f9206b029b7a7c0889932bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:48:22 +00:00
Sudheer Shanka
b153a4191b
Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803 am: b869ffc44c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049523
Change-Id: Ifddd8a252fd27ccad396b94d73b604824b66b115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:41:21 +00:00
Tyler Gunn
4636aea564
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Ie04277d055fb481438470087819c529a7392903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:26:29 +00:00
Tyler Gunn
cee2a1fd34
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: I1ab0b979c4ce254c01f918aa03311460f951359a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:25:36 +00:00
Caitlin Cassidy
200b8ea4fd
Merge "[Media TTT] Catch if the sender chip receives an invalid constant." into tm-dev am: 47883e857a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587109
Change-Id: I692b3ab90981e4ba7bea012582f995ab64187424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:17:00 +00:00
TreeHugger Robot
883c908aa6
[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 58e958133f -s ours am: 2ab56508dc -s ours am: efaa8b3d1b -s ours am: 8f5e6eeabf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I7c90d6dccd5614e94064f82cd349abfe1b7c9f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:16:30 +00:00
Jonathan Scott
bed49417f0
[automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: 8b4fe475a8 -s ours am: 18a459822e -s ours am: 25c5b4cfc5 -s ours am: 09fad10aa7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: Ib1845b75047327ffb347cf84024b08b9286727e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:16:24 +00:00
Sudheer Shanka
b869ffc44c
Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049523
Change-Id: I9369242fcec4d6e783c2cdcfb5f79eb5c7a539df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:15:47 +00:00
Caitlin Cassidy
47883e857a
Merge "[Media TTT] Catch if the sender chip receives an invalid constant." into tm-dev
2022-04-07 01:11:44 +00:00
Ilya Matyukhin
9df49f5c46
[automerge] Tighten the scope of ACTION_UDFPS_ILLUMINATE 2p: 78ac57b034
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878
Bug: 221125251
Change-Id: I722e590a54bb1fcc8ae59f2d9a866d6450d2a7f5
2022-04-07 01:04:37 +00:00
Ilya Matyukhin
78ac57b034
Tighten the scope of ACTION_UDFPS_ILLUMINATE
...
This metric is not supposed to reflect the latency outside of the
illumination path, such as the time it takes the user to move their
finger to the trigger point on the sensor.
Bug: 221125251
Test: N/A
Change-Id: I47ea062a0527aed774ad5bd5e778a1def7f94601
2022-04-07 01:03:59 +00:00
TreeHugger Robot
8f5e6eeabf
[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 58e958133f -s ours am: 2ab56508dc -s ours am: efaa8b3d1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I8bbde2b4353ea630cefc4faee3ddc6884883d4ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:01:16 +00:00
Tyler Gunn
e518ef6409
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Ifc65d6af6a1623ab2c4d6d25629ebad376cb5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:01:12 +00:00
Jonathan Scott
09fad10aa7
[automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: 8b4fe475a8 -s ours am: 18a459822e -s ours am: 25c5b4cfc5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I3e2f77d14f7c6aa6c622ff49ba3ea1008bb9d1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:00:41 +00:00
Zach Johnson
8896f2eddc
Merge changes from topic "bluetooth-certificate-change" into tm-dev am: 3ed0308046
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17605721
Change-Id: Icf07232c2e56730677824f3537501486a9a5474d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:54:25 +00:00
Zach Johnson
3ed0308046
Merge changes from topic "bluetooth-certificate-change" into tm-dev
...
* changes:
Make permissions Bluetooth needs role-available
Adding bt permissions to the priv app allowlist
2022-04-07 00:45:21 +00:00
Sudheer Shanka
ff7bc1e803
Merge "Update net/TEST_MAPPING to run more tests in presubmit."
2022-04-07 00:45:03 +00:00
Jerry Chang
98cf18a705
Merge "Fix wrong touch region of split sreen" into tm-dev am: 4c8378aa62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614765
Change-Id: Ife8502f0d35dcb806ee1b44a35c12ce3b122dc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:42:45 +00:00
Shan Huang
b125e004d8
Merge "Split predictive back bitmask flags into a few boolean flags." into tm-dev am: f608b18317
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17491587
Change-Id: I64872e6bc06e2e6f0eacd913509c5bd1b52fc1ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:41:13 +00:00
TreeHugger Robot
14fed02ecd
Merge "Check that InputDevice isn't null and add annotations" into tm-dev am: 94bba02785
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17546183
Change-Id: I72fe3385f39bf5023ec603eae26bf14e02044e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:39:52 +00:00
TreeHugger Robot
c4e0ce0780
[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 5d87e734a1 -s ours am: eccc92364a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I6c771b04434ab0168820976db03582e7f75d7a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:39:19 +00:00
Jonathan Scott
2fe6bf3178
[automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: cf54b5aad5 -s ours am: f44dcac8af -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I6e32ec18ad29610c42d30f76008754f897759a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:39:16 +00:00
TreeHugger Robot
2a31252f80
[automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am: d716a26d58 -s ours am: cc47da056a -s ours am: 25841e112a -s ours am: 76731ad5ff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530
Change-Id: I35159f794adbdd6c0854c228db384739093ef555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:38:54 +00:00
Jonathan Scott
df64309403
[automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: 3174a8bc5a -s ours am: 1c12b23d27 -s ours am: 09523a11bb -s ours am: 4e794bc62e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530
Change-Id: I497e3b75f846cc5309d51438ba1dbb38bfb2a54e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:38:47 +00:00
Tyler Gunn
6b36ce6895
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: I9264ab8f95bec38b438024cc7a65a6b6b720e6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:38:45 +00:00