Etan Cohen
59f5bcf834
Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce98e am: af364469e5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9987a2c2a98bff2e29cad4624b73bde0c37278dd
2021-01-29 23:23:13 +00:00
Cody Kesting
46309401db
Merge "Allow system components to request underlying network policies." am: ba04ef8481 am: 89a75849c2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf50bd8bba996b9bbbb4d77e1bac997fc95fbb10
2021-01-29 23:22:47 +00:00
Junyu Lai
22745a5c44
Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: 6194d765d2 am: 1800e22426
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556552
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifcaddb813f501065921e55b6e8a33269c1f4f95f
2021-01-29 23:22:35 +00:00
Treehugger Robot
c352f6cded
Merge "add ownership" am: c63817d8f0 am: b327283c1d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563872
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I843daa05b152bc2fdd2b51f6e7038df98a54e3d6
2021-01-29 23:22:13 +00:00
Junyu Lai
9e10a5a1ef
Merge "[FUI04] Refactor VpnInfo" am: 561626b20d am: 0824b59f74
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idee0985fa0feb2c3fd572c66c12a4ee5f0e236e7
2021-01-29 23:21:49 +00:00
Naomi Musgrave
2486ee1320
Merge "Introduce OWNERS file for Display unit tests" am: a1721e71ca am: a0fcc520c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563732
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd6c5d56cb4bbbe8fc4728409604ff3f1c018284
2021-01-29 23:21:17 +00:00
Junyu Lai
5ad75875bf
Merge "[VCN06] Support request background network" am: 7e0d8315d1 am: 5fa77ae82c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c41f6e2eda3b0b690cf6715c58f3bb98de8b1c1
2021-01-29 23:21:03 +00:00
Lucas Lin
ef5f51a45b
Merge "Remove unused method from MatchAllNetworkSpecifier" am: 6a5d57c2ee am: 2de61be98e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5120c364d877a6dd472197004a6a13740f743da9
2021-01-29 23:20:33 +00:00
Treehugger Robot
c0ca5d9c48
Merge "Add stange@ to the list of ContextHub owners" am: ac165ae86d am: ad0b5aac70
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564192
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9cb0ee144d45045b4f3dd16b5a411bf7a6aafb6a
2021-01-29 23:19:48 +00:00
Etan Cohen
af364469e5
Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce98e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf4c8e505f9ea5db7d8581b90825baef5624e9dc
2021-01-29 23:14:45 +00:00
Cody Kesting
89a75849c2
Merge "Allow system components to request underlying network policies." am: ba04ef8481
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cdd1d5624d1f41cd80b6353466af49d5e59a81b
2021-01-29 23:10:36 +00:00
TreeHugger Robot
c261534d10
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours am: 4186f7df67 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3798305452477581ca9fb27e84bf07ae34cb32bc
2021-01-29 23:08:43 +00:00
Junyu Lai
1800e22426
Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: 6194d765d2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556552
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d3eb542b1c3a9aabf51c58b8d83ad3e669f2077
2021-01-29 23:04:04 +00:00
Treehugger Robot
b327283c1d
Merge "add ownership" am: c63817d8f0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563872
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee5e276a3a67b8ce25490246628878f09dee9b11
2021-01-29 22:59:27 +00:00
Junyu Lai
0824b59f74
Merge "[FUI04] Refactor VpnInfo" am: 561626b20d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I59054bfe1761e28cdfb8e8e6d67e4aabda399adc
2021-01-29 22:55:54 +00:00
Naomi Musgrave
a0fcc520c6
Merge "Introduce OWNERS file for Display unit tests" am: a1721e71ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563732
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I803cd159081acd3cbb82f05cb4200dc98c1d7d97
2021-01-29 22:50:06 +00:00
Junyu Lai
5fa77ae82c
Merge "[VCN06] Support request background network" am: 7e0d8315d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic959a453489767781ebb8fb71effb2c14e0f69d8
2021-01-29 22:46:27 +00:00
Lucas Lin
2de61be98e
Merge "Remove unused method from MatchAllNetworkSpecifier" am: 6a5d57c2ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ebaa439101d01b444606a6e0aab4582217224a9
2021-01-29 22:41:55 +00:00
Treehugger Robot
ad0b5aac70
Merge "Add stange@ to the list of ContextHub owners" am: ac165ae86d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564192
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f3dd6ce93081ffb57eacca5a8378d158c8099c7
2021-01-29 22:37:40 +00:00
Treehugger Robot
770d0c072b
Merge "Throw IllegalStateException to fail fast in IMS" am: 7bbf421612 am: 0fb9491c10
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559442
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34b60fc181da390079ea86648d45730917fba468
2021-01-29 22:22:07 +00:00
TreeHugger Robot
4186f7df67
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1fb1414ea78f2b43530287482440b286805bcfdd
2021-01-29 22:08:40 +00:00
TreeHugger Robot
6ddefd679f
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours am: 5d2fa81de2 -s ours am: 72745aaf00 -s ours am: 30befa7b1a -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I45dd5c80413559458a4872cf764122bf9ea1f6d8
2021-01-29 21:38:43 +00:00
TreeHugger Robot
96a55a1699
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours am: 4a241c28a7 -s ours am: 05948ab847 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31219eb09df12ea1a62f9e09ce73ac3b1ed7b4c5
2021-01-29 21:38:10 +00:00
TreeHugger Robot
7316c1a161
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours am: 290cbce8e1 -s ours am: eb66da7a9d -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifeae108f2dbf97c61a79313e78f124516325cf58
2021-01-29 21:37:34 +00:00
TreeHugger Robot
a297374f96
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I484faf2bfa16a82b32781b9afa6d0d2ca2bef8de
2021-01-29 21:37:28 +00:00
Treehugger Robot
0fb9491c10
Merge "Throw IllegalStateException to fail fast in IMS" am: 7bbf421612
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559442
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic8ba160df9c78a5060338666b9146b986ff2d81a
2021-01-29 21:34:16 +00:00
Etan Cohen
ec8ebce98e
Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS""
2021-01-29 21:05:59 +00:00
TreeHugger Robot
30befa7b1a
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours am: 5d2fa81de2 -s ours am: 72745aaf00 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26db4102ac551c8006007ee29ad3ec672a75c63e
2021-01-29 21:00:03 +00:00
TreeHugger Robot
06985dae13
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cd0880df0f5c6a802a0275abf7fad619366e00e
2021-01-29 20:59:55 +00:00
TreeHugger Robot
05948ab847
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours am: 4a241c28a7 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I641039771a3e4d36e7b2e970bc769d4005facfd9
2021-01-29 20:59:49 +00:00
TreeHugger Robot
eb66da7a9d
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours am: 290cbce8e1 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I33dd8f04bf7cd1517465633bd5dddbf3b613c9c1
2021-01-29 20:59:35 +00:00
TreeHugger Robot
0f2e8a5985
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev am: 3c4f0c4946 -s ours am: 33e59d7f9b -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 0f337fcea8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307948
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae90c0c6a21062a4c916ca54db89c17a35baa42b
2021-01-29 20:48:33 +00:00
Heemin Seog
d34e379a31
Merge "DO NOT MERGE Handle back button for notification panel" into rvc-qpr-dev am: 7d4b625cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13408029
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7085fce31c5e2a8540e0bad63832068f3d6cdf65
2021-01-29 20:48:06 +00:00
Heemin Seog
5d7be49da6
DO NOT MERGE Handle back button for notification panel am: 2f5e1b4004
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13408029
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic191fbcde2893adb24b6fbcb14ce3e6c80057412
2021-01-29 20:47:44 +00:00
TreeHugger Robot
86522b53e8
Merge "Do not abort launch logger by invisible drawn activity" into rvc-qpr-dev am: c469f76079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13352090
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4811c3567ea556d02559987de62f1733f665ef24
2021-01-29 20:44:01 +00:00
TreeHugger Robot
589f538708
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 dca1c94faa is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3a42027376c2e65eab1219c9791f6862cc30ca5
2021-01-29 20:43:31 +00:00
TreeHugger Robot
4150198a61
Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-qpr-dev am: 2884b15032
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8114629e431bafd2fba9235e78a2e037afdb7165
2021-01-29 20:43:31 +00:00
TreeHugger Robot
72745aaf00
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours am: 5d2fa81de2 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If8b63161c685780fecfaf080ee0a2d1129761a3e
2021-01-29 20:42:17 +00:00
Baligh Uddin
8f89673bd7
Merge "Migrate apex/permission to packages/modules/Permission" am: d985fe7b0e am: e515ed6824
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562175
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4377200816776a7e10f023b2d144eba4da90a9e9
2021-01-29 20:42:04 +00:00
TreeHugger Robot
4a241c28a7
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id6f48c363ab68ab2cb5773dfb04e637aaffb9789
2021-01-29 20:41:56 +00:00
TreeHugger Robot
5d2fa81de2
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib3f3273fb2f73fb206d7d686abe80b9b679e1e3e
2021-01-29 20:41:32 +00:00
TreeHugger Robot
33e59d7f9b
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev am: 3c4f0c4946 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 0f337fcea8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307948
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If42589b8d528b764d947f1c28d63b07cf5a6dac6
2021-01-29 20:41:30 +00:00
TreeHugger Robot
290cbce8e1
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id1965d89c65d8aade99712ddda251a6e332eb3f2
2021-01-29 20:41:11 +00:00
Cody Kesting
ba04ef8481
Merge "Allow system components to request underlying network policies."
2021-01-29 18:58:00 +00:00
Heemin Seog
7d4b625cb2
Merge "DO NOT MERGE Handle back button for notification panel" into rvc-qpr-dev
2021-01-29 17:24:19 +00:00
Junyu Lai
6194d765d2
Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API"
2021-01-29 17:15:28 +00:00
Treehugger Robot
c63817d8f0
Merge "add ownership"
2021-01-29 17:14:58 +00:00
junyulai
0ee85f3bf8
[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API
...
The wifi (mainline module) need to set the subscriberId for specific
wifi network.
Bug: 176396812
Test: TreeHugger
Change-Id: Ib568ce0c2d1b629e1c20e7ac8d8b78579cf4825c
2021-01-29 22:09:10 +08:00
Junyu Lai
561626b20d
Merge "[FUI04] Refactor VpnInfo"
2021-01-29 13:54:53 +00:00
TreeHugger Robot
c469f76079
Merge "Do not abort launch logger by invisible drawn activity" into rvc-qpr-dev
2021-01-29 12:31:19 +00:00