Commit Graph

10808 Commits

Author SHA1 Message Date
TreeHugger Robot
869edf953d [automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: c3a780339a -s ours
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 301bc7b40a is in history

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

Change-Id: Iad71a237e3bac6340747e86a77c5569fea0bfb42
2020-06-16 03:42:22 +00:00
TreeHugger Robot
35b7392a08 Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409

Change-Id: Ie8f59a561f7184bcfbbe38e99da78ce092475ff8
2020-06-16 03:28:44 +00:00
TreeHugger Robot
c3a780339a [automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 301bc7b40a is in history

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

Change-Id: I63ad698bb29d3770e879f27b155a9fc656a80836
2020-06-16 03:28:39 +00:00
Chiachang Wang
1182d5a7fc Test extra info sent to NetworkMonitor
Test extra info sent to NetworkMonitor correctly if network
agent is created through new NetworkAgent constructor without
legacy network info taken as parameter.

Bug: 156173829
Test: atest FrameworkNetTests
Merged-In: I4f827664c528bea30cc957a0a617dd37693f4460
Change-Id: I4f827664c528bea30cc957a0a617dd37693f4460
2020-06-16 01:57:46 +00:00
Benedict Wong
b001522433 Set correct owner UID for VPN agentConnect()
This commit changes agentConnect to set the owner UID as the mOwnerUid
field instead of the Binder.getCallingUid().

Binder.getCallingUid() can return incorrect results for platform VPNs,
as agentConnect() is called under a clean calling UID.

Additionally, this relaxes the ownerUid sanitization check to allow a
VPN network's owner to see it's own ownership information.

Vpn.mOwnerUid is guaranteed to be correct, as all VPNs MUST have called
prepareInternal() at some previous point, which sets mOwnerUid as the
package's UID (or SYSTEM_UID if this is legacy VPN).

Bug: 150135470
Test: CTS tests showing ownership information
Merged-In: Ic979dad73983d722365849fbfb0becfd432b894c
Change-Id: Ic979dad73983d722365849fbfb0becfd432b894c
(cherry picked from commit e29bf99a7fc1067c546d7fa6cbcb9001fb110d16)
2020-06-16 01:42:48 +00:00
Chiachang Wang
bdb98b25b8 Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0 am: 26cd395a9e am: 41b5925f01 am: 5e26b14de2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: I860a85ee44c7fb3d6707bdae637c52c6796324b1
2020-06-16 01:29:27 +00:00
Chiachang Wang
5e26b14de2 Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0 am: 26cd395a9e am: 41b5925f01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: I52edaf94601620b8b22030e586ae9de0742b3303
2020-06-16 01:16:41 +00:00
Chiachang Wang
41b5925f01 Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0 am: 26cd395a9e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: Ice048df853589411ee1f1c935b929994af1c525b
2020-06-16 01:02:52 +00:00
Chiachang Wang
26cd395a9e Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: If48de0d3fe326d72170b13ec6a9477dfc8dc48ff
2020-06-16 00:52:01 +00:00
Chiachang Wang
9792742ee0 Merge "Test extra info sent to NetworkMonitor" 2020-06-16 00:38:58 +00:00
Benedict Wong
30798ac794 Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd am: bab1782868 am: d01a9458ed am: 46ba8068c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: I5b6b70ae00de8752b1033fc35bacc91549fe5dea
2020-06-15 17:44:11 +00:00
Benedict Wong
46ba8068c7 Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd am: bab1782868 am: d01a9458ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: Id56df437468962eea48b453c99564f68e3b38756
2020-06-15 17:38:17 +00:00
Benedict Wong
d01a9458ed Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd am: bab1782868
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: I5ff673d97fe4558da77575b2cc8c43b87e3673f6
2020-06-15 17:33:33 +00:00
Benedict Wong
bab1782868 Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: I04609b41c9e878e1e3ca8f128d86290012d4ede7
2020-06-15 17:18:15 +00:00
Benedict Wong
2f7bb517fd Merge "Set correct owner UID for VPN agentConnect()" 2020-06-15 17:09:46 +00:00
Aaron Huang
b0e7dca43e Add unit test for NetworkStatsSubscriptionsMonitor
Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
(copy from ag/11788484 but getActiveAndHiddenSubscriptionIdList() since it's renamed
in internal)
Change-Id: Ia162f36efe96d90b2f6f70190d9fa855bba34484
Merged-In: I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91
2020-06-15 07:05:19 +00:00
Chiachang Wang
301bc7b40a Test extra info sent to NetworkMonitor
Test extra info sent to NetworkMonitor correctly if network
agent is created through new NetworkAgent constructor without
legacy network info taken as parameter.

Bug: 156173829
Test: atest FrameworkNetTests
Change-Id: I4f827664c528bea30cc957a0a617dd37693f4460
2020-06-12 18:13:00 +08:00
Remi NGUYEN VAN
c3884937e1 Move Inet[4]AddressUtils to libs/net
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.

Also refine comments in DhcpResults following feedback in previous
change.

Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-06-12 17:04:06 +09:00
Chalard Jean
e1c175a221 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 am: 14280d011d -s ours am: a2689cb888 -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 cece40543e is in history

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

Change-Id: I3df529b7edc3a09065962a81fe12cbff11f7a980
2020-06-12 05:27:24 +00:00
Chalard Jean
927c52b439 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 -s ours am: 51732a8d91 -s ours am: 6b2aeee4eb -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 cece40543e is in history

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

Change-Id: I0d48248896a5877afa23566ff28bba39cee8b473
2020-06-12 05:26:56 +00:00
Chalard Jean
4cc47c8934 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 am: 14280d011d am: ed78b8532d -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 a5ff113bff is in history

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

Change-Id: Ia5760dd31d1c8b9c1e3ee4b367c51c0521c33e63
2020-06-12 05:25:51 +00:00
Chalard Jean
a2689cb888 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 am: 14280d011d -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 cece40543e is in history

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

Change-Id: I7194a4a3a70f93dd510bda107f620e23fb0af19d
2020-06-12 05:12:16 +00:00
Chalard Jean
6b2aeee4eb [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 -s ours am: 51732a8d91 -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 a5ff113bff is in history

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

Change-Id: I51aaef47a6e94d53a744b80fc684cd6fda6ec73c
2020-06-12 05:11:29 +00:00
Chalard Jean
51732a8d91 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 a5ff113bff is in history

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

Change-Id: I819ea5e14c6eaf108ac7252768014aa5d33891b3
2020-06-12 04:58:29 +00:00
Chalard Jean
14280d011d Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: Ic82a23e6f949bd2c74c3dc49da516938f0603e2e
2020-06-12 04:58:27 +00:00
Chalard Jean
df9ce18085 Merge "Document the limitation to a hundred callbacks." into rvc-dev 2020-06-12 04:54:02 +00:00
Automerger Merge Worker
65f7c9aaab Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 65556318aa" into rvc-d1-dev-plus-aosp am: 88e9323c20
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I65a8db74593d794c6efba6b70ae5e575cfce25d1
2020-06-12 02:32:20 +00:00
Automerger Merge Worker
13843ad809 Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 2070880fab am: 4d592c0387" into rvc-qpr-dev-plus-aosp 2020-06-12 02:31:40 +00:00
Aaron Huang
ee9b3b65b9 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 2070880fab am: 2acbd72f5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I643f27dda377ee5d2fa885cac8b814445363a20d
2020-06-12 02:31:29 +00:00
Aaron Huang
5873c3ebd3 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 2070880fab am: 4d592c0387
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I48486d88ee3fa4b81af8e82203d2810f118be7c2
2020-06-12 02:31:20 +00:00
Automerger Merge Worker
88e9323c20 Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 65556318aa" into rvc-d1-dev-plus-aosp 2020-06-12 02:20:40 +00:00
Aaron Huang
8248bb9c91 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 65556318aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I0e5b064f0633474c5200ecf4620540e883af5d0b
2020-06-12 02:20:15 +00:00
Aaron Huang
4d592c0387 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 2070880fab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I7c557b81d3e5ac35b7e8559d8f5d4f5e0d29236a
2020-06-12 02:19:55 +00:00
Aaron Huang
2070880fab Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I43328c82223382978ac3475a195011547f6d0fdc
2020-06-12 02:11:58 +00:00
Aaron Huang
65556318aa Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: Iac633487b359d751206e06b2352a2a9cb475811e
2020-06-12 02:11:29 +00:00
Aaron Huang
70afc75769 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev 2020-06-12 01:58:59 +00:00
Chalard Jean
cece40543e Document the limitation to a hundred callbacks.
Some developers have been surprised by this limitation and had trouble
figuring out what the issue was. Add documentation to address this.

This also includes a drive-by removal of a duplicate check.

Bug: 149867479
Test: doc-only change
Original-Change: https://android-review.googlesource.com/1313813
Merged-In: I5911d01984695550b6c9afe7a8eb535bf5e320a1
Change-Id: I5911d01984695550b6c9afe7a8eb535bf5e320a1
2020-06-12 00:35:39 +00:00
Mark Chien
e07071e93b [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: bd60308b8f -s ours am: e063ebdd7f -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 f949ec251f is in history

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

Change-Id: I62feefafdce8f21594d4578da32921ac280524a8
2020-06-11 15:58:53 +00:00
Mark Chien
bc48ab0a7d [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours am: 977a7aa9db -s ours am: 0a35a27bc4 -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 e9aad6fa2b is in history

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

Change-Id: I6ef41c6a4fb65d1143f575c93669d6cf536f5fac
2020-06-11 15:58:01 +00:00
Mark Chien
ec9ad77054 [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: bd60308b8f am: 3729872bc5 -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 e9aad6fa2b is in history

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

Change-Id: I430112862f94c37182e0224d5c0db71fadfcc240
2020-06-11 15:57:52 +00:00
Mark Chien
e063ebdd7f [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: bd60308b8f -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 f949ec251f is in history

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

Change-Id: I9d40c0e0998d238bcde75a1417f1dbac384285d7
2020-06-11 15:45:34 +00:00
Mark Chien
0a35a27bc4 [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours am: 977a7aa9db -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 e9aad6fa2b is in history

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

Change-Id: Ib9adc3d5bff3f75a2472ecef958a66d582fd9a97
2020-06-11 15:43:01 +00:00
Mark Chien
bd60308b8f Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092

Change-Id: Iece352be0190b902c4949c1feb76281653a9b59f
2020-06-11 15:42:41 +00:00
Mark Chien
977a7aa9db [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 e9aad6fa2b is in history

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

Change-Id: I03e5cf0b7950726825c781dda3b5efdc613e2dcf
2020-06-11 15:42:35 +00:00
Chalard Jean
2e4119e4b3 Merge "Document the limitation to a hundred callbacks." am: f60ed54d33 am: 363fb9fef9 am: 1fa0eab021 am: ad6fb4921b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: Iaff59cefc60948deb30b3a27ee16301b5aa30dcc
2020-06-11 13:36:54 +00:00
markchien
f949ec251f Cleanup config_mobile_hotspot_provision_app usage
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only.
enforceTetherChangePermission is no longer needed because its only
caller PanService already gate by other privileged permission
(BLUETOOTH_PRIVILEGED).

Bug: 146918263
Test: m

Change-Id: I030871c2bc46bc09c4e52970b4995f98d31bb90e
Merged-In: I030871c2bc46bc09c4e52970b4995f98d31bb90e
2020-06-11 13:32:12 +00:00
Chalard Jean
ad6fb4921b Merge "Document the limitation to a hundred callbacks." am: f60ed54d33 am: 363fb9fef9 am: 1fa0eab021
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: Ie9f8c65c307cbefb6e95ec0d3099e5da875ff1c2
2020-06-11 13:16:54 +00:00
Chalard Jean
1fa0eab021 Merge "Document the limitation to a hundred callbacks." am: f60ed54d33 am: 363fb9fef9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: I84b1e39503feddc914b61d4e8bd35953e92ac270
2020-06-11 13:03:37 +00:00
Chalard Jean
363fb9fef9 Merge "Document the limitation to a hundred callbacks." am: f60ed54d33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: Id2f70609c46ec6252b7e734c1e5838016314400f
2020-06-11 12:46:15 +00:00
Chalard Jean
f60ed54d33 Merge "Document the limitation to a hundred callbacks." 2020-06-11 12:31:09 +00:00