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

Merge "VoiceInteraction: Handle session delivery failure." into sc-dev am: f32842575b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13432082

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I283d99fad6a3ff17a919eabc9b091013a814f9d1
This commit is contained in:
Ahaan Ugale
2021-01-29 20:14:30 +00:00
committed by Automerger Merge Worker
parent e4de6b62d7 f32842575b
commit aa2cf5f477
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/voice/IVoiceInteractionSessionService.aidl
View File

@@ -18,8 +18,6 @@ package android.service.voice;
import android.os.Bundle;
import android.service.voice.IVoiceInteractionSession;
/**
* @hide
*/

23
core/java/android/service/voice/VoiceInteractionSessionService.java
View File

@@ -21,11 +21,14 @@ import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.DeadObjectException;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Log;
import com.android.internal.app.IVoiceInteractionManagerService;
import com.android.internal.os.HandlerCaller;
import com.android.internal.os.SomeArgs;
@@ -38,6 +41,8 @@ import java.io.PrintWriter;
*/
public abstract class VoiceInteractionSessionService extends Service {
private static final String TAG = "VoiceInteractionSession";
static final int MSG_NEW_SESSION = 1;
IVoiceInteractionManagerService mSystemService;
@@ -120,10 +125,22 @@ public abstract class VoiceInteractionSessionService extends Service {
mSession = null;
}
mSession = onNewSession(args);
try {
mSystemService.deliverNewSession(token, mSession.mSession, mSession.mInteractor);
if (deliverSession(token)) {
mSession.doCreate(mSystemService, token);
} catch (RemoteException e) {
} else {
// TODO(b/178777121): Add an onError() method to let the application know what happened.
mSession.doDestroy();
mSession = null;
}
}
private boolean deliverSession(IBinder token) {
try {
return mSystemService.deliverNewSession(token, mSession.mSession, mSession.mInteractor);
} catch (DeadObjectException ignored) {
} catch (RemoteException e) {
Log.e(TAG, "Failed to deliver session: " + e);
}
return false;
}
}