Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 380d8d52 authored by Willie Koomson's avatar Willie Koomson
Browse files

Delete generated preview file if corrupted 

Update AppWidgetServiceImpl so that if it fails to read a generated
preview file, the file is deleted and providers are updated.

This change also updates the service to keep previews after a provider
app updates. Since we now delete previews files if they cannot be read
into RemoteViews, we do not need to worry about missing resource IDs
after an app update.

Bug: 364420494
Test: atest CtsAppWidgetHostTestCases
Flag: android.appwidget.flags.remote_views_proto
Change-Id: I7f4a8aa6c73471c176aa75f2e47627ad8574ce3a
parent 9ef0692a

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+12 −8
Original line number Diff line number Diff line
@@ -4673,12 +4673,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                        keep.add(providerId);

                        // Use the new AppWidgetProviderInfo.

                        provider.setPartialInfoLocked(info);

                        // Clear old previews

                        if (remoteViewsProto()) {

                            clearGeneratedPreviewsAsync(provider);

                        } else {

                            provider.clearGeneratedPreviewsLocked();

                        }

                        // If it's enabled

                        final int M = provider.widgets.size();

                        if (M > 0) {
@@ -5104,6 +5098,10 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        AndroidFuture<RemoteViews> result = new AndroidFuture<>();

        mSavePreviewsHandler.post(() -> {

            SparseArray<RemoteViews> previews = loadGeneratedPreviews(provider);

            if (previews.size() == 0 && provider.info.generatedPreviewCategories != 0) {

                // Failed to read previews from file, clear the file and update providers.

                saveGeneratedPreviews(provider, previews, /* notify= */ true);

            }

            for (int i = 0; i < previews.size(); i++) {

                if ((widgetCategory & previews.keyAt(i)) != 0) {

                    result.complete(previews.valueAt(i));
@@ -5222,8 +5220,14 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                continue;

            }

            ProtoInputStream input = new ProtoInputStream(previewsFile.readFully());

            try {

                provider.info.generatedPreviewCategories = readGeneratedPreviewCategoriesFromProto(

                        input);

            } catch (IOException e) {

                Slog.e(TAG, "Failed to read generated previews from file for " + provider, e);

                previewsFile.delete();

                provider.info.generatedPreviewCategories = 0;

            }

            if (DEBUG) {

                Slog.i(TAG, TextUtils.formatSimple(

                        "loadGeneratedPreviewCategoriesLocked %d %s categories %d", profileId,