Treehugger Robot
5db7c0028c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-06 06:27:36 +00:00
Bill Yi
2adde431b6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I729ec6ac98a95690838697c28220b11b0f1b0399
2020-09-05 21:39:23 -07:00
Treehugger Robot
dc54ae3488
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 44d4d1333c -s ours am: 7243e173c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: I191ef5c7773eff3dbdadf2937476c3d6c0bb1995
2020-09-05 05:40:07 +00:00
Treehugger Robot
7243e173c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 44d4d1333c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: Icd0d9a7683326f0f5c5230ccceeededd4afce81a
2020-09-05 05:27:36 +00:00
Treehugger Robot
44d4d1333c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: I65af634549f635e7acf2a1b88213500081d8fde2
2020-09-05 04:33:51 +00:00
Bill Yi
6c701f5341
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibfe7031a80e38ed3fe776e195514e6c7cad418ab
2020-09-05 01:14:22 +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
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
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
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
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
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
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
Chalard Jean
8818498877
Merge changes I33b70b0a,I1074eedb
...
* changes:
Remove the services.net-module-wifi module target.
Revert "Revert "Move Inet[4]AddressUtils to libs/net""
2020-08-07 06:45:15 +00:00
Chalard Jean
78701646dd
Revert "Revert "Move Inet[4]AddressUtils to libs/net""
...
This patch is still needed and should go in now that the
error is fixed.
The patch was submitted into rvc-dev and is already in
rvc-dev-plus-aosp (patch in in ag/11923559, revert
skipped in ag/12072199). A follow-up will remove the
unused services.net-module-wifi target.
Test: originally tested in aosp/1324109
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
2020-08-07 03:31:04 +00:00
Mark Chien
e0e75de37e
Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a am: b537c25685 am: 04720e79b0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398
Change-Id: I209007d8742ac5a331b2b19af164944f38ac36ca
2020-08-05 06:54:40 +00:00
Mark Chien
04720e79b0
Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a am: b537c25685
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398
Change-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053
2020-08-05 06:36:36 +00:00
Mark Chien
b537c25685
Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398
Change-Id: I8977ef203c363d68c1c43ecd70f530a4924f01b9
2020-08-05 06:22:38 +00:00
Mark Chien
d2af4d9e2a
Merge "Allow wifi p2p to use legacy dedicated address"
2020-08-05 06:01:37 +00:00
markchien
eb8fec2111
Allow wifi p2p to use legacy dedicated address
...
Some exsting applications may expect wifi p2p use legacy
"192.168.49.1/24" address. Have a configuration for wifi p2p to
decide whether to use legacy dedicated address or random address.
Bug: 161520826
Test: atest TetheringTests
Change-Id: If79973416a6780ee19ee785c65772b1a2dc1fbf7
2020-08-05 11:03:46 +08:00
paulhu
f603ed5fb8
Verify pending intent flags
...
All PendingIntent included activity and broadcast should set
FLAG_IMMUTABLE flag.
Bug: 156353008
Test: atest TetheringTests
Change-Id: I4592e914b67ecb8865d7de47797423f27e9ff840
2020-08-04 11:24:33 +08:00
Chalard Jean
4a4a60da0c
Merge "Move utils from network stack to libs." am: f97ac209c2 am: d96c683595 am: 493f8b7b69
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: I56d148261c5fe94264ff0a68e87020329d06b857
2020-07-31 01:12:13 +00:00
Chalard Jean
493f8b7b69
Merge "Move utils from network stack to libs." am: f97ac209c2 am: d96c683595
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: Ia163bc416e16ce56fc96855c1111a9905b712843
2020-07-31 01:09:46 +00:00
Chalard Jean
d96c683595
Merge "Move utils from network stack to libs." am: f97ac209c2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: I846dae9b7e36ddf6360bb946cc07beb8c44a34a5
2020-07-31 00:53:12 +00:00
Chalard Jean
f97ac209c2
Merge "Move utils from network stack to libs."
2020-07-31 00:44:46 +00:00