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

Merge "Add CONNECTIVITY_INTERNAL to bt tethering related APIs temporarily"

Browse Source 
am: 60675ece9a

Change-Id: Ida6708c69af334b0cda965cfea0427b76fb6457e
This commit is contained in:
Paul Hu
2019-12-08 06:07:36 -08:00
committed by android-build-merger
parent 15878e511f 60675ece9a
commit 1fe8de5336
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.server; package com.android.server;
import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
import static android.Manifest.permission.NETWORK_SETTINGS; import static android.Manifest.permission.NETWORK_SETTINGS;
import static android.Manifest.permission.OBSERVE_NETWORK_POLICY; import static android.Manifest.permission.OBSERVE_NETWORK_POLICY;
import static android.Manifest.permission.SHUTDOWN; import static android.Manifest.permission.SHUTDOWN;
@@ -737,7 +738,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
// //
@Override @Override
public String[] listInterfaces() { 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 { try {
return mNetdService.interfaceGetList(); return mNetdService.interfaceGetList();
} catch (RemoteException | ServiceSpecificException e) { } catch (RemoteException | ServiceSpecificException e) {
@@ -787,7 +790,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
@Override @Override
public InterfaceConfiguration getInterfaceConfig(String iface) { 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; final InterfaceConfigurationParcel result;
try { try {
result = mNetdService.interfaceGetCfg(iface); result = mNetdService.interfaceGetCfg(iface);
@@ -805,7 +810,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
@Override @Override
public void setInterfaceConfig(String iface, InterfaceConfiguration cfg) { 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(); LinkAddress linkAddr = cfg.getLinkAddress();
if (linkAddr == null || linkAddr.getAddress() == null) { if (linkAddr == null || linkAddr.getAddress() == null) {
throw new IllegalStateException("Null LinkAddress given"); throw new IllegalStateException("Null LinkAddress given");