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

Commit bc9ed65b authored by Andy Mast's avatar Andy Mast Committed by Gerrit Code Review
Browse files

Avoid boot looping when theme provider is unavailable 

Was reported to happen when the device is encrypted.

Change-Id: I0e8da0270180038211bc469792bd5089aff49e96
(cherry picked from commit 98df5dde)
parent ee52f7a7

services/core/java/com/android/server/ThemeService.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -426,7 +426,12 @@ public class ThemeService extends IThemeService.Stub { 
            incrementProgress(progressIncrement);

            incrementProgress(progressIncrement);

        }

        }





        try {

            updateProvider(request, updateTime);

            updateProvider(request, updateTime);

        } catch(IllegalArgumentException e) {

            // Safeguard against provider not being ready yet.

            Log.e(TAG, "Not updating the theme provider since it is unavailable");

        }





        if (shouldUpdateConfiguration(request)) {

        if (shouldUpdateConfiguration(request)) {

            updateConfiguration(request, removePerAppTheme);

            updateConfiguration(request, removePerAppTheme);