Chiachang Wang
1d6fc4f622
Merge changes I6a51d803,I162fae5c am: b75c584971 am: 18013cefe3 am: 2d6e0ab8e7 am: fa1fc27d9b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228
Change-Id: I40ff3cfcb4dbe7dc036eaa87df2fa192aee3f016
2020-10-29 06:19:52 +00:00
Chiachang Wang
671a480929
Merge "Replace hidden NMS interface to network API" am: 689399aa75 am: 667b09128d am: cf129dae9f am: 054053a6ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473224
Change-Id: Id97da9dda9bed8c182ea2fcd92c79d94bc619d52
2020-10-29 06:19:30 +00:00
Chiachang Wang
fa1fc27d9b
Merge changes I6a51d803,I162fae5c am: b75c584971 am: 18013cefe3 am: 2d6e0ab8e7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228
Change-Id: I49cb16e2ae99687be9a4b72773901fa59b506138
2020-10-29 06:14:34 +00:00
Chiachang Wang
054053a6ca
Merge "Replace hidden NMS interface to network API" am: 689399aa75 am: 667b09128d am: cf129dae9f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473224
Change-Id: I4cd75254a26106103352c98d3fefe4a275c83bed
2020-10-29 06:14:03 +00:00
Chiachang Wang
2d6e0ab8e7
Merge changes I6a51d803,I162fae5c am: b75c584971 am: 18013cefe3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228
Change-Id: I61cdda413fe21a46ac075a0abba2b9affa015149
2020-10-29 05:52:33 +00:00
Chiachang Wang
cf129dae9f
Merge "Replace hidden NMS interface to network API" am: 689399aa75 am: 667b09128d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473224
Change-Id: Ifc403211281b58bf25c9e7c652a863368b80deae
2020-10-29 05:52:12 +00:00
Chiachang Wang
b75c584971
Merge changes I6a51d803,I162fae5c
...
* changes:
Replace hidden NMS API for setting MTU
Replace hidden NMS default network configuration API
2020-10-29 05:03:43 +00:00
Chiachang Wang
689399aa75
Merge "Replace hidden NMS interface to network API"
2020-10-29 05:02:21 +00:00
Hongwei Wang
903a7239df
Merge "Revert "Add maxTargetSdk restriction to unused APIs.""
2020-10-28 23:58:21 +00:00
Hongwei Wang
1dc34ce1e6
Revert "Add maxTargetSdk restriction to unused APIs."
...
This reverts commit 335e158fb0 .
Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testAppZygotePreload&testClass=android.app.cts.ServiceTest&atpConfigName=suite%2Ftest-mapping-presubmit-retry_cloud-tf&testModule=CtsAppTestCases&fkbb=6936597&lkbb=6936969&lkgb=6936551&testResults=true&branch=git_master&target=cf_x86_phone-userdebug >, bug b/171886397
Bug: 171886397
Change-Id: Ibe0f0430a3451477c1ee8ef56a596e91ea1e7672
2020-10-28 20:16:22 +00:00
Mathew Inwood
15f681fb2c
Merge "Add maxTargetSdk restriction to unused APIs."
2020-10-28 09:39:20 +00:00
Chiachang Wang
fd47831a5c
Replace hidden NMS API for setting MTU
...
Replace the hidden NMS setMtu API with calling INetd directly
for incoming ConnectivityService mainline.
Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect network
Change-Id: I6a51d8033b3354824d4cfb953c2bbe3055d00102
2020-10-28 14:38:18 +08:00
Chiachang Wang
a93ddb250b
Replace hidden NMS interface to network API
...
Replace the hidden NMS addInterfaceToNetwork and
removeInterfaceFromNetwork with calling INetd directly for
incoming ConnectivityService mainline.
Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect network
Change-Id: I0f1f866be2f8084b992b340aeabfb5d62420686b
2020-10-28 14:38:18 +08:00
Chiachang Wang
c1fe7a0a37
Replace hidden NMS default network configuration API
...
Replace the hidden setDefaultNetId and clearDefaultNetId NMS
APIs with accessing INetd directly for the incoming
ConnectivityService mainline.
Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect wifi
Change-Id: I162fae5ca444207a037e5ac4bf8fa0a77a648ca1
2020-10-28 14:38:18 +08:00
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
Mathew Inwood
335e158fb0
Add maxTargetSdk restriction to unused APIs.
...
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.
Bug: 170729553
Test: Treehugger
Change-Id: I4c8fd0006f950de9955242e93968fb0996ceb372
2020-10-27 15:46:07 +00: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