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

Commit 597b5b2a authored by lucaslin's avatar lucaslin
Browse files

Remove incorrect annotation - @TransportType 

This annotation is mis-adding by aosp/929879, and now it also
makes compilation failure for Telephony Mainline.

Bug: 145755373
Test: atest FrameworksNetTests
Change-Id: Ic22ce6bf17c4300b8cd52217976bfb215a123f68
parent da3518bc

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 {