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

Commit e7654519 authored by lucaslin's avatar lucaslin Committed by android-build-merger
Browse files

Merge "Remove incorrect annotation - @TransportType" am: 7f81046b 

am: 1e2e0892

Change-Id: Ia82a146de1afadcc415ba69fd5cf01480332b37f
parents a2a1150a 1e2e0892

services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

+1 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.net.NetworkSpecifier; 
import android.net.StringNetworkSpecifier;

import android.net.wifi.WifiInfo;

import android.os.UserHandle;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;
@@ -105,8 +104,7 @@ public class NetworkNotificationManager { 
        return -1;

    }



    // TODO: Remove @TransportType or change it to @Transport.

    private static String getTransportName(@TransportType int transportType) {

    private static String getTransportName(final int transportType) {

        Resources r = Resources.getSystem();

        String[] networkTypes = r.getStringArray(R.array.network_switch_type_name);

        try {