Automerger Merge Worker
dec7d79809
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp am: e4d619fc77 -s ours am: e1ac7346f1 -s ours am: 80f5ac3388 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I6e10d2f36c707ef0438e673a027d9a38768097d2
2020-09-03 16:40:51 +00:00
TreeHugger Robot
b03fe73809
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am: e895502223 -s ours am: 9755660115 -s ours am: 69227f0bfa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I1a9fe4f839f9e49b613ab3f4814620793d0db5d9
2020-09-03 16:40:26 +00:00
Automerger Merge Worker
80f5ac3388
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp am: e4d619fc77 -s ours am: e1ac7346f1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: If335fb0237a1c82b821040f3c9c876701fb14594
2020-09-03 16:12:12 +00:00
TreeHugger Robot
69227f0bfa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am: e895502223 -s ours am: 9755660115 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: Ifc747069b8f3a643bec3b9035eb9545d11b4379b
2020-09-03 16:11:54 +00:00
Automerger Merge Worker
e1ac7346f1
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp am: e4d619fc77 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: Ia9bf530f1374ad90b35b2987eafa37b05bb27158
2020-09-03 15:42:11 +00:00
TreeHugger Robot
9755660115
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am: e895502223 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I572304d0a513ab314282b54f282c359ddbf5beb9
2020-09-03 15:41:41 +00:00
Automerger Merge Worker
e4d619fc77
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp
2020-09-03 15:27:39 +00:00
TreeHugger Robot
fa057a2054
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I8d402d836fbfd2090ef839420de9b35f2e6b873c
2020-09-03 15:27:28 +00:00
TreeHugger Robot
e895502223
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I2afceeedf1a90fc10c981a4d139004ce5f237030
2020-09-03 15:27:07 +00:00
TreeHugger Robot
14d438a337
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-03 15:17:50 +00:00
Bill Yi
ac8f65a544
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I946ba0e5ca40f934bdc7588eb244969103813c4c
2020-09-03 08:32:04 +00:00
Xin Li
e7213f4deb
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 0cfc7f9932 -s ours am: 1e40a5d256 -s ours am: 69a5e083ef -s ours
...
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140
Change-Id: I33e54d0cd8b83b842effa774170a43b2439ed76b
2020-09-02 20:56:53 +00:00
Xin Li
69a5e083ef
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 0cfc7f9932 -s ours am: 1e40a5d256 -s ours
...
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140
Change-Id: I6e8a2040ecfef8ba0e28807c2f753d68afa32155
2020-09-02 20:33:01 +00:00
Xin Li
1e40a5d256
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 0cfc7f9932 -s ours
...
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140
Change-Id: Ibe18c1e4bb2fffb65add10a48b8a72fde60a2e2b
2020-09-02 19:37:31 +00:00
Xin Li
0cfc7f9932
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours
...
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140
Change-Id: Ie4932da5ffa8bc042a930b01a18d1ff1ce1abc90
2020-09-02 19:15:20 +00:00
Xin Li
31e2400668
Mark RP1A.200720.001 as merged
...
Bug: 167588565
Merged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0
Change-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f
2020-09-02 11:44:54 -07:00
Xin Li
7482816913
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: eea8d0591b -s ours am: 5484d174a4 -s ours am: 5c7ec98fde -s ours
...
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: I73509239c8e21916b1d275bb9f04e3d971fde73d
2020-09-02 01:59:21 +00:00
Xin Li
5c7ec98fde
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: eea8d0591b -s ours am: 5484d174a4 -s ours
...
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: Ibf18c18a55f917c4bbdccd1e088a5ec808573ea7
2020-09-01 22:09:55 +00:00
Xin Li
5484d174a4
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: eea8d0591b -s ours
...
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: Icebcb9092d11694141d0d6a0c47c9f8378f5b03a
2020-09-01 21:46:39 +00:00
Xin Li
eea8d0591b
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours
...
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: I6fee791ed4a4939ab3f24b66f779a20124d0c63d
2020-09-01 20:37:03 +00:00
Xin Li
82a71b8f72
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Mark Chien
add39ee6c2
Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a am: 1ed9e74716 am: 36fd800cb1 am: 94724bacec am: 660375a29d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629
Change-Id: I19c418eb5af7bd633ca21597710e8d3096383841
2020-08-18 10:02:25 +00:00
Mark Chien
660375a29d
Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a am: 1ed9e74716 am: 36fd800cb1 am: 94724bacec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629
Change-Id: I2ca525b77ef8b5968ae8effe9518ecb381b06b97
2020-08-18 09:55:57 +00:00
Mark Chien
94724bacec
Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a am: 1ed9e74716 am: 36fd800cb1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629
Change-Id: I7a70a8ea8cfe430755544b0b57660658477e7416
2020-08-18 09:43:15 +00:00
Mark Chien
36fd800cb1
Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a am: 1ed9e74716
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629
Change-Id: If1ea472e2b7e715ab97851394dc8980ad269b7a1
2020-08-18 09:28:57 +00:00
Mark Chien
1ed9e74716
Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629
Change-Id: Ia5d7695edf13ac4ae9544c648fa95068809f0ab1
2020-08-18 09:19:56 +00:00
Mark Chien
3aee2ac91a
Merge "Add usesCleartextTraffic to Tethering"
2020-08-18 09:04:59 +00:00
markchien
c12b03a935
Add usesCleartextTraffic to Tethering
...
usesCleartextTraffic needs to be true for the networkstack process so
that the NetworkStack module can use no-encrypted probes to detect
captive portals.
When loaded in the networkstack process, all packages in process must
set usesCleartextTraffic=true, otherwise there may be races causing
the flag not to be set for the process.
Bug: 161860610
Test: CtsTetheringTest, TetheringTests
Change-Id: Ife03ee0c7096ea242eb701b297a69b471e15b436
2020-08-18 09:00:58 +00:00
Chalard Jean
d6fddfbfc9
Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: c5d748e694 am: 09fdd9236d am: 8c4ebe4067 am: d114cd412d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I89b50df2ea418f609d4ce7919f3154f54a1379b1
2020-08-13 05:14:14 +00:00
Chalard Jean
d114cd412d
Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: c5d748e694 am: 09fdd9236d am: 8c4ebe4067
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I69da39a99014256dd1188cb522e8d0900deb66d1
2020-08-13 04:57:30 +00:00
Chalard Jean
8c4ebe4067
Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: c5d748e694 am: 09fdd9236d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I6d7b924f9c0e8722400611cec31b4bf4222548ad
2020-08-13 04:43:45 +00:00
Chalard Jean
09fdd9236d
Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: c5d748e694
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I6362695120ea8669e1da84bb686e886b85efd6a3
2020-08-13 04:26:11 +00:00
Chalard Jean
c5d748e694
Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509
2020-08-13 04:09:27 +00:00
Chalard Jean
96924bf201
Rename Kotlin util files to not include the Kt suffix
...
Callers don't care what language the utilities are written in
Test: builds
Change-Id: Ie212144f36c50db223c05f3fcb6bad745842cb5e
2020-08-12 10:02:50 +09:00
Paul Hu
893d9e21e6
Merge "Verify pending intent flags" am: 346a361e93 am: 9caa751767 am: 0ee374a02c am: 90ffbeea18 am: fcf09fb717
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696
Change-Id: I154ad1f3e02b9f94dad208f1c5c5dc667ef9114d
2020-08-10 03:02:22 +00:00
Paul Hu
fcf09fb717
Merge "Verify pending intent flags" am: 346a361e93 am: 9caa751767 am: 0ee374a02c am: 90ffbeea18
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696
Change-Id: I7bbfcf02fd2e9e2d0914945814e9ef64cc3934ad
2020-08-10 02:44:38 +00:00
Paul Hu
90ffbeea18
Merge "Verify pending intent flags" am: 346a361e93 am: 9caa751767 am: 0ee374a02c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696
Change-Id: I885046eb25c6dafbcb4284fd94bff0052f7bdd09
2020-08-10 02:27:25 +00:00
Paul Hu
0ee374a02c
Merge "Verify pending intent flags" am: 346a361e93 am: 9caa751767
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696
Change-Id: Id37713388c0c2245e708ca1ca81e78d288168dfd
2020-08-10 02:04:40 +00:00
Paul Hu
9caa751767
Merge "Verify pending intent flags" am: 346a361e93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696
Change-Id: I6764ac9bface86d26f395c6a4fd8b63f7a08df6e
2020-08-10 01:46:50 +00:00
Paul Hu
346a361e93
Merge "Verify pending intent flags"
2020-08-10 01:32:12 +00:00
Chalard Jean
36a9060e24
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours am: f1ac1eddad -s ours am: 371cab2454 -s ours am: 29d81e4d26 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: Ice038957c1a18e1a978362309adeef798b6223bf
2020-08-07 07:45:45 +00:00
Chalard Jean
626a15a708
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 78701646dd am: 827a8abfb5 -s ours am: ce321cccc3 -s ours am: 5a3b172d0b -s ours am: baa46ebf2b -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I9b0b0167f3ac86bf41aeb9655e6e4c19ea33a554
2020-08-07 07:45:39 +00:00
Chalard Jean
29d81e4d26
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours am: f1ac1eddad -s ours am: 371cab2454 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I8a133f595e5f40a0aec4b831070997c9a0fa4bdc
2020-08-07 07:37:08 +00:00
Chalard Jean
baa46ebf2b
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 78701646dd am: 827a8abfb5 -s ours am: ce321cccc3 -s ours am: 5a3b172d0b -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I3fa582c372cf3b4c9d4063e343411eaa71ef438b
2020-08-07 07:37:06 +00:00
Chalard Jean
371cab2454
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours am: f1ac1eddad -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b
2020-08-07 07:26:54 +00:00
Chalard Jean
5a3b172d0b
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 78701646dd am: 827a8abfb5 -s ours am: ce321cccc3 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I853068e1d6301fc99466f255e9084a130d122971
2020-08-07 07:26:47 +00:00
Chalard Jean
f1ac1eddad
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I462f911d13e7574a0babd6d661c0b569f0265b58
2020-08-07 07:16:28 +00:00
Chalard Jean
ce321cccc3
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 78701646dd am: 827a8abfb5 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I5b15fde5cb76d1dc178a3cb2b1597e0c27aa7af2
2020-08-07 07:16:23 +00:00
Chalard Jean
5ab9ebb883
Merge changes I33b70b0a,I1074eedb am: 8818498877
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450
2020-08-07 06:59:30 +00:00
Chalard Jean
827a8abfb5
Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 78701646dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: Ia5e7e926bc3a9af8b03f8970738e6abe4c6d15b6
2020-08-07 06:59:26 +00:00