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

Merge "Use exposed permission defintion in Tethering" am: f1a0c3abea

Browse Source 
Change-Id: I1cf7f1077687f6a7cad2f4d0d6a99d9091bf0a37
This commit is contained in:
Automerger Merge Worker
2020-02-21 11:37:51 +00:00
parent 5c7bc2062f f1a0c3abea
commit e8f538b03a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
View File

@@ -16,6 +16,8 @@
package com.android.server.connectivity.tethering; 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.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.hardware.usb.UsbManager.USB_CONFIGURED; import static android.hardware.usb.UsbManager.USB_CONFIGURED;
import static android.hardware.usb.UsbManager.USB_CONNECTED; 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 DBG = false;
private static final boolean VDBG = 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 = { private static final Class[] sMessageClasses = {
Tethering.class, TetherMasterSM.class, IpServer.class Tethering.class, TetherMasterSM.class, IpServer.class
}; };
@@ -1987,9 +1985,9 @@ public class Tethering {
/** Register tethering event callback */ /** Register tethering event callback */
void registerTetheringEventCallback(ITetheringEventCallback callback) { void registerTetheringEventCallback(ITetheringEventCallback callback) {
final boolean hasListPermission = final boolean hasListPermission =
hasCallingPermission(PERMISSION_NETWORK_SETTINGS) hasCallingPermission(NETWORK_SETTINGS)
|| hasCallingPermission(PERMISSION_MAINLINE_NETWORK_STACK) || hasCallingPermission(PERMISSION_MAINLINE_NETWORK_STACK)
|| hasCallingPermission(PERMISSION_NETWORK_STACK); || hasCallingPermission(NETWORK_STACK);
mHandler.post(() -> { mHandler.post(() -> {
mTetheringEventCallbacks.register(callback, new CallbackCookie(hasListPermission)); mTetheringEventCallbacks.register(callback, new CallbackCookie(hasListPermission));
final TetheringCallbackStartedParcel parcel = new TetheringCallbackStartedParcel(); final TetheringCallbackStartedParcel parcel = new TetheringCallbackStartedParcel();