Yixiao Luo
|
925e1460ae
|
Merge "TIAF: handling null objects in DsmccResponse class" into tm-dev
|
2022-03-22 03:45:34 +00:00 |
|
Calvin Pan
|
1da7fdde5e
|
Merge changes from topic "app_selection_in_locale_picker" into tm-dev
* changes:
Add subtitle in System language
Reuse LocalePickerWithRegion in app language selection
|
2022-03-22 03:35:28 +00:00 |
|
Antonio Kantek
|
5715750e57
|
Merge "Check instrumentation source UID in setInstrumenting" into tm-dev
|
2022-03-22 03:33:16 +00:00 |
|
Jay Aliomer
|
fe874818ca
|
Merge "When change user, update configuration" into tm-dev
|
2022-03-22 03:30:14 +00:00 |
|
Yi-yo Chiang
|
7aae11ac71
|
Merge changes from topic "dynamic_system.data_transfer.shared_memory.size" am: f76e45bf6f am: 304b980f44 am: 7f4dfc67e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033045
Change-Id: I10cc178c3c894f0ee8831a34f4df93c20ee3aaa7
|
2022-03-22 03:23:15 +00:00 |
|
Yi-Yo Chiang
|
fb03539393
|
dynsystem: Enlarge default shared memory size and allow size override am: 6287488399 am: 8ee811c412 am: b426d136a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033044
Change-Id: I740800b42d4d9dee7aeedf58102460d8601fde29
|
2022-03-22 03:22:46 +00:00 |
|
Yi-yo Chiang
|
7f4dfc67e9
|
Merge changes from topic "dynamic_system.data_transfer.shared_memory.size" am: f76e45bf6f am: 304b980f44
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033045
Change-Id: I0102ecc11620f3f41fdbbf5e5966068844d9536f
|
2022-03-22 03:03:13 +00:00 |
|
Yi-Yo Chiang
|
b426d136a5
|
dynsystem: Enlarge default shared memory size and allow size override am: 6287488399 am: 8ee811c412
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033044
Change-Id: I455cd7a37ca003c92366311ca6a82244cb17f07a
|
2022-03-22 03:03:02 +00:00 |
|
Yi-yo Chiang
|
304b980f44
|
Merge changes from topic "dynamic_system.data_transfer.shared_memory.size" am: f76e45bf6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033045
Change-Id: Ibb3a2a8904f2f1ef76e9136961c37512a77b406d
|
2022-03-22 02:42:02 +00:00 |
|
Yi-Yo Chiang
|
8ee811c412
|
dynsystem: Enlarge default shared memory size and allow size override am: 6287488399
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033044
Change-Id: I168180a7f6f0ec7ba15c74ea1bbb05db96485054
|
2022-03-22 02:41:57 +00:00 |
|
Adam Bookatz
|
56996833f7
|
Merge "Relax permissions for isUserOfType, isUserNameSet" into tm-dev
|
2022-03-22 02:33:54 +00:00 |
|
Yi-yo Chiang
|
f76e45bf6f
|
Merge changes from topic "dynamic_system.data_transfer.shared_memory.size"
* changes:
dynsystem.SparseInputStream: Implement read(buf, off, len)
dynsystem: Enlarge default shared memory size and allow size override
|
2022-03-22 02:28:07 +00:00 |
|
Shaowei Shen
|
72fbb77539
|
Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make either transfer or expansion on a single route" into tm-dev
|
2022-03-22 02:07:10 +00:00 |
|
Chris Li
|
a729b09f9b
|
Merge "Group ActivityEmbedding split by Task id" into tm-dev
|
2022-03-22 02:01:38 +00:00 |
|
Ryan Lin
|
55eb3067b2
|
Merge "Revert "Adds install source checks for accessibility service"" into tm-dev
|
2022-03-22 01:30:39 +00:00 |
|
Rios Kao
|
f10600c7ad
|
Merge "correct sequence about granting permission of SoundTriggerTestApp" into tm-dev
|
2022-03-22 00:58:11 +00:00 |
|
Ming-Shin Lu
|
a6462766f9
|
Merge "Revert "Fix a redundant assignRelativeLayerForIme case"" into tm-dev
|
2022-03-22 00:57:33 +00:00 |
|
Kyle Zhang
|
8b7f31171a
|
Merge "Change getSupportedCryptoSchemesNative to use getSupportedSchemes" into tm-dev
|
2022-03-22 00:55:18 +00:00 |
|
Jack Yu
|
fcd56e60dd
|
Merge "Moved MVNO matching logic out of old data stack" into tm-dev
|
2022-03-22 00:24:38 +00:00 |
|
David Christie
|
bed1ec90cc
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev am: 6ce6f0b8fb am: e5d5ade2e1 am: 60a3bc12a6 am: afe42e9e37 am: 25b4dfccc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17186288
Change-Id: If119a96cc01b129c06d75a9a1f5e1c5be32ce77f
|
2022-03-22 00:23:02 +00:00 |
|
TreeHugger Robot
|
0a21d7ac91
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev am: 72d9b9c9a3 -s ours am: 21726fc866 -s ours am: 7f7cca8f64 -s ours am: dcc9d12a36 -s ours am: 8dfdf75a30 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: If199c30dc3cb60eff9ed77f41955160372f41155
|
2022-03-22 00:22:43 +00:00 |
|
Julia Reynolds
|
905445d39b
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: b21e9e17f6 -s ours am: ee9f86ef77 -s ours am: c0e8534be3 -s ours am: 16645c6c5e -s ours am: 5a232a25c5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: Ibfe74eb7b3516d4344c8aed2fa3d59fe9fd907e1
|
2022-03-22 00:22:31 +00:00 |
|
David Christie
|
1e1379b440
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into sc-qpr1-dev am: e6213b83f8 am: 0f2b3ccafd am: efbbf0bb71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185510
Change-Id: Id08a352ed01f7e042aa353ac3826205c5c44e0a8
|
2022-03-22 00:21:54 +00:00 |
|
Yixiao Luo
|
bbf7f2884a
|
TIAF: handling null objects in DsmccResponse class
Bug: 225256308
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: I20c9a5c16ff824f39e5223623672a02edc518e77
|
2022-03-21 17:20:52 -07:00 |
|
TreeHugger Robot
|
97d6cf4abe
|
Merge "Add conditional permission check annotation to checkPermission methods" into tm-dev
|
2022-03-22 00:14:07 +00:00 |
|
Felipe Leme
|
d406f1f7ac
|
Merge changes from topic "cmd_user_refactoring" into tm-dev
* changes:
Improvements on UserManagerService ShellCommand implementation (3/4).
Improvements on UserManagerService ShellCommand implementation (2/4).
|
2022-03-22 00:12:19 +00:00 |
|
David Christie
|
25b4dfccc6
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev am: 6ce6f0b8fb am: e5d5ade2e1 am: 60a3bc12a6 am: afe42e9e37
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17186288
Change-Id: I46b0bf555efba297477251cc6804b71934839601
|
2022-03-22 00:07:16 +00:00 |
|
David Christie
|
1d4f9a6a32
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev am: 6ce6f0b8fb am: e5d5ade2e1 am: 736d93e76c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17186288
Change-Id: Ie68ef0722b61c30adc0809b4a22e2dadd77159ce
|
2022-03-22 00:07:10 +00:00 |
|
TreeHugger Robot
|
8dfdf75a30
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev am: 72d9b9c9a3 -s ours am: 21726fc866 -s ours am: 7f7cca8f64 -s ours am: dcc9d12a36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: Ib6cb3bed3000ac51c84ee4c00f49adb2923c6559
|
2022-03-22 00:06:56 +00:00 |
|
TreeHugger Robot
|
e5276aedcd
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev am: 72d9b9c9a3 -s ours am: 21726fc866 -s ours am: e910819940 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: I80a93f8997ca609c8b2b69133b189e81de886b44
|
2022-03-22 00:06:43 +00:00 |
|
Julia Reynolds
|
5a232a25c5
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: b21e9e17f6 -s ours am: ee9f86ef77 -s ours am: c0e8534be3 -s ours am: 16645c6c5e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: I2776b11847cefc17901af899b79ae2ff1e3d9d06
|
2022-03-22 00:06:42 +00:00 |
|
Julia Reynolds
|
569fc1c50c
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: b21e9e17f6 -s ours am: ee9f86ef77 -s ours am: 6a026b83be -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: I5d5d14b2ecc357eb6946a4896f602e4e9cd6bd25
|
2022-03-22 00:06:30 +00:00 |
|
David Christie
|
efbbf0bb71
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into sc-qpr1-dev am: e6213b83f8 am: 0f2b3ccafd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185510
Change-Id: I15fa9320e3a959593b108f348f342f3197bb9edb
|
2022-03-22 00:06:18 +00:00 |
|
Treehugger Robot
|
23f1f86b26
|
[automerger skipped] Merge "Fixed service state changed event" am: 372b449bbb am: 292e308e22 am: 2d973aba60 -s ours
am skip reason: Merged-In Ifd988943a3f6e22ec563417eea6f173c02a866e2 with SHA-1 6d94e1c200 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034524
Change-Id: I9f24c1e386cd174c112e13b9bfbc02484a1c5978
|
2022-03-21 23:51:41 +00:00 |
|
David Christie
|
afe42e9e37
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev am: 6ce6f0b8fb am: e5d5ade2e1 am: 60a3bc12a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17186288
Change-Id: I705d56bbe425bd7b3629e8eeb43b0244f1ba67f5
|
2022-03-21 23:51:19 +00:00 |
|
TreeHugger Robot
|
dcc9d12a36
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev am: 72d9b9c9a3 -s ours am: 21726fc866 -s ours am: 7f7cca8f64 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: I9c105e441a7f921070ca7b6bc5151513d3df0906
|
2022-03-21 23:51:09 +00:00 |
|
Treehugger Robot
|
d55ceb53f2
|
[automerger skipped] Merge changes from topics "td_based_caps", "urllc_embb" am: 6ddc05484d am: 3e47ef8b8b am: cc5442bae5 -s ours
am skip reason: Merged-In Ia6d79d10f39f998cfc35ab56ec625c6ec7e4b990 with SHA-1 fc700a37cc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033127
Change-Id: I66a1e6c012e1f3a9409c19d3061af53611f42573
|
2022-03-21 23:51:03 +00:00 |
|
Julia Reynolds
|
16645c6c5e
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: b21e9e17f6 -s ours am: ee9f86ef77 -s ours am: c0e8534be3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: Ice9f547183de3426cb1f077eb50e67bc8d0cbed7
|
2022-03-21 23:51:01 +00:00 |
|
Jack Yu
|
65cf935fe7
|
[automerger skipped] Supported traffic descriptor based network capability am: a0a59e4c33 am: 663e44720c am: a28f3647e5 -s ours
am skip reason: Merged-In Ibf47aec9f99cf7437c9e03e10f9db83714aca5de with SHA-1 b17fd69f8a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033376
Change-Id: I3a017a302c74eb73962067a300587cc03ce97693
|
2022-03-21 23:50:45 +00:00 |
|
David Christie
|
60a3bc12a6
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev am: 6ce6f0b8fb am: e5d5ade2e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17186288
Change-Id: Iaf4c32e1b8ab9887b431567b89a2357b8c817a03
|
2022-03-21 23:43:15 +00:00 |
|
TreeHugger Robot
|
7f7cca8f64
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev am: 72d9b9c9a3 -s ours am: 21726fc866 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: Ibf4c003eb80348d2c30b71b8a1e9fc7b980d2dd1
|
2022-03-21 23:43:08 +00:00 |
|
Julia Reynolds
|
c0e8534be3
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: b21e9e17f6 -s ours am: ee9f86ef77 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: Ie86a2b0ab8439d06b93e12620a092fe796aa5f05
|
2022-03-21 23:43:07 +00:00 |
|
David Christie
|
0f2b3ccafd
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into sc-qpr1-dev am: e6213b83f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185510
Change-Id: I981f59252864a9f2cf9bf9a259e26d5530a23e4e
|
2022-03-21 23:43:05 +00:00 |
|
David Christie
|
736d93e76c
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev am: 6ce6f0b8fb am: e5d5ade2e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17186288
Change-Id: I9d6ba1e0e94e630b6b8bf623ac213e391d004465
|
2022-03-21 23:42:33 +00:00 |
|
TreeHugger Robot
|
e910819940
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev am: 72d9b9c9a3 -s ours am: 21726fc866 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: I4eb58b2b12033b3a5df41887672423f5b3d30322
|
2022-03-21 23:42:24 +00:00 |
|
Julia Reynolds
|
6a026b83be
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: b21e9e17f6 -s ours am: ee9f86ef77 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626
Change-Id: I7871dbda5b01cfe89fafd90cfb902db9cb32234e
|
2022-03-21 23:42:16 +00:00 |
|
Treehugger Robot
|
2d973aba60
|
Merge "Fixed service state changed event" am: 372b449bbb am: 292e308e22
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034524
Change-Id: I11bc0e03070ea4a2e6fe318d5f742d5b9a3afddd
|
2022-03-21 23:38:34 +00:00 |
|
Treehugger Robot
|
cc5442bae5
|
Merge changes from topics "td_based_caps", "urllc_embb" am: 6ddc05484d am: 3e47ef8b8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033127
Change-Id: I6fa85f9b2f55da84648e39d35b54bf67ee91fbd6
|
2022-03-21 23:37:16 +00:00 |
|
Jack Yu
|
a28f3647e5
|
Supported traffic descriptor based network capability am: a0a59e4c33 am: 663e44720c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033376
Change-Id: I41309f56d6fb2b65c530935e5d38d9548e71da50
|
2022-03-21 23:37:11 +00:00 |
|
David Christie
|
a2afb955d1
|
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into sc-v2-dev am: a0be1a586a am: 194755d05b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183360
Change-Id: I1f310aa345d47575ec3d43c401ffeef0507376af
|
2022-03-21 23:28:55 +00:00 |
|