Chun-Wei Wang
b0538566e7
Merge "Pass the correct user id" am: 1d01d76048 am: 132f054eb2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2d39c7c5ee17dacecf0edbf070f7bb98f469b7d
2021-01-26 23:06:44 +00:00
Yan Yan
e0662139e0
Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89 am: 67d7fde5ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I395e7b7ba8c5e1752ad162b0428597587e425e3c
2021-01-26 23:06:22 +00:00
Jeff Sharkey
5694062005
Merge "Add owners for shortcut utils" am: f9095c3bc7 am: 22c5c6b246
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I597920a35ef71326a7e26219a7082336160637dd
2021-01-26 23:06:08 +00:00
Tianjie Xu
d6496b0d6b
Merge "Create the ResumeOnRebootService." am: edc7961287 am: 12b77e5e5b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4c2af2483a986fcb13234bab8547950e0dd6b48
2021-01-26 23:04:55 +00:00
Hall Liu
7f159d477f
Merge "Allow carriers to configure RTT while roaming" am: 923d7d28d0 am: 36e819d95f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558908
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I43ecce89c03cb33969f489c082684d3c5c0e56a3
2021-01-26 23:03:30 +00:00
Benedict Wong
6a762e057a
Merge "Implement Disconnected state" am: 4f27883485 am: b66cdc3e87
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530784
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b2341f138d50aec6fd26f7312539f3314e3d907
2021-01-26 23:03:09 +00:00
Nikita Ioffe
0356d3a9a3
Merge "Fix for TestDirectBootEmulated testcase" am: 0bd1e20da8 am: e69cdcc689
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559104
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac803ff44f99afdca3481bd0d17f62c815dca3aa
2021-01-26 23:02:51 +00:00
Treehugger Robot
bdf7512708
Merge "Update OWNERS files for tests" am: ac64bae06d am: 5fc7bffd49
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559350
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I57c968a828a56fecb497cac5fc76df1ce225f5f5
2021-01-26 23:02:34 +00:00
Jeff Sharkey
c359bbe9a7
Merge "Update OWNERS for SigningDetailsTest" am: c934889c91 am: 6ddd93b80e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e134cc76b27f8559309e4629be00c8f02624828
2021-01-26 23:02:22 +00:00
Robin Lee
1437a142dc
Merge changes from topic "revert-1510032-atv-rro-ZVBUWAKVPO" am: 3d6736d0fd am: 8966a5dd89
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559778
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibfab465cbb08d4f34d6b174e1efd0606505c4154
2021-01-26 23:02:03 +00:00
TreeHugger Robot
2c23216d49
Merge "ActivityManagerService: all users can handle freezer state in debug builds" into rvc-qpr-dev am: 595e3ee3c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13408289
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb3eb9683278717e14451f286b4d715ca6e6b2c7
2021-01-26 22:25:33 +00:00
TreeHugger Robot
595e3ee3c0
Merge "ActivityManagerService: all users can handle freezer state in debug builds" into rvc-qpr-dev
2021-01-26 22:02:25 +00:00
Rob Carr
d1874fe870
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46 am: d3eb04e729 -s ours am: 03ca6d9014 am: 2092b189c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2bcdaa459c5d6b3e75312ac9f8183208f0ace9d2
2021-01-26 20:45:51 +00:00
Rob Carr
91b0140cca
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours am: bbd4d45090 am: 74f95bbb51 -s ours am: b8e01656c0 am: 8935ee5f8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7eceeefd8a4eb8541b7b61e3db7bec1593576c3
2021-01-26 20:45:16 +00:00
Rob Carr
b132ec6a23
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev am: 525770f7e8 am: 9089b9f175 -s ours am: bc0cd4a148 am: 99dfe5fa7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d7c5e928cdd60af64cee175664929238ff1ded6
2021-01-26 20:44:49 +00:00
Robert Carr
32714c9963
[automerger skipped] DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. am: 514b329776 am: f5aa61a735 -s ours am: 027e0beec5 am: 73db664c90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3845dabb9ac469fb1974eede1c7ceb31a98ccf73
2021-01-26 20:44:11 +00:00
Rob Carr
b65482bbea
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-qpr1-dev am: 735a40b06b -s ours am: e058131d53 am: 86b6c9fba9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb06c791eb5949b60a7dab93c8d73de7a51a45ce
2021-01-26 20:37:32 +00:00
Rob Carr
2092b189c6
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46 am: d3eb04e729 -s ours am: 03ca6d9014
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35f436a7604cc258e0b9eb920d0b32bf6164d14b
2021-01-26 20:17:38 +00:00
Rob Carr
8935ee5f8f
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours am: bbd4d45090 am: 74f95bbb51 -s ours am: b8e01656c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica9a04b9b2827794c49f5d1a5866da17a3681215
2021-01-26 20:17:30 +00:00
Rob Carr
99dfe5fa7c
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev am: 525770f7e8 am: 9089b9f175 -s ours am: bc0cd4a148
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4f93c32aea4ebca63fbdfe261b35e5433754809
2021-01-26 20:17:20 +00:00
Robert Carr
73db664c90
[automerger skipped] DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. am: 514b329776 am: f5aa61a735 -s ours am: 027e0beec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62598614ef8a482f6f200a3651b4cd777583506d
2021-01-26 20:17:12 +00:00
Rob Carr
86b6c9fba9
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-qpr1-dev am: 735a40b06b -s ours am: e058131d53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If5106411587a22d9bf0d3bb13e0c8ba3fcf7b272
2021-01-26 20:16:52 +00:00
Rob Carr
03ca6d9014
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46 am: d3eb04e729 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8bbdf308d354d716f4e4e8349cd4eed3cff4cb9a
2021-01-26 20:06:23 +00:00
Rob Carr
b8e01656c0
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours am: bbd4d45090 am: 74f95bbb51 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie40d88988fbbf7f246820d519e13227f7793168b
2021-01-26 20:06:10 +00:00
Rob Carr
d3eb04e729
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1cb556ca775bbfbe4346eab371a1cc5b77acac31
2021-01-26 20:05:45 +00:00
Rob Carr
bc0cd4a148
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev am: 525770f7e8 am: 9089b9f175 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9be06dd024415698db9252f9e7badadaddb4f587
2021-01-26 20:05:36 +00:00
Rob Carr
74f95bbb51
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours am: bbd4d45090
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9118e44b35a309a57bbab3073dad028c69fe705f
2021-01-26 20:05:33 +00:00
Robert Carr
027e0beec5
[automerger skipped] DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. am: 514b329776 am: f5aa61a735 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47435f2d060c8e33ba7284e0e8ba7355f7f24e09
2021-01-26 20:05:26 +00:00
Marco Ballesio
bbebaf7a10
ActivityManagerService: all users can handle freezer state in debug builds
...
Processes whose proxy maps exceed CRASH_AT_SIZE might need to disable
the freezer prior dumping their binding for debug purposes. This happens
on builds with the IS_DEBUGGABLE flag set, so ActivityManager needs to
allow freezer state toggling from any user in this case.
Bug: 178037173
Test: booted device with userdebug, forced interface dumps from all
binder proxies with no crashes.
Change-Id: Ib1f5c7f6ad2b404d56fef566b3d9f17730592762
2021-01-26 19:55:01 +00:00
Rob Carr
a22cfe0b46
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia295a8f7839dc362ca05c4141aaeca0d0fc58fe5
2021-01-26 19:55:00 +00:00
Rob Carr
bbd4d45090
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ea5c9bb7a472f04cf6b65f6efe31e7c1223e873
2021-01-26 19:54:43 +00:00
Rob Carr
aa682dec92
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I505e9e636e908e23e3b229262e522dd628d2faff
2021-01-26 19:53:27 +00:00
Rob Carr
9089b9f175
Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev am: 525770f7e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I40066702ef4d4952e4bb3a7d533d9fddb4f53715
2021-01-26 19:53:24 +00:00
Robert Carr
f5aa61a735
DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. am: 514b329776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4168daaae9fb5972dcea0245e49d1759df7127f5
2021-01-26 19:53:21 +00:00
Rob Carr
e058131d53
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-qpr1-dev am: 735a40b06b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I232a503efc439c40a01e4ae9c319bf4a44603489
2021-01-26 19:53:14 +00:00
Rob Carr
525770f7e8
Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev
2021-01-26 19:27:40 +00:00
Rob Carr
e3f7644490
Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev
2021-01-26 19:27:37 +00:00
Rob Carr
4f162df18e
Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev
2021-01-26 19:27:19 +00:00
Rob Carr
735a40b06b
Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-qpr1-dev
2021-01-26 19:27:19 +00:00
Chun-Wei Wang
132f054eb2
Merge "Pass the correct user id" am: 1d01d76048
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I489d363f7a4faeb57a8bac8e4a174aeb3dfde67f
2021-01-26 05:08:52 +00:00
Yan Yan
67d7fde5ad
Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I274765b51f942562dbe5683c9339866a0f55d13f
2021-01-26 03:51:17 +00:00
Chun-Wei Wang
1d01d76048
Merge "Pass the correct user id"
2021-01-26 02:21:22 +00:00
Yan Yan
5b8a0c8d89
Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs"
2021-01-26 02:19:58 +00:00
Sungsoo Lim
c62ec99fec
Merge "Prevent multiple calls of ActivityThread.systemMain()" into rvc-qpr-dev am: de3b7f1aea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13365411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad8fb5c18c68300b2c01548abd3798cfccb445a5
2021-01-26 02:14:06 +00:00
Sungsoo Lim
de3b7f1aea
Merge "Prevent multiple calls of ActivityThread.systemMain()" into rvc-qpr-dev
2021-01-26 01:39:30 +00:00
Calin Juravle
15ad2d977b
Merge "Update boot image profiles OWNERS" am: 547556cfb7 am: b7ae05e92b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6ecba9443adf713500b56fbb6f314ccd5ae31b84
2021-01-26 00:08:42 +00:00
Hai Shalom
dfa03a290b
Merge "Shift stringslint to using python3." am: 785a55ff0c am: ac6c441667
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557450
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie7bb52645264f82a751d19189ebd9a8355219b9e
2021-01-26 00:08:24 +00:00
Jeff Sharkey
6b2d1bb8c4
Merge "Add the owner for those files related to voice." am: 24bbd50cea am: 2a0549bc14
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554992
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I55d845133463c0e20cfa761a7c18ad50cd3f1dd2
2021-01-26 00:08:05 +00:00
Jordan Liu
b5dab85753
Merge "Add carrier config for carrier key" am: 11dff58d5e am: b24ba046ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8508d94fe93bca5034259926a7c60a05d6bc2990
2021-01-26 00:05:48 +00:00
Jeffrey Vander Stoep
c819062e8c
Merge "Add alanstokes@ to privileged permissions OWNERS" am: bb448f504f am: e5bf14e7aa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556082
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0721a35678546bc37259893a1f5f903e75149e0b
2021-01-26 00:05:23 +00:00