SetupWizard: Fix AccessibilityController regression and service leak

Change-Id: Ic8e419792d2468b937feb08d6678608c936d9f98

1 files changed, 6 insertions, 5 deletions

diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index 3c36328..76c69a3 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -88,7 +88,8 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
             mSetupData.load(savedInstanceState.getBundle("data"));
         }
         if (EnableAccessibilityController.canEnableAccessibilityViaGesture(this)) {
-            mEnableAccessibilityController = new EnableAccessibilityController(this);
+            mEnableAccessibilityController =
+                    EnableAccessibilityController.getInstance(getApplicationContext());
             mRootView.setOnTouchListener(new View.OnTouchListener() {
                 @Override
                 public boolean onTouch(View v, MotionEvent event) {
@@ -119,9 +120,6 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (mEnableAccessibilityController != null) {
-            mEnableAccessibilityController.onDestroy();
-        }
         mSetupData.unregisterListener(this);
         unregisterReceiver(mSetupData);
     }
@@ -273,7 +271,10 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
         Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
         Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 1);
         ((SetupWizardApp)AppGlobals.getInitialApplication()).enableStatusBar();
-        SetupWizardUtils.disableSetupWizards(this);
         finish();
+        if (mEnableAccessibilityController != null) {
+            mEnableAccessibilityController.onDestroy();
+        }
+        SetupWizardUtils.disableSetupWizards(this);
     }
 }