diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-03-19 11:46:55 +0000 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2020-03-19 12:29:35 +0000 |
| commit | fb800f0d889fbec1c3211f20b4e2d7a2e6b4d657 (patch) | |
| tree | 67408f1a62dc8c5f866332f00d0c4ea78f2e6463 /java/com/android/server/ethernet/EthernetServiceImpl.java | |
| parent | 4e5d753c920f9a2f93780ddec86122a9af7da8d5 (diff) | |
| download | ethernet-fb800f0d889fbec1c3211f20b4e2d7a2e6b4d657.tar.gz | |
Make Ethernet interfaces more testable.
This CL adds a setIncludeTestInterfaces method to EthernetManager
that, when called, causes the Ethernet service to recognize and
manage test interfaces created by TestNetworkManager.
Bug: 150644681
Test: Tested by EthernetTetheringTest in same topic
Change-Id: I86eef7a93267f800dbfc8eafd307effa76a344ca
Merged-In: I86eef7a93267f800dbfc8eafd307effa76a344ca
(cherry picked from commit 4978dbd5fb6592fc4e7be08d02783752245da634)
Diffstat (limited to 'java/com/android/server/ethernet/EthernetServiceImpl.java')
| -rw-r--r-- | java/com/android/server/ethernet/EthernetServiceImpl.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/java/com/android/server/ethernet/EthernetServiceImpl.java b/java/com/android/server/ethernet/EthernetServiceImpl.java index 1cf38b4..3fc6aab 100644 --- a/java/com/android/server/ethernet/EthernetServiceImpl.java +++ b/java/com/android/server/ethernet/EthernetServiceImpl.java @@ -164,14 +164,23 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { } @Override + public void setIncludeTestInterfaces(boolean include) { + NetworkStack.checkNetworkStackPermissionOr(mContext, + android.Manifest.permission.NETWORK_SETTINGS); + mTracker.setIncludeTestInterfaces(include); + } + + @Override public void requestTetheredInterface(ITetheredInterfaceCallback callback) { - NetworkStack.checkNetworkStackPermission(mContext); + NetworkStack.checkNetworkStackPermissionOr(mContext, + android.Manifest.permission.NETWORK_SETTINGS); mTracker.requestTetheredInterface(callback); } @Override public void releaseTetheredInterface(ITetheredInterfaceCallback callback) { - NetworkStack.checkNetworkStackPermission(mContext); + NetworkStack.checkNetworkStackPermissionOr(mContext, + android.Manifest.permission.NETWORK_SETTINGS); mTracker.releaseTetheredInterface(callback); } |