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

Merge "Prevent bad grid configuration by making sure RestoreDbTask updates IDP correctly." into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-12-16 22:06:32 -08:00
committed by Android (Google) Code Review
parent 254ba3092e 3eec1895ed
commit d3f591f614
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/InvariantDeviceProfile.java
+8 -6
View File
@@ -246,10 +246,6 @@ public class InvariantDeviceProfile implements SafeCloseable {
@TargetApi(23)
private InvariantDeviceProfile(Context context) {
String gridName = getCurrentGridName(context);
FileLog.d(TAG, "New InvariantDeviceProfile, before initGrid(): "
+ "gridName:" + gridName
+ ", LauncherPrefs GRID_NAME:" + LauncherPrefs.get(context).get(GRID_NAME)
+ ", LauncherPrefs DB_FILE:" + LauncherPrefs.get(context).get(DB_FILE));
initGrid(context, gridName);
DisplayController.INSTANCE.get(context).setPriorityListener(
(displayContext, info, flags) -> {
@@ -358,6 +354,11 @@ public class InvariantDeviceProfile implements SafeCloseable {
}
private String initGrid(Context context, String gridName) {
FileLog.d(TAG, "Before initGrid:"
+ "gridName:" + gridName
+ ", dbFile:" + dbFile
+ ", LauncherPrefs GRID_NAME:" + LauncherPrefs.get(context).get(GRID_NAME)
+ ", LauncherPrefs DB_FILE:" + LauncherPrefs.get(context).get(DB_FILE));
Info displayInfo = DisplayController.INSTANCE.get(context).getInfo();
List<DisplayOption> allOptions = getPredefinedDeviceProfiles(
context,
@@ -383,8 +384,9 @@ public class InvariantDeviceProfile implements SafeCloseable {
}
initGrid(context, displayInfo, displayOption);
FileLog.d(TAG, "initGrid: "
FileLog.d(TAG, "After initGrid:"
+ "gridName:" + gridName
+ ", dbFile:" + dbFile
+ ", LauncherPrefs GRID_NAME:" + LauncherPrefs.get(context).get(GRID_NAME)
+ ", LauncherPrefs DB_FILE:" + LauncherPrefs.get(context).get(DB_FILE));
return displayOption.grid.name;
@@ -402,7 +404,7 @@ public class InvariantDeviceProfile implements SafeCloseable {
*/
@Deprecated
public void reset(Context context) {
initGrid(context, getDefaultGridName(context));
initGrid(context, getCurrentGridName(context));
}
@VisibleForTesting