Commit Graph

1645 Commits

Author SHA1 Message Date
TreeHugger Robot
ed7fbea66b Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 422c0ddfe6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945

Change-Id: I0a6c2b29c04aa8105c8d1cf9075491d950912d29
2020-07-01 08:14:33 +00:00
TreeHugger Robot
0a5a4e2548 Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 1e6e79a7c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945

Change-Id: I72bf0a2d89f2c9818ecc4bfd7fdada389fa81f1a
2020-07-01 08:14:03 +00:00
TreeHugger Robot
422c0ddfe6 Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945

Change-Id: I8eec902878e34cb6a4ee7989d45cc0c7149c791c
2020-07-01 07:58:32 +00:00
TreeHugger Robot
1e6e79a7c3 Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945

Change-Id: I9db426581ba148b3743ac04a45af9bf4ea3089e4
2020-07-01 07:58:07 +00:00
markchien
683932315b Fix tethering jarjar rule for LocalLog
LocalLog is in android.util* instead of android.net*.
No crash happened because the methods used by tethering are
@UnsupportedAppUsage.

Bug: 160113128
Test: atest TetheringTests
Change-Id: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56
2020-07-01 03:40:50 +00:00
Paul Hu
2ad5f4e82f Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013

Change-Id: Ia843da82bc8fa03aca33a51fc309b65e73dfdc8f
2020-06-29 12:31:12 +00:00
Paul Hu
b6958b47d9 Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013

Change-Id: I67e2d4facd77f978255a10423a9baff231ac0695
2020-06-29 12:17:07 +00:00
Paul Hu
7a87bc4742 Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013

