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

Merge "Fixed NPE on VoiceInteractor.destroy()" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-14 20:27:44 +00:00
committed by Android (Google) Code Review
parent b26d003713 8092cdaeda
commit aa6965983b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/VoiceInteractor.java
View File

@@ -79,10 +79,10 @@ public final class VoiceInteractor {
/** @hide */ /** @hide */
public static final String KEY_KILL_SIGNAL = "key_kill_signal"; public static final String KEY_KILL_SIGNAL = "key_kill_signal";
IVoiceInteractor mInteractor; @Nullable IVoiceInteractor mInteractor;
Context mContext; @Nullable Context mContext;
Activity mActivity; @Nullable Activity mActivity;
boolean mRetaining; boolean mRetaining;
final HandlerCaller mHandlerCaller; final HandlerCaller mHandlerCaller;
@@ -999,8 +999,10 @@ public final class VoiceInteractor {
// destroyed now // destroyed now
mInteractor = null; mInteractor = null;
if (mActivity != null) {
mActivity.setVoiceInteractor(null); mActivity.setVoiceInteractor(null);
} }
}
public boolean submitRequest(Request request) { public boolean submitRequest(Request request) {
return submitRequest(request, null); return submitRequest(request, null);