Anton Hansson
af4ec86b42
[automerger skipped] Merge "Remove @TestApi from @SystemApi symbols" am: 49ca9d3ca9 am: cbe282347e am: 9cd59a3529 am: 14ea2ab355 -s ours
...
am skip reason: Change-Id I772790b783b0a8730b8bf680c9e569a886b8d789 with SHA-1 71bd86ed3d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: Ic5423c394cfa3e489ec2f6f6d043afdadb19d9e9
2020-10-20 21:22:43 +00:00
Chiachang Wang
a6d08e9723
Merge "Remove unused MockableSystemProperties from DnsManager constructor" am: 3e23d7271b am: 250a9d3d20 am: 672ee3eef5 am: 67fcddf4f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466231
Change-Id: Id0b0b33e8156831222968ca68f289d206787d635
2020-10-20 21:22:27 +00:00
Aaron Huang
bab995ceba
[automerger skipped] Merge "Create service-connectivity.jar" am: 4a19a57729 am: b91257f553 am: acc01f1346 am: 5e5c1a72bb -s ours
...
am skip reason: Change-Id Ie732bfaf381404af0bb599ca2f421a96e7aa4257 with SHA-1 dfba5d17fe is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252
Change-Id: I431314b5ee4a18c462850c21a7dabc00da89016e
2020-10-20 21:20:31 +00:00
Anton Hansson
14ea2ab355
Merge "Remove @TestApi from @SystemApi symbols" am: 49ca9d3ca9 am: cbe282347e am: 9cd59a3529
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: I859503688ea3254d5bd1b55e80cf1962286e948f
2020-10-20 20:31:58 +00:00
Chiachang Wang
67fcddf4f5
Merge "Remove unused MockableSystemProperties from DnsManager constructor" am: 3e23d7271b am: 250a9d3d20 am: 672ee3eef5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466231
Change-Id: I88c08a92dafdcb4d40374068d6f9466f5b57c819
2020-10-20 20:31:23 +00:00
Aaron Huang
5e5c1a72bb
Merge "Create service-connectivity.jar" am: 4a19a57729 am: b91257f553 am: acc01f1346
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252
Change-Id: I9a04f911043e34c3de1bcac3647773c5adfde294
2020-10-20 20:27:13 +00:00
Anton Hansson
9cd59a3529
Merge "Remove @TestApi from @SystemApi symbols" am: 49ca9d3ca9 am: cbe282347e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: I86daec690141893837ec58ab1d75aecc88557ff9
2020-10-20 19:45:04 +00:00
Chiachang Wang
672ee3eef5
Merge "Remove unused MockableSystemProperties from DnsManager constructor" am: 3e23d7271b am: 250a9d3d20
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466231
Change-Id: Ib8464068df47baebd3d56c66f6b517d8f59da4f9
2020-10-20 19:44:46 +00:00
Aaron Huang
acc01f1346
Merge "Create service-connectivity.jar" am: 4a19a57729 am: b91257f553
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252
Change-Id: Ic068be012bee6d8b1cd7b974896da9750e6ca453
2020-10-20 19:42:46 +00:00
Anton Hansson
16d8406001
[automerger skipped] Merge "Remove @TestApi from @SystemApi symbols" into mainline-prod am: 0bace0cd01 -s ours
...
am skip reason: Change-Id I772790b783b0a8730b8bf680c9e569a886b8d789 with SHA-1 878c9e47d3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12876438
Change-Id: I64743a9f2f8b9ba6afd5da61e8c5ce67bb1fd3cf
2020-10-20 16:45:24 +00:00
Anton Hansson
49ca9d3ca9
Merge "Remove @TestApi from @SystemApi symbols"
2020-10-20 13:45:13 +00:00
Anton Hansson
878c9e47d3
Remove @TestApi from @SystemApi symbols
...
I ran these commands:
cd frameworks/base
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'
Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
2020-10-20 09:04:03 +01:00
Chiachang Wang
6710686910
Remove unused MockableSystemProperties from DnsManager constructor
...
DnsManager does not use MockableSystemProperties to communicate
with netd to configure the dns server anymore. ConnectivityService
does not need to take it into DnsManager as a parameter. Thus,
clean up the unused code.
Bug: 33308258
Test: atest FrameworksNetTests
Change-Id: I2ac89944391f7d1fd5d67f26cf7f2b11a4a4cf84
2020-10-20 15:46:30 +08:00
Aaron Huang
4a19a57729
Merge "Create service-connectivity.jar"
2020-10-20 06:09:41 +00:00
Anton Hansson
71bd86ed3d
Remove @TestApi from @SystemApi symbols
...
I ran these commands:
cd frameworks/base
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'
Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
2020-10-19 19:08:26 +01:00
Anton Hansson
f4d863eb95
Remove @TestApi from @SystemApi symbols
...
I ran these commands:
cd frameworks/base
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'
Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
2020-10-19 16:41:01 +01:00
Chalard Jean
64db0ea5b0
Merge "Remove unused methods from LinkProperties." am: 88e32a8ae6 am: f812dc9b77 am: 57899a690d am: c703b02538
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448415
Change-Id: I7e97ed89636e22553c6b2a3a759d2bdcbed9ba24
2020-10-19 10:50:44 +00:00
Chalard Jean
c703b02538
Merge "Remove unused methods from LinkProperties." am: 88e32a8ae6 am: f812dc9b77 am: 57899a690d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448415
Change-Id: Id5162e3225c112cf82903c44b99cceabc004eba0
2020-10-19 10:36:54 +00:00
Chalard Jean
57899a690d
Merge "Remove unused methods from LinkProperties." am: 88e32a8ae6 am: f812dc9b77
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448415
Change-Id: Idfd7ca6b4448623110ac6f98d96ddcea7ca43c5b
2020-10-19 10:23:04 +00:00
Chalard Jean
f812dc9b77
Merge "Remove unused methods from LinkProperties." am: 88e32a8ae6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448415
Change-Id: I7adcc9920cc2bdebe9a1dc22f32ce0955a4524dd
2020-10-19 09:50:44 +00:00
Chalard Jean
88e32a8ae6
Merge "Remove unused methods from LinkProperties."
2020-10-19 09:37:26 +00:00
Yan Yan
85c79d51d4
Merge changes from topic "new-ipsec-api" am: 644a034eed am: e0dd7159d5 am: 24c72089d7 am: a818c55e65
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433
Change-Id: I18748127d0c97d9473c96678d556b03ad6048808
2020-10-17 00:09:20 +00:00
Yan Yan
a818c55e65
Merge changes from topic "new-ipsec-api" am: 644a034eed am: e0dd7159d5 am: 24c72089d7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433
Change-Id: I2f7b92f59747df7a78ce72ff5df26d486907be56
2020-10-16 23:24:13 +00:00
Yan Yan
24c72089d7
Merge changes from topic "new-ipsec-api" am: 644a034eed am: e0dd7159d5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433
Change-Id: I45530694608909ddbb21d037cc3302130d8140c7
2020-10-16 23:07:31 +00:00
Yan Yan
e0dd7159d5
Merge changes from topic "new-ipsec-api" am: 644a034eed
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433
Change-Id: I074e1cc2d9b8e38d242c4a1c9b2176d3b8338774
2020-10-16 22:52:03 +00:00
Yan Yan
644a034eed
Merge changes from topic "new-ipsec-api"
...
* changes:
Expose new algorithms as public API
Add new mandatory IPsec algorithms
2020-10-16 22:30:37 +00:00
Bernie Innocenti
26b8ea83f0
Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: ab60aa4add am: 5e29d0c679 am: d8422c8eb4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561
Change-Id: I78ef627fdf0312cf84de53aa8da5f0bca466a6f3
2020-10-16 15:23:18 +00:00
Aaron Huang
925d09b779
Create service-connectivity.jar
...
Create a new target service-connectivity to split
ConnectivityService from services.core.
Add ConnectivityServiceInitializer for initializing
ConnectivityService and add systemReady() in
ConnectivityManager so that SystemServer can call systemReady()
through ConnectivityManager which won't change current behavior.
Bug: 158268939
Test: make target-java, make host-java
atest FrameworksNetIntegrationTests
atest FrameworksNetTests
make, device can boot,
atest CtsStrictJavaPackagesTestCases
wifi and mobile data work.
Change-Id: I99401772ba9c1c34adca20040da3c7c72d86ddd9
Merged-In: Ie732bfaf381404af0bb599ca2f421a96e7aa4257
2020-10-16 22:46:14 +08:00
Bernie Innocenti
d8422c8eb4
Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: ab60aa4add am: 5e29d0c679
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561
Change-Id: I2f310676bd67385921b42f47777dcb522e343ffa
2020-10-16 14:35:59 +00:00
Bernie Innocenti
5e29d0c679
Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: ab60aa4add
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561
Change-Id: I347b1bd257775204499e1c880b4205c04c76710d
2020-10-16 14:18:20 +00:00
Bernie Innocenti
ab60aa4add
Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561
Change-Id: Id30674df53eead41a626eef81a0d7e449dfd7c83
2020-10-16 14:03:43 +00:00
Chiachang Wang
e62f378b9c
Stop setting the legacy net.dnsX system properties
...
These have been locked down via SELinux for a while and thus
they should be safe to delete at this point.
Test: atest FrameworksNetTest
Bug: 33308258
Bug: 148724751
Change-Id: I3a1e9c6ad92c8d2367e0048e5d6cd7d06bbc6e80
2020-10-16 08:19:25 +00:00
Aaron Huang
42fe792772
Merge "Create service-connectivity.jar"
2020-10-16 07:03:33 +00:00
Chalard Jean
badc37d4fe
Remove unused methods from LinkProperties.
...
LinkProperties.compare{Dnses,ValidatedPrivateDnses,AllRoutes,
AllInterfaceNames} actually have no users.
Test: LinkPropertiesTest
Change-Id: Ic54ab3c5520fbbc2be1309aeaf1e5a7857dbd194
2020-10-16 15:32:19 +09:00
Yan Yan
2274995a29
Add new mandatory IPsec algorithms
...
This CL adds new mandatory IPsec algorithms and allows
OEM to enable them on old devices using resource overlay
Bug: 161716062
Test: FrameworksNetTests:IpSecAlgorithmTest
Change-Id: Ib827b05ea27dbe61b14ad236e858f825293ed994
2020-10-15 17:35:17 -07:00
Aaron Huang
dfba5d17fe
Create service-connectivity.jar
...
Create a new target service-connectivity to split
ConnectivityService from services.core.
Add ConnectivityServiceInitializer for initializing
ConnectivityService and add systemReady() in
ConnectivityManager so that SystemServer can call systemReady()
through ConnectivityManager which won't change current behavior.
Bug: 158268939
Test: make target-java, make host-java
atest FrameworksNetIntegrationTests
atest FrameworksNetTests
make, device can boot,
atest CtsStrictJavaPackagesTestCases
wifi and mobile data work.
Change-Id: Ie732bfaf381404af0bb599ca2f421a96e7aa4257
2020-10-16 02:29:04 +08:00
Roman Kalukiewicz
e2b9459da9
Add @Nullable annotation to the parameter of Object.equals() methods.
...
Those annotations could be inferred by some tools (like Kotlin), but the
https://checkerframework.org/ doesn't check inherited annotations
complaining about all equals() invocations that get nullable argument.
The change was generated by running
find . -name \*.java | xargs sed -i 's/public boolean equals(Object /public boolean equals(@Nullable Object /'
in the frameworks/base directory and by automatically adding and
formatting required imports if needed. No manual edits.
Bug: 170883422
Test: Annotation change only. Should have not impact.
Exempt-From-Owner-Approval: Mechanical change not specific to any component.
Change-Id: I5eedb571c9d78862115dfdc5dae1cf2a35343580
2020-10-15 10:48:01 -07:00
Treehugger Robot
5e308f61e4
Merge "Add imports to networking test mapping" am: a9d1392d0b am: a2558cbfc2 am: 1bb4204e60 am: eaaa95983c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982
Change-Id: Ib665e3d7e2ad6058c36c5d93fdc67131d2f670b5
2020-10-15 12:39:49 +00:00
Treehugger Robot
eaaa95983c
Merge "Add imports to networking test mapping" am: a9d1392d0b am: a2558cbfc2 am: 1bb4204e60
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982
Change-Id: I2532899ff95a737bf1f22640c8b5843fec595136
2020-10-15 11:47:10 +00:00
Treehugger Robot
1bb4204e60
Merge "Add imports to networking test mapping" am: a9d1392d0b am: a2558cbfc2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982
Change-Id: If6e2aec576eea261aa648cc027e4047c99363841
2020-10-15 11:28:49 +00:00
Treehugger Robot
a2558cbfc2
Merge "Add imports to networking test mapping" am: a9d1392d0b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982
Change-Id: I835d9c17377cee5adcc5f44cff3e1d4f0774aaa2
2020-10-15 11:07:41 +00:00
Treehugger Robot
a9d1392d0b
Merge "Add imports to networking test mapping"
2020-10-15 10:21:25 +00:00
Remi NGUYEN VAN
1932b12535
Add imports to networking test mapping
...
Ensure that appropriate networking tests are triggered when submitting
changes in the frameworks/base directories.
Change-Id: Ibf8b567fa7721299120b0a6c6836dd770d92a9fc
Test: treehugger runs TEST_MAPPING tests
2020-10-15 09:16:40 +00:00
Treehugger Robot
cbca7cffe3
Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024 am: 173b634aab am: da629196fd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885
Change-Id: I084659f9f874fd7654645043c31e6f5e2b7a04de
2020-10-14 12:28:40 +00:00
Treehugger Robot
da629196fd
Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024 am: 173b634aab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885
Change-Id: I8428419ef645a312c7fbbc45a8ac5709d6ab5d9c
2020-10-14 12:08:20 +00:00
Treehugger Robot
173b634aab
Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885
Change-Id: Ifdaed83a7696ad37df0487a91bcb089de229de07
2020-10-14 11:54:57 +00:00
Treehugger Robot
0df34e3024
Merge "Fix a typo in a comment" am: 968238aa92
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885
Change-Id: I9174acc91209d83526901587bf4603d61aa30acc
2020-10-14 11:24:43 +00:00
Treehugger Robot
968238aa92
Merge "Fix a typo in a comment"
2020-10-14 10:54:25 +00:00
Chalard Jean
05fcb2e43e
Fix a typo in a comment
...
Test: is not necessary for fixing typos in comments
Change-Id: Idf48d2649e728cafda5c1ca32d21102094cf23f5
2020-10-14 04:56:20 +00:00
Chiachang Wang
6baf4256c9
Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b am: 8d5767de05 am: 669defa316
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126
Change-Id: Ib1983313f09336f1bac13a8a84e80cffeee721f7
2020-10-13 10:47:57 +00:00