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