Commit graph

2,019 commits

Message SHA1
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 am: 244299e38b
Change-Id: I1d6aa0c23fd227eca478e4a6ab5fd7dd26e4c297

Automerger Merge Worker   commited 2020-02-13 08:07:01 +00:00
16d7a45bfe
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 am: 9ec52c9fe8
Change-Id: Icc69f682437baf209aa537820201be45db6ccf3a

Automerger Merge Worker   commited 2020-02-12 05:11:59 +00:00
027902a86c
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
Merge "[SP11] add dumpsys support to dump stats inside providers" am: 2b4a6517bf am: e49c7caae3 am: 6c2c1baecf
Change-Id: I03ea04d5851ae4f911f9c64dbdb235aedf4cea3c

Automerger Merge Worker   commited 2020-02-12 03:28:19 +00:00
1934036da7
Merge "[SP11] add dumpsys support to dump stats inside providers" am: 2b4a6517bf am: e49c7caae3
Change-Id: I7c6bf5cb081fb943777988c4d9f40b36f9a16efb

Automerger Merge Worker   commited 2020-02-12 03:13:22 +00:00
6c2c1baecf
Merge "[SP11] add dumpsys support to dump stats inside providers" am: 2b4a6517bf
Change-Id: I44f69d27b89c6d0463a5b12b98e0cc3cf8297a33

