Commit Graph

7967 Commits

Author SHA1 Message Date
paulhu
e102b0bb49 Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi
Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests

Change-Id: I77cb45e6b2aaf4ab2c457cb59ccf77b1b8c01fa9
2020-01-15 15:38:23 +08:00
Mark Chien
8dbe02fe3f Merge "Unhide NetworkRequest API which use legacy type"
am: a64019915e

Change-Id: Ie6f4021c758aececda5628ba5f0e3b59f1aff42d
2020-01-14 23:06:28 -08:00
Mark Chien
a64019915e Merge "Unhide NetworkRequest API which use legacy type" 2020-01-15 06:49:33 +00:00
paulhu
f0049fe598 Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
am: 4ed1963c4a

Change-Id: I26e3d04bb9c5c895bf8f9a20d3cc1c5caf87db1e
2020-01-14 21:08:13 -08:00
Treehugger Robot
4ed1963c4a Merge "Expose SocketKeepalive#SUCCESS as SystemApi" 2020-01-15 05:01:04 +00:00
paulhu
2f7c345d56 Expose SocketKeepalive#SUCCESS as SystemApi
Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests
Change-Id: I94171b2dc4f26442df918547bf8bc40953f63f2e
Merged-In: I94171b2dc4f26442df918547bf8bc40953f63f2e
2020-01-15 02:45:43 +00:00
Rambo Wang
582ba554de Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer
StringNetworkSpecifier is widely used to specify subscription id for
the NetworkRequest. The raw string field introduce ambiguity and leave
large space for bugs. With TelephonyNetworkSpecifer, we are able to
settle down the type and value of the fields (although currently only
one) and introduce validation to detect the bug in the beginning.

Bug: 145993724
Test: atest FrameworksNetTests FrameworksTelephonyTests &
      make offline-sdk-docs
Change-Id: Iefbad9b1deb3de2c0b262d9ce5ae0704a50d08a6
2020-01-14 10:51:11 -08:00
Aaron Huang
6426059fa3 Merge "Make NattKeepalivePacketData @SystemApi"
am: 9fef5a5cf0

Change-Id: I6d212d1b830f29b8d8a77c727bfa23572f7e08a6
2020-01-14 07:03:31 -08:00
Aaron Huang
9fef5a5cf0 Merge "Make NattKeepalivePacketData @SystemApi" 2020-01-14 14:36:09 +00:00
Lorenzo Colitti
385ec77624 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
am: baf25cde90

Change-Id: I5b8def0055bb8f7062405b1f354c1edf6292a129
2020-01-13 22:04:13 -08:00
Lorenzo Colitti
baf25cde90 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" 2020-01-14 05:30:14 +00:00
markchien
d6eeffd079 Unhide NetworkRequest API which use legacy type
Bug: 144753389
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
Merged-In: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
2020-01-14 04:56:54 +00:00
Chiachang Wang
006e9bc1e7 Merge "Support reevaluation request from captive portal app"
am: 254c3d830e

Change-Id: I5f376b4a342557b91b70d892308469b1fdda2363
2020-01-13 18:05:03 -08:00
paulhu
74357e70a8 Expose ConnectivityManager#TYPE_NONE as SystemApi
Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests
Change-Id: Ia496aaeaf74fa44764640fd2b97c417509e040aa
2020-01-14 10:02:30 +08:00
Chiachang Wang
254c3d830e Merge "Support reevaluation request from captive portal app" 2020-01-14 01:42:22 +00:00
Aaron Huang
aead9c64fa Make NattKeepalivePacketData @SystemApi
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests

Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287
2020-01-14 01:45:28 +08:00
Junyu Lai
3402bbf714 Merge changes from topic "sp04"
am: 429d86ae3c

Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
2020-01-13 06:12:54 -08:00
junyulai
85f2dd96fc [SP04] add unit test for NetworkStatsProvider
am: 276921b6e1

