| commit | 7b4e31888952fe11dcd1abcc5695d26f80ca38a3 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Mon Sep 02 14:25:31 2024 +0800 |
| committer | Junyu Lai <junyulai@google.com> | Mon Sep 02 14:32:07 2024 +0800 |
| tree | 886043db150442a607419aee28336dcaf946515e | |
| parent | 60cc6a145b0e16536d838ef5fcfdbf9d33b23e4a [diff] |
Return false when tetherOffloadRuleAdd doesn't really add items This is needed for the follow-up CLs to check whether an item was added when calling tetherOffloadRuleAdd. This is safe since no one is actually checking the return value of this method. Test: atest TetheringTests Bug: 354619988 Change-Id: I28bafe3145bd2f62f9a7db9d0a300d2c7a148040
diff --git a/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java b/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java index 4d1e7ef..e6e99f4 100644 --- a/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java +++ b/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java
@@ -359,6 +359,7 @@ } catch (IllegalStateException e) { // Silent if the rule already exists. Note that the errno EEXIST was rethrown as // IllegalStateException. See BpfMap#insertEntry. + return false; } return true; }
diff --git a/Tethering/apishim/common/com/android/networkstack/tethering/apishim/common/BpfCoordinatorShim.java b/Tethering/apishim/common/com/android/networkstack/tethering/apishim/common/BpfCoordinatorShim.java index d28a397..026b1c3 100644 --- a/Tethering/apishim/common/com/android/networkstack/tethering/apishim/common/BpfCoordinatorShim.java +++ b/Tethering/apishim/common/com/android/networkstack/tethering/apishim/common/BpfCoordinatorShim.java
@@ -140,6 +140,8 @@ /** * Adds a tethering IPv4 offload rule to appropriate BPF map. + * + * @return true iff the map was modified, false if the key already exists or there was an error. */ public abstract boolean tetherOffloadRuleAdd(boolean downstream, @NonNull Tether4Key key, @NonNull Tether4Value value);