ADHOC/replicant-packages_apps_SetupWizard
3
0
Fork 0
Code Issues Pull Requests Releases Activity

SetupWizard: Handle register theme change listener crash

Browse Source 
Issue-id: FEIJ-84

Change-Id: I8ffca77418702f04328ae7d0581ab8cc316a04e8
This commit is contained in:
cretin45 2016-04-26 11:14:38 -07:00
parent 2e75c4ee04
commit 941aa1e1e2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
View File

@ -32,6 +32,7 @@ import android.os.UserHandle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewAnimationUtils; import android.view.ViewAnimationUtils;
@ -355,7 +356,11 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
mFinishingProgressBar.setIndeterminate(true); mFinishingProgressBar.setIndeterminate(true);
mFinishingProgressBar.startAnimation(fadeIn); mFinishingProgressBar.startAnimation(fadeIn);
final ThemeManager tm = ThemeManager.getInstance(this); final ThemeManager tm = ThemeManager.getInstance(this);
tm.addClient(this); try {
tm.registerThemeChangeListener(this);
} catch (Exception e) {
Log.w(TAG, "ThemeChangeListener already registered");
}
mSetupData.finishPages(); mSetupData.finishPages();
} }
@ -473,7 +478,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
mEnableAccessibilityController.onDestroy(); mEnableAccessibilityController.onDestroy();
} }
final ThemeManager tm = ThemeManager.getInstance(SetupWizardActivity.this); final ThemeManager tm = ThemeManager.getInstance(SetupWizardActivity.this);
tm.removeClient(SetupWizardActivity.this); tm.unregisterThemeChangeListener(SetupWizardActivity.this);
SetupStats.sendEvents(SetupWizardActivity.this); SetupStats.sendEvents(SetupWizardActivity.this);
SetupWizardUtils.disableGMSSetupWizard(SetupWizardActivity.this); SetupWizardUtils.disableGMSSetupWizard(SetupWizardActivity.this);
final WallpaperManager wallpaperManager = final WallpaperManager wallpaperManager =