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

Commit acdb2f28 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Null check overlayPaths/resourceDirs when applying widget changes"

parents 92e4bb6a c8936d36

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

+4 −2
Original line number Diff line number Diff line
@@ -3346,8 +3346,10 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
            // Isolate the changes relating to RROs. The app info must be copied to prevent

            // affecting other parts of system server that may have cached this app info.

            oldAppInfo = new ApplicationInfo(oldAppInfo);

            oldAppInfo.overlayPaths = newAppInfo.overlayPaths.clone();

            oldAppInfo.resourceDirs = newAppInfo.resourceDirs.clone();

            oldAppInfo.overlayPaths = newAppInfo.overlayPaths == null

                    ? null : newAppInfo.overlayPaths.clone();

            oldAppInfo.resourceDirs = newAppInfo.resourceDirs == null

                    ? null : newAppInfo.resourceDirs.clone();

            provider.info.providerInfo.applicationInfo = oldAppInfo;



            for (int j = 0, M = provider.widgets.size(); j < M; j++) {