| commit | 4ac111af720a3d82aa52c968e419ff0115e8f436 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Sep 28 09:50:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 28 09:50:14 2020 +0000 |
| tree | 8086bfac7f56d838c1ddb183ba1cf3cd79dbac75 | |
| parent | ab364519adc02db179e21130239e13b13d8f0246 [diff] | |
| parent | 3b5d49b7bb308688ab6781693c01f16dbff53598 [diff] |
Merge "Fix TetheredClient callback fail in InProcessTethering" am: 3ed624fb2e am: 3b5d49b7bb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273 Change-Id: I8faacd26cc6f3e940af3a0147b84b693cb93503c
diff --git a/packages/Tethering/src/com/android/networkstack/tethering/Tethering.java b/packages/Tethering/src/com/android/networkstack/tethering/Tethering.java index 7dd5290..64d5025 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 @@ } private boolean hasCallingPermission(@NonNull String permission) { - return mContext.checkCallingPermission(permission) == PERMISSION_GRANTED; + return mContext.checkCallingOrSelfPermission(permission) == PERMISSION_GRANTED; } /** Unregister tethering event callback */