commit 1e2ff51ee089eb9a6c2e9a78637a8faa8e6c64ef
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 29 20:09:09 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 20:09:09 2024 +0000
tree fb0ce767053cdc081b43b1175371f0145c2ea720
parent 91f85e132f24f7e9270778f81af810373aa33983
parent cb3761cc36579d02944b2b60b067706e53700ae4

Merge "Remove permission check for resetTemporaryServices in system-server" 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 dd76037..f540f1d 100644
--- a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java
+++ b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java
@@ -925,10 +925,11 @@
         }
     }
 
-    @RequiresPermission(Manifest.permission.USE_ON_DEVICE_INTELLIGENCE)
+    /**
+     * Reset the temporary services set in CTS tests, this method is primarily used to only revert
+     * the changes caused by CTS tests.
+     */
     public void resetTemporaryServices() {
-        mContext.enforceCallingPermission(
-                Manifest.permission.USE_ON_DEVICE_INTELLIGENCE, TAG);
         synchronized (mLock) {
             if (mTemporaryHandler != null) {
                 mTemporaryHandler.removeMessages(MSG_RESET_TEMPORARY_SERVICE);