From 69dfb64a7d29af03bbcf88d4ed56c26cadf0070c Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Thu, 16 Apr 2020 13:34:46 -0400
Subject: Controls Ui - Fix seeding crash

Need to return early when there is no preferred component to seed
controls from.

Bug: 154037512
Test: manual
Change-Id: I5aad8bfb90453cdc97fc75575390d16cd2824c05
---
 .../src/com/android/systemui/globalactions/GlobalActionsDialog.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 2c080b8efc63..9bb253b3d890 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -395,6 +395,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
         if (preferredComponent == null) {
             Log.i(TAG, "Controls seeding: No preferred component has been set, will not seed");
             mControlsPreferences.edit().putBoolean(PREFS_CONTROLS_SEEDING_COMPLETED, true).apply();
+            return;
         }
 
         mControlsController.seedFavoritesForComponent(
@@ -2316,4 +2317,4 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
                 && mControlsUiController.getAvailable()
                 && !mControlsServiceInfos.isEmpty();
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-59-g8ed1b