Change-Id: I2d1886c4bc2892d3673e87544e3e9c2bb0bb8633
2020-06-29 12:04:06 +00:00
Paul Hu
6b2b4e6514 Merge "Correct PendingIntent#getActivity() flags" 2020-06-29 11:53:18 +00:00
Treehugger Robot
175605dd27 [automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours am: a2d6b35eeb -s ours
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444

Change-Id: I1e88786727ec4a32665bf4b36e66f39bd58c672b
2020-06-29 04:41:02 +00:00
Treehugger Robot
a2d6b35eeb [automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444

Change-Id: I86e4fca7fbec72a1cdbded8782afa22b211f2967
2020-06-29 04:29:37 +00:00
Treehugger Robot
9fba78c098 Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444

Change-Id: Ib2a16bd545b98a8d95338f6acce23e265ec5130a
2020-06-29 04:16:40 +00:00
Treehugger Robot
cdf6b4202c Merge "Use unstable networkstack AIDLs in development branches" 2020-06-29 04:02:49 +00:00
paulhu
67aeab2eee Correct PendingIntent#getActivity() flags
TetheringNotificationUpdater create a PendingIntent with
Intent#FLAG_ACTIVITY_NEW_TASK flag. But this flag is used for
Intent only. Thus, move this flag into Intent.

Bug: 158639789
Test: atest TetheringTests
Change-Id: I4c3af75c87b797bcde9356a94c835c7422dac1c6
2020-06-29 00:32:19 +08:00
Orion Hodson
e5fdcd86a2 [automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours am: 6c0e9f46cd -s ours
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764

Change-Id: I4b94400277e38db25c76e02f66e4f5f523358452
2020-06-25 08:32:19 +00:00
Orion Hodson
6b0056827f [automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours am: 77156e6721 -s ours
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763

Change-Id: I812dfa946299dc565e915dcbabe43e1d74abeb1f
2020-06-25 08:32:12 +00:00
Orion Hodson
6c0e9f46cd [automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764

Change-Id: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9
2020-06-25 08:13:32 +00:00
Orion Hodson
77156e6721 [automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763

Change-Id: Ief614f159c1972c181986ae05b01b5dc2a92b1ee
2020-06-25 08:13:26 +00:00
Orion Hodson
9228c914d2 Merge changes from topic "lnh-platform-split" am: c6b2c39d04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764

Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
2020-06-25 07:58:17 +00:00
Orion Hodson
1309dcd8de Sync with libnativehelper refactoring am: 0cdccd707f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763

Change-Id: I7511170930440ec5a1a8067b57a76a6c19484d71
2020-06-25 07:58:10 +00:00
Orion Hodson
c6b2c39d04 Merge changes from topic "lnh-platform-split"
* changes:
  Update to use nativehelper/JNIPlatformHelp.h
  Sync with libnativehelper refactoring
2020-06-25 07:36:05 +00:00
Orion Hodson
db4a0425f3 Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 1eff58da30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985379

Change-Id: I2c4432fd6aebf2706b2a927842d9fb21b09dd166
2020-06-24 21:23:34 +00:00
Orion Hodson
1eff58da30 Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp 2020-06-24 21:02:39 +00:00
Luke Huang
8fc588f87b [automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours am: 04e5539162 -s ours
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582

Change-Id: I5af3e4f7a38fa4374a568dc99925b76fc0f033a6
2020-06-24 19:12:16 +00:00
Luke Huang
04e5539162 [automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582

Change-Id: I4bddd1c6f072845f1a62812995a3b4cb4299ccaa
2020-06-24 19:11:24 +00:00
Orion Hodson
0cdccd707f Sync with libnativehelper refactoring
jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.

Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505)
2020-06-24 14:13:13 +01:00
Orion Hodson
697ec868d2 Sync with libnativehelper refactoring
jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.

Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505)
2020-06-24 12:47:10 +00:00
Luke Huang
895594dcc2 Move DnsPacket to libs net
This class might be used by some mainline modules.

Bug: 151052811
Test: atest DnsPacketTest
Test: atest DnsResolverTest
(clean cherry-pick from internal branch)
Merged-In: I8841d91456952ded5efbf8ea221289aecc7746ad
Change-Id: I8841d91456952ded5efbf8ea221289aecc7746ad
2020-06-24 11:32:26 +00:00
TreeHugger Robot
3edc33cc49 [automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours am: 5c5ee11ba0 -s ours
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 e8141aa9c3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745

Change-Id: Ia4bbbe4ada4628fb18205bec5a4f66a03ba0c917
2020-06-24 06:57:17 +00:00
TreeHugger Robot
95ba1d0661 [automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745

Change-Id: Ib4ece60f5283898764ffd23aea615060e2dbe348
2020-06-24 06:56:48 +00:00
TreeHugger Robot
91d1d07ff4 Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745

Change-Id: I70a9139123e5703607e2c011c7449e37880e78d5
2020-06-24 06:51:09 +00:00
TreeHugger Robot
5c5ee11ba0 [automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745

Change-Id: Ib853e8dcf754451407ef858f3af766b9cab9696c
2020-06-24 06:50:26 +00:00
TreeHugger Robot
0de458a801 Merge "tethering: offload: Netlink Req" into rvc-dev 2020-06-24 06:46:47 +00:00
Lorenzo Colitti
5e02e65a89 [automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours am: fdb754c00d -s ours
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638

Change-Id: I1ce91e52fad77b3a546dedea8034cba442c618a4
2020-06-24 04:53:31 +00:00
Lorenzo Colitti
f201a04a2c [automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 -s ours
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638

Change-Id: I02ca5d4528ad443c6498c9d5b14adfa850cbd42f
2020-06-24 04:53:23 +00:00
Lorenzo Colitti
96a0513a90 Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638

Change-Id: I6ceddc20bdec83e23039b9566187c3cbaff79176
2020-06-24 04:41:15 +00:00
Lorenzo Colitti
fdb754c00d [automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638

Change-Id: I972b6d352b2c65f023b6a5239a32e9bfec573472
2020-06-24 04:40:39 +00:00
Lorenzo Colitti
e8141aa9c3 tethering: offload: Netlink Req
Send netlink request over fd for offload config before
completing init sequence. Provides existing conntrack
entries to IPA. Resolves issue where there are NAT
misses in IPA due to IPA only having the conntrack
entries added after tethering starts.

Bug: 149109043
Test: OffloadHardwareInterfaceTest
Original-Change: https://android-review.googlesource.com/1290954
Merged-In: Iaf3e847e92f205b55f10fa85c17b9f3995d52099
Change-Id: Iaf3e847e92f205b55f10fa85c17b9f3995d52099
2020-06-24 04:21:47 +00:00
Lorenzo Colitti
ee131d4c64 Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0 am: 4d2944cda4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954

Change-Id: I13fb2f296c8c026619e817e5fd8a16098d1dcc6c
2020-06-24 03:51:47 +00:00
Lorenzo Colitti
4d2944cda4 Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954

Change-Id: I5f976d70d87ef25ebb8e1483532781ac3d42425b
2020-06-24 03:44:31 +00:00
Lorenzo Colitti
b90c974174 Merge "tethering: offload: Netlink Req" 2020-06-24 03:11:26 +00:00
Mark Chien
45fa4f9c88 Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323

Change-Id: Ib53b8bb0f325661ed1919978220b3a4a503b9ae8
2020-06-22 23:45:04 +00:00
Mark Chien
fdf89ee7fb Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323

Change-Id: Ib48182d51cc6e4586cb43f8ca51ea673ee14d1d7
2020-06-22 23:43:43 +00:00
Dedy Lansky
4dd87aafc0 Tethering: Add WiGig support
This change is a combination of following changes:

1) Tethering: add TETHERING_WIGIG type
   Currently both WIFI and WIGIG use the same tethering type,
   TETHERING_WIFI. This causes conflicts between the frameworks,
   when both WIFI and WIGIG SoftAPs are started, one or both will
   not work.
   Fix this by using a seperate tethering type for WIGIG.

2) Tethering: remove TETHERING_WIGIG state machine on interface down
   The wigig state machine relies on a TETHERING_STATE_CHANGED broadcast
   that is sent when the tethering state machine is first created, during
   interface up. Currently the tethering state machine is not removed
   on interface down except for TETHERING_BLUETOOTH, and as a result
   wigig tethering only works the first time SoftAP is started.
   In order to fix this, remove the tethering state machine on interface
   down for TETHERING_WIGIG as well.

Bug: 143356416
Test: TetheringCoverageTests

Change-Id: Ic4d3aca0ed69234093af7f0206dab3335938c52a
Merged-In: Ic4d3aca0ed69234093af7f0206dab3335938c52a
2020-06-22 23:23:25 +00:00
Dedy Lansky
6896f6193f Tethering: Add WiGig support
This change is a combination of following changes:

1) Tethering: add TETHERING_WIGIG type
   Currently both WIFI and WIGIG use the same tethering type,
   TETHERING_WIFI. This causes conflicts between the frameworks,
   when both WIFI and WIGIG SoftAPs are started, one or both will
   not work.
   Fix this by using a seperate tethering type for WIGIG.

2) Tethering: remove TETHERING_WIGIG state machine on interface down
   The wigig state machine relies on a TETHERING_STATE_CHANGED broadcast
   that is sent when the tethering state machine is first created, during
   interface up. Currently the tethering state machine is not removed
   on interface down except for TETHERING_BLUETOOTH, and as a result
   wigig tethering only works the first time SoftAP is started.
   In order to fix this, remove the tethering state machine on interface
   down for TETHERING_WIGIG as well.

Bug: 143356416
Test: TetheringCoverageTests

Change-Id: Ic4d3aca0ed69234093af7f0206dab3335938c52a
2020-06-22 21:17:46 +08:00
Xiao Ma
e5e0743057 Use unstable networkstack AIDLs in development branches
Development branches should use the -unstable version of the
NetworkStack AIDLs so that refreezing is not necessary for each
modification.
The versions will be re-frozen before each release instead.

Bug: 157534516
Test: m
Merged-In: I74b4a16266bda7b8ac740b3a0193268da260fc2f
Change-Id: I1c2fe707d865e6a1953b4ab82194d4b9132258f9
2020-06-22 10:15:13 +00:00
Wayne Ma
ffdf42bc64 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 31b6461408
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: Ib6cc939508bacb6771a8022de7733530a241f8f5
2020-06-22 09:09:16 +00:00
Wayne Ma
a896f25304 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: I39dec2d8f085dc8aeb93387bc3cdd36fd25d7000
2020-06-22 09:03:59 +00:00
Wayne Ma
31b6461408 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: I81e0304f0560cbd070c5bb49967a8b6bf3e5d58a
2020-06-22 08:51:46 +00:00
Wayne Ma
4b0912d248 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: If4a423ffe3cdd4f0f615aace774e2606deada766
2020-06-22 08:51:43 +00:00