commit c791ff7edfc9aa3a1a036e114b0ef933f7cd7d33
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 17 19:06:09 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 17 19:06:09 2024 +0000
tree 938883bacc78261ae4cc33f87ff24fce47a17c30
parent 44caa4625592a0a5f53dc69781cd4366ca6c7e5f
parent f51271e5d666c91dfd78823853ee1033ca76d53e

Merge "Move shell check to ShellCommand from system-service" into main

services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java

diff --git a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java
index b2e861c..ac73382 100644
--- a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java
+++ b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java
@@ -850,7 +850,6 @@
 
     @RequiresPermission(Manifest.permission.USE_ON_DEVICE_INTELLIGENCE)
     public void resetTemporaryServices() {
-        enforceShellOnly(Binder.getCallingUid(), "resetTemporaryServices");
         mContext.enforceCallingPermission(
                 Manifest.permission.USE_ON_DEVICE_INTELLIGENCE, TAG);
         synchronized (mLock) {

services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceShellCommand.java

diff --git a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceShellCommand.java b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceShellCommand.java
index 5744b5c..b52812f 100644
--- a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceShellCommand.java
+++ b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceShellCommand.java
@@ -17,6 +17,7 @@
 package com.android.server.ondeviceintelligence;
 
 import android.annotation.NonNull;
+import android.os.Binder;
 import android.os.ShellCommand;
 
 import java.io.PrintWriter;
@@ -78,6 +79,8 @@
 
         if (getRemainingArgsCount() == 0 && intelligenceServiceName == null
                 && inferenceServiceName == null) {
+            OnDeviceIntelligenceManagerService.enforceShellOnly(Binder.getCallingUid(),
+                    "resetTemporaryServices");
             mService.resetTemporaryServices();
             out.println("OnDeviceIntelligenceManagerService temporary reset. ");
             return 0;