Commit Graph

1193 Commits

Author SHA1 Message Date
TreeHugger Robot
eeab99aa74 [automerger skipped] Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2 am: dd670c6e58 -s ours am: de9be63d40 -s ours am: 2658e12848 -s ours
am skip reason: Change-Id I26d89a81f1c448d9b4809652b079a5f5eace3924 with SHA-1 6f532ba30f is in history

Change-Id: Ief82593abb0636a15660e28d1aacc1ba85a7e8fb
2020-04-14 13:24:30 +00:00
TreeHugger Robot
e9e8c3894d [automerger skipped] Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2 -s ours am: 47b038a734 -s ours am: cf69919cb4 -s ours am: bf1039d5bc -s ours
am skip reason: Change-Id I26d89a81f1c448d9b4809652b079a5f5eace3924 with SHA-1 330a9b9fa7 is in history

Change-Id: I3876a3c71f17f18c4b6e0522a6c7d492ce00e587
2020-04-14 13:23:06 +00:00
TreeHugger Robot
2658e12848 [automerger skipped] Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2 am: dd670c6e58 -s ours am: de9be63d40 -s ours
am skip reason: Change-Id I26d89a81f1c448d9b4809652b079a5f5eace3924 with SHA-1 6f532ba30f is in history

Change-Id: I5c3e0db9193f3448cd5241a13f027a3219157515
2020-04-14 13:01:53 +00:00
TreeHugger Robot
de9be63d40 [automerger skipped] Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2 am: dd670c6e58 -s ours
am skip reason: Change-Id I26d89a81f1c448d9b4809652b079a5f5eace3924 with SHA-1 6f532ba30f is in history

Change-Id: Ie49d45a5bf7bd1c8acf5eca0edb8ea6a82c6d09b
2020-04-14 13:00:58 +00:00
TreeHugger Robot
bf1039d5bc [automerger skipped] Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2 -s ours am: 47b038a734 -s ours am: cf69919cb4 -s ours
am skip reason: Change-Id I26d89a81f1c448d9b4809652b079a5f5eace3924 with SHA-1 330a9b9fa7 is in history

Change-Id: I58b2bdeceb7922e368d0dc377c06785387f5534d
2020-04-14 13:00:41 +00:00
TreeHugger Robot
cf69919cb4 [automerger skipped] Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2 -s ours am: 47b038a734 -s ours
am skip reason: Change-Id I26d89a81f1c448d9b4809652b079a5f5eace3924 with SHA-1 330a9b9fa7 is in history

Change-Id: I4e914003fe6aa804fb20befe8aa14632aa51c186
2020-04-14 12:53:10 +00:00
TreeHugger Robot
47b038a734 [automerger skipped] Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2 -s ours
am skip reason: Change-Id I26d89a81f1c448d9b4809652b079a5f5eace3924 with SHA-1 330a9b9fa7 is in history

