Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe23b581 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

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

am: 69cd215a

Change-Id: I4cc04ed9666fd3ce7826d8d4898bfa187ca75ea8
parents fdd04237 69cd215a

core/java/android/app/VoiceInteractor.java

+6 −4
Original line number Diff line number Diff line
@@ -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,8 +999,10 @@ public final class VoiceInteractor { 


        // destroyed now

        mInteractor = null;

        if (mActivity != null) {

            mActivity.setVoiceInteractor(null);

        }

    }



    public boolean submitRequest(Request request) {

        return submitRequest(request, null);