summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-09-28 10:30:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-09-28 10:30:20 +0000
commitcf00541f630362e72e1286f462b9baf19b0393f6 (patch)
tree14fdfc334dd9248ee0306be651ee747dda53728c
parent1d222edd71c74443627aba9353f37a85292a5e46 (diff)
parent15ed18ed7e2dafd7024627e48e5e147a9133da50 (diff)
Merge "Fix TetheredClient callback fail in InProcessTethering" am: 3ed624fb2e am: 3b5d49b7bb am: 4ac111af72 am: 15ed18ed7e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273 Change-Id: I7109614a931e0ca7b19ca680cf4704385c611a01
-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 */