Change-Id: If5985ff96dcaf48e6cbc61d88464c4ab9cc5be56
2020-04-14 12:43:46 +00:00
TreeHugger Robot
dd670c6e58 Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2
Change-Id: I3e9253bb1b1a66dadb6623d69f03d9cea21fc740
2020-04-14 12:42:41 +00:00
Mark Chien
a39b9f6245 [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c am: 59caa047c9 am: dc77385937 am: 5c460cc714 -s ours am: 29a90f0113 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 7dc2dcc37a is in history

Change-Id: I38b9238d516bc5d74045b30c6df425578347aa84
2020-04-14 10:59:15 +00:00
Mark Chien
2a3326767f [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c -s ours am: de4fb9898c -s ours am: 9565042fd6 -s ours am: af7e2e46f1 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 7dc2dcc37a is in history

Change-Id: I8970b9ea2c406daef7ef3f1ad5f19e22b902f623
2020-04-14 10:57:59 +00:00
Mark Chien
29a90f0113 [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c am: 59caa047c9 am: dc77385937 am: 5c460cc714 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 7dc2dcc37a is in history

Change-Id: Ifc268f83d1d398c155a3184799dcce67605e94fa
2020-04-14 10:57:51 +00:00
Mark Chien
ad489ab397 [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c am: 59caa047c9 -s ours am: 8648c2bd67 -s ours am: 452e87b2b1 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 d995566700 is in history

Change-Id: I047505c1dd7075bcd8a78d20090849799ab101af
2020-04-14 10:56:52 +00:00
Mark Chien
af7e2e46f1 [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c -s ours am: de4fb9898c -s ours am: 9565042fd6 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 7dc2dcc37a is in history

Change-Id: I3db909fa775940b94e2529470039a49d7edda67b
2020-04-14 10:33:39 +00:00
Mark Chien
5c460cc714 Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c am: 59caa047c9 am: dc77385937
Change-Id: I4c15da068575e60b836fccf064883a07b3a63cba
2020-04-14 10:33:35 +00:00
Mark Chien
452e87b2b1 [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c am: 59caa047c9 -s ours am: 8648c2bd67 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 d995566700 is in history

Change-Id: I8abe1810c55db650330f91919d2b862b1fa620a9
2020-04-14 10:32:46 +00:00
Lorenzo Colitti
dad733aa47 Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 941a53ce91 am: 81dd21611d am: dd43e05b6e am: 9910abce5f am: c9f555589d
Change-Id: Icf64d871d6ea87bbab6a3fd3b9a1732bc423832f
2020-04-14 10:08:05 +00:00
Paul Hu
5bc47bf309 Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de am: caf808e0eb am: 3793a8eece am: ac1ddcf34a
Change-Id: I1d6aedfb2008a4af9a1cb7eb392050774204fcae
2020-04-14 10:07:54 +00:00
Mark Chien
b3dcb3df1f [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours am: 1cfb5e6365 am: db0698b0a0 am: c78a72d80c
Change-Id: I0ef964128dd034af024e589bf898ef325cda03ce
2020-04-14 10:07:25 +00:00
Mark Chien
9565042fd6 [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c -s ours am: de4fb9898c -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 7dc2dcc37a is in history

Change-Id: Ib6dcd4f4682c18062b8fd964ad390580fa8df5fc
2020-04-14 10:06:13 +00:00
Mark Chien
8648c2bd67 [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c am: 59caa047c9 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 d995566700 is in history

Change-Id: If621a7a931ddbb417e85a6a2a28bc9c2811ad2e0
2020-04-14 10:04:54 +00:00
Lorenzo Colitti
6f532ba30f Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED.
These events don't have MAC addresses, so the code attempts to
create an Ipv6ForwardingRule with a null MAC address. This
crashes when attempting to get the raw MAC address bytes to send
to netd in the TetherOffloadRuleParcel.

This was not caught by unit tests because the test exercise this
code path in a way that is not correct (by sending RTM_DELNEIGH
and NUD_FAILED events with MAC addresses). Fix the unit tests to
properly pass in null MAC addresses for these events.

Bug: 153697068
Test: fixed existing tests to be more realistic
Merged-In: I26d89a81f1c448d9b4809652b079a5f5eace3924
Change-Id: I26d89a81f1c448d9b4809652b079a5f5eace3924
2020-04-14 09:55:17 +00:00
Lorenzo Colitti
c9f555589d Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 941a53ce91 am: 81dd21611d am: dd43e05b6e am: 9910abce5f
Change-Id: Ifa511743d965b5c5c2fc6dbd9edb117bdc7492d4
2020-04-14 09:46:12 +00:00
Paul Hu
ac1ddcf34a Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de am: caf808e0eb am: 3793a8eece
Change-Id: I85bba02377351bdf19562b27a645a142356371ca
2020-04-14 09:45:57 +00:00
Mark Chien
c78a72d80c [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours am: 1cfb5e6365 am: db0698b0a0
Change-Id: I573b350831f620a4a570c402f99e0943c735d35a
2020-04-14 09:45:42 +00:00
Mark Chien
de4fb9898c [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 d995566700 is in history

Change-Id: I0994b834ff0af2ebee3cd7e5bc9c73c4b08a4c99
2020-04-14 09:45:14 +00:00
Mark Chien
59caa047c9 Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c
Change-Id: Ia593900f8ec91326b52b7630a9c4f922bd743fe0
2020-04-14 09:44:40 +00:00
Lorenzo Colitti
9910abce5f Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 941a53ce91 am: 81dd21611d am: dd43e05b6e
Change-Id: I0302aa499478fa8430c14becb5db76d10656324f
2020-04-14 09:25:01 +00:00
Paul Hu
3793a8eece Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de am: caf808e0eb
Change-Id: I0a4801884b455aa1e6186afcc41f73f34caa9474
2020-04-14 09:22:46 +00:00
Mark Chien
db0698b0a0 [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours am: 1cfb5e6365
Change-Id: I9f5ea3568621f7350bb8d3314a4b8dc0ee5bdc67
2020-04-14 09:22:07 +00:00
Lorenzo Colitti
dd43e05b6e Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 941a53ce91 am: 81dd21611d
Change-Id: Ie7060e6408acd73f1a5d2456d030a1958df32847
2020-04-14 09:21:19 +00:00
Paul Hu
caf808e0eb Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de
Change-Id: If9d8e5945160b6def527e7f3ee372dfe533140e9
2020-04-14 09:20:54 +00:00
Mark Chien
1cfb5e6365 [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours
am skip reason: skipped by user markchien

Change-Id: I23b0ffb1f366f980bc7c9c3b4c061214b8199307
2020-04-14 09:19:38 +00:00
Lorenzo Colitti
81dd21611d Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 941a53ce91
Change-Id: I62dd1888231eb13c4c5bcc2c4c4d95e47c5b8aaa
2020-04-14 08:40:35 +00:00
Lorenzo Colitti
941a53ce91 Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." 2020-04-14 08:22:30 +00:00
Paul Hu
26b3b4e0de Merge "Update tethering notification strings" am: 6f6527e2d7
Change-Id: I1af1b1a8664662ebdffba1b08725b4e505c222f4
2020-04-14 07:32:32 +00:00
Paul Hu
6f6527e2d7 Merge "Update tethering notification strings" 2020-04-14 07:15:16 +00:00
markchien
7dc2dcc37a Change tethering file structure to respect its package name
Bug: 145099347
Test: atest TetheringTests
      atest CtsTetheringTest
Change-Id: I7401c550fbafd17a5ed2d925b5d0e17e358af467
Merged-In: I7401c550fbafd17a5ed2d925b5d0e17e358af467
2020-04-14 14:33:45 +08:00
Lorenzo Colitti
330a9b9fa7 Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED.
These events don't have MAC addresses, so the code attempts to
create an Ipv6ForwardingRule with a null MAC address. This
crashes when attempting to get the raw MAC address bytes to send
to netd in the TetherOffloadRuleParcel.

This was not caught by unit tests because the test exercise this
code path in a way that is not correct (by sending RTM_DELNEIGH
and NUD_FAILED events with MAC addresses). Fix the unit tests to
properly pass in null MAC addresses for these events.

Bug: 153697068
Test: fixed existing tests to be more realistic
Change-Id: I26d89a81f1c448d9b4809652b079a5f5eace3924
2020-04-14 15:02:17 +09:00
Mark Chien
9fce5bc8b9 Merge "Change tethering file structure to respect its package name" am: c31e88ace6
Change-Id: Ib7db789690b64ca00905577ee9ed7ed993293967
2020-04-14 04:50:53 +00:00
Mark Chien
e4d18addd3 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours am: dd81ce4743 -s ours am: 4dd1e7dfaf -s ours am: f03d622633 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Ide1ce0e29ec85bb0c7c7260b2cc4fd491d0f04d0
2020-04-14 03:27:10 +00:00
Mark Chien
f03d622633 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours am: dd81ce4743 -s ours am: 4dd1e7dfaf -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Ia0863cd191c11d1ada99af1ddbc8ea989232bed5
2020-04-14 03:04:19 +00:00
Mark Chien
4dd1e7dfaf [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours am: dd81ce4743 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: I677fbecc79dcfe3ba8bc5265e02288e4f2856a61
2020-04-14 02:42:52 +00:00
Mark Chien
3bf1ce0aec [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: 4c1bfe97e9 am: 787ed2c4b2 -s ours am: 3bc84ebb9a -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Ifbc6b6f856e1dd905f883f3ca0c5cb7d9ed9d599
2020-04-14 02:37:01 +00:00
Mark Chien
27312f6417 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 313841e5eb am: 34000f3b25 -s ours am: 526b96e312 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Iefdfddd941e47b435451c57d9d4b7413171a8940
2020-04-14 02:35:40 +00:00
Mark Chien
26aab8b17c [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: fb4fc50afd am: d22d5de8f6 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 dc03d15189 is in history

Change-Id: I319b1ce795e2b731c621559bcb8d57f77199e485
2020-04-14 02:35:28 +00:00
Mark Chien
3bc84ebb9a [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: 4c1bfe97e9 am: 787ed2c4b2 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: I009351412aca7e385dc29aeb327af79542d2098e
2020-04-14 02:32:47 +00:00
Mark Chien
dd81ce4743 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Idfc7a32b608c97c9ebc956b6d4bf85a5d8f42776
2020-04-14 02:19:35 +00:00
Mark Chien
526b96e312 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 313841e5eb am: 34000f3b25 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: I64be42bd1e866248fd7b684a24d309d01030252d
2020-04-14 02:14:13 +00:00
Mark Chien
d22d5de8f6 Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: fb4fc50afd
Change-Id: I5ec9ab1546d54eac5567ade0ba0a10ad36199f25
2020-04-14 02:14:04 +00:00
Mark Chien
787ed2c4b2 Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: 4c1bfe97e9
Change-Id: If2a83e19b3074af14a8433a98e73d539bd211dab
2020-04-14 02:11:12 +00:00