Merge "Covert list<String> into String[] in INetd" am: d274332a9d (b7f2831b) · Commits · e / os / android_frameworks_base

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);
		}