Set Metrics & Privacy settings false

src/com/cyanogenmod/setupwizard/FinishActivity.java

@@ -240,22 +240,13 @@ public class FinishActivity extends BaseSetupWizardActivity {
     }
 
     private static void handleEnableMetrics(SetupWizardApp setupWizardApp) {
-        Bundle privacyData = setupWizardApp.getSettingsBundle();
-        if (privacyData != null
-                && privacyData.containsKey(KEY_SEND_METRICS)) {
-            CMSettings.Secure.putInt(setupWizardApp.getContentResolver(),
-                    CMSettings.Secure.STATS_COLLECTION, privacyData.getBoolean(KEY_SEND_METRICS)
-                            ? 1 : 0);
-        }
+        CMSettings.Secure.putInt(setupWizardApp.getContentResolver(),
+                CMSettings.Secure.STATS_COLLECTION, 0);
     }
 
     private static void handlePrivacyGuard(SetupWizardApp setupWizardApp) {
-        Bundle mPrivacyData = setupWizardApp.getSettingsBundle();
-        if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) {
-            CMSettings.Secure.putInt(setupWizardApp.getContentResolver(),
-                    CMSettings.Secure.PRIVACY_GUARD_DEFAULT,
-                    mPrivacyData.getBoolean(KEY_PRIVACY_GUARD) ? 1 : 0);
-        }
+        CMSettings.Secure.putInt(setupWizardApp.getContentResolver(),
+                CMSettings.Secure.PRIVACY_GUARD_DEFAULT, 0);
     }
 
     private static void handleNavKeys(SetupWizardApp setupWizardApp) {