Commit graph android_packages_modules_Co.../core/java/android
Message SHA1
Add missing RequiresPermission to EthernetManager
The method requires NETWORK_STACK or MAINLINE_NETWORK_STACK permissions,
but the annotation was missing.

Test: m
Fixes: 150877670
Merged-In: I2af74cbcfa642f05f5e7bf85b2a8e8c38595f6ca
(cherry picked from commit e45d3ff849695977cb063cc59550c505b220bd6c)

Change-Id: Ia215b74df99ae60be2e380917be68a272d658ef4

Automerger Merge Worker   authored and   Remi NGUYEN VAN   commited 2020-03-09 10:20:22 +00:00
3bc71e0d89
Fix crash and duplicated ethernet tethering request
This change fix two things:
1. Handle ethernet callback in internal thread to avoid crash. IpServer
should be created from tethering thread, otherwise mIpNeighborMonitor of
IpServer would throw
   IllegalStateException("start() called from off-thread")
2. Ethernet tethering request may be duplicated if multiple
startTethering is called but no stopTethering

Bug: 130840861
Bug: 148824036
Test: ON/OFF ethernet tehtering manually
      atest TetheringTests

Change-Id: Ibd3ea6bc6751bd65647ff381f9b0124bc3395c09
Merged-In: I7c5127e96d80d077735010d2e62c7227805ccb10
Merged-In: Ibd3ea6bc6751bd65647ff381f9b0124bc3395c09
(cherry picked from commit 72702b979654234c18045f04270040056a74cf90)

Automerger Merge Worker   authored and   Mark Chien   commited 2020-03-09 02:02:23 +00:00
87aa2869fe
Merge "[SP16] Address comments on aosp/1172143" am: f4eaaa2415 am: d58bf88378 am: 59a0c28cf3
Change-Id: I4cff4d096f375210585ceae5eb27002b97a35226

Junyu Lai   commited 2020-02-17 14:18:32 +00:00
50e1c228d0
Merge "[SP16] Address comments on aosp/1172143" am: f4eaaa2415
Change-Id: I9c826c08320e112466dea0d2628f3447ebcb7d02

Junyu Lai   commited 2020-02-15 02:35:42 +00:00
d58bf88378
[SP16] Address comments on aosp/1172143
Test: atest FrameworksNetTests
Test: atest NetworkPolicyManagerServiceTest
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Iccaab09f5b9668ec4a7249737c64a69cecb08d15

junyulai   commited 2020-02-14 16:53:40 +08:00
4fe16c5214
Merge "Implement Ikev2VpnRunner" am: e334a83e46
Change-Id: I9b966b52f78fa54dca9d8c3032ec26ed853ad572

Benedict Wong   commited 2020-02-13 21:31:28 +00:00
c722981400
Merge "Implement Ikev2VpnRunner"
Benedict Wong   authored and   Gerrit Code Review   commited 2020-02-13 21:15:24 +00:00
e334a83e46
Implement Ikev2VpnRunner
This change adds the implementation for IKEv2/IPsec VPNs.

Bug: 144246767
Test: Manually tested
Change-Id: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76
Merged-In: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76

Benedict Wong   commited 2020-02-13 18:37:06 +00:00
c85b7b0114
Merge "Implement Ikev2VpnRunner"
Benedict Wong   authored and   Android (Google) Code Review   commited 2020-02-13 18:36:49 +00:00
c2eefbb98a
Implement Ikev2VpnRunner
This change adds the implementation for IKEv2/IPsec VPNs.

Bug: 144246767
Test: Manually tested
Change-Id: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76

Benedict Wong   commited 2020-02-13 00:33:44 -08:00
9ee6603153
Merge "Fix incorrect interpolation of active bucket for partial requests." am: cb011605cf am: 244299e38b am: 16d7a45bfe
Change-Id: I3a7df5061e0a2a90231072a5cd3e8c799302b346

Automerger Merge Worker   commited 2020-02-13 08:26:15 +00:00
afff4915ec
Merge "Fix incorrect interpolation of active bucket for partial requests." am: cb011605cf
Change-Id: Ibfaf1e3d13ce758323c30381ba44702b6016d9eb

Automerger Merge Worker   commited 2020-02-13 07:53:18 +00:00
244299e38b
Merge "Fix incorrect interpolation of active bucket for partial requests."
Maciej Å»enczykowski   authored and   Gerrit Code Review   commited 2020-02-13 07:37:57 +00:00
cb011605cf
Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 9d8a9cbfcc am: 9ec52c9fe8 am: 027902a86c
Change-Id: I0e7322090364fc1724797641276416c07277d0bc

