Commit Graph

640 Commits

Author SHA1 Message Date
paulhu
d744b0e554 Stop using NetworkStack#checkNetworkStackPermission* am: d6789606d5 am: 1932a7e7ec am: 4f201939ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1827093

Change-Id: I1236e6172eea0597b2fb4a97be84b53063665129
2021-09-16 02:30:40 +00:00
paulhu
4f201939ec Stop using NetworkStack#checkNetworkStackPermission* am: d6789606d5 am: 1932a7e7ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1827093

Change-Id: Iadd2fe1489e989b67110deaa60408dc6217c25bb
2021-09-16 02:18:54 +00:00
paulhu
1932a7e7ec Stop using NetworkStack#checkNetworkStackPermission* am: d6789606d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1827093

Change-Id: I304701a1ad5be47bec534d679eca259b06cb084d
2021-09-16 02:03:58 +00:00
paulhu
d6789606d5 Stop using NetworkStack#checkNetworkStackPermission*
Replace them with PermissionUtils.enforceNetworkStackPermission*
since those methods are deprecated.

Bug: 177187957
Test: atest EthernetServiceTests
Change-Id: Ifde4a8898439b86e6cc49b7469787bc5e4a91835
2021-09-15 16:53:45 +08:00
Treehugger Robot
3c9edfdee8 Merge "prevent nullptr dereference when calling unwanted" am: 03f03d7acf am: 07060e39fd am: cc1a711197 am: aa073db020
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802269

Change-Id: I284fd6a75f75870e015d94692bd781bd89653dc1
2021-08-20 09:55:17 +00:00
Treehugger Robot
aa073db020 Merge "prevent nullptr dereference when calling unwanted" am: 03f03d7acf am: 07060e39fd am: cc1a711197
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802269

Change-Id: I7d54b1e0f6e092a15364c9e7ad0e94f31682acfe
2021-08-20 09:39:19 +00:00
Treehugger Robot
cc1a711197 Merge "prevent nullptr dereference when calling unwanted" am: 03f03d7acf am: 07060e39fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802269

Change-Id: Ica7a0ee1ae2d2c977fcc6caac3b53e157ff61281
2021-08-20 09:25:55 +00:00
Treehugger Robot
07060e39fd Merge "prevent nullptr dereference when calling unwanted" am: 03f03d7acf
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802269

Change-Id: I703f0c9fb9748cc2a211acd667f7d27a265025a7
2021-08-20 09:11:10 +00:00
Treehugger Robot
03f03d7acf Merge "prevent nullptr dereference when calling unwanted" 2021-08-20 08:57:35 +00:00
Patrick Rohr
4cf6809d75 prevent nullptr dereference when calling unwanted
When the EthernetNetworkAgent has already been stopped, a call to
unwanted will cause a crash due to a nullptr derefernce.

Bug: 197279734
Test: atest EthernetNetworkFactoryTest
Change-Id: Ice39c603bdd3e3139aa8ece7fb897bf7b567e74b
2021-08-20 09:36:00 +02:00
Chiachang Wang
745d38c127 Add null check for the taken callback am: c57eb8c6ad am: a03cf172bb am: 6ef870281f am: 040b9927d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802597

Change-Id: Ib1f01d00655d7b87131a0189b7476c1d37ef41a6
2021-08-20 05:46:11 +00:00
Chiachang Wang
040b9927d7 Add null check for the taken callback am: c57eb8c6ad am: a03cf172bb am: 6ef870281f
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802597

Change-Id: I92e2288d1e35a848ada4a47d40024745c8f50dae
2021-08-20 05:37:29 +00:00
Chiachang Wang
6ef870281f Add null check for the taken callback am: c57eb8c6ad am: a03cf172bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802597

Change-Id: If9fcfd0b634838342e81f9fcfa62d53fa4f66f2c
2021-08-20 05:28:31 +00:00
Chiachang Wang
a03cf172bb Add null check for the taken callback am: c57eb8c6ad
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802597

Change-Id: I8fe9b5918e2af72d6edd7ae334f6062e32bbfdad
2021-08-20 05:13:41 +00:00
Chiachang Wang
c57eb8c6ad Add null check for the taken callback
The requestTetheredInterface() and releaseTetheredInterface() in
EthernetManager is annotated as @NonNull. Basically, the taken
callback parameter to the service implementation should also be
@NonNull. However, it still possible to use native commands to
call the method in the aidl. If a null callback is taken, it may
cause unexpected results and cause crashes. Add a null check and
throw NPE as a warning.

Bug: 190058445
Test: adb commands
Change-Id: I18fd63aba3f7326597fc3a8c93ba8c9097bf7348
2021-08-20 03:40:29 +00:00
Xin Li
eaa34bb268 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: d4afc0d708 -s ours am: 7ff8d101ef -s ours am: b5e7b30867 -s ours
am skip reason: Merged-In I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53 with SHA-1 3ed5c3997b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15571823

