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

Commit f6073fb9 authored by Fan Zhang's avatar Fan Zhang
Browse files

Guard against a NPE when disconnecting suggestion service. 

Change-Id: Ib10502b9467365f6e348737655806ef2369a747b
Fixes: 68885411
Test: robotests
parent b0f65ac8

src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java

+4 −1
Original line number Diff line number Diff line
@@ -97,7 +97,10 @@ public class SuggestionControllerMixin implements SuggestionController.ServiceCo 
        if (DEBUG) {

            Log.d(TAG, "SuggestionService disconnected");

        }

        mHost.getLoaderManager().destroyLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS);

        final LoaderManager loaderManager = mHost.getLoaderManager();

        if (loaderManager != null) {

            loaderManager.destroyLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS);

        }

    }



    @Override

tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java

+10 −0
Original line number Diff line number Diff line
@@ -97,4 +97,14 @@ public class SuggestionControllerMixinTest { 


        verify(mHost).getLoaderManager();

    }



    @Test

    public void onServiceDisconnected_hostNotAttached_shouldDoNothing() {

        when(mHost.getLoaderManager()).thenReturn(null);



        mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);

        mMixin.onServiceDisconnected();



        verify(mHost).getLoaderManager();

    }

}