Commit Graph

1530 Commits

Author SHA1 Message Date
junyulai
7ba6e2e145 [SP25] Rename functions that add Entry conditionally am: abb0596a0a am: 063b3720fa
Change-Id: I22d32f9cbc9c2694160ad5cd30d7b637529b8e44
2020-03-17 23:56:28 +00:00
junyulai
0d3b23946a [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 4aa86b782b -s ours am: 2770b697e8 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 5752baa6b6 is in history

Change-Id: I47afb9f93dc191b4e04e4d5bd5ff4a1cfd566b02
2020-03-17 23:56:20 +00:00
junyulai
063b3720fa [SP25] Rename functions that add Entry conditionally am: abb0596a0a
Change-Id: I5f9924cf5b3eccfcdaa6dda991a102b97cebd11a
2020-03-17 23:35:57 +00:00
junyulai
2770b697e8 [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 4aa86b782b -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 5752baa6b6 is in history

Change-Id: I80ab45b6a34b66f1bed766b3e2fb72926325021e
2020-03-17 23:35:48 +00:00
junyulai
abb0596a0a [SP25] Rename functions that add Entry conditionally
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record conditionally,
name them addEntry.
  addValues -> addEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Fix: 148895143
Change-Id: I9495a198cf247e6c79100f7ac1edcea370b071de
2020-03-17 14:59:59 +00:00
junyulai
4aa86b782b [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
Merged-In: I141393f229e772d2eb9f7c156849e379bd71b845
(cherry picked from aosp/1253717)
2020-03-17 14:57:59 +00:00
Automerger Merge Worker
e626f090a9 Merge "Support static address configuration" am: 6d175120a0 am: 7ea8df5599 am: f465942e66 am: 90ab48c691
Change-Id: I112214162c581db7bfd8a588cf551b5ce554979c
2020-03-17 14:26:50 +00:00
Automerger Merge Worker
90ab48c691 Merge "Support static address configuration" am: 6d175120a0 am: 7ea8df5599 am: f465942e66
Change-Id: I663332a12188521917e9e286cd6cb8927f7efd9c
2020-03-17 14:15:06 +00:00
Automerger Merge Worker
f465942e66 Merge "Support static address configuration" am: 6d175120a0 am: 7ea8df5599
Change-Id: Ia070e65d6a068cdab0b5338b1f6308465586aff0
2020-03-17 14:01:05 +00:00
Automerger Merge Worker
7ea8df5599 Merge "Support static address configuration" am: 6d175120a0
Change-Id: I9637c44f3e88e5e9d08be59a0eb03e019e9919e1
2020-03-17 13:40:34 +00:00
Mark Chien
6d175120a0 Merge "Support static address configuration" 2020-03-17 13:26:09 +00:00
Automerger Merge Worker
b75366cee6 [automerger skipped] Merge "Create all variants of stubs for tethering" am: 9814b482cb am: dfc41a2298 -s ours am: 822132113a -s ours am: 2ba5f8287a -s ours
am skip reason: Change-Id I0ed44691b4e7080818442a9d0eb37d874f707195 with SHA-1 6a9c68b619 is in history

Change-Id: I4632a44932814fd0c122293775c615836eba230b
2020-03-17 08:58:32 +00:00
Automerger Merge Worker
2ba5f8287a [automerger skipped] Merge "Create all variants of stubs for tethering" am: 9814b482cb am: dfc41a2298 -s ours am: 822132113a -s ours
am skip reason: Change-Id I0ed44691b4e7080818442a9d0eb37d874f707195 with SHA-1 6a9c68b619 is in history

Change-Id: I17500658707b0ffe9e21ee26014407725edfbcd5
2020-03-17 08:53:03 +00:00
Automerger Merge Worker
822132113a [automerger skipped] Merge "Create all variants of stubs for tethering" am: 9814b482cb am: dfc41a2298 -s ours
am skip reason: Change-Id I0ed44691b4e7080818442a9d0eb37d874f707195 with SHA-1 6a9c68b619 is in history

Change-Id: I857b4d6c0e7bbfc894219b4d0f9dc6997202ab58
2020-03-17 08:44:50 +00:00
Automerger Merge Worker
dfc41a2298 Merge "Create all variants of stubs for tethering" am: 9814b482cb
Change-Id: Ib819726e0409806ea38d2d5e2ef22f9affb96c93
2020-03-17 08:25:33 +00:00
Automerger Merge Worker
911442b4c5 [automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 677a3b5e92 -s ours am: 44019d6bab -s ours am: 0e8ea95ec3 -s ours
am skip reason: Change-Id Iecf65859cdeeaac2fa7b817b4f505c510424ac89 with SHA-1 0010ca0c70 is in history

Change-Id: I67fa4221a36d685fc0d8c2cd17fa9f5cef26ba7a
2020-03-17 05:22:42 +00:00
Automerger Merge Worker
6f3f5d49be Merge "[automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 677a3b5e92 am: ee28e4a7a1 -s ours" into rvc-d1-dev-plus-aosp am: 0b633a8f69 -s ours
am skip reason: Change-Id Iecf65859cdeeaac2fa7b817b4f505c510424ac89 with SHA-1 dfdf750417 is in history

Change-Id: Ife2df361a806e96893b08b794794a3dff625fe69
2020-03-17 05:22:27 +00:00
Automerger Merge Worker
0e8ea95ec3 [automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 677a3b5e92 -s ours am: 44019d6bab -s ours
am skip reason: Change-Id Iecf65859cdeeaac2fa7b817b4f505c510424ac89 with SHA-1 0010ca0c70 is in history

Change-Id: If3eee293fcc89cf0ccce7e0954651d23dc1c8162
2020-03-17 05:01:42 +00:00
Automerger Merge Worker
4b596bacbe [automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 677a3b5e92 am: ee28e4a7a1 -s ours
am skip reason: Change-Id Iecf65859cdeeaac2fa7b817b4f505c510424ac89 with SHA-1 dfdf750417 is in history

Change-Id: Ibb97a74c708abca2126d7c8404ad0105d1a9a706
2020-03-17 05:01:25 +00:00
Automerger Merge Worker
44019d6bab [automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 677a3b5e92 -s ours
am skip reason: Change-Id Iecf65859cdeeaac2fa7b817b4f505c510424ac89 with SHA-1 dfdf750417 is in history

Change-Id: I9796cca859f19631e764651a954f10f751b24c39
2020-03-17 04:51:46 +00:00
Remi NGUYEN VAN
677a3b5e92 Merge "Cleanup the TetheredClients API" into rvc-dev 2020-03-17 04:49:06 +00:00
Automerger Merge Worker
8122e5ba4a [automerger skipped] Merge "[TNU01] Add Tethering notification updater" into rvc-dev am: 517ca12acd -s ours am: 136156cc5d -s ours am: 09e07d135b -s ours
am skip reason: Change-Id I7faacde7ac84e93ea0dfe03dd33d2cc41c589225 with SHA-1 08294f9c09 is in history

Change-Id: Icf96db849d7bb40697a70cfe3bda310fe7172b1a
2020-03-17 02:06:33 +00:00
Automerger Merge Worker
09e07d135b [automerger skipped] Merge "[TNU01] Add Tethering notification updater" into rvc-dev am: 517ca12acd -s ours am: 136156cc5d -s ours
am skip reason: Change-Id I7faacde7ac84e93ea0dfe03dd33d2cc41c589225 with SHA-1 08294f9c09 is in history

Change-Id: I3f30381e356819aac5527b6b6b0583283854fb98
2020-03-17 01:48:51 +00:00
Automerger Merge Worker
136156cc5d [automerger skipped] Merge "[TNU01] Add Tethering notification updater" into rvc-dev am: 517ca12acd -s ours
am skip reason: Change-Id I7faacde7ac84e93ea0dfe03dd33d2cc41c589225 with SHA-1 08294f9c09 is in history

Change-Id: I23d80e43b908b8c163221db24a6367009dd5ad77
2020-03-17 01:46:25 +00:00
Paul Hu
517ca12acd Merge "[TNU01] Add Tethering notification updater" into rvc-dev 2020-03-17 01:38:03 +00:00
markchien
f053e4b6f5 Support static address configuration
Application can specify static ipv4 server and client address to setup
tethering and this is one shot configuration. Tethering service would
not save the configuration and the configuration would be reset when
tethering stop or start failure.

When startTethering callback fired, it just mean tethering is requested
successful. Therefore, callers may call startTethering again if
startTethering successful but do not receive following tethering active
notification for a while. Tethering service never actually does anything
synchronously when startTethering is called:
  -startProvisioningIfNeeded just posts a message to the handler thread.
  -enableTetheringInternal doesn't do anything synchronously, it just
  asks the downstreams to get their interfaces ready and waits for
  callbacks.
If tethering is already enabled with a different request,
tethering would be disabled and re-enabled.

Bug: 141256482
Test: -build, flash, boot
      -atest TetheringTests
      -atest CtsTetheringTest

Change-Id: I0399917e7cefa1547d617e688225544c4fc1a231
2020-03-17 00:11:16 +08:00
Anton Hansson
064ed493ce Create all variants of stubs for tethering
Add separate publicapi, systemapi and module_libs stubs for tethering.

Bug: 147768409
Test: m
Test: m framework-tethering-stubs-{public,system,module_libs_}api
Change-Id: I0ed44691b4e7080818442a9d0eb37d874f707195
Merged-In: I0ed44691b4e7080818442a9d0eb37d874f707195
2020-03-16 15:54:19 +00:00
Automerger Merge Worker
0010ca0c70 Cleanup the TetheredClients API
Add comments to getters as requested in API review, and remove the
expirationTime private field that was planned to be replaced with
LinkAddress expiration.

Test: atest TetheringTests
Fixes: 150878126
Change-Id: Iecf65859cdeeaac2fa7b817b4f505c510424ac89
Merged-In: Iecf65859cdeeaac2fa7b817b4f505c510424ac89
(cherry picked from commit 594d0eae38c13e2bb03de0b3ae1f8781991c321e)
2020-03-16 10:11:29 +00:00
Automerger Merge Worker
693e9761e0 [automerger skipped] Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf0038e -s ours am: d81a2fc8ec -s ours am: c8490a4357 -s ours
am skip reason: Change-Id Ia02be3d1d91a08ae4a56b25560ed448c96a693db with SHA-1 4b896ba32b is in history

Change-Id: I5a87c3acf42a39549581392df8777f87c96ad7df
2020-03-16 10:01:21 +00:00
Automerger Merge Worker
aaef5e1986 [automerger skipped] Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf0038e am: cf40067421 -s ours am: 52a3d872dc -s ours
am skip reason: Change-Id Ia02be3d1d91a08ae4a56b25560ed448c96a693db with SHA-1 4b896ba32b is in history

Change-Id: Idcb380598fbab2dbe1d2a5e6f7b4e133292221cc
2020-03-16 10:01:00 +00:00
Automerger Merge Worker
c8490a4357 [automerger skipped] Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf0038e -s ours am: d81a2fc8ec -s ours
am skip reason: Change-Id Ia02be3d1d91a08ae4a56b25560ed448c96a693db with SHA-1 4b896ba32b is in history

Change-Id: If029feae6638e3b2e2c967bb887f911e9c915a20
2020-03-16 09:47:05 +00:00
Automerger Merge Worker
52a3d872dc [automerger skipped] Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf0038e am: cf40067421 -s ours
am skip reason: Change-Id Ia02be3d1d91a08ae4a56b25560ed448c96a693db with SHA-1 4b896ba32b is in history

Change-Id: I25c87e69f2801df2301babb0b05931f717d9ed01
2020-03-16 09:47:00 +00:00
Automerger Merge Worker
d81a2fc8ec [automerger skipped] Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf0038e -s ours
am skip reason: Change-Id Ia02be3d1d91a08ae4a56b25560ed448c96a693db with SHA-1 4b896ba32b is in history

Change-Id: I51fe5c0cc6e72ed386f380bf8542970a02665869
2020-03-16 09:34:16 +00:00
Automerger Merge Worker
943fb5b686 Change TetheringConstants class to final
Bug: 151322331
Test: m doc-comment-check-docs

Change-Id: Ieca36d81b7799988b8dbb9c0d22de690136303ab
Merged-In: Ia02be3d1d91a08ae4a56b25560ed448c96a693db
(cherry picked from commit 5e2740b24658ba340a6b47a46c89cfd642afe394)
2020-03-16 07:43:05 +00:00
Automerger Merge Worker
90039c9e7d Merge "Change TetheringConstants class to final" am: 0c5f387efe am: fd2db9bf0a am: f699cd14f5 am: 2b9f22e051
Change-Id: Icca30a44123b6da2cdf5b43458ee546dd031cf0f
2020-03-16 06:02:36 +00:00
Automerger Merge Worker
2b9f22e051 Merge "Change TetheringConstants class to final" am: 0c5f387efe am: fd2db9bf0a am: f699cd14f5
Change-Id: Ia107063b17a6a11cb0a000e6605ba9bab25c5a88
2020-03-16 05:47:46 +00:00
Automerger Merge Worker
f699cd14f5 Merge "Change TetheringConstants class to final" am: 0c5f387efe am: fd2db9bf0a
Change-Id: I5c4a3c1b011b6a0eeda8473b9206c4adf307c168
2020-03-16 05:47:02 +00:00
Automerger Merge Worker
34c19bf1a4 Merge "Give tethering bluetooth privilege permission" am: 1d68778a35 am: 52534a2358 am: d946b2f5d5 am: 0fe1893b96
Change-Id: I92a265231c83bb20b0f9a52f305abb0bc2559ade
2020-03-16 05:34:07 +00:00
Automerger Merge Worker
fd2db9bf0a Merge "Change TetheringConstants class to final" am: 0c5f387efe
Change-Id: I3446ad5a368b9f127066ba1e133a7191afe80c2b
2020-03-16 05:33:55 +00:00
Mark Chien
0c5f387efe Merge "Change TetheringConstants class to final" 2020-03-16 05:25:40 +00:00
Automerger Merge Worker
0fe1893b96 Merge "Give tethering bluetooth privilege permission" am: 1d68778a35 am: 52534a2358 am: d946b2f5d5
Change-Id: I71f2b77761e7b9becbf2b8f80728ac66815948bd
2020-03-16 05:16:31 +00:00
Automerger Merge Worker
d946b2f5d5 Merge "Give tethering bluetooth privilege permission" am: 1d68778a35 am: 52534a2358
Change-Id: I86a0fc5498d6c77e032c839d09c018906ec78b42
2020-03-16 05:06:57 +00:00
Automerger Merge Worker
52534a2358 Merge "Give tethering bluetooth privilege permission" am: 1d68778a35
Change-Id: I4410ec8ae4331b663fe22edfd2705e3126ae1d82
2020-03-16 04:48:50 +00:00
Mark Chien
1d68778a35 Merge "Give tethering bluetooth privilege permission" 2020-03-16 04:46:44 +00:00
Automerger Merge Worker
3bbe748082 Merge "[SP21] Address comments for API council review about aosp/1172143" am: 12b21035c4 am: be47eb855f am: fd96c7cc49 am: 2ba5626af9
Change-Id: I850de0272d246288b0149f0a2076a0e589616c10
2020-03-16 03:54:15 +00:00
Automerger Merge Worker
fc9e421872 Merge "Cleanup the TetheredClients API" am: 89711eaefe am: 7d28e4e36e am: 2c655ed0a1 am: 8c89a3cb3f
Change-Id: I7bc1b34340ebdc3162961aba7ec145b4cdc8ed03
2020-03-16 03:53:49 +00:00
Automerger Merge Worker
fae591e351 [SP21] Address comments for API council review about aosp/1172143 am: 5752baa6b6 am: 2a24054c31 am: fc9abbb159 am: 9be270f93c
Change-Id: Ifd2cb773ca0776d12e8199b0f79dd696a2df0df4
2020-03-16 03:52:38 +00:00
Automerger Merge Worker
2ba5626af9 Merge "[SP21] Address comments for API council review about aosp/1172143" am: 12b21035c4 am: be47eb855f am: fd96c7cc49
Change-Id: I5c77bcd0a95e51c91c306981c5f396f445da5ab8
2020-03-16 03:39:33 +00:00
Automerger Merge Worker
8c89a3cb3f Merge "Cleanup the TetheredClients API" am: 89711eaefe am: 7d28e4e36e am: 2c655ed0a1
Change-Id: I5cc55bc3bb5b142f9c6b6fcbce68e1c232c7c5a2
2020-03-16 03:39:24 +00:00
Automerger Merge Worker
9be270f93c [SP21] Address comments for API council review about aosp/1172143 am: 5752baa6b6 am: 2a24054c31 am: fc9abbb159
Change-Id: I9c44371665dc09612357a5ef880364bc32824784
2020-03-16 03:39:03 +00:00