Merge "Remove permission check for resetTemporaryServices in system-server" into main (1e2ff51e) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -925,10 +925,11 @@ public class OnDeviceIntelligenceManagerService extends SystemService {
		}
		}

		@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);