Change-Id: I202a0103890492bda0b99eaf46c512fdf73dab70
2021-08-17 20:32:29 +00:00
Xin Li
b5e7b30867 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: d4afc0d708 -s ours am: 7ff8d101ef -s ours
am skip reason: Merged-In I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53 with SHA-1 3ed5c3997b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15571823

Change-Id: I591145e19a0dd5ffc59a58fed5e9dbb1b5156b43
2021-08-17 19:46:24 +00:00
Xin Li
7ff8d101ef [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: d4afc0d708 -s ours
am skip reason: Merged-In I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53 with SHA-1 3ed5c3997b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15571823

Change-Id: Ie22864e375511188d33632ee66c241422e38af62
2021-08-17 18:35:54 +00:00
Xin Li
945edff9b3 Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53
Change-Id: I34ac5913bff3b6a14b373a9596065bc953626567
2021-08-14 06:31:21 +00:00
Ady Abraham
7f675bc8aa Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" am: 089b5546c3 am: 416a820c9c am: fcd079ca06 am: 54c496dd18
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1792673

Change-Id: I42913bec27697940107ae7ee394ec1c77e441fd3
2021-08-12 20:14:46 +00:00
Ady Abraham
54c496dd18 Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" am: 089b5546c3 am: 416a820c9c am: fcd079ca06
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1792673

Change-Id: Ica317a4a6b89c16b7807672bcd8efedb8ce251a9
2021-08-12 18:58:36 +00:00
Ady Abraham
fcd079ca06 Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" am: 089b5546c3 am: 416a820c9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1792673

Change-Id: Ib13a70578ab3e98caa8538600078190ac3814a2a
2021-08-12 18:46:46 +00:00
Ady Abraham
416a820c9c Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" am: 089b5546c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1792673

Change-Id: Id3a13f23c228bf69562e7212c165ca32ead03d36
2021-08-12 18:31:21 +00:00
Ady Abraham
089b5546c3 Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" 2021-08-12 18:16:07 +00:00
Ady Abraham
7a4fecc3de Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"
This reverts commit b94c4e7453.

Reason for revert: b/196387077

Change-Id: I8e27ce915b6069b642c614a018aa5e1788ae07af
2021-08-12 17:16:51 +00:00
Treehugger Robot
ae192ba7e2 Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" am: f7059e69ba am: dfca8a970d am: efec1eac58 am: 9ac3947a68
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1688326

Change-Id: Ib84c4f5fbf1124c5464642d44fdce27d89e1d8c7
2021-08-12 04:20:39 +00:00
Treehugger Robot
9ac3947a68 Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" am: f7059e69ba am: dfca8a970d am: efec1eac58
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1688326

Change-Id: Ieee33c624b7d59b4adf6488c1fa3a93766afcb5b
2021-08-12 04:08:29 +00:00
Treehugger Robot
efec1eac58 Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" am: f7059e69ba am: dfca8a970d
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1688326

Change-Id: I193c1862b8fa7db9f6db97d813c00dd22f3e80cf
2021-08-12 03:45:35 +00:00
Treehugger Robot
dfca8a970d Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" am: f7059e69ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1688326

Change-Id: I0ddd67a41594986fd9029ed61c67d7bd58a40851
2021-08-12 03:26:11 +00:00
Treehugger Robot
f7059e69ba Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" 2021-08-12 03:13:50 +00:00
Patrick Rohr
3b3029b190 Remove Unused Code From EthernetNetworkFactory am: 698b59510f am: e7048826ba am: 3ed5c3997b
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1722876

Change-Id: I96a1b4b8ecb6d0821f8efa7482b4c69d835e54a0
2021-07-29 09:44:18 +00:00
Patrick Rohr
3ed5c3997b Remove Unused Code From EthernetNetworkFactory am: 698b59510f am: e7048826ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1722876

Change-Id: I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53
2021-07-29 09:27:55 +00:00
Patrick Rohr
e7048826ba Remove Unused Code From EthernetNetworkFactory am: 698b59510f
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1722876

Change-Id: I45330b6646697a7b7655f764bcb8c87b2a1635e7
2021-07-29 09:16:49 +00:00
Milim Lee
b94c4e7453 Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet
Bug: 175199512
Test: Build and test multi-ethernet
Change-Id: I6ec50b42bee89520f6f27d40e0d2b0d774b8e2e5
2021-07-29 13:41:18 +09:00
Patrick Rohr
dfbc7dee53 Add Tests for EthernetNetworkFactory am: e78e8828d6 am: f5e25fcc5d am: 98958bbabf
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1486182

Change-Id: I6ebceef181faf9088b766abf78a9b12c10be30a2
2021-07-28 14:31:54 +00:00
Patrick Rohr
98958bbabf Add Tests for EthernetNetworkFactory am: e78e8828d6 am: f5e25fcc5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1486182

Change-Id: Id09046b501b7b280830e51d5b82f2d5e8f7fa6d7
2021-07-28 14:18:22 +00:00
Patrick Rohr
f5e25fcc5d Add Tests for EthernetNetworkFactory am: e78e8828d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1486182

Change-Id: If2049d3b4484d68232a9ce1b405aa438c9c673fa
2021-07-28 14:06:11 +00:00
Patrick Rohr
698b59510f Remove Unused Code From EthernetNetworkFactory
Test: atest EthernetNetworkFactoryTest
Change-Id: Ibe0190b3108dca644da2d67bd107954cb26f41ce
2021-07-28 14:22:41 +02:00
Patrick Rohr
e78e8828d6 Add Tests for EthernetNetworkFactory
Test: atest EthernetNetworkFactoryTest
Bug: 191635995
Change-Id: I1c07bb6d30706c4e13002eb402fadfecb97b36d1
2021-07-28 14:22:41 +02:00
Lorenzo Colitti
a2c3876444 [automerger skipped] Stop using LinkPropertiesParcelableUtil. am: 75f629ace7 -s ours am: 1065fc30b6 -s ours
am skip reason: Merged-In Iace3ba898bec2940ec3c3323c5bf8a13627d545f with SHA-1 0e077cb1d5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15044794

Change-Id: I74ee5a7546c5583292f79ac353e1774a0909a8fc
2021-06-22 23:36:47 +00:00
Lorenzo Colitti
6c58f1e957 [automerger skipped] Stop using LinkPropertiesParcelableUtil. am: 75f629ace7 am: c8da0b5a12 -s ours
am skip reason: Merged-In Iace3ba898bec2940ec3c3323c5bf8a13627d545f with SHA-1 007d976b7c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15044794

Change-Id: I1dcec66d9e6801234c9426cec81983fb413d8d94
2021-06-22 21:26:49 +00:00
Lorenzo Colitti
c8da0b5a12 Stop using LinkPropertiesParcelableUtil. am: 75f629ace7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15044794

Change-Id: I9d0522aa17c20045c144ca6212ad9e4e5eaaf6f1
2021-06-22 14:58:46 +00:00
Lorenzo Colitti
1065fc30b6 [automerger skipped] Stop using LinkPropertiesParcelableUtil. am: 75f629ace7 -s ours
am skip reason: Merged-In Iace3ba898bec2940ec3c3323c5bf8a13627d545f with SHA-1 0e077cb1d5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15044794

Change-Id: Ic9603caae079c1c01201d674e8807f38253f01c5
2021-06-22 05:22:52 +00:00
Lorenzo Colitti
1fd065918c Merge "Stop using LinkPropertiesParcelableUtil." am: 0b58e409a1 am: a04fb395b6 am: e30816d4ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1733473

Change-Id: I984286157820f384be102504b213c96daf21bd39
2021-06-21 16:19:16 +00:00
Lorenzo Colitti
007d976b7c Stop using LinkPropertiesParcelableUtil.
Its methods are all no-ops. Stop using them.

Test: m
Bug: 151052811
Original-Change: https://android-review.googlesource.com/1733473
Merged-In: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
Change-Id: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
2021-06-21 13:43:51 +00:00
Lorenzo Colitti
75f629ace7 Stop using LinkPropertiesParcelableUtil.
Its methods are all no-ops. Stop using them.

Test: m
Bug: 151052811
Original-Change: https://android-review.googlesource.com/1733473
Merged-In: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
Change-Id: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
2021-06-21 10:55:56 +00:00
Lorenzo Colitti
e30816d4ed Merge "Stop using LinkPropertiesParcelableUtil." am: 0b58e409a1 am: a04fb395b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1733473

Change-Id: I51829f89466e518712f117675eef40792577ece3
2021-06-21 10:34:48 +00:00
Lorenzo Colitti
a04fb395b6 Merge "Stop using LinkPropertiesParcelableUtil." am: 0b58e409a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1733473

Change-Id: I723327ade7f1f8134a907e58910812e73ba84968
2021-06-21 10:08:52 +00:00
Lorenzo Colitti
0b58e409a1 Merge "Stop using LinkPropertiesParcelableUtil." 2021-06-21 09:54:29 +00:00
Lorenzo Colitti
0e077cb1d5 Stop using LinkPropertiesParcelableUtil.
Its methods are all no-ops. Stop using them.

Test: m
Bug: 151052811
Change-Id: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
2021-06-12 00:42:24 +09:00