Merge "Guard against a NPE when disconnecting suggestion service."

2017-11-06 20:29:56 +00:00
parent 146997a6c9 f6073fb978
commit 5f6c80a288
2 changed files with 14 additions and 1 deletions
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java
@@ -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();
+    }
 }