diff options
| author | Paul Hu <paulhu@google.com> | 2019-09-20 07:23:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-20 07:23:07 +0000 |
| commit | 878b108119aa3fa48e4ec23edf20105656653371 (patch) | |
| tree | 38d53c113a0962ce1638f674f53ed6efd8402b11 | |
| parent | 70b8312970445a3a8c0514c051136c00191c9daa (diff) | |
| parent | 3aeb34497531a784ee240b018f1095a974db9137 (diff) | |
| download | ethernet-ndk-sysroot-r21.tar.gz | |
Merge "[Ethernet] Replace internal connectivity checks permission"ndk-sysroot-r21
| -rw-r--r-- | java/com/android/server/ethernet/EthernetServiceImpl.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/java/com/android/server/ethernet/EthernetServiceImpl.java b/java/com/android/server/ethernet/EthernetServiceImpl.java index d5beec1..fda3c3c 100644 --- a/java/com/android/server/ethernet/EthernetServiceImpl.java +++ b/java/com/android/server/ethernet/EthernetServiceImpl.java @@ -21,6 +21,7 @@ import android.content.pm.PackageManager; import android.net.IEthernetManager; import android.net.IEthernetServiceListener; import android.net.IpConfiguration; +import android.net.NetworkStack; import android.os.Binder; import android.os.Handler; import android.os.HandlerThread; @@ -57,12 +58,6 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { "EthernetService"); } - private void enforceConnectivityInternalPermission() { - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.CONNECTIVITY_INTERNAL, - "ConnectivityService"); - } - private void enforceUseRestrictedNetworksPermission() { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS, @@ -117,7 +112,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { Log.w(TAG, "System isn't ready enough to change ethernet configuration"); } - enforceConnectivityInternalPermission(); + NetworkStack.checkNetworkStackPermission(mContext); if (mTracker.isRestrictedInterface(iface)) { enforceUseRestrictedNetworksPermission(); |