diff options
| author | Paul Hu <paulhu@google.com> | 2019-12-08 06:11:39 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-08 06:11:39 -0800 |
| commit | f0f09efa1e429a9fbdadcfabc7d2793267d78fb1 (patch) | |
| tree | 9621e301bda201e480e4ce026b6c81729d5d2b5e | |
| parent | c2769be12604ee75c144d92c2a8e6fbf7a5e614a (diff) | |
| parent | 1fe8de53360b9da10c9fdd194a75c11130144c66 (diff) | |
Merge "Add CONNECTIVITY_INTERNAL to bt tethering related APIs temporarily" am: 60675ece9a
am: 1fe8de5336
Change-Id: I6d5928c623b72fc8415b499dc69f9775be21a58a
| -rw-r--r-- | services/core/java/com/android/server/NetworkManagementService.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index e79a2897d86a..840b7af19890 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -16,6 +16,7 @@ package com.android.server; +import static android.Manifest.permission.CONNECTIVITY_INTERNAL; import static android.Manifest.permission.NETWORK_SETTINGS; import static android.Manifest.permission.OBSERVE_NETWORK_POLICY; import static android.Manifest.permission.SHUTDOWN; @@ -737,7 +738,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub { // @Override public String[] listInterfaces() { - NetworkStack.checkNetworkStackPermission(mContext); + // TODO: Remove CONNECTIVITY_INTERNAL after bluetooth tethering has no longer called these + // APIs. + NetworkStack.checkNetworkStackPermissionOr(mContext, CONNECTIVITY_INTERNAL); try { return mNetdService.interfaceGetList(); } catch (RemoteException | ServiceSpecificException e) { @@ -787,7 +790,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub { @Override public InterfaceConfiguration getInterfaceConfig(String iface) { - NetworkStack.checkNetworkStackPermission(mContext); + // TODO: Remove CONNECTIVITY_INTERNAL after bluetooth tethering has no longer called these + // APIs. + NetworkStack.checkNetworkStackPermissionOr(mContext, CONNECTIVITY_INTERNAL); final InterfaceConfigurationParcel result; try { result = mNetdService.interfaceGetCfg(iface); @@ -805,7 +810,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub { @Override public void setInterfaceConfig(String iface, InterfaceConfiguration cfg) { - NetworkStack.checkNetworkStackPermission(mContext); + // TODO: Remove CONNECTIVITY_INTERNAL after bluetooth tethering has no longer called these + // APIs. + NetworkStack.checkNetworkStackPermissionOr(mContext, CONNECTIVITY_INTERNAL); LinkAddress linkAddr = cfg.getLinkAddress(); if (linkAddr == null || linkAddr.getAddress() == null) { throw new IllegalStateException("Null LinkAddress given"); |