From 0afc3ce6a7d4cda59ab0f015f0f495f3090fe851 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Mon, 28 Sep 2020 09:50:14 +0000 Subject: [PATCH] Fix TetheredClient callback fail in InProcessTethering TetheredClient callback would additional check whether caller has NETWORK_SETTINGS or {MAINLINE_}NETWORK_STACK permission, but it do not grant for self accessing. InProcessTethering run in system server, so the services in system server would fail to call TetheredClient callback. Grant permission for self process. Bug: 169231588 Test: atest CtsTetheringTest Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273 Change-Id: I8faacd26cc6f3e940af3a0147b84b693cb93503c Merged-In: Ic04e44aef4df772c718ff25ed331bf02f5940c1d (cherry picked from commit 0c9a370cfc49b843488a1f23f721abae21461d00) --- Tethering/src/com/android/networkstack/tethering/Tethering.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java index 7dd5290ee8..64d5025807 100644 --- a/Tethering/src/com/android/networkstack/tethering/Tethering.java +++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java @@ -2104,7 +2104,7 @@ public class Tethering { } private boolean hasCallingPermission(@NonNull String permission) { - return mContext.checkCallingPermission(permission) == PERMISSION_GRANTED; + return mContext.checkCallingOrSelfPermission(permission) == PERMISSION_GRANTED; } /** Unregister tethering event callback */