summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-09-28 10:07:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-09-28 10:07:50 +0000
commit15ed18ed7e2dafd7024627e48e5e147a9133da50 (patch)
tree7aed6ec2b91163be67f770aa317a06cfc92f8a9d
parent676fa106c9e786570b161a2f73b7fa9c735f4b2c (diff)
parent4ac111af720a3d82aa52c968e419ff0115e8f436 (diff)
Merge "Fix TetheredClient callback fail in InProcessTethering" am: 3ed624fb2e am: 3b5d49b7bb am: 4ac111af72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273 Change-Id: I324a11ae925a120ad19d841fd7e136aa07607cd5
-rw-r--r--packages/Tethering/src/com/android/networkstack/tethering/Tethering.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Tethering/src/com/android/networkstack/tethering/Tethering.java b/packages/Tethering/src/com/android/networkstack/tethering/Tethering.java
index 7dd5290ee83b..64d5025807e7 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 */