Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c4c92ce authored by Hugo Benichi's avatar Hugo Benichi
Browse files

NetworkCapabilities: remove duplicated TRANSPORT_NAMES 

Due to multi-branch automerging issue, TRANSPORT_NAMES got inserted
twice into NetworkCapabilities both by commits a365bace and
9910dbc6. This patch deletes one of the copy.

Test: no functionality change. Build is fixed.
Change-Id: I2adec1a9cb1ee6f1d61dfeec2d0b92b8141eed88
parent 8f8c43bd

core/java/android/net/NetworkCapabilities.java

+0 −9
Original line number Diff line number Diff line
@@ -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