Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Covert list<String> into String[] in INetd" am: d274332a9d

Browse Source 
am: 8fd6b59224

Change-Id: Ia95981369d5840ad3b9489e47e0534dde49789ed
This commit is contained in:
Luke Huang
2018-12-13 22:23:42 -08:00
committed by android-build-merger
parent 70badb2b3e 8fd6b59224
commit b7f2831b3e
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/NetworkManagementService.java
View File

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