diff options
| author | 2017-04-25 16:28:28 +0900 | |
|---|---|---|
| committer | 2017-04-25 16:31:06 +0900 | |
| commit | 8c4c92ce750cc5339dea0f4b872fd85b00c2368e (patch) | |
| tree | 183f5d6682755c5eb101a90e4999552d9824ab04 | |
| parent | 8f8c43bde8842f93bb2f5e8d6effc5b51fe3e066 (diff) | |
NetworkCapabilities: remove duplicated TRANSPORT_NAMES
Due to multi-branch automerging issue, TRANSPORT_NAMES got inserted
twice into NetworkCapabilities both by commits a365bace7a8e and
9910dbc68211. This patch deletes one of the copy.
Test: no functionality change. Build is fixed.
Change-Id: I2adec1a9cb1ee6f1d61dfeec2d0b92b8141eed88
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index b91ed3d606b1..bf7207ca5bbb 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -432,15 +432,6 @@ public final class NetworkCapabilities implements Parcelable { "WIFI_AWARE" }; - private static final String[] TRANSPORT_NAMES = { - "CELLULAR", - "WIFI", - "BLUETOOTH", - "ETHERNET", - "VPN", - "WIFI_AWARE" - }; - /** * Adds the given transport type to this {@code NetworkCapability} instance. * Multiple transports may be applied sequentially. Note that when searching |