diff options
| author | 2020-10-07 09:45:49 -0700 | |
|---|---|---|
| committer | 2020-10-07 12:36:10 -0700 | |
| commit | 105ce49b0dd94cbdd28c86ad3b544c01302dfd89 (patch) | |
| tree | 88609d5593f1b2405e299281b13d89f87f63e791 | |
| parent | 65d966e1d1f2040f3ed57cd7b76a9dccae342439 (diff) | |
Remove soundtrigger permission checks for cancelation operations
We should not require special permissions for unloading/stopping/
detaching. There are some scenarios where those operations would be
performed after the session owner had already lost its privileges,
such as when the designated assistant app gets replaced. The old app
should still be allowed to clean up.
Bug: 169628490
Test: atest GtsAssistIntentTestCases:com.google.android.assist.gts.KeyphraseModelManagerTest#testUpdateAndRemoveKeyphraseSoundModel
Test still fails, but for different reasons.
Change-Id: Iea64970f7b2d7b387e6e892d555bbb90c73b1a18
| -rw-r--r-- | services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java b/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java index 7b6c6561ccf1..51b00faa28d2 100644 --- a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java +++ b/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java @@ -236,7 +236,8 @@ public class SoundTriggerMiddlewarePermission implements ISoundTriggerMiddleware @Override public void unloadModel(int modelHandle) throws RemoteException { - enforcePermissions(); + // Unloading a model does not require special permissions. Having a handle to the + // session is sufficient. mDelegate.unloadModel(modelHandle); } @@ -250,7 +251,8 @@ public class SoundTriggerMiddlewarePermission implements ISoundTriggerMiddleware @Override public void stopRecognition(int modelHandle) throws RemoteException { - enforcePermissions(); + // Stopping a model does not require special permissions. Having a handle to the + // session is sufficient. mDelegate.stopRecognition(modelHandle); } @@ -284,7 +286,8 @@ public class SoundTriggerMiddlewarePermission implements ISoundTriggerMiddleware @Override public void detach() throws RemoteException { - enforcePermissions(); + // Detaching does not require special permissions. Having a handle to the session is + // sufficient. mDelegate.detach(); } |