PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against a NPE when disconnecting suggestion service.

Browse Source 
Change-Id: Ib10502b9467365f6e348737655806ef2369a747b
Fixes: 68885411
Test: robotests
This commit is contained in:
Fan Zhang
2017-11-06 10:30:05 -08:00
parent b0f65ac832
commit f6073fb978
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java
View File

@@ -97,7 +97,10 @@ public class SuggestionControllerMixin implements SuggestionController.ServiceCo
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "SuggestionService disconnected"); 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 @Override

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

@@ -97,4 +97,14 @@ public class SuggestionControllerMixinTest {
verify(mHost).getLoaderManager(); 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();
}
} }