Change-Id: Icd440ff9086604cb0baaa4cb3e8e458dcda3bb97
2020-01-13 06:12:48 -08:00
Junyu Lai
429d86ae3c Merge changes from topic "sp04"
* changes:
  [SP05] add unit test for onStatsProviderLimitReached in NPMS
  [SP04] add unit test for NetworkStatsProvider
  [SP03] support registerNetworkStatsProvider API
  [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
2020-01-13 14:09:52 +00:00
junyulai
276921b6e1 [SP04] add unit test for NetworkStatsProvider
Test: atest NetworkStatsServiceTest
Bug: 130855321
Change-Id: I0c19d8bedcb9398da3f464efe01e775fde9f8a78
2020-01-13 14:43:06 +08:00
Chiachang Wang
938bfba0c3 Support reevaluation request from captive portal app
CaptivePortalLogin use similar way to validate the network as
NetworkMonitor. Provide API to reuse NetworkMonitor facilities
for consistent captive portal detection.

Bug: 134892996
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Test: manually test with captive portal Wi-Fi
Test: make system-api-stubs-docs-update-current-api \
      test-api-stubs-docs-update-current-api
Change-Id: I6f039eae7ceb18eb6c3cf15587cdc27a7fe35b00
2020-01-13 14:28:02 +08:00
Lorenzo Colitti
3efc93af3d Merge changes I7ea39b80,I6b9979f3
am: 310d1dac0d

Change-Id: I33b163077fcc270f79a11a43e481767934e8ac9e
2020-01-12 20:19:21 -08:00
Lorenzo Colitti
a86fae785a Stop using NetworkFactory in connectivity code.
Bug: 138306002
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I6b9979f343108c0c077abd86ae1c21e5ece0cccc
2020-01-12 17:40:02 +09:00
Automerger Merge Worker
02ee974ee1 Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 0e82d1c50d am: 2d976e6c9e
Change-Id: I3b07f1715e550568014becb9f987963777da4bba
2020-01-10 09:43:41 +00:00
paulhu
2d976e6c9e Merge "Add NetworkCapabilities#deduceRestrictedCapability"
am: 0e82d1c50d

Change-Id: I3c451ed7725cacd5672e7b1920a0725239015e68
2020-01-10 01:32:25 -08:00
Treehugger Robot
0e82d1c50d Merge "Add NetworkCapabilities#deduceRestrictedCapability" 2020-01-10 09:27:31 +00:00
Automerger Merge Worker
badb0c36b6 Merge "Expose DhcpInfo parcelable interface implementation methods" am: 617e9bd709 am: 6817693ef3
Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
2020-01-10 08:34:19 +00:00
Aaron Huang
6817693ef3 Merge "Expose DhcpInfo parcelable interface implementation methods"
am: 617e9bd709

Change-Id: Ie432bee8641bd0c2e94adb04329ea6e80e8ed72c
2020-01-10 00:10:03 -08:00
Aaron Huang
617e9bd709 Merge "Expose DhcpInfo parcelable interface implementation methods" 2020-01-10 08:05:24 +00:00
Automerger Merge Worker
6e6fd92d08 Merge "Add keepalive related methods and fields to system APIs" am: 434bc5adf4 am: 57e9fd7e5a
Change-Id: Ie4cd12bb96a42f414d7026828e72eea16f4bd073
2020-01-10 06:31:54 +00:00
Aaron Huang
57e9fd7e5a Merge "Add keepalive related methods and fields to system APIs"
am: 434bc5adf4

Change-Id: Ic557c3ece7b443124ca050e6c6bfd3a1f2d77c3b
2020-01-09 22:20:39 -08:00
Aaron Huang
434bc5adf4 Merge "Add keepalive related methods and fields to system APIs" 2020-01-10 06:16:04 +00:00
Automerger Merge Worker
cfde6e371c [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours am: d643f69d68 -s ours am: f13799cb24 -s ours am: c47be40b76 -s ours
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history

Change-Id: I1e7d1dfcc789c0a5f801c880c2bbbe8bc6e781d3
2020-01-09 18:32:52 +00:00
Automerger Merge Worker
e213703513 [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: b5933251bc -s ours am: 0135f92c89 -s ours
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 d73f6baa90 is in history

Change-Id: I04970c02f44adbff3c713c81a18840b3d4c2c7d8
2020-01-09 18:32:12 +00:00
Automerger Merge Worker
c47be40b76 [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours am: d643f69d68 -s ours am: f13799cb24 -s ours
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history

Change-Id: Id7d778048e411acc447b4adf43d977e8eb98a8af
2020-01-09 17:41:35 +00:00
Automerger Merge Worker
0135f92c89 [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: b5933251bc -s ours
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 d73f6baa90 is in history

Change-Id: I641d8967ec8af4b58696bf2c044f5a87a6836937
2020-01-09 17:40:58 +00:00
Automerger Merge Worker
f13799cb24 [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours am: d643f69d68 -s ours
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history

Change-Id: I9b95f9715b7d15e3f430e6c46a2fd975b6b51f23
2020-01-09 16:50:47 +00:00
Automerger Merge Worker
b5933251bc [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 d73f6baa90 is in history

Change-Id: Id83288231d705e604e5094d40d211c0c940c4dd4
2020-01-09 16:50:08 +00:00
Automerger Merge Worker
b24adb4bb0 Merge "Add a NetworkProvider class to the SDK." am: 3bd0d010bb am: 4de6a72e85
Change-Id: I6f15335ae03674b1b2d759b2bb7b52607eb9e3e0
2020-01-09 15:15:05 +00:00
Lorenzo Colitti
4de6a72e85 Merge "Add a NetworkProvider class to the SDK."
am: 3bd0d010bb

Change-Id: If92b0d0e5644f66db3dd17f6b11ff937232c2a90
2020-01-09 07:13:16 -08:00
Lorenzo Colitti
3bd0d010bb Merge "Add a NetworkProvider class to the SDK." 2020-01-09 15:09:58 +00:00
Automerger Merge Worker
d643f69d68 [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history

Change-Id: Ifa87cac191ad07937dc70770ff74a9d025131a40
2020-01-09 14:06:22 +00:00
Automerger Merge Worker
be4ef9fe6f Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca
Change-Id: I5660cafce05a0e3c6edff03bd645d8df329c5d50
2020-01-09 13:53:42 +00:00
Automerger Merge Worker
0ebda2d6ca Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876
Change-Id: I4c255820617a86afdfa239febdd46fff7d082381
2020-01-09 13:40:20 +00:00
Aaron Huang
cf22d1a29f Expose DhcpInfo parcelable interface implementation methods
Parcelable class requires a CREATOR field be exposed.

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
      atest android.net.cts

Change-Id: I41c68406d09014dda99f337add8c0db0298b0582
2020-01-09 21:33:22 +08:00
Lorenzo Colitti
6702d4b5b2 Add a NetworkProvider class to the SDK.
Bug: 138306002
Test: builds, boots, wifi and telephony work
Test: tested by upcoming change that uses this in NetworkFactory
Change-Id: I2f61bf323215b7c6feff8acc92e7434346751773
2020-01-09 19:50:26 +09:00
paulhu
9c7a0fa46a Add NetworkCapabilities#deduceRestrictedCapability
Support telephony mainline module usage.

Bug: 138306002
Test: atest FrameworksNetTests
      atest CtsNetTestCases --instant

Change-Id: Idbd9c547eff7227085c753461b901c7cdbe396fb
2020-01-09 17:59:46 +08:00
Automerger Merge Worker
2687f35f34 Merge "[SP01] Add NetworkStats to system API" am: c494e23773 am: 02a936a9ad
Change-Id: I771bf8836f9b754fc05fd743de8cc5a15aecddf1
2020-01-09 09:18:36 +00:00
Junyu Lai
02a936a9ad Merge "[SP01] Add NetworkStats to system API"
am: c494e23773

Change-Id: Ie9e97a16bbe221f42cff73bba59e9fc8404db551
2020-01-09 01:01:49 -08:00
Junyu Lai
c494e23773 Merge "[SP01] Add NetworkStats to system API" 2020-01-09 08:33:24 +00:00