Commit Graph

1976 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
c5c664b88d Add support for Ethernet tethering
Ethernet tethering can be started via
startTethering(TETHERING_ETHERNET).

Test: flashed, enabled ethernet tethering, verified internet access on
      downstream.
Bug: 130840861

Change-Id: I34842acd94b972e440c3622f7617df10c18acf65
2020-01-27 19:31:08 +09:00
Lorenzo Colitti
1d48d5e90d Support putting one Ethernet interface in server mode.
requestTetheredInterface can be used to put an interface in server mode,
which will persist until release() is called on the returned request, or
until the requesting process dies.

Test: Enabled ethernet tethering with change on top
Bug: 130840861
Change-Id: Id96d581acb3fa4e52ca62dd94ec257f56bd3a1ce
2020-01-27 19:12:54 +09:00
Automerger Merge Worker
7155a16463 Merge "minor change to keep it building" am: f369b2f771 am: c728c5e185 am: 1db0e41455
Change-Id: I5fc3686a1457001fe1c9662dd550d0289d4c3435
2020-01-14 09:35:11 +00:00
Automerger Merge Worker
1db0e41455 Merge "minor change to keep it building" am: f369b2f771 am: c728c5e185
Change-Id: Ie95edcead9b39e399a3b3fc51f121e17bc92c5fc
2020-01-14 09:20:10 +00:00
Maciej Żenczykowski
c728c5e185 Merge "minor change to keep it building"
am: f369b2f771