Automerger Merge Worker   commited 2020-02-12 05:27:01 +00:00
d6bf586774
Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 9d8a9cbfcc
Change-Id: I4d352ed54671ce77ebbcaa9f0808a0ef703d3c6f

Automerger Merge Worker   commited 2020-02-12 04:54:02 +00:00
9ec52c9fe8
Merge "[SP10] Add IntDef annotations for system api of NetworkStats"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-02-12 04:37:55 +00:00
9d8a9cbfcc
[SP10] Add IntDef annotations for system api of NetworkStats
Test: m -j
Bug: 130855321
Change-Id: I8855ec95d5d086fc14e2eb71558bc2dcd9a830e5

junyulai   authored and   Junyu Lai   commited 2020-02-11 09:47:03 +00:00
8016a35c78
Merge changes Iaa6f0d65,I68a16b64 am: e486951a92
Change-Id: I687e59f2c25d5c5e2cb5b1574dbcf6f32ec8c817

Automerger Merge Worker   commited 2020-01-31 16:37:49 +00:00
8abb5a0520
Merge changes Iaa6f0d65,I68a16b64
* changes:
  Networking: Rename removeDoubleQuotes to sanitizeSsid
  Wifi: Rename removeDoubleQuotes to sanitizeSsid

David Su   authored and   Gerrit Code Review   commited 2020-01-30 22:42:16 +00:00
e486951a92
Merge changes I34842acd,Icc6c4d6b
am: 5312d0be3e

Change-Id: I38f5452905216ebf9e0b28311d34ad0667243274

Lorenzo Colitti   authored and   android-build-merger   commited 2020-01-28 02:53:38 -08:00
4036bb43a0
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

Merged-In: I34842acd94b972e440c3622f7617df10c18acf65
Change-Id: I34842acd94b972e440c3622f7617df10c18acf65
(cherry-pick with conflicts in test-current.txt)

Remi NGUYEN VAN   commited 2020-01-28 17:52:06 +09:00
199d685186
Merge "Support putting one Ethernet interface in server mode."
am: e7e38501e8

Change-Id: Ib1c26821880daa118b1911d4f98ebbd970c3c1b4

Remi NGUYEN VAN   authored and   android-build-merger   commited 2020-01-28 00:37:20 -08:00
88bc15c4bc
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
Merged-In: Id96d581acb3fa4e52ca62dd94ec257f56bd3a1ce
Change-Id: Id96d581acb3fa4e52ca62dd94ec257f56bd3a1ce
(clean cherry-pick from internal branch)

Lorenzo Colitti   authored and   Remi NGUYEN VAN   commited 2020-01-28 16:25:43 +09:00
19b8b88d18
Fix incorrect interpolation of active bucket for partial requests.
Just because the bucket is active (ie. overlaps with 'now') doesn't
mean the request necessarily covers the entire bucket.

For example a bucketDuration=5 with a bucket from curStart=1 to
curEnd=6 with now=4 and requests:
- from start=0 to end=3 --> overlap=[1,3] --> bucketSpan=2
- from start=2 to end=3 --> overlap=[2,3] --> bucketSpan=1
- from start=2 to end=5 --> overlap=[2,4] --> bucketSpan=2
- from start=2 to end=7 --> overlap=[2,4] --> bucketSpan=2
and the previously correctly handled cases:
- from start=0 to end=5 --> overlap=[1,4] --> bucketSpan=3
- from start=0 to end=7 --> overlap=[1,4] --> bucketSpan=3

We fix this by bounding the end of buckets to now, this means
that bucketDuration is no longer a constant, but it simplifies
all the rest of the logic.

Test: builds, atest
Bug: 143338233
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I642b57f7b8486071ad7808fd9b901859923b6d25

Maciej Å»enczykowski   commited 2020-01-27 18:39:15 -08:00
2b92fa5323
Networking: Rename removeDoubleQuotes to sanitizeSsid
Bug: 145745815
Test: compiles
Change-Id: Iaa6f0d65cab556c24b0a9010427de8e6a02836c1

David Su   commited 2020-01-27 13:52:26 -08:00
7092cf164f
Networking: Rename removeDoubleQuotes to sanitizeSsid
Bug: 145745815
Test: compiles
Change-Id: Iaa6f0d65cab556c24b0a9010427de8e6a02836c1
Merged-In: Iaa6f0d65cab556c24b0a9010427de8e6a02836c1
(clean cherry-pick from internal branch)

David Su   commited 2020-01-27 13:51:56 -08:00
7ae4c7b600
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

Remi NGUYEN VAN   commited 2020-01-27 19:31:08 +09:00
c5c664b88d
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

Lorenzo Colitti   authored and   Remi NGUYEN VAN   commited 2020-01-27 19:12:54 +09:00
1d48d5e90d
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb

Xin Li   commited 2020-01-15 16:15:41 -08:00
3b49ef3445
[SP03] support registerNetworkStatsProvider API am: 258eb3b9e5 am: 573e809597 am: 910f2d53bd
Change-Id: Iaedbf1f8bbe8128ca2631efff24048b97ce9d909

Automerger Merge Worker   commited 2020-01-13 14:48:01 +00:00
a6f36f4246
[SP03] support registerNetworkStatsProvider API am: 258eb3b9e5 am: 573e809597
Change-Id: I16130e06129e985fab33b5caf904477bf241e1b2

Automerger Merge Worker   commited 2020-01-13 14:28:05 +00:00
910f2d53bd
[SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull am: 644ec019dd am: 9ea8dae9fc
Change-Id: I872285f988905d6707109ab3c7e6a419df47d39b

Automerger Merge Worker   commited 2020-01-13 14:28:02 +00:00
5607e53d46
[SP03] support registerNetworkStatsProvider API
am: 258eb3b9e5

Change-Id: Id3a21676b6063048124c54035207a1c070df7a8c

junyulai   authored and   android-build-merger   commited 2020-01-13 06:12:41 -08:00
573e809597
[SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
am: 644ec019dd

Change-Id: I17550a2191ccd33a53a195df3cd178d93fbfe952

junyulai   authored and   android-build-merger   commited 2020-01-13 06:12:31 -08:00
9ea8dae9fc
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

Junyu Lai   authored and   Gerrit Code Review   commited 2020-01-13 14:09:52 +00:00
c621ac4b44
Merge "Use new UnsupportedAppUsage annotation." am: 89ac95017f am: b2b309516a
Change-Id: Ia3b772ad3ae7c26d92f3367a3689579cd00860ab

Automerger Merge Worker   commited 2020-01-13 13:50:52 +00:00
e07959a156
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

Artur Satayev   authored and   satayev   commited 2020-01-13 12:39:59 +00:00
fcda85b772
[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

junyulai   commited 2020-01-13 14:43:03 +08:00
258eb3b9e5
[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

junyulai   commited 2020-01-13 14:42:37 +08:00
644ec019dd
Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" am: 1207761344 am: b5189ed2d9 am: 9bd7141d12
Change-Id: I3c2b6dbe514a9f41d27c71b4f76484d801cb92e8

Automerger Merge Worker   commited 2020-01-10 00:27:55 +00:00
ca2c6f19ea
Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" am: 1207761344 am: b5189ed2d9
Change-Id: I40382746ab54ed21fe9d8fc68b2c81bdf2b4e464

Automerger Merge Worker   commited 2020-01-10 00:16:11 +00:00
9bd7141d12
Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection"
Yan Yan   authored and   Gerrit Code Review   commited 2020-01-09 23:42:59 +00:00
1207761344
Merge "Use new UnsupportedAppUsage annotation." am: 57f5cccd29 am: fe3063fb71
Change-Id: Iea82f97f0ba766ce3f435630175aea48ca47f12f

Automerger Merge Worker   commited 2020-01-09 16:15:31 +00:00
a0e0b34013
Merge "Use new UnsupportedAppUsage annotation."
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-01-09 15:46:03 +00:00
57f5cccd29
Merge "[SP02] Add provider interfaces to system API" am: 2220f75cdf am: c6487568ad am: 44358d9d8f
Change-Id: I490c69f902e4b288502adbe5f97c94688147c741

Automerger Merge Worker   commited 2020-01-09 15:33:22 +00:00
03ec23c40a
Merge "[SP02] Add provider interfaces to system API" am: 2220f75cdf am: c6487568ad
Change-Id: I569fbcc38f44221ff1be355e48ced65359f2e70f

Automerger Merge Worker   commited 2020-01-09 15:14:16 +00:00
44358d9d8f
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

Artur Satayev   commited 2020-01-09 13:56:05 +00:00
7dc15b923f
Merge "[SP01] Add NetworkStats to system API" am: a113464439 am: b340068a3e am: cc0ae82905
Change-Id: I1bb272727cbaec0102669b3f3b8141994f8e1f9a

Automerger Merge Worker   commited 2020-01-09 09:37:50 +00:00
6c530816c0
Merge "[SP01] Add NetworkStats to system API" am: a113464439 am: b340068a3e
Change-Id: I771bf8836f9b754fc05fd743de8cc5a15aecddf1

Automerger Merge Worker   commited 2020-01-09 09:18:36 +00:00
cc0ae82905
[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

junyulai   authored and   Junyu Lai   commited 2020-01-09 08:57:37 +00:00
b9471063dd