From 8e8532c8f3123d510ab8731046ed58261e7578fb Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 25 Apr 2017 16:28:28 +0900 Subject: [PATCH] NetworkCapabilities: remove duplicated TRANSPORT_NAMES Due to multi-branch automerging issue, TRANSPORT_NAMES got inserted twice into NetworkCapabilities both by commits 45670bb37d4b and 21665ac8099b. This patch deletes one of the copy. Test: no functionality change. Build is fixed. Change-Id: I2adec1a9cb1ee6f1d61dfeec2d0b92b8141eed88 --- core/java/android/net/NetworkCapabilities.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index b91ed3d606..bf7207ca5b 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