summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
index 33335633f61d..84ca656d64ba 100644
--- a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
@@ -16,6 +16,8 @@
package com.android.server.connectivity.tethering;
+import static android.Manifest.permission.NETWORK_SETTINGS;
+import static android.Manifest.permission.NETWORK_STACK;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.hardware.usb.UsbManager.USB_CONFIGURED;
import static android.hardware.usb.UsbManager.USB_CONNECTED;
@@ -150,10 +152,6 @@ public class Tethering {
private static final boolean DBG = false;
private static final boolean VDBG = false;
- // TODO: add the below permissions to @SystemApi
- private static final String PERMISSION_NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS";
- private static final String PERMISSION_NETWORK_STACK = "android.permission.NETWORK_STACK";
-
private static final Class[] sMessageClasses = {
Tethering.class, TetherMasterSM.class, IpServer.class
};
@@ -1987,9 +1985,9 @@ public class Tethering {
/** Register tethering event callback */
void registerTetheringEventCallback(ITetheringEventCallback callback) {
final boolean hasListPermission =
- hasCallingPermission(PERMISSION_NETWORK_SETTINGS)
+ hasCallingPermission(NETWORK_SETTINGS)
|| hasCallingPermission(PERMISSION_MAINLINE_NETWORK_STACK)
- || hasCallingPermission(PERMISSION_NETWORK_STACK);
+ || hasCallingPermission(NETWORK_STACK);
mHandler.post(() -> {
mTetheringEventCallbacks.register(callback, new CallbackCookie(hasListPermission));
final TetheringCallbackStartedParcel parcel = new TetheringCallbackStartedParcel();