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 
am: aa6965983b

Change-Id: Ie61b20e6726e8c6d2bda92c65514d2e2f38213dd
This commit is contained in:
Felipe Leme
2019-05-14 13:42:04 -07:00
committed by android-build-merger
parent a4db2ab5b9 aa6965983b
commit 69cd215add
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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