Commit Graph

2049 Commits

Author SHA1 Message Date
android-build-team Robot
b325bf3e89 Snap for 6166993 from 6b398d9c3741c8c6664d740dddcb98d5fb8381e2 to rvc-release
Change-Id: Ic43525376c351bc28a5081799b3ebde31c8caa43
2020-01-29 04:22:21 +00:00
Automerger Merge Worker
82f4cb1794 [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
2020-01-28 11:18:31 +00:00
Automerger Merge Worker
145a512dd2 Merge changes I34842acd,Icc6c4d6b am: 5312d0be3e am: 4036bb43a0
Change-Id: I801ab058c34ed261f6ca4d100927a0cd89fd8e02
2020-01-28 11:03:56 +00:00
Lorenzo Colitti
4036bb43a0 Merge changes I34842acd,Icc6c4d6b
am: 5312d0be3e

Change-Id: I38f5452905216ebf9e0b28311d34ad0667243274
2020-01-28 02:53:38 -08:00
Lorenzo Colitti
5312d0be3e Merge changes I34842acd,Icc6c4d6b
* changes:
  Add support for Ethernet tethering
  Local Tethering with ncm interface
2020-01-28 10:43:33 +00:00
Automerger Merge Worker
9b95fe00b4 [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
2020-01-28 09:17:08 +00:00
Automerger Merge Worker
135240ae67 Merge "Support putting one Ethernet interface in server mode." am: e7e38501e8 am: 88bc15c4bc
Change-Id: Ifc0f80406038051afe179bf38a4583ab95ab630c
2020-01-28 08:52:56 +00:00
Remi NGUYEN VAN
199d685186 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)
2020-01-28 17:52:06 +09:00
Remi NGUYEN VAN
88bc15c4bc Merge "Support putting one Ethernet interface in server mode."
am: e7e38501e8

Change-Id: Ib1c26821880daa118b1911d4f98ebbd970c3c1b4
2020-01-28 00:37:20 -08:00
Lorenzo Colitti
19b8b88d18 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)
2020-01-28 16:25:43 +09:00
android-build-team Robot
04b88d77a5 Snap for 6164373 from f83559781f8f793694b5895b86e809e1837ae472 to rvc-release
Change-Id: I42dfbcfd0aa12066df7af8faa705cf5924f7869c
2020-01-28 04:20:14 +00:00
Remi NGUYEN VAN
66c9974bb8 Merge "Add support for Ethernet tethering" 2020-01-27 13:01:29 +00:00
Remi NGUYEN VAN
7ec57856a1 Merge "Support putting one Ethernet interface in server mode." 2020-01-27 13:00:59 +00:00
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
android-build-team Robot
735d299842 Snap for 6145313 from 108ac3af123ec7309f4c7708b35943f704779d4a to rvc-release
Change-Id: I2ed1864be3c9b9d503de93620658ec058e09b2c4
2020-01-18 04:18:19 +00:00
Automerger Merge Worker
40e53af6db Merge "NetworkStatsFactory.cpp: IWYU" am: 79e97166a8 am: 1e13dec72f am: e058f2fd66
Change-Id: I75378b3435eb63599758b60c687abbce20b8b65d
2020-01-17 21:47:19 +00:00
Automerger Merge Worker
e058f2fd66 Merge "NetworkStatsFactory.cpp: IWYU" am: 79e97166a8 am: 1e13dec72f
Change-Id: I16f481d9c954848feb12db5be9563ec1ff49bcb6
2020-01-17 21:35:47 +00:00
Steven Moreland
1e13dec72f Merge "NetworkStatsFactory.cpp: IWYU"
am: 79e97166a8

Change-Id: Ic76deb1a3f7b63237f93d1abea2a56ea14dc3465
2020-01-17 11:53:48 -08:00
android-build-team Robot
61df98d975 Snap for 6142138 from 0622f209592028109bb301f314706238b8378dbd to rvc-release
Change-Id: Id0ec993a8b9bde293fc3e8b5a186b9b32b364b74
2020-01-17 04:07:36 +00:00
Steven Moreland
79e97166a8 Merge "NetworkStatsFactory.cpp: IWYU" 2020-01-16 21:22:46 +00:00
Automerger Merge Worker
015d719b3d [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
2020-01-16 19:01:09 +00:00
Automerger Merge Worker
2ccb93a98c DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 3b49ef3445
Change-Id: I180670ed08710f325b9f83edfe152f10455d856c
2020-01-16 18:34:50 +00:00
Aaron Huang
2c2e849960 Merge "Move DnsSdTxtRecord to net common static library" 2020-01-16 03:15:55 +00:00
Xin Li
3b49ef3445 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
android-build-team Robot
1da9c33fc7 Snap for 6134912 from 38ada9b3d5bc7005e91a23f70278c7ed046a5243 to rvc-release
Change-Id: Idfbfd0d240961044f3c97277ef602be07b84e7b5
2020-01-15 04:13:12 +00:00
Steven Moreland
7b2c9ab255 NetworkStatsFactory.cpp: IWYU
Bug: 140330870
Test: N/A
Change-Id: Id6107c8a83b22ac56f4da61a5d5757d29ecb07ac
2020-01-14 09:25:32 -08:00
Aaron Huang
1970749b57 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
2020-01-14 17:50:11 +08: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
android-build-team Robot
977fb5b831 Snap for 6132583 from 6a10c36efe2ae4bff73df9853d49a3dfa59d169a to rvc-release
Change-Id: I84a94f5b4e8d5a55b25c55c658e58f07771ac693
2020-01-14 04:08:39 +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