PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b am: 2b8067e797

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473

Change-Id: Ie6f50f7e915be5990ba5f33c5e375f3508491b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Chiu
2023-06-02 10:21:49 +00:00
committed by Automerger Merge Worker
parent 2f3132c132 2b8067e797
commit d103243e8b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/dashboard/CategoryManager.java
View File

@@ -34,6 +34,8 @@ import com.android.settingslib.drawer.ProviderTile;
import com.android.settingslib.drawer.Tile; import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.TileUtils; import com.android.settingslib.drawer.TileUtils;
import com.google.android.setupcompat.util.WizardManagerHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -79,6 +81,9 @@ public class CategoryManager {
} }
public synchronized List<DashboardCategory> getCategories(Context context) { public synchronized List<DashboardCategory> getCategories(Context context) {
if (!WizardManagerHelper.isUserSetupComplete(context)) {
return new ArrayList<>();
}
tryInitCategories(context); tryInitCategories(context);
return mCategories; return mCategories;
} }
@@ -142,6 +147,10 @@ public class CategoryManager {
} }
private synchronized void tryInitCategories(Context context, boolean forceClearCache) { private synchronized void tryInitCategories(Context context, boolean forceClearCache) {
if (!WizardManagerHelper.isUserSetupComplete(context)) {
// Don't init while setup wizard is still running.
return;
}
if (mCategories == null) { if (mCategories == null) {
final boolean firstLoading = mCategoryByKeyMap.isEmpty(); final boolean firstLoading = mCategoryByKeyMap.isEmpty();
if (forceClearCache) { if (forceClearCache) {