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

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

Change-Id: I57de9ba753356b0d1d64b7b87673abfced30f685

1 files changed, 5 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubShellCommand.java b/services/core/java/com/android/server/location/contexthub/ContextHubShellCommand.java
index 5ec85e661b98..6931baa948a1 100644
--- a/services/core/java/com/android/server/location/contexthub/ContextHubShellCommand.java
+++ b/services/core/java/com/android/server/location/contexthub/ContextHubShellCommand.java
@@ -32,16 +32,18 @@ public class ContextHubShellCommand extends ShellCommand {
 
     // Internal service impl -- must perform security checks before touching.
     private final ContextHubService mInternal;
+    private final Context mContext;
 
     public ContextHubShellCommand(Context context, ContextHubService service) {
         mInternal = service;
-
-        context.enforceCallingOrSelfPermission(
-                android.Manifest.permission.ACCESS_CONTEXT_HUB, "ContextHubShellCommand");
+        mContext = context;
     }
 
     @Override
     public int onCommand(String cmd) {
+        mContext.enforceCallingOrSelfPermission(
+                android.Manifest.permission.ACCESS_CONTEXT_HUB, "ContextHubShellCommand");
+
         if ("deny".equals(cmd)) {
             return runDisableAuth();
         }