Merge "Controls Ui - Fix seeding crash" into rvc-dev am: 86a91d2de0

Change-Id: I4481fd76454a07e7eb83463fbc61bcd56d9d6071
2020-04-16 19:06:58 +00:00
parent ffea2256b9 86a91d2de0
commit 6fefb20133
1 changed files with 2 additions and 1 deletions
--- 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();
    }
-}
+}