commit 1784f25df51979e760aa52a8182a673b21c45e72
author Chiachang Wang <chiachangwang@google.com> Fri Feb 21 17:50:18 2020 +0800
committer Chiachang Wang <chiachangwang@google.com> Fri Feb 21 17:50:18 2020 +0800
tree 2505077ea91ae8b77d4831cca32a6230b2258a4d
parent e19cd8f3abab3781001225e37dab4372b087e978

Use exposed permission defintion in Tethering

The permissions are checked by Tethering; mainline modules should be
able to do permission checks based on these permissions.

Bug: 135411507
Test: m
Change-Id: Ib7f2aedfaaa909bbc356196114c62af9345f2593

Tethering/src/com/android/server/connectivity/tethering/Tethering.java

diff --git a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
index 3333563..84ca656 100644
--- a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/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 @@
     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 @@
     /** 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();