Remi NGUYEN VAN
3a6bbc2559
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576 am: 2e4fce8669 am: 5780b3c45f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: Ifba7b5b88e162caaf7c5393051f867655cf1b9fb
2021-04-09 02:34:17 +00:00
Remi NGUYEN VAN
5780b3c45f
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576 am: 2e4fce8669
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: I8208c38f4c7a81a1217cc8aeca78374171eae69a
2021-04-09 01:46:43 +00:00
Remi NGUYEN VAN
89eae3bd33
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75 am: 1474024e59 am: 70c7bba941
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304
Change-Id: I3a64653b1a9cb283ba04d4c5a363d3b44fa7b987
2021-04-09 01:30:00 +00:00
Remi NGUYEN VAN
0eae121e2c
[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec am: e9aecbb5d2 am: 19381a5938 -s ours
...
am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 5ee45003b4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: I5bf71b3f1f938d06eae5c3739af081d49ea3777b
2021-04-09 01:29:27 +00:00
Remi NGUYEN VAN
70c7bba941
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75 am: 1474024e59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304
Change-Id: Iaec8ac01bbb518af8e14c0936cf8d8f2f75d8dd4
2021-04-09 01:24:14 +00:00
Remi NGUYEN VAN
19381a5938
Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec am: e9aecbb5d2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: I6a1cf633329d2b3cb90a0ea68e946777f9feff89
2021-04-09 01:23:58 +00:00
Remi NGUYEN VAN
2e4fce8669
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: I3ea1379e439a1dfda99e9332275ea38efed86f4f
2021-04-09 01:08:42 +00:00
Remi NGUYEN VAN
1474024e59
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304
Change-Id: I52e7aaca589eefb385cec78bf4372922d8089018
2021-04-09 01:05:40 +00:00
Remi NGUYEN VAN
e9aecbb5d2
Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: If054ef1739a273e4a203be44675d3b410784dedf
2021-04-09 01:00:10 +00:00
Remi NGUYEN VAN
94c8957576
Merge "Add RequiresPermission to TestNetworkManager"
2021-04-09 00:19:51 +00:00
Remi NGUYEN VAN
793d607d75
Merge "Replace IS_DEBUGGABLE with isDebuggable module API"
2021-04-09 00:19:19 +00:00
Remi NGUYEN VAN
df60573aae
Merge "Make service-connectivity APEX-only" into sc-dev
2021-04-09 00:18:35 +00:00
Remi NGUYEN VAN
4e34417eec
Merge "Use String in CaptivePortalData underlying types"
2021-04-09 00:17:59 +00:00
James Mattis
cec6dac976
Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5 am: 0cc8a225ac am: 038d68cd1f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: Ia028efd68ae8ce229c5382dc4798671da9124a5b
2021-04-08 22:58:14 +00:00
James Mattis
038d68cd1f
Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5 am: 0cc8a225ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: I982301cdaf36457d1adecbcda1ffa6457fd3bfab
2021-04-08 22:11:04 +00:00
James Mattis
0cc8a225ac
Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: I14a27b3b9e7dad67fe9ca275527926e63d465b9a
2021-04-08 21:29:36 +00:00
James Mattis
9e1bc22ce5
Merge "Adding OEM Network Preferences for testing"
2021-04-08 20:51:05 +00:00
Remi NGUYEN VAN
58df155b9d
Use String in CaptivePortalData underlying types
...
The venue friendly name comes from the network, and only plain strings
should be used in practice. writeCharSequence is also not usable in
CaptivePortalData, as it must build using module_api.
Use a String as the underlying type in CaptivePortalData, keeping
CharSequence in the API for consistency with UI-related elements.
This brings CaptivePortalData in line with downstream branches.
Bug: 183174863
Test: atest FrameworksNetTests
Merged-In: Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97
Change-Id: Ic662d3b546d52f825f9c3a24c5e0d4ba03818ab0
2021-04-08 08:23:20 +00:00
Aaron Huang
e0869fbce4
[automerger skipped] Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba am: 9b87bcb32d am: 85d1e0a6e1 -s ours
...
am skip reason: skip tag Change-Id Ie0c540303ba06b8fba029d2b98ae753afb08c963 with SHA-1 f668c3b2b2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: I5d2e532792b6abf0c35968f136c16a418ad2b380
2021-04-08 07:56:06 +00:00
Paul Hu
20ad372472
Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff40 am: d16a01546f am: f0c991fa6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667080
Change-Id: I5fd350d67065211b84dbea769d258daff9780276
2021-04-08 07:48:14 +00:00
Remi NGUYEN VAN
6671f42bef
Add RequiresPermission to TestNetworkManager
...
All API methods in TestNetworkManager require the MANAGE_TEST_NETWORKS
permission.
Fixes: 183972672
Test: m
Change-Id: Ic5929c24ea88d7259d367a81fec8f223a2e3ecb0
2021-04-08 16:12:23 +09:00
Remi NGUYEN VAN
53e0271281
Replace IS_DEBUGGABLE with isDebuggable module API
...
Introduce a Build.isDebuggable() getter instead of the IS_DEBUGGABLE
static member.
Also make it module API as APK modules now have access to module APIs in
S, but also TestApi so it can be tested.
Test: m
Fixes: 182345786
Change-Id: I25d0848aee758792bbaba8ab73b5dd997a7250b3
2021-04-08 13:50:31 +09:00
Aaron Huang
85d1e0a6e1
Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba am: 9b87bcb32d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: Ie3d8de6a1df69231367c8d476a158070d21f7f91
2021-04-08 03:00:27 +00:00
Aaron Huang
9b87bcb32d
Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: I3770e6f3b146c47fa5b20dcd09e2bbd0fd69cbdf
2021-04-08 02:43:55 +00:00
Paul Hu
f0c991fa6f
Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff40 am: d16a01546f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667080
Change-Id: Ice9b0d027e7e4f00bc9f14eb075ead9e77eaeca7
2021-04-08 02:37:23 +00:00
Aaron Huang
77d6e7b0ba
Merge "Remove Network, NetworkRequest metrics from jobscheduler"
2021-04-08 02:27:05 +00:00
TreeHugger Robot
2630088264
Merge "Remove unnecessary public API getActiveNetworkForUid" into sc-dev
2021-04-08 02:26:15 +00:00
Paul Hu
d16a01546f
Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff40
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667080
Change-Id: I4f180fc6e083b21d089dc15881e89a021557635a
2021-04-08 01:56:44 +00:00
Treehugger Robot
eec974b788
[automerger skipped] Merge "Expose constants of ConnectivityManager" am: 62967ab5d5 am: cf22e5a521 am: f0b8f3dc98 -s ours
...
am skip reason: skip tag Change-Id I715c766ad8e5eb54f4dc67239c1dbca7239506fc with SHA-1 1a0ca5f171 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579805
Change-Id: I998cf20b3f54ccdfadf46e64ee655858e3534097
2021-04-07 12:06:15 +00:00
paulhu
164c97d0be
Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager
...
- As API review feedback, move ACTION_CLEAR_DNS_CACHE form Intent
to ConnectivityManager.
- Rename to "android.net.action.CLEAR_DNS_CACHE" because of lint
suggestion.
frameworks/base/packages/Connectivity/framework/src/android/net/
ConnectivityManager.java:449: error: Inconsistent action value;
expected `android.net.action.CLEAR_DNS_CACHE`, was
`android.intent.action.CLEAR_DNS_CACHE` [ActionValue]
Bug: 183937999
Test: atest FrameworksNetTests
Test: atest ActivityTaskManagerServiceTests
Test: atest android.permission2.cts.PermissionPolicyTest
Test: atest CtsNetTestCases
Change-Id: Iae8aa0ba10dfc7581f0cfaab82643edbee789e2f
2021-04-07 19:40:47 +08:00
Treehugger Robot
f0b8f3dc98
Merge "Expose constants of ConnectivityManager" am: 62967ab5d5 am: cf22e5a521
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579805
Change-Id: Ibd12c85a42d9b0c13113923c3a61dde7f2cd3e5a
2021-04-07 11:25:59 +00:00
Treehugger Robot
cf22e5a521
Merge "Expose constants of ConnectivityManager" am: 62967ab5d5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579805
Change-Id: I0e3930444640a8bff7b0f9846cd2ce0e92df8d6f
2021-04-07 10:42:47 +00:00
Treehugger Robot
62967ab5d5
Merge "Expose constants of ConnectivityManager"
2021-04-07 10:11:06 +00:00
lucaslin
4892f26bb8
Expose constants of ConnectivityManager
...
The callers cannot call the hidden APIs after ConnectivityManager
became a part of mainline module, so expose them for callers.
Also change the value of ACTION_PROMPT_PARTIAL_CONNECTIVITY,
ACTION_PROMPT_LOST_VALIDATION and ACTION_PROMPT_UNVALIDATED because
of API lint errors.
Bug: 172183305
Test: Check private DNS settings is normal, and test NO_INTERNET
notification can be shown normally.
Change-Id: I715c766ad8e5eb54f4dc67239c1dbca7239506fc
Merged-In: I715c766ad8e5eb54f4dc67239c1dbca7239506fc
2021-04-07 09:13:46 +00:00
Treehugger Robot
e54dd7b837
Merge "Split networkDestroy() and destroyNetworkCache()" am: a544e4b417 am: d9002eac4f am: 6bcd3d1a25
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020
Change-Id: I40eb6f8d8ea6924b05da34352dbc9192caa4b82e
2021-04-07 06:07:32 +00:00
Chiachang Wang
ec27c044d3
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2 am: 7f5c1bc46c am: 67bdf0e830
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307
Change-Id: Ia3a1974227ebfd0069b288203df3551a561556eb
2021-04-07 06:06:50 +00:00
Treehugger Robot
6bcd3d1a25
Merge "Split networkDestroy() and destroyNetworkCache()" am: a544e4b417 am: d9002eac4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020
Change-Id: Ibe4408e7eb1b23abe0ff8e92b06d4a04f26962de
2021-04-07 06:01:13 +00:00
Treehugger Robot
d9002eac4f
Merge "Split networkDestroy() and destroyNetworkCache()" am: a544e4b417
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020
Change-Id: I517e242589fa979826c65817d5918ce05ced9866
2021-04-07 05:40:17 +00:00
Chiachang Wang
67bdf0e830
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2 am: 7f5c1bc46c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307
Change-Id: I68844967fbef3cffb7211ce72fd502ae19c331c8
2021-04-07 05:39:01 +00:00
Treehugger Robot
a544e4b417
Merge "Split networkDestroy() and destroyNetworkCache()"
2021-04-07 05:05:46 +00:00
Chiachang Wang
7f5c1bc46c
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307
Change-Id: I548347851e102f81cd13516a6a409e74c59859f4
2021-04-07 04:56:41 +00:00
Chiachang Wang
d125112aa2
Merge "Assign the bit calculation as long to prevent overflow"
2021-04-07 04:24:46 +00:00
Aaron Huang
fe5e81000c
Remove Network, NetworkRequest metrics from jobscheduler
...
These metrics are deprecated so remove them from jobscheduler.
Also remove dumpDebug method from Network, NetworkRequest and
NetworkCapabilities because there's no caller anymore.
This change also for connectivity mainline module. These
three classes are inculded in framework-connectivity so
external module cannot have dependencies on its hidden API.
With this change, the dependencies can be removed.
(cherry-picked from ag/13959431)
Bug: 178777253
Test: FrameworksNetTests
JobStoreTest
adb shell dumpsys jobscheduler --proto
CtsIncidentHostTestCases:JobSchedulerIncidentTest
Merged-In: Ie0c540303ba06b8fba029d2b98ae753afb08c963
Change-Id: Ie0c540303ba06b8fba029d2b98ae753afb08c963
2021-04-07 12:22:57 +08:00
Remi NGUYEN VAN
f049994046
Make service-connectivity APEX-only
...
service-connectivity is not used by arc-services anymore, so it does not
need apex_available for the platform anymore.
Bug: 183691942
Test: m
Change-Id: I8e7aa59e517a3694b7c4c1ed1e29f4281777b62c
2021-04-07 13:22:31 +09:00
Treehugger Robot
4755f52830
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611 am: 938579f701 am: dfe1a80db6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279
Change-Id: I05777492db3ab9d7b4c6c69131f9404780e4e832
2021-04-07 02:47:49 +00:00
Chiachang Wang
7dd2a3d7db
Assign the bit calculation as long to prevent overflow
...
The value should be assigned as a long to do the bit calculation
as the mNetworkCapabilities is intended to be a long. Otherwise,
the value will be temporary assigned into an integer then
assigned to the target long. When the bit shift calculation
is out of the integer scope, the calculation will overflow and
result in unexpected bebavior.
Without assigning to a long, ConnectivityServiceTest will get
Out-Of-Memory in StringBuilder while generating toString() in
NetworkCapabilities after updating tests to verify
NET_CAPABILITY_VSIM and NET_CAPABILITY_BIP.
Bug: 130869457
Test: atest FrameworksNetTests
Change-Id: I4d34c1215c7efb6dc352c314107792e3fa512ad7
2021-04-07 02:06:33 +00:00
Treehugger Robot
dfe1a80db6
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611 am: 938579f701
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279
Change-Id: I9fe5fb1cbbbae44e91efe90107c220a7b64d9755
2021-04-07 02:00:09 +00:00
Treehugger Robot
938579f701
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279
Change-Id: I6653d668d1fdc4370f8d5db1da41214b9755bb4d
2021-04-07 01:16:24 +00:00
Treehugger Robot
7fe967c611
Merge "ConnectivityManager: Address review comments from aosp/1595396"
2021-04-07 00:36:27 +00:00
Roshan Pius
8429766378
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183 am: 5a76723653 am: 2435d5a787
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151
Change-Id: Ia04c6e313a5c960c4874cd57cf91c6619d1505da
2021-04-06 18:25:52 +00:00