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

Commit 1b4f92f6 authored by Luke Huang's avatar Luke Huang
Browse files

Covert list<String> into String[] in INetd 

NDK AIDL doesn't support generic types, use array instead of it.

Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest
Change-Id: I980f513786f3b3a312527f2b5cdc68d926f5f93e
parent 481251a0

services/core/java/com/android/server/NetworkManagementService.java

+3 −8
Original line number Diff line number Diff line
@@ -163,8 +163,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub 


    private static final int MAX_UID_RANGES_PER_COMMAND = 10;



    private static final  String[] EMPTY_STRING_ARRAY = new String[0];



    /**

     * Name representing {@link #setGlobalAlert(long)} limit when delivered to

     * {@link INetworkManagementEventObserver#limitReached(String, String)}.
@@ -954,8 +952,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    public String[] listInterfaces() {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        try {

            final List<String> result = mNetdService.interfaceGetList();

            return result.toArray(EMPTY_STRING_ARRAY);

            return mNetdService.interfaceGetList();

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }
@@ -1247,8 +1244,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    public String[] listTetheredInterfaces() {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        try {

            final List<String> result = mNetdService.tetherInterfaceList();

            return result.toArray(EMPTY_STRING_ARRAY);

            return mNetdService.tetherInterfaceList();

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }
@@ -1271,8 +1267,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    public String[] getDnsForwarders() {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        try {

            final List<String> result = mNetdService.tetherDnsList();

            return result.toArray(EMPTY_STRING_ARRAY);

            return mNetdService.tetherDnsList();

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }