Commit Graph

11296 Commits

Author SHA1 Message Date
Treehugger Robot
f44fb38d88 Merge "Address comments on aosp/1448415" am: bc7602e296 am: bafa575166 am: 1f4d324fc7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465505

Change-Id: I20be1778be2f00d8cbd310743f0a93b350fd8313
2020-10-21 08:14:05 +00:00
Chiachang Wang
84ea88acb2 Merge "Do not use hidden SystemProperties.set" am: 93961f7b21 am: d7146b6742 am: b2d82398a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460971

Change-Id: Iac749359f15229a89782e16309352ef8f0624da1
2020-10-21 08:13:21 +00:00
Treehugger Robot
1f4d324fc7 Merge "Address comments on aosp/1448415" am: bc7602e296 am: bafa575166
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465505

Change-Id: I86a2f48ee199c83c429d99d5025ece56f42251cd
2020-10-21 08:03:39 +00:00
Chiachang Wang
b2d82398a6 Merge "Do not use hidden SystemProperties.set" am: 93961f7b21 am: d7146b6742
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460971

Change-Id: I3ff0ce12f3b12e0eb78f330a75675fb79ecf561d
2020-10-21 07:55:31 +00:00
Treehugger Robot
bc7602e296 Merge "Address comments on aosp/1448415" 2020-10-21 07:05:49 +00:00
Chiachang Wang
93961f7b21 Merge "Do not use hidden SystemProperties.set" 2020-10-21 07:00:56 +00:00
Chalard Jean
c8b4e0124d Address comments on aosp/1448415
Adds the necessary jarjar rules to FrameworksTestNet and
removes the test for CompareResult which has moved to its
right place.

Test: FrameworksTestNet
Change-Id: I50e51e72268e432a65a831aa5eebd606584ac721
2020-10-21 13:54:02 +09: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
49ca9d3ca9 Merge "Remove @TestApi from @SystemApi symbols" 2020-10-20 13:45:13 +00:00
Chiachang Wang
c43d68f0d0 Do not use hidden SystemProperties.set
ConnectivityService is going to become a mainline module, and
it will not able to use hidden method anymore. Thus, use
alternative new sysprop as API to control the tcp init rwnd
value.

Bug: 170917042
Test: adb shell getprop net.tcp_def_init_rwnd and check if
      value is set correctly
Test: atest FrameworksNetTests
Change-Id: If9e99c88de50b6829721b0dfacc430a3b53c7728
2020-10-20 19:35:01 +08: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
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
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
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
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
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
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
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
669defa316 Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b am: 8d5767de05
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: I8bc3e27c6cb9f7be7056d1124458c4e283a0f945
2020-10-13 10:12:04 +00:00
Chiachang Wang
8d5767de05 Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: Id33a233789eb58e6ef5be2d5edf3f504c9b4eb12
2020-10-13 09:50:11 +00:00
Chiachang Wang
231acbca1b Merge "Use system api for shell command handling" am: 3da3af2a10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: I322bbe2f711f8c50efe9d50056787c0e60051fbb
2020-10-13 09:29:47 +00:00
Chiachang Wang
3da3af2a10 Merge "Use system api for shell command handling" 2020-10-13 08:41:40 +00:00
Chiachang Wang
0efaff8cbc Use system api for shell command handling
ConnectivityService should not use ShellCommand since it's @hide
which does not accessible in mainline modules. Replace it with
system api for mainline.

Bug: 170598012
Test: adb shell cmd connectivity airplane-mode enable
Test: adb shell cmd connectivity airplane-mode disable
Change-Id: I47e7a371c19eb18eac643fe9a2ab481bec5743c2
2020-10-13 08:41:24 +00:00
TreeHugger Robot
94c3921a03 [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 009ac78c7b -s ours am: 973d635675 -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

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

Change-Id: Icb052e904d339089be1b2e0014b7dd16f958e3d6
2020-10-13 04:22:42 +00:00
Junyu Lai
a33114824f Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00 am: 36b8c1d919
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: Id948a9453139cbf4e9afc75647152bdbd24cfe0a
2020-10-13 04:19:38 +00:00