Paul Hu
bc878d5baf
[automerger skipped] Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163 am: 997f6e9893 -s ours am: 9b574bfcbb -s ours
...
am skip reason: Merged-In Ibea354d8dda1f02652a193820f3f9eb573b9a956 with SHA-1 a1ac564748 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729092
Change-Id: I13eacf9e2db3acbcf196c2c59c8a0d9906b36a93
2021-06-08 08:35:45 +00:00
Paul Hu
9b574bfcbb
[automerger skipped] Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163 am: 997f6e9893 -s ours
...
am skip reason: Merged-In Ibea354d8dda1f02652a193820f3f9eb573b9a956 with SHA-1 a1ac564748 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729092
Change-Id: Ib5ba2903f1a5a57764b05ce49617b66343ebd1a9
2021-06-08 08:21:23 +00:00
Paul Hu
997f6e9893
Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729092
Change-Id: Ib2e80a59085eea9decade271da3dec2b5a3e2b72
2021-06-08 07:47:06 +00:00
Paul Hu
7cba5f4163
Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting"
2021-06-08 07:23:39 +00:00
Paul Hu
1f08ee5565
[automerger skipped] Merge "Address leftover comments" am: e2791b00d3 am: a9d6f3c4c5 -s ours am: 867862c930 -s ours
...
am skip reason: Merged-In I9056758db15e8a21b84ef244d4cacf24c3b79894 with SHA-1 5d8340f7ae is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729091
Change-Id: Id9e8fa7bc4c90510ba1a0e9996abf0c4e0b9a394
2021-06-08 07:19:38 +00:00
Paul Hu
867862c930
[automerger skipped] Merge "Address leftover comments" am: e2791b00d3 am: a9d6f3c4c5 -s ours
...
am skip reason: Merged-In I9056758db15e8a21b84ef244d4cacf24c3b79894 with SHA-1 5d8340f7ae is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729091
Change-Id: Iab3e813878c17b3043a3e0ee72f51b5ca752b0df
2021-06-08 06:58:35 +00:00
Paul Hu
a9d6f3c4c5
Merge "Address leftover comments" am: e2791b00d3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729091
Change-Id: I97628a5e88d4410f0745c4a0b1d1bc3bef8111e5
2021-06-08 06:36:02 +00:00
Paul Hu
e2791b00d3
Merge "Address leftover comments"
2021-06-08 06:18:19 +00:00
Remi NGUYEN VAN
ce497608ad
[automerger skipped] Merge "Revert "Add min_sdk_version to connectivity targets"" am: 8665528151 am: ffddb67ddc -s ours am: 3b143d3369 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729095
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729694
Change-Id: I8c2e5d0797a27ecbbdc40e4a72066ff1ad22b971
2021-06-08 05:29:11 +00:00
Remi NGUYEN VAN
7ffe17d7b1
[automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: bf7cffa7a0 am: 4c9c1ed2ac -s ours am: 265f25869d -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729095
Change-Id: I0656d7bffe78ffdefeac6df2e8b3c1834bad9e30
2021-06-08 05:28:57 +00:00
Remi NGUYEN VAN
3b143d3369
[automerger skipped] Merge "Revert "Add min_sdk_version to connectivity targets"" am: 8665528151 am: ffddb67ddc -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729095
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729694
Change-Id: Ib216b167d9239624748a3e847a626d626f7708ed
2021-06-08 05:07:42 +00:00
Remi NGUYEN VAN
265f25869d
[automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: bf7cffa7a0 am: 4c9c1ed2ac -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729095
Change-Id: I75a795f6771184ee10db5c4ee40f4e2349c60777
2021-06-08 05:07:33 +00:00
Remi NGUYEN VAN
ffddb67ddc
Merge "Revert "Add min_sdk_version to connectivity targets"" am: 8665528151
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729694
Change-Id: I289f613fe3576cd13f9fe4da091df25fe42f497a
2021-06-08 04:55:03 +00:00
Remi NGUYEN VAN
4c9c1ed2ac
Merge "Add min_sdk_version to connectivity targets" am: bf7cffa7a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729095
Change-Id: I74f741739686c4172301ef052ee55167995cb0ea
2021-06-08 04:54:36 +00:00
Remi NGUYEN VAN
8665528151
Merge "Revert "Add min_sdk_version to connectivity targets""
2021-06-08 04:52:03 +00:00
Remi NGUYEN VAN
ccd2a6aeb4
Revert "Add min_sdk_version to connectivity targets"
...
This reverts commit 0b900c91f6 .
Reason for revert: Broke errorprone: b/190454846
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I21de7e7e06daa5f4a688b4246986f8d44da97c91
Fixes: 190454846
2021-06-08 04:50:01 +00:00
Remi NGUYEN VAN
0307af17c6
[automerger skipped] Merge "Add lint baseline to address NewApi errors" am: 8bf9411324 am: 5768410eb7 -s ours am: 0ee7f803ac -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729094
Change-Id: I4f57ae1863d46724d240e91108e7bac09489824c
2021-06-08 04:41:43 +00:00
Remi NGUYEN VAN
bf7cffa7a0
Merge "Add min_sdk_version to connectivity targets"
2021-06-08 04:38:30 +00:00
Remi NGUYEN VAN
0ee7f803ac
[automerger skipped] Merge "Add lint baseline to address NewApi errors" am: 8bf9411324 am: 5768410eb7 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729094
Change-Id: I754141dc8deebd3880a3a38d977d5687bdf7f0d7
2021-06-08 04:17:38 +00:00
Remi NGUYEN VAN
5768410eb7
Merge "Add lint baseline to address NewApi errors" am: 8bf9411324
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729094
Change-Id: I05903fe08c1137dc757db7f0deedda93c60600c0
2021-06-08 03:59:09 +00:00
Remi NGUYEN VAN
8bf9411324
Merge "Add lint baseline to address NewApi errors"
2021-06-08 03:28:26 +00:00
Remi NGUYEN VAN
0b900c91f6
Add min_sdk_version to connectivity targets
...
All targets need min_sdk_version 30 to be included in the tethering
APEX. They will actually never be used on SDK 30 and are only loaded on
31, but this is necessary to be included in com.android.tethering.
Original change (project moved):
I190fd1f3c9fabff057d0a2bd7f45b63a4fe447b3
Bug: 171540887
Test: m
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I3db00acc79b11058a1c235916b9bfe6c759afda5
2021-06-08 09:28:26 +09:00
Pedro Loureiro
8f16b39776
Add lint baseline to address NewApi errors
...
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.
This is a partial cherry-pick of change merged downstream.
Bug: 150847901
Test: m lint-check
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I214d60e858b7c03885d4d1c9a083e67a9340b4fe
2021-06-08 09:28:12 +09:00
Junyu Lai
d1a1693cd3
[automerger skipped] Merge "[NS10] Fix a bug where registerIgnoringScore is broken" am: 217f4ad9b1 am: aedcd7822c -s ours am: 66b9f546fb -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723146
Change-Id: Ifba70cab9285fe1beadce1bcafe26cd1558ba2aa
2021-06-07 19:36:57 +00:00
Treehugger Robot
8c3dd6182b
Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc am: 058e8f9f28 am: 0deed353b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590
Change-Id: I66d6f1f2f4004a9aa3dfa2a26fa2375581c87b80
2021-06-07 19:36:50 +00:00
Junyu Lai
66b9f546fb
[automerger skipped] Merge "[NS10] Fix a bug where registerIgnoringScore is broken" am: 217f4ad9b1 am: aedcd7822c -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723146
Change-Id: I813e2b7ec389bc833c000559d14b6310d1ea3bb2
2021-06-07 19:22:24 +00:00
Treehugger Robot
0deed353b7
Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc am: 058e8f9f28
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590
Change-Id: I10a6a9c97cf7bfdde877a9d061b03990a830833c
2021-06-07 19:22:18 +00:00
Junyu Lai
aedcd7822c
Merge "[NS10] Fix a bug where registerIgnoringScore is broken" am: 217f4ad9b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723146
Change-Id: I97b92d1249d60fca6a2c674dd296ec0b75dfd46e
2021-06-07 19:01:48 +00:00
Treehugger Robot
058e8f9f28
Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590
Change-Id: I1cd0d5563416630dac3baa769c96b40838a5e9b8
2021-06-07 19:01:19 +00:00
Junyu Lai
217f4ad9b1
Merge "[NS10] Fix a bug where registerIgnoringScore is broken"
2021-06-07 18:53:37 +00:00
Treehugger Robot
5cfbc2e4cc
Merge "Require location permission for ConnDiags WiFi only."
2021-06-07 18:44:48 +00:00
Chalard Jean
c2f55eef9e
[automerger skipped] [NS09] Implement the new ranking code am: e4aeac6d75 am: 9134beb0e0 -s ours am: 21c6c1d96e -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723145
Change-Id: Ie2def0acf1b9f7efa31c33e5f9353f85728927ba
2021-06-07 17:12:12 +00:00
Chalard Jean
8cbe6ebb59
[automerger skipped] [NS08] Expose public NetworkScore API am: e3d2481792 am: aacf61c306 -s ours am: d835cf01bc -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723144
Change-Id: I64db07462e1c24369eecae2cb1dff182c02d3cbc
2021-06-07 17:12:10 +00:00
Chalard Jean
21c6c1d96e
[automerger skipped] [NS09] Implement the new ranking code am: e4aeac6d75 am: 9134beb0e0 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723145
Change-Id: I08a9413757b8dda2bcfc6b12a51158454dc6626b
2021-06-07 16:49:50 +00:00
Chalard Jean
d835cf01bc
[automerger skipped] [NS08] Expose public NetworkScore API am: e3d2481792 am: aacf61c306 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723144
Change-Id: I44d19a0eb2b66f2d59c26d1c5966032629161d11
2021-06-07 16:49:47 +00:00
Chalard Jean
9134beb0e0
[NS09] Implement the new ranking code am: e4aeac6d75
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723145
Change-Id: I64e07af6e5da388e58967b98289709915af6e0e4
2021-06-07 16:30:42 +00:00
Chalard Jean
aacf61c306
[NS08] Expose public NetworkScore API am: e3d2481792
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723144
Change-Id: I6da6cfa821cbd2e0c9425de209370bb4e0b878a3
2021-06-07 16:30:34 +00:00
Chalard Jean
59ff483635
[automerger skipped] [NS07] Add the rest of the scoring policy am: f3ff362210 am: 789b9b4ae3 -s ours am: 7e5405ce00 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723143
Change-Id: I0b682200692bd5a68aa5f1f4475a34a863046304
2021-06-07 15:50:45 +00:00
Chalard Jean
7e5405ce00
[automerger skipped] [NS07] Add the rest of the scoring policy am: f3ff362210 am: 789b9b4ae3 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723143
Change-Id: I2290ef623f1ef6da39bfdfc32efb356f3455a8c9
2021-06-07 15:22:46 +00:00
Chalard Jean
789b9b4ae3
[NS07] Add the rest of the scoring policy am: f3ff362210
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723143
Change-Id: I95a5f8359e12c71a4593356e1994d49260e4349b
2021-06-07 15:03:02 +00:00
Chalard Jean
03ea3e6fd4
[automerger skipped] [NS06] Implement the don't-reap mechanism am: 947acd4275 am: f7fc878b82 -s ours am: 9a9ab04661 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723142
Change-Id: I966bb9f5b5d24f69e81f5fcd50052eb49af35d8a
2021-06-07 14:33:37 +00:00
James Mattis
a6abe14373
[automerger skipped] Updating tests to honor per-app TRACK_DEFAULT am: 5c3bb5b1ce am: 5706b8961d -s ours am: 585a62288d -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723153
Change-Id: I99bb7fb86a4b95446411c7ea3b9bb1e38fc71498
2021-06-07 14:33:35 +00:00
Chalard Jean
2f3c4ca303
[automerger skipped] [NS05] Feed network offer callbacks am: 0354d8c7e0 am: b6fac46c0d -s ours am: dcb5aac3dd -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722739
Change-Id: I76c9cb57fbb22fdbe1862a00e9abd58597cb84c5
2021-06-07 14:33:32 +00:00
Chalard Jean
9a9ab04661
[automerger skipped] [NS06] Implement the don't-reap mechanism am: 947acd4275 am: f7fc878b82 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723142
Change-Id: I7944e5628ce21b1d08fe4f9195523847de3df653
2021-06-07 14:17:22 +00:00
James Mattis
585a62288d
[automerger skipped] Updating tests to honor per-app TRACK_DEFAULT am: 5c3bb5b1ce am: 5706b8961d -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723153
Change-Id: I7967eefef39fce3299931401cd8f0b650a7588ee
2021-06-07 14:17:21 +00:00
Chalard Jean
dcb5aac3dd
[automerger skipped] [NS05] Feed network offer callbacks am: 0354d8c7e0 am: b6fac46c0d -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722739
Change-Id: I4b657a482d81244d4f3d11647d778ce1d075f1d5
2021-06-07 14:17:18 +00:00
Chalard Jean
f7fc878b82
[NS06] Implement the don't-reap mechanism am: 947acd4275
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723142
Change-Id: If1e034d04ab5789fb2eb4c0e43966aa2b39d4e39
2021-06-07 13:59:15 +00:00
James Mattis
5706b8961d
Updating tests to honor per-app TRACK_DEFAULT am: 5c3bb5b1ce
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723153
Change-Id: I144339a24f956aa4144efebf298eda3d323e4d2b
2021-06-07 13:59:12 +00:00
Chalard Jean
b6fac46c0d
[NS05] Feed network offer callbacks am: 0354d8c7e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722739
Change-Id: I63ca1b23495d9979a08cd572b04401d68ea379bc
2021-06-07 13:59:05 +00:00
Nikita Ioffe
96c5b5175e
[automerger skipped] Merge "Mark tethering apex as compressible" into sc-dev am: 8148656efc am: 9f59763887 -s ours
...
am skip reason: Merged-In I621305e47b5b86408a72c622b1e367cd0e75f82c with SHA-1 5f33357348 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14748198
Change-Id: Ibfd38d1e0341b2dd60070ce37c4042ddf88caacf
2021-06-07 11:49:06 +00:00