From b617f84b326be92f85232b7ef00fa01de6ba38b0 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 31 Jan 2019 13:48:40 -0800
Subject: [PATCH] Fix a NPE from incorrect assumption of operation pecedence.

Change-Id: I13d01c39bd3afcfbc7b680b96e0c7eb341fbc584
Fixes: 123709444
Test: robotest
---
 .../LegacySuggestionContextualCardController.java           | 6 ++++--
 .../LegacySuggestionContextualCardControllerTest.java       | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java
index bbcebbe6a2e..3b0b46d2f2b 100644
--- a/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java
@@ -128,8 +128,10 @@ public class LegacySuggestionContextualCardController implements ContextualCardC
                 return;
             }
             final List<Suggestion> suggestions = mSuggestionController.getSuggestions();
-            Log.d(TAG, "Loaded suggests: "
-                    + suggestions == null ? "null" : String.valueOf(suggestions.size()));
+            final String suggestionCount = suggestions == null
+                    ? "null"
+                    : String.valueOf(suggestions.size());
+            Log.d(TAG, "Loaded suggests: " + suggestionCount);
 
             final List<ContextualCard> cards = new ArrayList<>();
             if (suggestions != null) {
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
index ebc2154a009..a2d4d093c42 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
@@ -19,6 +19,7 @@ package com.android.settings.homepage.contextualcards.legacysuggestion;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
 
@@ -84,8 +85,10 @@ public class LegacySuggestionContextualCardControllerTest {
 
     @Test
     public void onServiceConnected_shouldLoadSuggestion() {
+        when(mSuggestionController.getSuggestions()).thenReturn(null);
         mController.mSuggestionController = mSuggestionController;
         mController.setCardUpdateListener(mCardUpdateListener);
+
         mController.onServiceConnected();
 
         verify(mSuggestionController).getSuggestions();