diff options
| author | 2019-04-10 01:04:11 +0100 | |
|---|---|---|
| committer | 2019-04-10 17:06:45 +0100 | |
| commit | 1e41180dae74e76a86e5300dafc1eb76df3b16c8 (patch) | |
| tree | 137a6f9ec1dcdc74fc0a8176b58ff8af031f1a13 | |
| parent | fd8f96d71925cc80f5052365af2e5150cc0ec3ca (diff) | |
Remove unused methods from INetworkManagementService
Remove unused public methods setPermission() and clearPermission()
Bug: 114231106
Test: make
Change-Id: I2dc14c9791f73175e8dacf3cd00a84f61b00edc2
| -rw-r--r-- | core/java/android/os/INetworkManagementService.aidl | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/NetworkManagementService.java | 32 |
2 files changed, 0 insertions, 35 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 03e8c154e3fc..db23cfab8563 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -396,9 +396,6 @@ interface INetworkManagementService */ void setNetworkPermission(int netId, int permission); - void setPermission(String permission, in int[] uids); - void clearPermission(in int[] uids); - /** * Allow UID to call protect(). */ diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 7875e93c80f9..2cea44739010 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -2138,38 +2138,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub { } } - private int parsePermission(String permission) { - if (permission.equals("NETWORK")) { - return INetd.PERMISSION_NETWORK; - } - if (permission.equals("SYSTEM")) { - return INetd.PERMISSION_SYSTEM; - } - return INetd.PERMISSION_NONE; - } - - @Override - public void setPermission(String permission, int[] uids) { - mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - - try { - mNetdService.networkSetPermissionForUser(parsePermission(permission), uids); - } catch (RemoteException | ServiceSpecificException e) { - throw new IllegalStateException(e); - } - } - - @Override - public void clearPermission(int[] uids) { - mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - - try { - mNetdService.networkClearPermissionForUser(uids); - } catch (RemoteException | ServiceSpecificException e) { - throw new IllegalStateException(e); - } - } - @Override public void allowProtect(int uid) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); |