diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-02-13 18:28:35 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-02-13 19:34:37 +0900 |
| commit | f9a8c2e173f3c45cce7d4bcb8a853979ca9fc622 (patch) | |
| tree | e8d1e206e6862072981eea1c426ea98c484fb63c /core/java/android/net/InterfaceConfiguration.java | |
| parent | d8b390c88b7a910516c0787953f9a0982c5a53e5 (diff) | |
Remove deps from framework on netd interfaces
If included in framework.jar, the interfaces conflict with any app that
needs to depend on them, including the NetworkStack.
(cherry-pick of aosp/903220 with trivial conflict in Android.bp)
Bug: 124033493
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I0ecae20d514bf888f3a80331f19369ceb1c52aa3
Diffstat (limited to 'core/java/android/net/InterfaceConfiguration.java')
| -rw-r--r-- | core/java/android/net/InterfaceConfiguration.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/net/InterfaceConfiguration.java b/core/java/android/net/InterfaceConfiguration.java index 62cf7d7ceb25..b9d49c14f6c6 100644 --- a/core/java/android/net/InterfaceConfiguration.java +++ b/core/java/android/net/InterfaceConfiguration.java @@ -36,8 +36,9 @@ public class InterfaceConfiguration implements Parcelable { private LinkAddress mAddr; private HashSet<String> mFlags = Sets.newHashSet(); - private static final String FLAG_UP = INetd.IF_STATE_UP; - private static final String FLAG_DOWN = INetd.IF_STATE_DOWN; + // Must be kept in sync with constant in INetd.aidl + private static final String FLAG_UP = "up"; + private static final String FLAG_DOWN = "down"; private static final String[] EMPTY_STRING_ARRAY = new String[0]; |