Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move permission enforcement to onCommand" into sc-dev am: fe219c9698 am: ed06e1d691

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14958560

Change-Id: I598994cd6c2842357bfe8c88e8160124d6c57606
This commit is contained in:
TreeHugger Robot
2021-06-14 20:58:35 +00:00
committed by Automerger Merge Worker
parent 8d524dd118 ed06e1d691
commit 2addb05c51
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/location/contexthub/ContextHubShellCommand.java
View File

@@ -32,16 +32,18 @@ public class ContextHubShellCommand extends ShellCommand {
// Internal service impl -- must perform security checks before touching. // Internal service impl -- must perform security checks before touching.
private final ContextHubService mInternal; private final ContextHubService mInternal;
private final Context mContext;
public ContextHubShellCommand(Context context, ContextHubService service) { public ContextHubShellCommand(Context context, ContextHubService service) {
mInternal = service; mInternal = service;
mContext = context;
context.enforceCallingOrSelfPermission(
android.Manifest.permission.ACCESS_CONTEXT_HUB, "ContextHubShellCommand");
} }
@Override @Override
public int onCommand(String cmd) { public int onCommand(String cmd) {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.ACCESS_CONTEXT_HUB, "ContextHubShellCommand");
if ("deny".equals(cmd)) { if ("deny".equals(cmd)) {
return runDisableAuth(); return runDisableAuth();
} }