Commit Graph

11904 Commits

Author SHA1 Message Date
James Mattis
07ae51bd26 Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0 am: 73877e08a8 am: 0829a6ac61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472326

Change-Id: I33da7fd0b61eb0d5a6b45b4ba2140b39c377e15a
2020-10-28 00:38:12 +00:00
James Mattis
0829a6ac61 Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0 am: 73877e08a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472326

Change-Id: Id8605eb5f8f4d8b977ff04359a12061c68527971
2020-10-28 00:10:47 +00:00
James Mattis
73877e08a8 Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472326

Change-Id: I3eeeb071bf77c9f71ba54a680b7d43936200b12e
2020-10-27 23:57:19 +00:00
James Mattis
b3b4899980 Add OEM_PRIVATE NetworkCapability
Adding network capability to be used with networks to be only used by
OEM apps.

Bug: 171505922
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ib55ebec0e178b6317d92f17e1aff060dacdfb2b1
2020-10-27 13:14:06 -07:00
Paul Hu
d98cddc3d0 Merge "Replace PendingIntent @hide APIs" am: 3b32517990 am: 97adf1f334 am: 1847f9be9a am: d8bb35fdf5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456121

Change-Id: I6f3a1e221d9ce57947ff14c3f5b17a50e0e5d40f
2020-10-26 09:38:28 +00:00
Paul Hu
d8bb35fdf5 Merge "Replace PendingIntent @hide APIs" am: 3b32517990 am: 97adf1f334 am: 1847f9be9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456121

Change-Id: I837c5cd9ebc46e350e3c7950323614df4cbc38f3
2020-10-26 08:26:40 +00:00
Paul Hu
1847f9be9a Merge "Replace PendingIntent @hide APIs" am: 3b32517990 am: 97adf1f334
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456121

Change-Id: I18693b621bcae7a011719324bd8bede302d22efb
2020-10-26 07:59:15 +00:00
Paul Hu
3b32517990 Merge "Replace PendingIntent @hide APIs" 2020-10-26 07:32:56 +00:00
Treehugger Robot
51d380586c Merge "Add a mutability flag to the PendingIntent" am: 315a097740 am: 0cfb318d10 am: fd2447df82 am: 9b136ebaa0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456120

Change-Id: I1e0adcc9affae154318f2e92a75ce190c97d3b10
2020-10-23 11:24:41 +00:00
Treehugger Robot
9b136ebaa0 Merge "Add a mutability flag to the PendingIntent" am: 315a097740 am: 0cfb318d10 am: fd2447df82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456120

Change-Id: I7018d8afbd43690810d6b00683c6e7d26091e8ae
2020-10-23 11:11:41 +00:00
Treehugger Robot
fd2447df82 Merge "Add a mutability flag to the PendingIntent" am: 315a097740 am: 0cfb318d10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456120

Change-Id: Id09c2c39f6ba7ecd68d1b5c792b300ae33c30278
2020-10-23 10:27:28 +00:00
Treehugger Robot
315a097740 Merge "Add a mutability flag to the PendingIntent" 2020-10-23 09:49:27 +00:00
Lucas Lin
752bba2382 Merge "Using Context#getSystemService instead of ServiceManager#checkService" am: d769b3863e am: bb6fc081c2 am: 884546597e am: c93771dde5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463902

Change-Id: If50e3be30fa1ba34c945736ed9a8a83fbe122b48
2020-10-23 05:01:48 +00:00
Lucas Lin
c93771dde5 Merge "Using Context#getSystemService instead of ServiceManager#checkService" am: d769b3863e am: bb6fc081c2 am: 884546597e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463902

Change-Id: I5c37ff8092125e979b83cfb8207f45507ed6c604
2020-10-23 04:46:05 +00:00
Lucas Lin
884546597e Merge "Using Context#getSystemService instead of ServiceManager#checkService" am: d769b3863e am: bb6fc081c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463902

Change-Id: I453b183add07e6b3e3d24138d62ceb2c800710cc
2020-10-23 04:30:27 +00:00
lucaslin
f0d393d530 Using Context#getSystemService instead of ServiceManager#checkService
ConnectivityService is going to be a mainline module, it can only
use formal APIs or @SystemApi. So use public API -
Context#getSystemService() instead of hidden API -
ServiceManager#checkService().

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I9824caa7aec57e70f0ba405fcce39f9bc068732d
2020-10-23 03:07:07 +00:00
TreeHugger Robot
8182e66f18 Merge "Merge "Remove unused methods from LinkProperties." am: 88e32a8ae6 am: f812dc9b77 am: 57899a690d am: c703b02538" into mainline-prod am: 4aa8adb073
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12891080

Change-Id: I46718037b41181e32d2749ab4620020efc403f21
2020-10-22 08:01:39 +00:00
Chalard Jean
3c01153f05 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
(cherry picked from commit 64db0ea5b0)
2020-10-22 02:12:47 +00:00
Treehugger Robot
17ab9135eb Merge "Address comments on aosp/1448415" am: bc7602e296 am: bafa575166 am: 1f4d324fc7 am: f44fb38d88
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465505

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

Change-Id: Ie125f2d0d5605180189fa1dfbef70286ad79c23e
2020-10-21 08:31:09 +00:00
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
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
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
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