LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkCapabilities: remove duplicated TRANSPORT_NAMES

Browse Source 
Due to multi-branch automerging issue, TRANSPORT_NAMES got inserted
twice into NetworkCapabilities both by commits 45670bb37d and
21665ac809. This patch deletes one of the copy.

Test: no functionality change. Build is fixed.
Change-Id: I2adec1a9cb1ee6f1d61dfeec2d0b92b8141eed88
This commit is contained in:
Hugo Benichi
2017-04-25 16:28:28 +09:00
parent 1ee1487e29
commit 8e8532c8f3
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/NetworkCapabilities.java
View File

@@ -432,15 +432,6 @@ public final class NetworkCapabilities implements Parcelable {
"WIFI_AWARE" "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. * Adds the given transport type to this {@code NetworkCapability} instance.
* Multiple transports may be applied sequentially. Note that when searching * Multiple transports may be applied sequentially. Note that when searching