Commit Graph

530366 Commits

Author SHA1 Message Date
TreeHugger Robot
45f2c24dbe [automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: e83871ae6a -s ours am: 7681aae091 -s ours am: a580cdd025 -s ours
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12322905

Change-Id: I1b0b51e38681de24756947c32247bd177e86cf55
2020-09-10 01:44:35 +00:00
TreeHugger Robot
16b8f33c6e [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours am: 107c868f10 -s ours
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I63b18c469854d3c3025c7b6e99827ddbea327f65
2020-09-10 01:44:10 +00:00
TreeHugger Robot
21aa2cb61f Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 am: 9d81730088 am: 71151c2788 am: c98bb7e415 am: 5406da5a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: I1137a5e7d2e73fa8aee1d2ec8debdf100c7b64e6
2020-09-10 01:44:06 +00:00
TreeHugger Robot
4e30ab99c5 [automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: e83871ae6a -s ours am: 7681aae091 -s ours am: a580cdd025 -s ours
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12322905

Change-Id: Ief0314ecf7ad9c8c85894e5afca3345b21b1aa5b
2020-09-10 01:43:30 +00:00
TreeHugger Robot
ace84bf09f [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours am: 107c868f10 -s ours
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: Ie0d62c79853bc017102ad95acc1a5190182a92c7
2020-09-10 01:43:19 +00:00
TreeHugger Robot
5406da5a50 Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 am: 9d81730088 am: 71151c2788 am: c98bb7e415
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: Ie9b6cc7b4957298f220dacf98c29a5d237ae2d54
2020-09-10 01:36:30 +00:00
TreeHugger Robot
e059ae5659 Merge "Sanitize more of the notification text fields" into qt-dev am: e07950e2d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512682

Change-Id: I2535e5d049b4ea8b227b75292e7c17426eaee1a7
2020-09-10 01:36:15 +00:00
TreeHugger Robot
a580cdd025 [automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: e83871ae6a -s ours am: 7681aae091 -s ours
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12322905

Change-Id: I65977552f542d70e0b5c33ee8ddfd245f01593c9
2020-09-10 01:15:08 +00:00
TreeHugger Robot
107c868f10 [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I553eead2b24367b09f4888ea8a687c48cd2bf9da
2020-09-10 01:14:38 +00:00
TreeHugger Robot
e07950e2d8 Merge "Sanitize more of the notification text fields" into qt-dev 2020-09-10 01:11:14 +00:00
TreeHugger Robot
c98bb7e415 Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 am: 9d81730088 am: 71151c2788
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: I5cedc80c1bbd4fc60edf553e896804fb42dcf09f
2020-09-10 00:55:09 +00:00
TreeHugger Robot
7681aae091 [automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: e83871ae6a -s ours
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12322905

Change-Id: I0af07680e4f6f4eb8c28227033682b201fec7421
2020-09-10 00:47:08 +00:00
TreeHugger Robot
fe846d3095 [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I90bb0d837e4ac6c3acc834653bc1f758d62e1a08
2020-09-10 00:46:56 +00:00
TreeHugger Robot
33b7db96e2 Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d am: b6380403ea am: 34dc3a6637
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512485

Change-Id: I4016e2f870dd12f2fe26361250cc18311743238c
2020-09-10 00:40:17 +00:00
Julia Reynolds
3c2d40a53e [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours am: 2d983eccad am: cbd950ac78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962

Change-Id: If3945aefa1834d867d4b6019cdc74d170cf70889
2020-09-10 00:40:07 +00:00
TreeHugger Robot
0bde044d27 Merge "Accept repeated locale as an input of LocaleList construction." into qt-dev am: 941e8bb7ec am: 537a509d99 am: c335a819fe am: c86b1f3a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12523479

Change-Id: I93918a160c42286dd9b4df5ac73cb4ab48ca4171
2020-09-10 00:39:57 +00:00
TreeHugger Robot
5ccdc796dc Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d am: b6380403ea am: 01b521197a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512485

Change-Id: I9d2f42b28d30d1cde458b2f3ea77c9ca7b9dcbf6
2020-09-10 00:39:40 +00:00
Automerger Merge Worker
5ad3165f05 Merge "[automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours am: 2d983eccad am: d1ff215c87" into rvc-d1-dev-plus-aosp 2020-09-10 00:39:37 +00:00
Automerger Merge Worker
b3582f1937 Merge "Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d am: 19ba4a28f9" into rvc-d1-dev-plus-aosp 2020-09-10 00:39:33 +00:00
Julia Reynolds
1a93e26174 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours am: 2d983eccad am: d1ff215c87
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962

Change-Id: Ibcacba1fbd1e3c6a2a030eba92aeeb5639180441
2020-09-10 00:39:32 +00:00
Automerger Merge Worker
b22e875889 Merge "Merge "Accept repeated locale as an input of LocaleList construction." into qt-dev am: 941e8bb7ec am: 537a509d99 am: c335a819fe am: df8078f441" into rvc-d1-dev-plus-aosp 2020-09-10 00:39:27 +00:00
TreeHugger Robot
5ba54537c4 Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d am: 19ba4a28f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512484

Change-Id: Id4104df127d15753913731675bd7cd1645286aed
2020-09-10 00:39:27 +00:00
TreeHugger Robot
5474d89213 Merge "Accept repeated locale as an input of LocaleList construction." into qt-dev am: 941e8bb7ec am: 537a509d99 am: c335a819fe am: df8078f441
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12523479

Change-Id: Ie04e2899fff8d91c6e23613e41c36862c12981a4
2020-09-10 00:39:22 +00:00
TreeHugger Robot
8a1bf4c696 Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 am: 6ad9a7886a am: fda237ae5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I415d67bda9bc2fa48739e45d5b1f530fd0c30956
2020-09-10 00:39:11 +00:00
Julia Reynolds
fd5ca7926f [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510 am: 0fac23f66e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: Ic0c60d60be1359979df0eb2d13450e7aefe0ccdb
2020-09-10 00:38:50 +00:00
TreeHugger Robot
7a8fe1d4ca Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d am: 7012fe4440
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512484

Change-Id: I73f0d94af00a4b4620ae81011f8d885ab4338082
2020-09-10 00:38:40 +00:00
TreeHugger Robot
bf508c1c59 Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 am: 6ad9a7886a am: 9e08b1cad3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I91d069f9c2b6e6c26511903a8c8a205014ad0d95
2020-09-10 00:38:23 +00:00
Automerger Merge Worker
6844992410 Merge "Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f am: 6367b4800e" into rvc-d1-dev-plus-aosp 2020-09-10 00:38:16 +00:00
Julia Reynolds
575a789759 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510 am: e383c8697f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: I1e1ff16b5e8f2b051bcba59c0a5971d3433b3eee
2020-09-10 00:38:10 +00:00
TreeHugger Robot
39f33f6c58 Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f am: 6367b4800e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: Ie891af706cd6b27f7dfb78f65312bd465bf7e77c
2020-09-10 00:38:07 +00:00
TreeHugger Robot
089f82deb6 Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f am: 1ed53ed94e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: I07d566dc2943e5001a95a0a7437d699cdd365bdd
2020-09-10 00:37:58 +00:00
TreeHugger Robot
71151c2788 Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 am: 9d81730088
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: I6ca62a6deda554f8205ddcbe1df79f109f4ff0ad
2020-09-10 00:36:56 +00:00
TreeHugger Robot
e83871ae6a [automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12322905

Change-Id: Ie77013e116fe7669104d446e7ebc679aacd7e1b5
2020-09-10 00:28:04 +00:00
TreeHugger Robot
634c26d63f [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I58327bb904244e5f962c27b7c8facdfeae8a758d
2020-09-10 00:27:47 +00:00
TreeHugger Robot
01b521197a Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d am: b6380403ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512485

Change-Id: I9cf2f06605c6917c26835ae53bb21f4e31d2a39e
2020-09-10 00:22:57 +00:00
TreeHugger Robot
8a0ab48cb4 Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev 2020-09-10 00:22:46 +00:00
Julia Reynolds
d1ff215c87 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours am: 2d983eccad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962

Change-Id: Ib4dceb30de2dc4cba8c3b7dc9017d355389c99a2
2020-09-10 00:22:38 +00:00
TreeHugger Robot
34dc3a6637 Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d am: b6380403ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512485

Change-Id: Ifc096a4963b22bfc77102024001980204ca82903
2020-09-10 00:22:27 +00:00
TreeHugger Robot
df8078f441 Merge "Accept repeated locale as an input of LocaleList construction." into qt-dev am: 941e8bb7ec am: 537a509d99 am: c335a819fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12523479

Change-Id: I26daeb2af9af9d08aff1badcde228f72d37da337
2020-09-10 00:22:19 +00:00
Julia Reynolds
cbd950ac78 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours am: 2d983eccad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962

Change-Id: Iea5f2d5946a0808ce5c9a33ce67c9380c0d3a2e2
2020-09-10 00:22:14 +00:00
TreeHugger Robot
7012fe4440 Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512484

Change-Id: I555f07756c6e1188ddbdf41f406c1ded2679a82e
2020-09-10 00:22:03 +00:00
TreeHugger Robot
c86b1f3a1a Merge "Accept repeated locale as an input of LocaleList construction." into qt-dev am: 941e8bb7ec am: 537a509d99 am: c335a819fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12523479

Change-Id: Ief5f0e5e333d14cab0d3f5b8278132fd2cd65536
2020-09-10 00:21:59 +00:00
TreeHugger Robot
19ba4a28f9 Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512484

Change-Id: Ibd54c8f0f950a36fc8882e9571642bd23e4d9a5f
2020-09-10 00:21:39 +00:00
TreeHugger Robot
9e08b1cad3 Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 am: 6ad9a7886a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: Id16f6d2a2000adb0d5797b02ed11e0083939373c
2020-09-10 00:21:34 +00:00
Julia Reynolds
e383c8697f [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: Ie1d66b36bd6b17c2326ad84f069dc5fbcc3fcf8b
2020-09-10 00:21:05 +00:00
TreeHugger Robot
fda237ae5a Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 am: 6ad9a7886a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I65c96fa4b23ce15f31d7dbed4cafab767c579491
2020-09-10 00:20:57 +00:00
Julia Reynolds
0fac23f66e [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: I381ca7e10ec0cd4fef05845494ad70bfa9306a23
2020-09-10 00:20:35 +00:00
TreeHugger Robot
9d81730088 Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: I8e3f0fde0a0a2bbe9027ea00541c41cccbb512ed
2020-09-10 00:20:18 +00:00
TreeHugger Robot
1ed53ed94e Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: Ief6065688eb49cd0d795dbd892ea9bfa76290f2b
2020-09-10 00:20:15 +00:00
TreeHugger Robot
b6380403ea Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512485

Change-Id: I23fca26a229780f79493cd03ad249fe311ae4035
2020-09-10 00:20:11 +00:00