PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetupWizard: Handle register theme change listener crash

Browse Source 
Issue-id: FEIJ-84

Change-Id: I8ffca77418702f04328ae7d0581ab8cc316a04e8
(cherry picked from commit 941aa1e1e2)
This commit is contained in:
cretin45
2016-04-26 11:14:38 -07:00
committed by Ed Carrigan
parent 4c7f320b6f
commit 081fc3d4ae
1 changed files with 7 additions and 2 deletions
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.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewAnimationUtils;
@@ -354,7 +355,11 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
mFinishingProgressBar.setIndeterminate(true);
mFinishingProgressBar.startAnimation(fadeIn);
final ThemeManager tm = ThemeManager.getInstance(this);
tm.addClient(this);
try {
tm.registerThemeChangeListener(this);
} catch (Exception e) {
Log.w(TAG, "ThemeChangeListener already registered");
}
mSetupData.finishPages();
}
@@ -470,7 +475,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
mEnableAccessibilityController.onDestroy();
}
final ThemeManager tm = ThemeManager.getInstance(SetupWizardActivity.this);
tm.removeClient(SetupWizardActivity.this);
tm.unregisterThemeChangeListener(SetupWizardActivity.this);
SetupStats.sendEvents(SetupWizardActivity.this);
SetupWizardUtils.disableGMSSetupWizard(SetupWizardActivity.this);
final WallpaperManager wallpaperManager =