summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2020-04-16 13:34:46 -0400
committer Matt Pietal <mpietal@google.com> 2020-04-16 13:34:46 -0400
commit69dfb64a7d29af03bbcf88d4ed56c26cadf0070c (patch)
tree9b66853ce49dbcf53251dc017731448b0578042d
parent9b6af1dcc58723b86988ac42993af0b07416a2ee (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java3
1 files changed, 2 insertions, 1 deletions
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
+}