| commit | 117622173250a90a05eabeb7ee3c76fdbca17258 | [log] [tgz] |
|---|---|---|
| author | Patrick Rohr <prohr@google.com> | Tue Aug 09 15:45:24 2022 -0700 |
| committer | Patrick Rohr <prohr@google.com> | Tue Aug 09 15:45:24 2022 -0700 |
| tree | 2b7beaaf0d2986511add50d3b473717784db2362 | |
| parent | 285f705ced04623492114750959a45452b2750c6 [diff] |
ethernet: fix aosp <-> internal conflict Ic36d26be7dae5fd3f72abce3cea1ee845813a6e5 was merged with a new line in internal-master. This mismatch is now creating conflicts. Test: TH Change-Id: I31111d1634f8dbe58873e1db86a6b38a5a521ef6
diff --git a/service-t/src/com/android/server/ethernet/EthernetTracker.java b/service-t/src/com/android/server/ethernet/EthernetTracker.java index 3e71093..31caabc 100644 --- a/service-t/src/com/android/server/ethernet/EthernetTracker.java +++ b/service-t/src/com/android/server/ethernet/EthernetTracker.java
@@ -91,6 +91,7 @@ * if setIncludeTestInterfaces is true, any test interfaces. */ private volatile String mIfaceMatch; + /** * Track test interfaces if true, don't track otherwise. */