From aaeaa420c2fbf19e33597515a6959f7d06220971 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 4ac111af720a3d82aa52c968e419ff0115e8f436) --- .../src/com/android/networkstack/tethering/Tethering.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Tethering/src/com/android/networkstack/tethering/Tethering.java b/packages/Tethering/src/com/android/networkstack/tethering/Tethering.java index 7dd5290ee83b8..64d5025807e75 100644 --- a/packages/Tethering/src/com/android/networkstack/tethering/Tethering.java +++ b/packages/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 */