aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NullPointerException in WidgetSizes.updateWidgetSizeRangesAsync

Browse Source 
This commit addresses a NullPointerException that occurs when updating
widget options in the WidgetSizes class. The fix includes:

- Adding null checks for sizeOptions and currentOptions
- Comparing new sizes with current sizes before updating
- Catching and logging exceptions during widget option updates
- Returning null from getWidgetSizeOptions if it fails to create a valid Bundle

These changes should resolve the "Attempt to invoke virtual method 'void
android.os.Bundle.putAll(android.os.Bundle)' on a null object reference" error
and improve the robustness of widget size updates.

java.lang.NullPointerException: Attempt to invoke virtual method 'void android.os.Bundle.putAll(android.os.Bundle)' on a null object reference
at android.os.Parcel.createExceptionOrNull(Parcel.java:3075)
at android.os.Parcel.createException(Parcel.java:3053)
at android.os.Parcel.readException(Parcel.java:3036)
at android.os.Parcel.readException(Parcel.java:2978)
at com.android.internal.appwidget.IAppWidgetService$Stub$Proxy.updateAppWidgetOptions(IAppWidgetService.java:1017)
at android.appwidget.AppWidgetManager.updateAppWidgetOptions(AppWidgetManager.java:727)
at com.android.launcher3.widget.util.WidgetSizes.lambda$updateWidgetSizeRangesAsync$0(Unknown Source:31)
at com.android.launcher3.widget.util.WidgetSizes.a(Unknown Source:0)
at ba.a.run(Unknown Source:10)
at android.os.Handler.handleCallback(Handler.java:958)
at android.os.Handler.dispatchMessage(Handler.java:99)
at android.os.Looper.loopOnce(Looper.java:230)
at android.os.Looper.loop(Looper.java:319)
at android.os.HandlerThread.run(HandlerThread.java:67)
Caused by: android.os.RemoteException: Remote stack trace:
at com.android.server.appwidget.AppWidgetServiceImpl.updateAppWidgetOptions(AppWidgetServiceImpl.java:2193)
at com.android.internal.appwidget.IAppWidgetService$Stub.onTransact(IAppWidgetService.java:500)
at android.os.Binder.execTransactInternal(Binder.java:1375)
at android.os.Binder.execTransact(Binder.java:1311)
This commit is contained in:
MrSluffy
2024-12-28 09:31:58 +08:00
parent d401ba32fd
commit 4ad2e73075
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/launcher3/widget/util/WidgetSizes.java
View File

@@ -32,6 +32,7 @@ import android.util.SizeF;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.model.WidgetItem;
import java.util.ArrayList;
@@ -105,7 +106,7 @@ public final class WidgetSizes {
* from {@code spanX}, {@code spanY} in all supported device profiles.
*/
public static void updateWidgetSizeRangesAsync(int widgetId,
AppWidgetProviderInfo info, Context context, int spanX, int spanY) {
AppWidgetProviderInfo info, Context context, int spanX, int spanY) {
if (widgetId <= 0 || info == null) {
return;
}
@@ -113,13 +114,28 @@ public final class WidgetSizes {
UI_HELPER_EXECUTOR.execute(() -> {
AppWidgetManager widgetManager = AppWidgetManager.getInstance(context);
Bundle sizeOptions = getWidgetSizeOptions(context, info.provider, spanX, spanY);
if (sizeOptions.<SizeF>getParcelableArrayList(
AppWidgetManager.OPTION_APPWIDGET_SIZES).equals(
widgetManager.getAppWidgetOptions(widgetId).<SizeF>getParcelableArrayList(
AppWidgetManager.OPTION_APPWIDGET_SIZES))) {
if (sizeOptions == null) {
Log.e("WidgetSizes", "Failed to get widget size options for widgetId: " + widgetId);
return;
}
widgetManager.updateAppWidgetOptions(widgetId, sizeOptions);
Bundle currentOptions = widgetManager.getAppWidgetOptions(widgetId);
if (currentOptions == null) {
currentOptions = new Bundle();
}
if(!Utilities.ATLEAST_S) return;
ArrayList<SizeF> newSizes = sizeOptions.getParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES);
ArrayList<SizeF> currentSizes = currentOptions.getParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES);
if (newSizes != null && !newSizes.equals(currentSizes)) {
try {
widgetManager.updateAppWidgetOptions(widgetId, sizeOptions);
} catch (Exception e) {
Log.e("WidgetSizes", "Error updating widget options for widgetId: " + widgetId, e);
}
}
});
}
@@ -129,6 +145,10 @@ public final class WidgetSizes {
public static Bundle getWidgetSizeOptions(Context context, ComponentName provider, int spanX,
int spanY) {
ArrayList<SizeF> paddedSizes = getWidgetSizesDp(context, spanX, spanY);
if (paddedSizes == null || paddedSizes.isEmpty()) {
Log.e("WidgetSizes", "Failed to get widget sizes for provider: " + provider);
return null;
}
Rect rect = getMinMaxSizes(paddedSizes);
Bundle options = new Bundle();
@@ -136,7 +156,9 @@ public final class WidgetSizes {
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, rect.top);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, rect.right);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, rect.bottom);
options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, paddedSizes);
if (Utilities.ATLEAST_S) {
options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, paddedSizes);
}
Log.d("b/267448330", "provider: " + provider + ", paddedSizes: " + paddedSizes
+ ", getMinMaxSizes: " + rect);
return options;