Change-Id: I63a9b21b59b1192065284f9e44071c368c12e641
2020-01-14 01:06:12 -08:00
Maciej Żenczykowski
f369b2f771 Merge "minor change to keep it building" 2020-01-14 09:03:11 +00:00
Automerger Merge Worker
e9c7419b55 Merge changes from topic "sp04" am: c621ac4b44 am: dfb59a3bd4 am: 6d5a7b305e
Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4
2020-01-13 14:48:20 +00:00
Automerger Merge Worker
8ac081233a [SP04] add unit test for NetworkStatsProvider am: a97b5c3bb3 am: a51ef24361 am: 1677f601f7
Change-Id: Ic48609b113a7174204eaa2207901c8110d76f65f
2020-01-13 14:48:10 +00:00
Automerger Merge Worker
a6f36f4246 [SP03] support registerNetworkStatsProvider API am: 258eb3b9e5 am: 573e809597 am: 910f2d53bd
Change-Id: Iaedbf1f8bbe8128ca2631efff24048b97ce9d909
2020-01-13 14:48:01 +00:00
Automerger Merge Worker
4f9e7e4d4c [automerger skipped] [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull am: 644ec019dd am: 9ea8dae9fc am: 5607e53d46 -s ours
am skip reason: Change-Id I42117ebfb640e3b0b133183e5e146860bed8471a with SHA-1 634844fe4a is in history

Change-Id: I35ac1c3ffadff900139fc5dc2049eed3524a43af
2020-01-13 14:47:52 +00:00
Automerger Merge Worker
6d5a7b305e Merge changes from topic "sp04" am: c621ac4b44 am: dfb59a3bd4
Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d
2020-01-13 14:28:14 +00:00
Automerger Merge Worker
1677f601f7 [SP04] add unit test for NetworkStatsProvider am: a97b5c3bb3 am: a51ef24361
Change-Id: I0ce508b3ccf22b01603de7246b2068d3b1a2afcd
2020-01-13 14:28:10 +00:00
Automerger Merge Worker
910f2d53bd [SP03] support registerNetworkStatsProvider API am: 258eb3b9e5 am: 573e809597
Change-Id: I16130e06129e985fab33b5caf904477bf241e1b2
2020-01-13 14:28:05 +00:00
Automerger Merge Worker
5607e53d46 [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull am: 644ec019dd am: 9ea8dae9fc
Change-Id: I872285f988905d6707109ab3c7e6a419df47d39b
2020-01-13 14:28:02 +00:00
Junyu Lai
dfb59a3bd4 Merge changes from topic "sp04"
am: c621ac4b44

Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
2020-01-13 06:12:54 -08:00
junyulai
a51ef24361 [SP04] add unit test for NetworkStatsProvider
am: a97b5c3bb3

Change-Id: Icd440ff9086604cb0baaa4cb3e8e458dcda3bb97
2020-01-13 06:12:48 -08:00
junyulai
573e809597 [SP03] support registerNetworkStatsProvider API
am: 258eb3b9e5

Change-Id: Id3a21676b6063048124c54035207a1c070df7a8c
2020-01-13 06:12:41 -08:00
junyulai
9ea8dae9fc [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
am: 644ec019dd

Change-Id: I17550a2191ccd33a53a195df3cd178d93fbfe952
2020-01-13 06:12:31 -08:00
Automerger Merge Worker
9d530215d8 [automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 89ac95017f am: b2b309516a am: e07959a156 -s ours
am skip reason: Change-Id I534e3fd1305e2f4af076986770033478448a665c with SHA-1 fb1d015c12 is in history

Change-Id: Id70ece52187bd4db1689c7f9fb7098308f5fbe41
2020-01-13 14:10:26 +00:00
Junyu Lai
c621ac4b44 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
Automerger Merge Worker
e07959a156 Merge "Use new UnsupportedAppUsage annotation." am: 89ac95017f am: b2b309516a
Change-Id: Ia3b772ad3ae7c26d92f3367a3689579cd00860ab
2020-01-13 13:50:52 +00:00
Artur Satayev
fcda85b772 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I534e3fd1305e2f4af076986770033478448a665c
Merged-In: I534e3fd1305e2f4af076986770033478448a665c
2020-01-13 12:39:59 +00:00
junyulai
a97b5c3bb3 [SP04] add unit test for NetworkStatsProvider
Test: atest NetworkStatsServiceTest
Bug: 130855321
Change-Id: I0c19d8bedcb9398da3f464efe01e775fde9f8a78
2020-01-13 14:43:06 +08:00
junyulai
258eb3b9e5 [SP03] support registerNetworkStatsProvider API
This change provides an API that allow external modules to
register a custom provider of NetworkStats to merge the
network statistics that cannot be seen by the kernel to system.

Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: atest NetworkPolicyManagerServiceTest
Test: m doc-comment-check-docs
Bug: 130855321

Change-Id: I265bc637c40666cde505fde5056d2d9bfc5fb204
2020-01-13 14:43:03 +08:00
junyulai
644ec019dd [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
Extracted from ag/9990011 to make NetworkStatsManager sync with internal
line, given that it is missing in aosp/1198084.

Bug: 126528330

Test: Treehugger
Change-Id: I77f50326869799f51d4636cb7c6d7c97daf531e6
Merged-In: I42117ebfb640e3b0b133183e5e146860bed8471a
2020-01-13 14:42:37 +08:00
Automerger Merge Worker
ca2c6f19ea Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" am: 1207761344 am: b5189ed2d9 am: 9bd7141d12
Change-Id: I3c2b6dbe514a9f41d27c71b4f76484d801cb92e8
2020-01-10 00:27:55 +00:00
Automerger Merge Worker
9bd7141d12 Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" am: 1207761344 am: b5189ed2d9
Change-Id: I40382746ab54ed21fe9d8fc68b2c81bdf2b4e464
2020-01-10 00:16:11 +00:00
Yan Yan
1207761344 Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" 2020-01-09 23:42:59 +00:00
Automerger Merge Worker
3acbb159ca [automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 57f5cccd29 am: fe3063fb71 am: a0e0b34013 -s ours
am skip reason: Change-Id I8789f8499d4dca08580672e9e45ed9a7026dd686 with SHA-1 c6dee71164 is in history

Change-Id: I834646d326b8f591802cf35f38cc1bb2b4e753d5
2020-01-09 16:29:19 +00:00
Automerger Merge Worker
a0e0b34013 Merge "Use new UnsupportedAppUsage annotation." am: 57f5cccd29 am: fe3063fb71
Change-Id: Iea82f97f0ba766ce3f435630175aea48ca47f12f
2020-01-09 16:15:31 +00:00
Treehugger Robot
57f5cccd29 Merge "Use new UnsupportedAppUsage annotation." 2020-01-09 15:46:03 +00:00
Automerger Merge Worker
03ec23c40a Merge "[SP02] Add provider interfaces to system API" am: 2220f75cdf am: c6487568ad am: 44358d9d8f
Change-Id: I490c69f902e4b288502adbe5f97c94688147c741
2020-01-09 15:33:22 +00:00
Automerger Merge Worker
44358d9d8f Merge "[SP02] Add provider interfaces to system API" am: 2220f75cdf am: c6487568ad
Change-Id: I569fbcc38f44221ff1be355e48ced65359f2e70f
2020-01-09 15:14:16 +00:00
Artur Satayev
7dc15b923f Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I8789f8499d4dca08580672e9e45ed9a7026dd686
Merged-In: I8789f8499d4dca08580672e9e45ed9a7026dd686
2020-01-09 13:56:05 +00:00
Automerger Merge Worker
6c530816c0 Merge "[SP01] Add NetworkStats to system API" am: a113464439 am: b340068a3e am: cc0ae82905
Change-Id: I1bb272727cbaec0102669b3f3b8141994f8e1f9a
2020-01-09 09:37:50 +00:00
Automerger Merge Worker
cc0ae82905 Merge "[SP01] Add NetworkStats to system API" am: a113464439 am: b340068a3e
Change-Id: I771bf8836f9b754fc05fd743de8cc5a15aecddf1
2020-01-09 09:18:36 +00:00
junyulai
b9471063dd [SP02] Add provider interfaces to system API
This change contains a base class that allows external modules
to implement a custom network statistics provider. And a callback
interface that allows the implementation to signal the system.

These interfaces will be used in the follow-up changes that
implement the functionality.

Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Ib23377c8b9cef02bc32253462b068fd10734d21a
2020-01-09 08:57:37 +00:00
junyulai
55041a4ad2 [SP01] Add NetworkStats to system API
In order to let external module report their network stats,
expose necessary APIs to construct NetworkStats object.

Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Id3ec8aaff3df67948c25eac2319a74cf33a27979
2020-01-09 03:11:22 +00:00
evitayan
30878b0c76 Allow mainline IPsec(IKE) to statically include @PolicyDirection
@PolicyDirection was hidden API defined in IpSecManager and
mainline module IPsec(IKE) needs to depend on it.

To remove this hidden API dependency, this commit:
- Moves definition of @PolicyDirection to a separate class
- Creates sharing filegroup framework-ike-shared-srcs for mainline
  IKE and include PolicyDirection.java

Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: Ic6d7c06d4b92e16a9a65430365c9acc73932147b
2020-01-08 13:53:14 -08:00
Automerger Merge Worker
7980508977 [automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: 8081ee1b35 am: d9c69c6105 -s ours
am skip reason: Change-Id I0c336de56bc4a041dc97ff9b7927f62f0b44b457 with SHA-1 86716b7860 is in history

Change-Id: I5d5027d9a3ae3c7451b5bff629c0af0902b78a32
2020-01-08 17:25:23 +00:00
Automerger Merge Worker
d9c69c6105 Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: 8081ee1b35
Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
2020-01-08 17:14:42 +00:00
Artur Satayev
164c7569c1 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
Merged-In: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
2020-01-08 14:04:40 +00:00
Automerger Merge Worker
9c04ece0f0 Merge "Fix some @hide usage in Tethering" am: b763432e14 am: aff6974b16 am: a4e599c4b0
Change-Id: I94fc3652055c3ddbeb807c88b70d7fc833d69c3b
2020-01-08 01:27:25 +00:00
Automerger Merge Worker
a4e599c4b0 Merge "Fix some @hide usage in Tethering" am: b763432e14 am: aff6974b16
Change-Id: Ie88cd6ef541d5bd9fcec2e26c03277c75919a1a0
2020-01-08 01:13:35 +00:00
markchien
c74889d36c Fix some @hide usage in Tethering
Using alternative way to replace some @hide API.

Bug: 144814072
Test: build, flash, boot
      atest TetheringTests

Change-Id: I1e12d69db1ad91dff553e142e17c6a70808e1639
2020-01-07 21:29:52 +08:00
Maciej Żenczykowski
ed3ee3702b minor change to keep it building
This is part of 3 commits in 3 diff git repos, the main one is:
  https://android-review.googlesource.com/c/platform/system/netd/+/1200479
  "share eBPF struct definitions between ebpf and C++ netd"

as a side effect of which 'android::bpf::Stats' becomes simply '::Stats'

Test: builds
Bug: 146787904
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8548b27d1d8a7938f96c9fd9a185dae882e406f6
2020-01-06 23:25:49 +00:00
Artur Satayev
86716b7860 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
2020-01-06 16:47:35 +00:00
Automerger Merge Worker
6b709bab9b Merge "convert 'Stats stats; memset(&stats, 0, sizeof(Stats));' to 'Stats stats = {};'" am: 30bf98b239 am: d872904d2c am: 166e658c00
Change-Id: I270c321969d85ff5ae97627a6ecdb9c70d668247
2020-01-06 15:33:26 +00:00
Automerger Merge Worker
380559e9b8 Merge "remove spurious 'struct' on Stats" am: fa88e27173 am: 39b66243ee am: 16605fc29d
Change-Id: I7d6cb9ec24cb3012f445a46c746c5f8009bacc35
2020-01-06 15:32:32 +00:00
Automerger Merge Worker
166e658c00 Merge "convert 'Stats stats; memset(&stats, 0, sizeof(Stats));' to 'Stats stats = {};'" am: 30bf98b239 am: d872904d2c
Change-Id: I6025782d2deea26150c21bc682cca80ceca6148a
2020-01-06 15:21:17 +00:00