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

This commit is contained in:
TreeHugger Robot
2017-11-06 20:29:56 +00:00
committed by Android (Google) Code Review
2 changed files with 14 additions and 1 deletions

View File

@@ -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