Automerger Merge Worker   commited 2020-02-12 02:59:21 +00:00
e49c7caae3
Merge "[SP11] add dumpsys support to dump stats inside providers"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-02-12 02:45:38 +00:00
2b4a6517bf
[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
[automerger skipped] Merge changes Iaa6f0d65,I68a16b64 am: e486951a92 am: 8abb5a0520 am: a96f068996 -s ours
am skip reason: Change-Id Iaa6f0d65cab556c24b0a9010427de8e6a02836c1 with SHA-1 7092cf164f is in history

Change-Id: I306a831e47c08ac37de93285763500b73a4624ec

Automerger Merge Worker   commited 2020-01-31 16:47:44 +00:00
a8785a5152
Merge changes Iaa6f0d65,I68a16b64 am: e486951a92 am: 8abb5a0520
Change-Id: I7e66156659fb88110d2a7f027d488e15499caee2

Automerger Merge Worker   commited 2020-01-31 16:43:27 +00:00
a96f068996
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 from topic "api-review-removedoublequotes"
* changes:
  SettingsLib: Rename removeDoubleQuotes to sanitizeSsid
  Networking: Rename removeDoubleQuotes to sanitizeSsid
  Wifi: Rename removeDoubleQuotes to sanitizeSsid

David Su   authored and   Android (Google) Code Review   commited 2020-01-30 18:16:53 +00:00
1596be0133
[automerger skipped] Merge changes I34842acd,Icc6c4d6b am: 5312d0be3e am: 4036bb43a0 am: 145a512dd2 -s ours
am skip reason: Change-Id I34842acd94b972e440c3622f7617df10c18acf65 with SHA-1 c5c664b88d is in history

Change-Id: I7068557f0d30c9066e9bdcb2dd674dab8964a4b9

Automerger Merge Worker   commited 2020-01-28 11:18:31 +00:00
82f4cb1794
Merge changes I34842acd,Icc6c4d6b am: 5312d0be3e am: 4036bb43a0
Change-Id: I801ab058c34ed261f6ca4d100927a0cd89fd8e02

Automerger Merge Worker   commited 2020-01-28 11:03:56 +00:00
145a512dd2
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
Merge changes I34842acd,Icc6c4d6b
* changes:
  Add support for Ethernet tethering
  Local Tethering with ncm interface

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2020-01-28 10:43:33 +00:00
5312d0be3e
[automerger skipped] Merge "Support putting one Ethernet interface in server mode." am: e7e38501e8 am: 88bc15c4bc am: 135240ae67 -s ours
am skip reason: Change-Id Id96d581acb3fa4e52ca62dd94ec257f56bd3a1ce with SHA-1 1d48d5e90d is in history

Change-Id: I3314b899730f367f154bd8b513094076084a6cef

Automerger Merge Worker   commited 2020-01-28 09:17:08 +00:00
9b95fe00b4
Merge "Support putting one Ethernet interface in server mode." am: e7e38501e8 am: 88bc15c4bc
Change-Id: Ifc0f80406038051afe179bf38a4583ab95ab630c

Automerger Merge Worker   commited 2020-01-28 08:52:56 +00:00
135240ae67
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
Merge "Add support for Ethernet tethering"
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-01-27 13:01:29 +00:00
66c9974bb8
Merge "Support putting one Ethernet interface in server mode."
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-01-27 13:00:59 +00:00
7ec57856a1
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
Merge "NetworkStatsFactory.cpp: IWYU" am: 79e97166a8 am: 1e13dec72f am: e058f2fd66
Change-Id: I75378b3435eb63599758b60c687abbce20b8b65d

Automerger Merge Worker   commited 2020-01-17 21:47:19 +00:00
40e53af6db
Merge "NetworkStatsFactory.cpp: IWYU" am: 79e97166a8 am: 1e13dec72f
Change-Id: I16f481d9c954848feb12db5be9563ec1ff49bcb6

Automerger Merge Worker   commited 2020-01-17 21:35:47 +00:00
e058f2fd66
Merge "NetworkStatsFactory.cpp: IWYU"
am: 79e97166a8

Change-Id: Ic76deb1a3f7b63237f93d1abea2a56ea14dc3465

Steven Moreland   authored and   android-build-merger   commited 2020-01-17 11:53:48 -08:00
1e13dec72f
[SP11] add dumpsys support to dump stats inside providers
Sample output is like below:
  Stats Providers:
    OffloadController Xt:
      NetworkStats: ...
    OffloadController Uid:
      NetworkStats: ...
    ImsPhoneCallTracker Xt:
      NetworkStats: ...

Test: adb shell dumpsys netstats (--uid)
Bug: 130855321

Change-Id: I968006de83e13e66bb3359135f0237daf7252bd2

junyulai   commited 2020-01-17 17:32:36 +08:00
e4437529ca
Merge "NetworkStatsFactory.cpp: IWYU"
Steven Moreland   authored and   Gerrit Code Review   commited 2020-01-16 21:22:46 +00:00
79e97166a8
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 3b49ef3445 am: 2ccb93a98c -s ours
am skip reason: subject contains skip directive

Change-Id: I8cd5a78633d18b734a7232794ce24f49b0a964df

Automerger Merge Worker   commited 2020-01-16 19:01:09 +00:00
015d719b3d
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 3b49ef3445
Change-Id: I180670ed08710f325b9f83edfe152f10455d856c

Automerger Merge Worker   commited 2020-01-16 18:34:50 +00:00
2ccb93a98c
Merge "Move DnsSdTxtRecord to net common static library"
Aaron Huang   authored and   Android (Google) Code Review   commited 2020-01-16 03:15:55 +00:00
2c2e849960
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
NetworkStatsFactory.cpp: IWYU
Bug: 140330870
Test: N/A
Change-Id: Id6107c8a83b22ac56f4da61a5d5757d29ecb07ac

Steven Moreland   commited 2020-01-14 09:25:32 -08:00
7b2c9ab255
Move DnsSdTxtRecord to net common static library
DnsSdTxtRecord is moved to frameworks/libs/net for mainline
support. Also change the import path using this class.

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I6118b313ce668707d598aa2eab9baee2f7622dbc

Aaron Huang   commited 2020-01-14 17:50:11 +08:00
1970749b57
Merge "minor change to keep it building" am: f369b2f771 am: c728c5e185 am: 1db0e41455
Change-Id: I5fc3686a1457001fe1c9662dd550d0289d4c3435

Automerger Merge Worker   commited 2020-01-14 09:35:11 +00:00
7155a16463
Merge "minor change to keep it building" am: f369b2f771 am: c728c5e185
Change-Id: Ie95edcead9b39e399a3b3fc51f121e17bc92c5fc

Automerger Merge Worker   commited 2020-01-14 09:20:10 +00:00
1db0e41455
Merge "minor change to keep it building"
am: f369b2f771

Change-Id: I63a9b21b59b1192065284f9e44071c368c12e641

Maciej Żenczykowski   authored and   android-build-merger   commited 2020-01-14 01:06:12 -08:00
c728c5e185
Merge "minor change to keep it building"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2020-01-14 09:03:11 +00:00
f369b2f771
Merge changes from topic "sp04" am: c621ac4b44 am: dfb59a3bd4 am: 6d5a7b305e
Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4

Automerger Merge Worker   commited 2020-01-13 14:48:20 +00:00
e9c7419b55