Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Init HotwordDetectionSrvc identity earlier

Browse Source 
Grants mic access to the process as soon as it comes up, instead of
waiting for the initialization status callback.

Bug: 190011174
Test: manual - dsp and non-dsp; restarting while invoking the hotword
Test: atest CtsVoiceInteractionTestCases
Change-Id: I54e0b42868f663ae1c9edd9bcf4aaee2a13b827a
This commit is contained in:
Ahaan Ugale
2021-07-02 03:14:49 -07:00
parent 53459e966b
commit cb8ebd1151
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/service/voice/HotwordDetectionService.java
View File

@@ -200,6 +200,11 @@ public abstract class HotwordDetectionService extends Service {
HotwordDetectionService.this, manager, options);
}
@Override
public void ping(IRemoteCallback callback) throws RemoteException {
callback.sendResult(null);
}
@Override
public void stopDetection() {
HotwordDetectionService.this.onStopDetection();

6
core/java/android/service/voice/IHotwordDetectionService.aidl
View File

@@ -57,5 +57,11 @@ oneway interface IHotwordDetectionService {
in IContentCaptureManager contentCaptureManager,
in ContentCaptureOptions options);
/**
* Simply requests the service to trigger the callback, so that the system can check its
* identity.
*/
void ping(in IRemoteCallback callback);
void stopDetection();
}

30
services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
View File

@@ -164,15 +164,7 @@ final class HotwordDetectionConnection {
public void sendResult(Bundle bundle) throws RemoteException {
if (DEBUG) {
Slog.d(TAG, "updateState finish");
Slog.d(TAG, "updating hotword UID " + Binder.getCallingUid());
}
// TODO: Do this earlier than this callback and have the provider point to the
// current state stored in VoiceInteractionManagerServiceImpl.
final int uid = Binder.getCallingUid();
LocalServices.getService(PermissionManagerServiceInternal.class)
.setHotwordDetectionServiceProvider(() -> uid);
mIdentity =
new HotwordDetectionServiceIdentity(uid, mVoiceInteractionServiceUid);
future.complete(null);
if (mUpdateStateAfterStartFinished.getAndSet(true)) {
Slog.w(TAG, "call callback after timeout");
@@ -679,6 +671,7 @@ final class HotwordDetectionConnection {
updateAudioFlinger(connection);
updateContentCaptureManager(connection);
updateServiceIdentity(connection);
return connection;
}
}
@@ -792,18 +785,35 @@ final class HotwordDetectionConnection {
if (audioFlinger == null) {
throw new IllegalStateException("Service media.audio_flinger wasn't found.");
}
connection.post(service -> service.updateAudioFlinger(audioFlinger));
connection.run(service -> service.updateAudioFlinger(audioFlinger));
}
private static void updateContentCaptureManager(ServiceConnection connection) {
IBinder b = ServiceManager
.getService(Context.CONTENT_CAPTURE_MANAGER_SERVICE);
IContentCaptureManager binderService = IContentCaptureManager.Stub.asInterface(b);
connection.post(
connection.run(
service -> service.updateContentCaptureManager(binderService,
new ContentCaptureOptions(null)));
}
private void updateServiceIdentity(ServiceConnection connection) {
connection.run(service -> service.ping(new IRemoteCallback.Stub() {
@Override
public void sendResult(Bundle bundle) throws RemoteException {
if (DEBUG) {
Slog.d(TAG, "updating hotword UID " + Binder.getCallingUid());
}
// TODO: Have the provider point to the current state stored in
// VoiceInteractionManagerServiceImpl.
final int uid = Binder.getCallingUid();
LocalServices.getService(PermissionManagerServiceInternal.class)
.setHotwordDetectionServiceProvider(() -> uid);
mIdentity = new HotwordDetectionServiceIdentity(uid, mVoiceInteractionServiceUid);
}
}));
}
private static void bestEffortClose(Closeable closeable) {
try {
closeable.close();