Josep del Río
5c8400f0d8
Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a am: d1d3755436
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616
Change-Id: Ia4addaae8e16ca21be1748fd28240d11b7908f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 15:21:27 +00:00
Josep del Río
d1d3755436
Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616
Change-Id: I80e83c3f6a8c81d1919ba1d2abbc9c7266737312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 14:44:49 +00:00
Josep del Río
4a3603ed0a
Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616
Change-Id: Ie47160e41ef1751dbaecb5953fa851a13598d35c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 14:05:20 +00:00
Muralidhar Reddy Mule
fce5bf591b
Merge "Revert "isSimPortAvailable API should return true if the calling..."" into tm-qpr-dev am: 81c088391c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20755970
Change-Id: I6d2e811b5e3cfe1134e8293ef6d96840254628fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 13:27:00 +00:00
Josep del Río
9a64b4bbe5
Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev
2022-12-17 13:11:02 +00:00
Muralidhar Reddy Mule
81c088391c
Merge "Revert "isSimPortAvailable API should return true if the calling..."" into tm-qpr-dev
2022-12-17 13:01:52 +00:00
Brad Hinegardner
3b46e3c068
Merge "Add Do Not disturb custom quick affordance" into tm-qpr-dev am: 591c007930
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20726053
Change-Id: Iba6b5658231ef506a443c3e0ead988478107e105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 09:21:59 +00:00
Louis Chang
9f0f96a6fd
Merge "Finishing the visible requested activity vs. destroying it" into tm-qpr-dev am: ff91f4ef55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20747852
Change-Id: I1be9ae1457ae5d4c4e3177aae746382a94e5b2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 09:21:04 +00:00
Brad Hinegardner
591c007930
Merge "Add Do Not disturb custom quick affordance" into tm-qpr-dev
2022-12-17 08:59:52 +00:00
Louis Chang
ff91f4ef55
Merge "Finishing the visible requested activity vs. destroying it" into tm-qpr-dev
2022-12-17 08:32:09 +00:00
Robert Shih
53f5867fec
Merge "MediaDrm: error detail apis" am: 854155d3f4 am: cdba3c36f8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2359442
Change-Id: I0a97c2f3b31dbbcdf9090e14343b0cd7b3d6ddb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 08:01:57 +00:00
Benedict Wong
912ecdc42b
Merge "Add experimental support for IPsec tunnel aggregation" am: e9b6b19734 am: f5d9b010fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2338914
Change-Id: I8a36dc7b918b84d8316618018969993497a0c66d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 08:00:24 +00:00
Robert Shih
4684983801
MediaDrm: throw exceptions with extra info
...
Bug: 249941041
Test: MediaDrmParameterizedTests
Change-Id: I48b88b6d549277e38d86124f11bc99300ff8319b
2022-12-17 07:42:21 +00:00
Robert Shih
cdba3c36f8
Merge "MediaDrm: error detail apis" am: 854155d3f4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2359442
Change-Id: I1c3cff89286908db3a3522f8fcd1f513fdb63d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 07:27:41 +00:00
Benedict Wong
f5d9b010fc
Merge "Add experimental support for IPsec tunnel aggregation" am: e9b6b19734
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2338914
Change-Id: I0b5ea050846b3e20bc8f0729c91bf6d6692c216d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 07:26:50 +00:00
Robert Shih
854155d3f4
Merge "MediaDrm: error detail apis"
2022-12-17 07:17:01 +00:00
Louis Chang
582bd496bb
Merge "Ensure the above-top finishing activity is invisible" into tm-qpr-dev am: 41f50d35c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20748810
Change-Id: If945842137c2adcadb9e464bf4919dc1ee5a9ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 06:43:32 +00:00
Benedict Wong
e9b6b19734
Merge "Add experimental support for IPsec tunnel aggregation"
2022-12-17 06:28:31 +00:00
Louis Chang
41f50d35c2
Merge "Ensure the above-top finishing activity is invisible" into tm-qpr-dev
2022-12-17 06:22:48 +00:00
Winson Chung
3cdd706006
Merge "Ensure that the gesture handler always gets configuration change" into tm-qpr-dev am: 99c9b94531
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20765328
Change-Id: I1a400c8da340f73fef059a94fb9326134acfeddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 05:31:40 +00:00
Ivan Chiang
a460079f4d
[automerger skipped] Merge "add LatencyTracter per action device properties" into tm-qpr-dev am: 9e2d76249d -s ours
...
am skip reason: Merged-In I258a078074ca82a8837246c7b16407ab21ba1edf with SHA-1 a353b287e3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20745659
Change-Id: Ia400affb52f141a9034c6750f5e737bdab9ea9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 05:31:21 +00:00
Nicholas Ambur
aaab526296
[automerger skipped] add LatencyTracter per action device properties am: ffe101e992 -s ours
...
am skip reason: Merged-In I258a078074ca82a8837246c7b16407ab21ba1edf with SHA-1 a353b287e3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20745659
Change-Id: I4ee342a4df871920903ff7b19b319b9d3f7243b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 05:30:53 +00:00
Ivan Chiang
dfd0201444
Merge changes I4f225864,Ic95b7014 into tm-qpr-dev am: 18bd9509cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20752346
Change-Id: I549b18bd0d85a94a19bf886f11789ced9cf39234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 05:28:47 +00:00
Mark Punzalan
7d0a8539e0
Add initialAudio field to HotwordAudioStream am: 274085d4de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750985
Change-Id: I9955a5924a560f642f080d50769deadc60c7ca8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 05:28:13 +00:00
Winson Chung
99c9b94531
Merge "Ensure that the gesture handler always gets configuration change" into tm-qpr-dev
2022-12-17 05:25:58 +00:00
Ivan Chiang
9e2d76249d
Merge "add LatencyTracter per action device properties" into tm-qpr-dev
2022-12-17 04:57:31 +00:00
Ivan Chiang
18bd9509cc
Merge changes I4f225864,Ic95b7014 into tm-qpr-dev
...
* changes:
Include initialAudio size in metrics and logs
Add initialAudio field to HotwordAudioStream
2022-12-17 04:56:32 +00:00
Kevin Chyn
4f29942a07
Merge changes I5050e67a,I1099cf76 into tm-qpr-dev am: af38551fe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20714651
Change-Id: I80fb7f7becdc93aea6e34e6db1776e333e59ecf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 04:44:38 +00:00
Kevin Chyn
af38551fe7
Merge changes I5050e67a,I1099cf76 into tm-qpr-dev
...
* changes:
Address thread safety issues in WindowLayoutComponentImpl
Identify and fix potential thread safety issues in SplitController
2022-12-17 04:23:55 +00:00
Nicholas Ambur
ffe101e992
add LatencyTracter per action device properties
...
Each action LatencyTracker can log is controlled by gobal enable,
tracing threshold, and sampling rate DeviceConfig properties. This
change adds the ability to control properties per action.
By setting an action specific parameter, it will override the
associated global parameter.
New parameters added:
- <action name lowercase>_enable
- <action name lowercase>_sample_interval
- <action name lowercase>_trace_threshold
Bug: 260609037
Test: atest LatencyTrackerTest
Change-Id: I258a078074ca82a8837246c7b16407ab21ba1edf
Merged-In: I258a078074ca82a8837246c7b16407ab21ba1edf
2022-12-17 02:59:30 +00:00
Charles Chen
8988e06ea5
Merge "add LatencyTracter per action device properties" into tm-qpr-dev-plus-aosp
2022-12-17 02:59:13 +00:00
Bill Yi
f13c44d387
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d719af500a -s ours am: 348a503fc7 -s ours am: 0f4ed093b8 -s ours am: c1f210a7ee -s ours am: 4ca5ab9765 -s ours am: a599cd68f2 -s ours am: 0c13a67dbe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20754853
Change-Id: I00b0a29ffa990d43201d549a2f113016c475aea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:54:10 +00:00
Aaron Liu
a151f6b2cc
Merge "[Bouncer] Do not send message if face auth..." into tm-qpr-dev am: 76c5ba50f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20723670
Change-Id: I713340233709ba0472af0469424da8c2349ad629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:53:22 +00:00
Bill Yi
7462fc4abc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 98ac3bd2cb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20758144
Change-Id: I8210fbca8392b162c9462974fc7ab6b2a167bd75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:51:56 +00:00
Bill Yi
360b1fe512
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69cf21f2c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20758144
Change-Id: Ief3ba2f6c3cda8cb286e11e068f2f2c901339448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:51:32 +00:00
Bill Yi
5b43c4e397
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ef07bd1b8b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757946
Change-Id: I0f9e105595f95b53044e2f6b9b34b9c407908063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:51:23 +00:00
Bill Yi
d520ceda20
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d27300e0c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757946
Change-Id: Ib2805066a3c1dfcd8984bc707212dfd466e2dc92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:51:10 +00:00
Bill Yi
3cc22c6911
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aea8915ccf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757935
Change-Id: I9f677009e67db9e4dedf16d2955da12749ff0cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:50:59 +00:00
Bill Yi
99b6f7f2ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf56a8b6f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757935
Change-Id: I7a56744371088f9c1f1374071fcda22279135f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:50:44 +00:00
Bill Yi
20eb13b992
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c6181ae7b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757927
Change-Id: I0890ab1d020528b38b0fdfa93e22c8bc66e86fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:50:33 +00:00
Bill Yi
a32c4e8578
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9394f4085b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757927
Change-Id: Ia8002e823835d726986faaa417415483c205c445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:50:20 +00:00
Bill Yi
6e9899feb5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 99946801ab -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757728
Change-Id: Ie94e6ac0cb40d494b65c02f85b15aa7ff8703749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:50:11 +00:00
Bill Yi
b4b3764182
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e2cf5dae2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757728
Change-Id: I215a9ff710edf4ef88ce6d63a7bddc1cb0212499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:50:01 +00:00
Bill Yi
bcb626698a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: be6db1d4b5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757701
Change-Id: I848a56866e561d4db84ccdf20b144d2eb106dfbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:49:44 +00:00
Bill Yi
e252cbcaf6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4315e58f7d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757701
Change-Id: Id0c4226028a63463023441cda039dbaec2f77c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:49:31 +00:00
Bill Yi
ab613eeee3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a1ca431bb5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757604
Change-Id: If8bda69bbd162a96ab2182c8c57351abf4612c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:49:21 +00:00
Bill Yi
632c6b6826
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1f9d02804 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757604
Change-Id: Iada5170872cd31d7ed201d3229020efb817c4113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:49:11 +00:00
Bill Yi
f8139f588c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 62f5382be4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757599
Change-Id: I15a15ab181bc68c4afaec792570bd95b9e60e85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:49:02 +00:00
Bill Yi
85f8aeaf04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80cb6d0ce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757599
Change-Id: I5fe907e617e75563e6d22041f1ad3b8d1ad8af4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:48:48 +00:00
Bill Yi
5964421a98
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6c412a3674 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20757546
Change-Id: I83015269a00ad4929430b1248b25cbfa0dc5ab90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:48:37 +00:00