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

Commit df5e2309 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

ThemeService: ManagedProvisioning is a setup package too. 

Do _not_ restart it when applying themes. This causes its crappy
state machine to fail horribly when setting up AfW

Addresses CYNGNOS-1584

Change-Id: I0d8a59fa0347f168b6bec7b7a038a8c1501e38fb
parent f20ea48c

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ public class ThemeService extends IThemeService.Stub { 




    private static final String GOOGLE_SETUPWIZARD_PACKAGE = "com.google.android.setupwizard";

    private static final String GOOGLE_SETUPWIZARD_PACKAGE = "com.google.android.setupwizard";

    private static final String CM_SETUPWIZARD_PACKAGE = "com.cyanogenmod.account";

    private static final String CM_SETUPWIZARD_PACKAGE = "com.cyanogenmod.account";

    private static final String MANAGED_PROVISIONING_PACKAGE = "com.android.managedprovisioning";





    private static final long MAX_ICON_CACHE_SIZE = 33554432L; // 32MB

    private static final long MAX_ICON_CACHE_SIZE = 33554432L; // 32MB

    private static final long PURGED_ICON_CACHE_SIZE = 25165824L; // 24 MB

    private static final long PURGED_ICON_CACHE_SIZE = 25165824L; // 24 MB
@@ -859,6 +860,7 @@ public class ThemeService extends IThemeService.Stub { 




    private boolean isSetupActivity(ResolveInfo info) {

    private boolean isSetupActivity(ResolveInfo info) {

        return GOOGLE_SETUPWIZARD_PACKAGE.equals(info.activityInfo.packageName) ||

        return GOOGLE_SETUPWIZARD_PACKAGE.equals(info.activityInfo.packageName) ||

               MANAGED_PROVISIONING_PACKAGE.equals(info.activityInfo.packageName) ||

               CM_SETUPWIZARD_PACKAGE.equals(info.activityInfo.packageName);

               CM_SETUPWIZARD_PACKAGE.equals(info.activityInfo.packageName);

    }

    }