commit 74c324b70f676fa25e2dc643ee228b13fb59f848
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 24 12:41:46 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 24 12:41:46 2022 +0000
tree 9d4662fc156309accf07855291bc9e5f932f0799
parent 4c07e2b865c2b0bc797fb530cc80e4289092313c
parent 03d8d119145da8b8d030053014f2e53d274b2450

Merge "Fix can't start injected item problem" into tm-dev

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 09000bf..80c9ec6 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -185,9 +185,9 @@
                             && ActivityEmbeddingUtils.isEmbeddingActivityEnabled(mContext)) {
                         // Highlight the preference whenever it's clicked
                         final TopLevelSettings topLevelSettings = (TopLevelSettings) fragment;
-                        topLevelSettings.setHighlightPreferenceKey(key);
                         highlightMixin = topLevelSettings.getHighlightMixin();
                         isDuplicateClick = topLevelSettings.isDuplicateClick(preference);
+                        topLevelSettings.setHighlightPreferenceKey(key);
                     }
                     launchIntentOrSelectProfile(activity, tile, intent, sourceMetricsCategory,
                             highlightMixin, isDuplicateClick);